User Tools

Site Tools


wiki:development:build-howto-mswin:x2goclient

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
wiki:development:build-howto-mswin:x2goclient [2015/03/11 02:46]
mikedep333 [Copy the X2Go Client binaries to the desired folder] copy-pasta typo
wiki:development:build-howto-mswin:x2goclient [2023/05/08 22:20] (current)
orion [Copying the nxproxy binaries] Use nxproxy\src\.libs\nxproxy.exe
Line 8: Line 8:
 This howto is intended for 2 different audiences: This howto is intended for 2 different audiences:
   - Those doing official X2Go Project builds.   - Those doing official X2Go Project builds.
-  - Those doing informal builds, persona builds, or builds for use within their organization.+  - Those doing informal builds, personal builds, or builds for use within their organization.
 The former audience has extra steps to do. These steps will be noted. The former audience has extra steps to do. These steps will be noted.
  
 ===== Overview of third-party components ===== ===== Overview of third-party components =====
  
-X2Go Client for Windows needs several 3rd-party programmes for being able to run on MS Windows:+X2Go Client for Windows needs several 3rd-party programs for being able to run on MS Windows:
  
  
-  * [[wiki:development:build-howto-mswin:x2goclient/#build_add_nxproxy_with_libraries|nxproxy]]+  * [[wiki:development:build-howto-mswin:x2goclient/#building_nxproxy_openssh_optional|nxproxy]]
  
-  * [[wiki:development:build-howto-mswin:x2goclient/#open_ssh_server|OpenSSH Server]] for file sharing (optional)+  * [[wiki:development:build-howto-mswin:x2goclient/#openssh_server|OpenSSH Server]] for file sharing (optional)
  
   * [[wiki:development:build-howto-mswin:x2goclient/#pulseaudio|PulseAudio]] for sound support (optional)   * [[wiki:development:build-howto-mswin:x2goclient/#pulseaudio|PulseAudio]] for sound support (optional)
  
-  * [[wiki:development:build-howto-mswin:x2goclient/#vcxsrv|X-Server]](VcXsrv)+  * [[wiki:development:build-howto-mswin:x2goclient/#vcxsrv_-_xp_compatible|X-Server]] (VcXsrv
 + 
 +  * [[wiki:development:build-howto-mswin:x2goclient/#x3270-fonts|x3270 fonts]] (optional)
  
   * [[wiki:development:build-howto-mswin:x2goclient/#putty|PuTTY]] for Kerberos 5 (GSSAPI) authentication   * [[wiki:development:build-howto-mswin:x2goclient/#putty|PuTTY]] for Kerberos 5 (GSSAPI) authentication
  
-All these programmes, as well as many of the libraries, can now be downloaded from [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]]. Older versions are available from our [[http://code.x2go.org/releases/binary-win32/3rd-party|server]]+All these programs, as well as many of the libraries, can now be downloaded from [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]]. Older versions are available from our [[http://code.x2go.org/releases/binary-win32/3rd-party|server]]
  
 They can also be built from source, or downloaded from their project sites. However, this howto only explains how to build nxproxy and OpenSSH. They can also be built from source, or downloaded from their project sites. However, this howto only explains how to build nxproxy and OpenSSH.
Line 34: Line 36:
 ===== Build Utilities ===== ===== Build Utilities =====
  
-For building X2Go Client, we highly recommend to install [[http://msysgit.github.io/|MSysGit]] and [[http://www.flos-freeware.ch/notepad2.html|Notepad2]].+For building X2Go Client, we highly recommend to install [[http://msysgit.github.io/|MSysGit]] and [[http://www.flos-freeware.ch/notepad2.html|Notepad2]]. Any other editor that is capable of handling both UNIX- and Windows-style line endings and UTF-8 will do as well.
  
 MSysGit provides a Unix-like shell (bash) environment, so that you can use Git easily from the command line. MSysGit provides a Unix-like shell (bash) environment, so that you can use Git easily from the command line.
Line 44: Line 46:
 ===== Setup Build Environment ===== ===== Setup Build Environment =====
  
-==== Installing MinGW (Current Version) ====+==== Installing MinGW ====
  
-MinGW is a gcc compiler for Windows. You need it to build X2Go Client.+MinGW includes the GCC compiler suite for Windows. You need it to build X2Go Client.
  
 Since X2Go Client 4.0.3.0, X2Go Client uses Qt 4.8.6 specifically. Qt 4.8.6 uses MinGW 4.8.x. Qt 4.8.6 for Windows recommends this specific build of MinGW, so it is this specific build that you should use. Since X2Go Client 4.0.3.0, X2Go Client uses Qt 4.8.6 specifically. Qt 4.8.6 uses MinGW 4.8.x. Qt 4.8.6 for Windows recommends this specific build of MinGW, so it is this specific build that you should use.
Line 56: Line 58:
 Finally, you have to add these MinGW executable directories to your PATH environment variable: ''D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin'', ''D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\libexec\gcc\i686-w64-mingw32\4.8.2''. Finally, you have to add these MinGW executable directories to your PATH environment variable: ''D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin'', ''D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\libexec\gcc\i686-w64-mingw32\4.8.2''.
  
-==== Installing MinGW (Old Version) ==== +==== Installing Qt ====
- +
-Using Qt 4.8.5 + MinGW 4.4 is still an option for building X2Go Client 4.0.3.0 and later. It was how X2Go Client 4.0.2.1 and many prior versions were built. +
-Unfortunately, you can not download binaries for this version from MinGW project site any more. You can build it from source or download it from [[http://code.x2go.org/releases/binary-win32/tools/MinGW-gcc440_1.zip|X2Go Site ]] +
- +
-Extract it to your disk (''D:\mingw'' in this example). +
- +
-Finally, you have to add these MinGW executable directories to your PATH environment variable: ''D:\mingw\bin'', ''D:\mingw\libexec\gcc\mingw32\4.4.0''+
-==== Installing Qt (Current Version)====+
  
 You need Qt to build X2Go Client from source. You need Qt to build X2Go Client from source.
Line 74: Line 68:
 In this example D:\Qt\4.8.6 will be chosen as installation directory In this example D:\Qt\4.8.6 will be chosen as installation directory
  
-==== Installing Qt (Old Version)==== 
- 
-Qt-4.8.5 was tested and recommended for X2Go Client 4.0.2.1 and earlier. It is still an option for X2Go Client 4.0.3.0 and later. 
- 
-Download and install the **MinGW** version of Qt-4.8.5 for Windows from [[http://download.qt-project.org/archive/qt/4.8/4.8.5/|here]] 
- 
-In this example D:\Qt\4.8.5 will be chosen as installation directory 
 ==== Configuring Qt ==== ==== Configuring Qt ====
  
 === Providing OpenSSL support in Qt === === Providing OpenSSL support in Qt ===
  
-As X2Go Client needs Qt with SSL support you must install OpenSSL for MS Windows. OpenSSL depends on the [[http://www.microsoft.com/en-us/download/details.aspx?id=29|Microsoft Visual C++ 2008 Redistributables]]. Get that (32-bit version, x86) from the Microsoft site and install it prior to installing OpenSSL.+As X2Go Client needs Qt built with SSL support you must install OpenSSL for MS Windows. OpenSSL depends on the [[https://www.microsoft.com/en-us/download/details.aspx?id=40784|Microsoft Visual C++ 2013 Redistributables]]. Get that (32-bit version, x86) from the Microsoft site and install it prior to installing OpenSSL.
  
 Download the OpenSSL installer for Windows by browsing [[http://slproweb.com/products/Win32OpenSSL.html|here]] and selecting "Win32 OpenSSL v1.0.1*" where "1.0.1*" s the current version. You can also download it from [[http://code.x2go.org/releases/binary-win32/3rd-party/Win32OpenSSL/|our site]], but only do so if we have the current version. Install it on your build system (for example to directory ''d:\OpenSSL-Win32''). Download the OpenSSL installer for Windows by browsing [[http://slproweb.com/products/Win32OpenSSL.html|here]] and selecting "Win32 OpenSSL v1.0.1*" where "1.0.1*" s the current version. You can also download it from [[http://code.x2go.org/releases/binary-win32/3rd-party/Win32OpenSSL/|our site]], but only do so if we have the current version. Install it on your build system (for example to directory ''d:\OpenSSL-Win32'').
Line 94: Line 81:
 <code> <code>
 d:\OpenSSL-Win32\include\openssl -> d:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\include\openssl d:\OpenSSL-Win32\include\openssl -> d:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\include\openssl
-</code> 
-For MinGW 4.4: 
-<code> 
-d:\OpenSSL-Win32\include\openssl -> d:\mingw\include\openssl 
 </code> </code>
  
Line 104: Line 87:
 It is recommended to configure Qt to build statically linked applications. It is recommended to configure Qt to build statically linked applications.
  
-This is how official X2Go Client builds are done+This is how official X2Go Client builds are done.
  
 It will take some time to reconfigure Qt for static builds. You surely can skip this step, but in this case you must provide Qt libraries with your X2Go Client binary. It will take some time to reconfigure Qt for static builds. You surely can skip this step, but in this case you must provide Qt libraries with your X2Go Client binary.
Line 113: Line 96:
 <code> <code>
 $ configure -release -static -openssl -qt-style-windowsxp -qt-style-windowsvista $ configure -release -static -openssl -qt-style-windowsxp -qt-style-windowsvista
-</code> 
-For Qt 4.8.5: 
-<code> 
-$ configure -release -static -openssl 
 </code> </code>
  
-For either version of Qt, rebuild Qt:+Rebuild Qt:
 <code> <code>
-$ make sub-src+$ make -j3 sub-src
 </code> </code>
  
Line 134: Line 113:
 $ configure -release -openssl -qt-style-windowsxp -qt-style-windowsvista $ configure -release -openssl -qt-style-windowsxp -qt-style-windowsvista
 </code> </code>
-For Qt 4.8.5:+ 
 +Rebuild Qt:
 <code> <code>
-configure -release -openssl+make -j3 sub-src
 </code> </code>
  
-For either version of Qt, rebuild Qt: 
-<code> 
-$ make sub-src 
-</code> 
 ==== Installing libssh ==== ==== Installing libssh ====
 You need libssh to build X2Go Client. You need libssh to build X2Go Client.
  
-X2Go Client 4.0.3.and later use libssh 0.6.with pageant support.+X2Go Client 4.1.2.and later use libssh 0.9.with pageant support. 
 + 
 +=== Pre-built Binaries ===
  
 Get the **library** package built with MinGW 4.8.x (currently 4.8.2) from [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD | x2goclient-contrib.git]] Get the **library** package built with MinGW 4.8.x (currently 4.8.2) from [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD | x2goclient-contrib.git]]
  
-Or for MingW 4.4.0,  [[ http://code.x2go.org/releases/binary-win32/3rd-party/libssh-modified-by-x2go-project/ | here on our site]]. And then extract files from archive.  
  
 Copy headers files in "include" directory of MinGW. Copy headers files in "include" directory of MinGW.
Line 157: Line 134:
 <code> <code>
 x2goclient-contrib\libssh\0.6.3-762055b-pageant-support-mingw482_bin\include\libssh -> d:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\include\libssh x2goclient-contrib\libssh\0.6.3-762055b-pageant-support-mingw482_bin\include\libssh -> d:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\include\libssh
-</code> 
-For MinGW 4.4: 
-<code> 
-libssh\include\libssh -> d:\mingw\include\libssh 
 </code> </code>
  
Line 169: Line 142:
 x2goclient-contrib\libssh\0.6.3-762055b-pageant-support-mingw482_bin\lib\*.* -> d:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\lib\ x2goclient-contrib\libssh\0.6.3-762055b-pageant-support-mingw482_bin\lib\*.* -> d:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\lib\
 </code> </code>
-For MinGW 4.4:+ 
 +=== Building From Source === 
 + 
 +If you want to rebuild the library (e.g., to backport fixes) or update it as part of the release process, follow these steps. 
 + 
 +== Preparation == 
 + 
 +Download the tarball from [[https://www.libssh.org/get-it/|the libssh website]]. 
 + 
 +Unpack it as usually. The X2Go Project keeps libssh source code at ''D:\Build\libssh\''
 + 
 +Adapt any required patches so that they apply cleanup, build and work correctly. 
 + 
 +We currently patch libssh to include support for PuTTY's Pageant ssh agent. 
 + 
 +To rebase patches, the X2Go Project uses the private git repository at ''D:\Build\libssh\libssh-git'': 
 +  * update the repository: <code>git fetch origin</code> 
 +  * check out new release tag (or branch or whatever you intend to build later on): <code>git checkout ... (e.g., libssh-0.9.3)</code> 
 +  * create new branch based on the tag/commit/branch/...: <code>git branch ...-win32 (e.g., libssh-0.9.3-win32)</code> 
 +  * cherry-pick specific X2Go-related commits from older branches, one ''cherry-pick'' command per commit to be ported: <code>git cherry-pick ...-win32 (e.g., libssh-0.7.4-win32)</code> 
 +  * fix any merge conflicts, pull in other upstream code etc. 
 +  * update the commit message! 
 +  * when done, create patch files: <code>git format-patch HEAD~ (for one patch, use ~~ for two patches etc.)</code> 
 + 
 +Move the patches to the respective source directory and apply them in order. 
 + 
 +If needed, install or update ''cmake'' on the build machine. 
 + 
 +== Configuration == 
 + 
 +Open a terminal window. Crucially, this must **not** be a ''Cygwin'' instance. 
 + 
 +Make sure that the MinGW toolchain that was used to build Qt (and will be used to build X2Go CLient later on) is part of the %PATH% variable. On the X2Go Windows Builder, a session spawned via ''cmd.exe'' typically fulfills this requirement. Additionally, use the same ''zlib'' version for building both ''Qt'' and ''libssh''
 + 
 +Go to the unpacked source directory: <code>D:; cd Build\libssh\libssh-...</code> 
 + 
 +Create and switch to a build subdirectory: <code>mkdir build; cd build</code> 
 + 
 +The pre-built libssh versions in ''x2goclient-contrib'' contain a file called ''CMake-Show-My-Changes.txt''. Use this as a reference for building. 
 + 
 +Call ''cmake'' to configure the project, example (adapt to your system!): <code>"C:\Program Files\CMake\bin\cmake.exe" -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX:PATH="D:/Build/libssh/libssh-staging" -DCMAKE_C_COMPILER:FILEPATH="D:/i686-4.8.2-release-posix-dwarf-rt_v3-rev3/mingw32/bin/gcc.exe" -DCMAKE_LINKER:FILEPATH="D:/i686-4.8.2-release-posix-dwarf-rt_v3-rev3/mingw32/bin/ld.exe" -DZLIB_LIBRARY_RELEASE:FILEPATH="D:/x2goclient-contrib/zlib/1.2.8_bin/zlib1.dll" -DWITH_GSSAPI:BOOL="0" -DWITH_NACL:BOOL="0" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_MAKE_PROGRAM:FILEPATH="D:/i686-4.8.2-release-posix-dwarf-rt_v3-rev3/mingw32/bin/mingw32-make.exe" -DWITH_EXAMPLES:BOOL="0" -DZLIB_INCLUDE_DIR:PATH="D:/Build/zlib/zlib-1.2.8/" -DLIB_EAY:FILEPATH="D:/OpenSSL-Win32/lib/MinGW/libeay32.a" -DSSL_EAY:FILEPATH="D:/OpenSSL-Win32/lib/MinGW/ssleay32.a" -DOPENSSL_INCLUDE_DIR:PATH="D:/OpenSSL-Win32/include" ..</code> 
 + 
 +== Build == 
 + 
 +Build the software like any other, append ''-j'' and other flags as desired: 
 + 
 +<code>"D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin\mingw32-make.exe"</code> 
 + 
 +== Install == 
 + 
 +It's recommended to make sure that the install staging area is clean (fully deleted or at least empty) before installing/staging the built software. 
 + 
 +This ensures that old/removed files won't linger around and that changes will not remain undetected. 
 + 
 +<code>rm -rf "D:\Build\libssh\libssh-staging" 
 +"D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin\mingw32-make.exe" install</code> 
 + 
 +Afterwards, clean and install the newly built files into the MinGW prefix: 
 + 
 +Header files: 
 <code> <code>
-libssh\lib\*.* -> d:\mingw\lib\+rm -rf "D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\include\libssh
 +cp -av "D:\Build\libssh\libssh-staging\include\libssh" "D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\include\libssh"
 </code> </code>
 +
 +<note>''(dll).a'' files can be static libraries that are being used as "DLL import libraries" on Windows. They do not actually contain the library contents but a mechanism for loading the shared DLL files at run time. This differs from the UNIX concept of the linker automatically generating (unresolved) symbols and ignoring them (if an eventual symbol scanning suceeds) that are automatically resolved at run time.
 +
 +As such, it is important to keep these static DLL import libraries around on Windows, even if library is supposed to be used in a dynamically-linked fashion.</note>
 +
 +
 +Library files:
 +
 +<code>
 +for /R "D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\lib\" %I in (libssh*) do rm -rf "%I"
 +D:
 +cd "D:\Build\libssh\libssh-staging\lib"
 +for %I in (libssh*) do cp -av "%I" "D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\i686-w64-mingw32\lib\"
 +</code>
 +
 +Afterwards, optionally bundle the new libssh source and binaries in x2goclient-contrib. Explicitly document the command line invocation in a file named ''CMake-Show-My-Changes.txt''.
  
 ===== Build X2Go Client ===== ===== Build X2Go Client =====
Line 187: Line 237:
 <code> <code>
 $ copy debian\changelog txt\ $ copy debian\changelog txt\
-git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog+git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog
 $ copy ChangeLog.gitlog txt\git-info $ copy ChangeLog.gitlog txt\git-info
- 
 </code> </code>
  
Line 197: Line 246:
 $ PATH=%PATH%;D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin\ $ PATH=%PATH%;D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin\
 $ config_win.bat $ config_win.bat
 +$ cd client_build
 $ mingw32-make $ mingw32-make
 +$ cd ..
 $ cd x2gohelper $ cd x2gohelper
 $ mingw32-make $ mingw32-make
Line 204: Line 255:
  
 X2Go Client binaries (x2goclient.exe & x2gohelper.exe) are in d:\build\x2goclient\release\ directory. X2Go Client binaries (x2goclient.exe & x2gohelper.exe) are in d:\build\x2goclient\release\ directory.
 +
 ==== Build X2Go Client from source (debug build) ==== ==== Build X2Go Client from source (debug build) ====
 Repeat the instructions for "Build X2Go Client from source", except Repeat the instructions for "Build X2Go Client from source", except
Line 210: Line 262:
   - Edit nsis\x2goclient.nsi so that the following lines:   - Edit nsis\x2goclient.nsi so that the following lines:
  
-  * CreateShortCut "$INSTDIR\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" +<code> 
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" +  CreateShortCut "$INSTDIR\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" 
-  CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" 
 +  CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" 
 +</code> 
 Are replaced with the following: Are replaced with the following:
  
-  * CreateShortCut "$INSTDIR\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"  "--debug" +<code> 
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" "--debug" +  CreateShortCut "$INSTDIR\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"  "--debug" 
-  CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"  "--debug"+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" "--debug" 
 +  CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe"  "--debug" 
 +</code>
  
 ==== Copy the X2Go Client binaries to the desired folder ==== ==== Copy the X2Go Client binaries to the desired folder ====
Line 223: Line 280:
 The 2 binaries to copy are: The 2 binaries to copy are:
  
-  - x2goclient.exe (from the ''release/'' folder) +  - ''x2goclient.exe'' (from the ''client_build\release'' folder) 
-  - x2gohelper.exe (from the ''release/'' folder)+  - ''x2gohelper.exe'' (from the ''client_build\release'' folder)
  
 However, you must decide where you wish to copy them. However, you must decide where you wish to copy them.
  
-  - If you wish to run x2goclient from a folder without creating and running the NSIS installer , copy them to the ''dist'' folder. This is the folder where you will run them from. +  - If you wish to run x2goclient from a folder without creating and running the NSIS installer, copy them to the ''dist'' folder. This is the folder where you will run them from. 
-  - If you wish to create an x2goclient NSIS installer, create the ''nsis\x2goclient'' folder and copy them there+  - If you wish to create an x2goclient NSIS installer, create the ''nsis\x2goclient'' folder and copy them there.
  
 ==== Pack/Compress X2Go Client ==== ==== Pack/Compress X2Go Client ====
  
-You may want to pack X2Go Client to reduce it size. You can do it with [[http://upx.sourceforge.net/|upx]], which is available for Windows, Linux and Cygwin.+You may want to pack X2Go Client to reduce it size. You can do it with [[https://upx.github.io/|upx]], which is available for Windows, Linux and Cygwin.
  
-Official regular builds of X2Go Client are packed. Official debug builds of X2Go Client are not.+Official regular builds of X2Go Client are packed. Official debug builds of X2Go Client are not. There is no difference between nightly and release versions - both pack the release binary, while not packing the debug binary.
  
 It is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]]. The current version is located at: It is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]]. The current version is located at:
 <code> <code>
-x2goclient-contrib\upx\3.91_bin\upx.exe+x2goclient-contrib\upx\3.95_bin\upx.exe
 </code> </code>
  
 The 2 files to pack are: The 2 files to pack are:
-  - x2goclient.exe +  - ''x2goclient.exe'' 
-  - x2gohelper.exe+  - ''x2gohelper.exe'' 
 ===== Building nxproxy & OpenSSH (Optional) ===== ===== Building nxproxy & OpenSSH (Optional) =====
  
Line 250: Line 308:
  
 Official X2Go project builds usually rebuild nxproxy and OpenSSH if there are desired updates to those components, or if the cygwin libraries have been updated. Official X2Go project builds usually rebuild nxproxy and OpenSSH if there are desired updates to those components, or if the cygwin libraries have been updated.
 +
 +Official X2Go project builds are kept under the x2goclient-contrib git repository under a folder like "cygwin\20160121-1_bin" (the latest cygwin libraries as of 2016-01-21) or "cygwin\20160121-2_bin" (the former, with selective updates). These are then copied over during the Jenkins build process.
  
 ==== Installing Cygwin ==== ==== Installing Cygwin ====
  
-Download and start the [[http://cygwin.com/setup.exe|Cygwin installer]]+Download and start the [[https://cygwin.com/setup-x86.exe|Cygwin 32-bit installer]].
  
-Choose your cygwin directory. For example c:\cygwin. Follow installer instructions.+Choose your Cygwin directory. For example C:\cygwin. Follow installer instructions.
  
-on installer page "Select Packages" you can select programs and libraries that should be installed in your cygwin environment. For building of nxproxy you will need:+For the X2Go-WinBuilder VM, install to D:\cygwin.YYYY-MM-DD instead. 
 + 
 +You can automate the entirety of the instructions below with this command, except for selecting the source packages to install: 
 + 
 +<code> 
 +$ setup-x86.exe -P "autoconf,automake,gcc-core,gcc-g++,git,libX11-devel,libjpeg-devel,libpng-devel,libmpfr4,make,zlib-devel,wget,libedit-devel,libncurses-devel,openssl-devel,patch,bashdb,bash-completion,chere,colorgcc,colordiff,diffutils,dos2unix,cygcheck-dep,cygutils-extra,indent,mc,renameutils,vim,git-completion,patchutils,openssh,xz,unzip,nano,bzip2,time,mkfontdir,mkfontscale" 
 +</code> 
 + 
 +on installer page "Select Packages" you can select programs and libraries that should be installed in your Cygwin environment. For building of nxproxy you will need:
   * ''autoconf''   * ''autoconf''
   * ''automake''   * ''automake''
   * ''gcc-core''   * ''gcc-core''
-  * ''gcc-g\+\+''+  * ''gcc-g%%++%%''
   * ''git''   * ''git''
 +  * ''imake''
   * ''libX11-devel''   * ''libX11-devel''
   * ''libjpeg-devel''   * ''libjpeg-devel''
   * ''libpng15-devel'' (X2Go Client 4.0.3.x)   * ''libpng15-devel'' (X2Go Client 4.0.3.x)
-  * ''libpng-devel'' (X2Go Client 4.0.4.x)+  * ''libpng-devel'' (X2Go Client 4.0.4.x+)
   * ''libmpfr4''   * ''libmpfr4''
 +  * ''libtool'' (nx-libs 3.6)
   * ''make''   * ''make''
-  * ''mc'' 
   * ''zlib-devel''   * ''zlib-devel''
   * ''wget''   * ''wget''
  
-<note tip>By installing the ''libjpeg-devel'' package, you are now installing [[https://cygwin.com/ml/cygwin-announce/2014-06/msg00004.html|libjpeg-turbo]] instead of the legacy libjpeg . The same applies for the dependency ''libjpeg8'' package, which provides the cygjpeg-8.dll file that you will copy later.</note>+<note tip>By installing the ''libjpeg-devel'' package, you are now installing [[https://cygwin.com/ml/cygwin-announce/2014-06/msg00004.html|libjpeg-turbo]] instead of IJG libjpeg. The same applies for the dependency ''libjpeg8'' package, which provides the cygjpeg-8.dll file that you will copy later.</note>
  
-For building of OpenSSH Server, you will also need:+For building of OpenSSH Server, you will also need: 
-  *libedit-devel +  * ''libedit-devel'' 
-  *libncurses-devel +  * ''libncurses-devel'' 
-  *openssl-devel +  * ''openssl-devel'' 
-  *patch+  * ''patch''
  
-For openssh you should install both, binary and source packages (toggle "Src" checkbox beside of package name). Source package will be installed in /usr/src directory in your Cygwin installation.+For OpenSSH you should install both, binary and source packages. Toggle the "Src" checkbox beside the package name. Source package will be installed in ''/usr/src'' directory in your Cygwin installation.
  
 If you are updating the X2Go Windows build VM, X2Go-WinBuilder, install these packages too: If you are updating the X2Go Windows build VM, X2Go-WinBuilder, install these packages too:
Line 294: Line 363:
   * ''cygutils-extra''   * ''cygutils-extra''
   * ''indent''   * ''indent''
 +  * ''mc''
   * ''renameutils''   * ''renameutils''
   * ''vim''   * ''vim''
Line 305: Line 375:
   * ''bzip2''   * ''bzip2''
   * ''time''   * ''time''
 +  * ''mkfontdir''
 +  * ''mkfontscale''
  
 If you are doing official builds, install these **source** packages for both nxproxy and openssh: If you are doing official builds, install these **source** packages for both nxproxy and openssh:
-  * dash +  * ''dash'' 
-  * cygwin +  * ''cygwin'' 
-  * gcc (select source for: gcc-core) +  * ''gcc'' (select source for: ''gcc-core''
-  * libedit (select source for: libedit0) +  * ''libedit'' (select source for: ''libedit0''
-  * libjpeg-turbo (select source for: libjpeg-devel) +  * ''libjpeg-turbo'' (select source for: ''libjpeg-devel''
-  * libpng15 (select source for: libpng-devel) (X2Go Client 4.0.3.x) +  * ''libpng15'' (select source for: ''libpng-devel'') (X2Go Client 4.0.3.x) 
-  * libpng (select source for: libpng-devel) (X2Go Client 4.0.4.x) +  * ''libpng'' (select source for: ''libpng-devel'') (X2Go Client 4.0.4.x+
-  * ncurses (select source for: libncurses-devel) +  * ''ncurses'' (select source for: ''libncurses-devel''
-  * openssh (source, but not binary) +  * ''openssh'' (source, but not binary) 
-  * openssl +  * ''openssl'' 
-  * zlib (select source for: zlib-devel)+  * ''zlib'' (select source for: ''zlib-devel'') 
 + 
 +==== Building nxproxy 3.5 ====
  
-==== Building nxproxy ====+X2Go Client for Windows is currently built with nxproxy 3.5.
  
-  * Open a cygwin shell and change to your build directory. In this example d:\Build will be used+  * Open a cygwin shell and change to your build directory. In this example ''D:\Build'' will be used
 <code> <code>
 $ cd /cygdrive/d/Build $ cd /cygdrive/d/Build
 </code> </code>
-  * Download and extract the latest nx-libs-lite tarball from http://code.x2go.org/releases/source/nx-libs/ . Regular nx-libs sources will also work.+  * Download and extract the latest nx-libs-lite tarball from [[http://code.x2go.org/releases/source/nx-libs/]]. Regular nx-libs sources will also work.
  
 <note warning>Do not download and use the sources from git. Unlike the tarball, the git sources do not have the X2Go project's patches (debian/patches/) applied. (Technically, you could use the sources from git and apply the patches manually.)</note> <note warning>Do not download and use the sources from git. Unlike the tarball, the git sources do not have the X2Go project's patches (debian/patches/) applied. (Technically, you could use the sources from git and apply the patches manually.)</note>
Line 399: Line 473:
 $ cp -p nxproxy.exe nxproxy.exe.unstripped $ cp -p nxproxy.exe nxproxy.exe.unstripped
 $ strip nxproxy.exe $ strip nxproxy.exe
 +$ cd ..
 +</code>
 +
 +==== Building nxproxy 3.6 ====
 +
 +<note tip>X2Go Client for Windows is currently shipped with nxproxy 3.5, not 3.6. However, it should be safe to use 3.6.</note>
 +<note important>nxproxy 3.6 currently has one additional build dependency that 3.5 does not have. See the Cygwin installation instructions above.</note>
 +
 +  * Open a Cygwin shell and change to your build directory. In this example ''D:\Build'' will be used
 +<code>
 +$ cd /cygdrive/d/Build
 +</code>
 +  * Download [[nx-libs from Arctica on GitHub|https://github.com/ArcticaProject/nx-libs]] and checkout the 3.6.x branch.
 +<code>
 +git clone https://github.com/ArcticaProject/nx-libs.git
 +cd nx-libs
 +git checkout 3.6.x
 +</code>
 +  * Build nxcomp
 +<code>
 +$ cd nxcomp
 +$ autoreconf -vfi
 +$ ./configure
 +$ make
 +$ cd ..
 +</code>
 +  * Build nxproxy
 +<code>
 +$ cd nxproxy
 +$ autreoconf -vfi
 +$ ./configure
 +$ make
 +$ cp -p src/nxproxy.exe src/nxproxy.exe.unstripped
 +$ strip src/nxproxy.exe
 $ cd .. $ cd ..
 </code> </code>
Line 405: Line 513:
 ==== Copying the nxproxy binaries ==== ==== Copying the nxproxy binaries ====
  
-Now the nxproxy binary (nxproxy.exe) is ready. You can copy it into the programme packaging folder (''dist/'' or ''nsis/x2goclient/'') of X2Go Client.  +Now the nxproxy binary (nxproxy.exe) is ready. You can copy it into the program packaging folder (''dist/'' or ''nsis/x2goclient/'') of X2Go Client, or the x2goclient-contrib folder: 
-  - From nxproxy directory (d:\Build\nx-libs\nxproxy) - ''nxproxy.exe'' +  - nx-libs 3.5: From ''nxproxy'' directory (''D:\Build\nx-libs\nxproxy'') - ''nxproxy.exe'' 
-  - From nxcomp directory (d:\Build\nx-libs\nxcomp) - ''cygXcomp.dll''+  - nx-libs 3.5: From ''nxcomp'' directory (''D:\Build\nx-libs\nxcomp'') - ''cygXcomp.dll'' 
 +  - nx-libs 3.6: From ''nxproxy\src\.libs'' directory (''D:\Build\nx-libs\nxproxy\src\.libs'') - ''nxproxy.exe'' 
 +  - nx-libs 3.6: From ''nxcomp\src\.libs'' directory (''D:\Build\nx-libs\nxcomp\src\.libs'') - ''cygXcomp-3.dll'' 
 You must also copy required libraries into that folder. You must also copy required libraries into that folder.
-  - From cygwin directory (c:\cygwin\bin):+  - From cygwin directory (''C:\cygwin\bin''):
     * ''cyggcc_s-1.dll''     * ''cyggcc_s-1.dll''
     * ''cygjpeg-8.dll''     * ''cygjpeg-8.dll''
-    * ''cygpng15-15.dll'' +    * ''cygpng15-15.dll'' (x2goclient 4.0.3.x) 
-    * ''cygstdc\+\+-6.dll''+    * ''cygpng16-16.dll'' (x2goclient 4.0.4.x+) 
 +    * ''cygstdc%%++%%-6.dll''
     * ''cygwin1.dll''     * ''cygwin1.dll''
     * ''cygz.dll''     * ''cygz.dll''
Line 419: Line 531:
  
 If you wish to facilitate debugging, or if you are updating x2goclient-contrib, you should copy these files over also: If you wish to facilitate debugging, or if you are updating x2goclient-contrib, you should copy these files over also:
-  - From nxproxy directory (d:\Build\nx-libs\nxproxy) - ''nxproxy.exe.unstripped'' +  - nx-libs 3.5: From ''nxproxy'' directory (''D:\Build\nx-libs\nxproxy'') - ''nxproxy.exe.unstripped'' 
-  - From nxcomp directory (d:\Build\nx-libs\nxcomp):+  - nx-libs 3.5: From ''nxcomp'' directory (''D:\Build\nx-libs\nxcomp''):
     * ''libXcomp.dll.a''     * ''libXcomp.dll.a''
     * ''libXcomp.a''     * ''libXcomp.a''
 +  - nx-libs 3.6: From ''nxproxy\src'' directory (''D:\Build\nx-libs\nxproxy\src'') - ''nxproxy.exe.unstripped''
 +  - nx-libs 3.6: From ''nxcomp\src\.libs'' directory (''D:\Build\nx-libs\nxcomp\src\.libs''):
 +    * ''libXcomp.dll.a''
 +    * ''libXcomp.a''
 +
 +
 ==== Building OpenSSH Server ==== ==== Building OpenSSH Server ====
  
-Copy the source folder (downloaded and extracted from a tarball by cygwin) to your build directory. In this example d:\Build will be used+Copy the source folder (downloaded and extracted from a tarball by Cygwin) to your build directory. In this example ''D:\Build'' will be used
 <code> <code>
-$cp -pr /usr/src/openssh-6.1.1p1-3-src /cygdrive/d/Build/+$ cp -pr /usr/src/openssh-6.1.1p1-3-src /cygdrive/d/Build/
 </code> </code>
  
-cd to the openssh source directory, extract the upstream (openssh.com) tarball within, and cd to the lower-level source directory+''cd'' to the openssh source directory, extract the upstream (openssh.com) tarball within, and ''cd'' to the lower-level source directory
 <code> <code>
-$cd /cygdrive/d/Build/openssh-6.6.1p1-3 +$ cd /cygdrive/d/Build/openssh-6.6.1p1-3 
-$tar -xzvf openssh-6.6p1.tar.gz +$ tar -xzvf openssh-6.6p1.tar.gz 
-$cd openssh-6.6p1+$ cd openssh-6.6p1
 </code> </code>
  
-Apply any patches that cygwin provides. For example, with 6.6p1-3:+Apply any patches that Cygwin provides. For example, with 6.6p1-3:
 <code> <code>
-$patch < ../curve25519-sha256.patch+$ patch < ../curve25519-sha256.patch
 </code> </code>
  
 Get and apply the X2Go patch, which enables use of the Open SSH Server with X2Go Client Get and apply the X2Go patch, which enables use of the Open SSH Server with X2Go Client
 <code> <code>
-$wget http://code.x2go.org/releases/source/openssh-cygwin/openssh-6.6p1-1.x2go.patch ../ +$ wget http://code.x2go.org/releases/source/openssh-cygwin/openssh-6.6p1-1.x2go.patch ../ 
-$patch.exe < ../openssh-6.6p1-1.x2go.patch+$ patch.exe < ../openssh-6.6p1-1.x2go.patch
 </code> </code>
  
 Build Open SSH Server Build Open SSH Server
 <code> <code>
-$./configure --libexecdir=/usr/sbin --with-libedit --with-xauth=/usr/bin/xauth --build=mingw32w32 +$ ./configure --libexecdir=/usr/sbin --with-libedit --with-xauth=/usr/bin/xauth --build=mingw32 
-$make +$ make 
-$strip *.exe+$ strip *.exe
 </code> </code>
  
-<note>The command above is based on the command that Cygwin uses for their official builds, but with certain changes in order to eliminate unnecessary dependencies. Eliminating unnecessary dependencies decreases how frequently X2Go Client for Windows needs to rebuilt in order to include security patches for those dependencies.</note>+<note>If doing an official X2Go Client for Windows build, copy over the text from the "configure" output beginning with "OpenSSH has been configured with the following options:" to "openssh build options.txt." Then, put that .txt file in the same folder with the OpenSSH binaries later on.</note> 
 + 
 +<note>If doing an official X2Go Client for Windows build, create a file "openssh version.txt" with contents like "6.6p1-3-x2go1", where "6.6p1-3" is the version string from Cygwin, and "x2go1" denotes that this is the 1st version off of it modified by X2Go.</note> 
 + 
 +<note>The command above is based on the command that Cygwin uses for their official builds, but with certain changes in order to eliminate unnecessary dependencies. Eliminating unnecessary dependencies decreases how frequently X2Go Client for Windows needs to be rebuilt in order to include security patches for those dependencies.</note> 
  
 ==== Copying OpenSSH Server binaries ==== ==== Copying OpenSSH Server binaries ====
  
-Open SSH Server binaries are ready. Now you can copy them in to the installation directory of x2goclient:+Open SSH Server binaries are ready. You can copy it into the program packaging folder (''dist/'' or ''nsis/x2goclient/''of X2Go Client, or the x2goclient-contrib folder: 
 +  * ''sftp.exe'' 
 +  * ''sftp-server.exe'' 
 +  * ''ssh-keygen.exe'' 
 +  * ''sshd.exe''
  
-  *sftp.exe +For example: 
-  *sftp-server.exe +<code> 
-  *ssh-keygen.exe +$ cp --preserve=time sftp.exe sftp-server.exe ssh-keygen.exe sshd.exe /cygdrive/d/x2goclient-contrib/cygwin/20160121-1_bin/ 
-  *sshd.exe+</code>
  
-To be able to run Open SSH Server you should also copy needed programs and libraries from cygwin directory (c:\cygwin\bin).+To be able to run Open SSH Server you should also copy needed programs and libraries from the Cygwin directory (c:\cygwin\bin).
  
 +First, copy these files over without changing their filenames.
 +  * ''cygcrypto-1.0.0.dll''
 +  * ''cygedit-0.dll''
 +  * ''cyggcc_s-1.dll''
 +  * ''cygncursesw-10.dll''
 +  * ''cygssp-0.dll''
 +  * ''cygwin1.dll''
 +  * ''cygz.dll''
  
-1st, copy these files over without changing their filenames. +For example: 
-  *cygcrypto-1.0.0.dll +<code> 
-  *cygedit-0.dll +$ cd /bin 
-  *cyggcc_s-1.dll +$ cp --preserve=time cygcrypto-1.0.0.dll cygedit-0.dll cyggcc_s-1.dll cygncursesw-10.dll cygssp-0.dll cygwin1.dll cygz.dll /cygdrive/d/x2goclient-contrib/cygwin/20160121-1_bin/ 
-  *cygncursesw-10.dll +</code>
-  *cygssp-0.dll +
-  *cygwin1.dll +
-  *cygz.dll+
  
-2nd, copy the Dash executable over and rename it:+Then, copy the dash executable over and rename it:
 <code> <code>
 ash.exe -> sh.exe ash.exe -> sh.exe
 +</code>
 +
 +For example:
 +<code>
 +$ cp --preserve=time ash.exe /cygdrive/d/x2goclient-contrib/cygwin/20160121-1_bin/sh.exe
 </code> </code>
  
Line 486: Line 623:
  
 <note>This section needs to be updated for the .csv file that lists Cygwin packages and versions, and for the zip files on http://code.x2go.org/releases/ that contain pre-built binaries.</note> <note>This section needs to be updated for the .csv file that lists Cygwin packages and versions, and for the zip files on http://code.x2go.org/releases/ that contain pre-built binaries.</note>
- 
  
 ===== Copying 3rd-party libraries and components ===== ===== Copying 3rd-party libraries and components =====
Line 509: Line 645:
 You can then install all of them by using the ''copy-deps-win32.bat'' script in the x2goclient source folder. You can then install all of them by using the ''copy-deps-win32.bat'' script in the x2goclient source folder.
  
-The scripted approach is limited to MinGW 4.8.+First, clone [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=summary|x2goclient-contrib.git]] on http://code.x2go.org if you haven't already done so.
  
-1st, clone [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=summary|x2goclient-contrib.git]] on http://code.x2go.org if you haven't already done so. +Now run the script with the following arguments. In this example: 
- +  * ''..\x2goclient-contrib'' is the path to the x2goclient-contrib git repo 
-2nd, update the ''copy-deps-win32.bat'' script. +  * ''D:\OpenSSL-Win32\'' is the path to OpenSSL-Win32's installation folder (not the exact folder with the DLL's) 
-  * Do a find & replace in the script to replace the path to x2goclient-contrib with your own. +  ''dist'' is the subfolder you wish to run x2goclient from
-  * Do a find & replace in the script to replace the path to OpenSSL32-Win32 with your own. +
- +
-Now run the script, telling it to copy to the ''dist'' folder+
 <code> <code>
-cd x2goclient +cd x2goclient 
-copy-deps-win32.bat dist+copy-deps-win32.bat ..\x2goclient-contrib D:\OpenSSL-Win32 dist
 </code> </code>
 or to the ''nsis/x2goclient'' folder or to the ''nsis/x2goclient'' folder
 <code> <code>
-cd x2goclient +cd x2goclient 
-copy-deps-win32.bat nsis\x2goclient+copy-deps-win32.bat nsis\x2goclient
 </code> </code>
  
Line 534: Line 667:
 However, at the end: However, at the end:
  
-  - View the copy-deps-win32.bat file to determine the location of the cygwin bundle. +  - View the ''copy-deps-win32.bat'' file to determine the location of the Cygwin bundle. 
-  - From the cygwin bundle, ''copy nxproxy.exe.unstripped'' to the ''dist'' or ''release/x2goclient'' folder.+  - From the Cygwin bundle, ''copy nxproxy.exe.unstripped'' to the ''dist'' or ''release/x2goclient'' folder.
   - Replace nxproxy.exe with nxproxy.exe.unstripped   - Replace nxproxy.exe with nxproxy.exe.unstripped
  
Line 542: Line 675:
 === Libraries === === Libraries ===
  
-  - If you are using MinGW 4.4, add its libraries (copy from ''D:\MinGW\bin''+  - Add MinGW 4.8'libraries (copy from ''D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin'').
-    * ''libgcc_s_dw2-1.dll'' +
-    * ''mingwm10.dll'' +
-  - If you are using MinGW 4.8, add its libraries (copy from ''D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\bin''). (Note that the inclusion of '\' character before the '+' character is to work around a horrible issue in dokuwiki; the actual filenames do not have the '\" character.)+
     * ''libgcc_s_dw2-1.dll''     * ''libgcc_s_dw2-1.dll''
-    * ''libstdc\+\+-6.dll'' +    * ''libstdc%%++%%-6.dll'' 
-    * libwinpthread-1.dll+    * ''libwinpthread-1.dll''
   - Add OpenSSL libraries (copy from your OpenSSL installation directory)   - Add OpenSSL libraries (copy from your OpenSSL installation directory)
     * ''libeay32.dll''     * ''libeay32.dll''
Line 554: Line 684:
   - libssh library ([[wiki:development:build-howto-mswin:x2goclient#installing_libssh|see above section for download link]])   - libssh library ([[wiki:development:build-howto-mswin:x2goclient#installing_libssh|see above section for download link]])
     * ''libssh.dll''     * ''libssh.dll''
-  - libzip library (available [[http://code.x2go.org/releases/binary-win32/3rd-party/libzip/ |here on our site]]) (binaries originally from [[ftp://winkde.org/kde/ports/win32/releases/stable/latest/ | the KDE Windows project]] site) +  - zlib library for libssh (available [[http://code.x2go.org/releases/binary-win32/3rd-party/zlib/|here on our site]]) (binaries originally from [[http://www.zlib.net/ | the zlib project]] site)
-    * ''libzip.dll'' +
-  - zlib library for libzip (available [[http://code.x2go.org/releases/binary-win32/3rd-party/zlib/ |here on our site]]) (binaries originally from [[ftp://winkde.org/kde/ports/win32/releases/stable/latest/ | the KDE Windows project]] site ) +
-    * ''libz.dll'' +
-  - zlib library for libssh (available [[http://code.x2go.org/releases/binary-win32/3rd-party/zlib/ |here on our site]]) (binaries originally from [[http://www.zlib.net/ | the zlib project]] site)+
     * ''zlib1.dll''     * ''zlib1.dll''
-  - If you want to use X2Go Client on older versions of Windows, you should put the "Microsoft Visual C\+\+ Redistributable 2008 Package"'s dll files into your X2Go Client package directory. (Originally downloaded from the [[http://www.microsoft.com/en-us/download/details.aspx?id=29|Microsoft download site]]). +  - If you want to use X2Go Client on older versions of Windows, you should put the "Microsoft Visual C%%++%% Redistributable 2013 Package"'s dll files into your X2Go Client package directory. (Originally downloaded from the [[http://www.microsoft.com/en-us/download/details.aspx?id=29|Microsoft download site]]). 
-    * ''Microsoft.VC90.CRT.manifest'' +    * ''msvcp120.dll'' 
-    * ''msvcm90.dll'' +    * ''msvcr120.dll.dll'' 
-    * ''msvcp90.dll'' +    * ''vccorlib120.dll'' 
-    * ''msvcr90.dll''+
  
 === nxproxy === === nxproxy ===
  
-The latest version is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]] under the cygwin folder. This includes its libraries.+The latest version is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]] under the ''cygwin'' folder. This includes its libraries.
  
 You can download older versions, including their libraries, from here [[http://code.x2go.org/releases/binary-win32/3rd-party/nxproxy|here]]. You can download older versions, including their libraries, from here [[http://code.x2go.org/releases/binary-win32/3rd-party/nxproxy|here]].
Line 580: Line 706:
 Older builds do not have nxproxy.exe.unstripped; that is a limitation of X2Go's old build process. Older builds do not have nxproxy.exe.unstripped; that is a limitation of X2Go's old build process.
  
-=== OpenSSH server ===+=== OpenSSH Server ===
  
 X2Go Client for Windows uses a modified Cygwin OpenSSH Server for file sharing. X2Go Client for Windows uses a modified Cygwin OpenSSH Server for file sharing.
  
-The latest version is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]] under the cygwin folder.+The latest version is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]] under the ''cygwin'' folder.
  
 You can download older versions from [[http://code.x2go.org/releases/binary-win32/3rd-party/openssh-server|here]]. You can download older versions from [[http://code.x2go.org/releases/binary-win32/3rd-party/openssh-server|here]].
Line 590: Line 716:
 === PulseAudio === === PulseAudio ===
  
-The latest version of PulseAudio for Windows (5.0is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]] under the pulse folder.+PulseAudio for Windows 6.0 is used by X2Go Client 4.0.4.x and it is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]] under the pulse folder. 
 + 
 +PulseAudio for Windows 5.0 is used by X2Go Client 4.0.3.x and it is available in [[http://code.x2go.org/gitweb?p=x2goclient-contrib.git;a=tree;hb=HEAD|x2goclient-contrib.git]] under the pulse folder.
  
 You can download older Windows builds here [[http://code.x2go.org/releases/binary-win32/3rd-party/pulse|here]]. You can download older Windows builds here [[http://code.x2go.org/releases/binary-win32/3rd-party/pulse|here]].
Line 596: Line 724:
 Note that the files must be installed to the ''pulse'' subfolder of ''dist'' or ''nsis/x2goclient''. Note that the files must be installed to the ''pulse'' subfolder of ''dist'' or ''nsis/x2goclient''.
  
-Even older Windows builds are available from [[http://www.freedesktop.org/wiki/Software/PulseAudio/Ports/Windows/Support|project site]] and the above link.+Even older Windows builds are available from [[http://www.freedesktop.org/wiki/Software/PulseAudio/Ports/Windows/Support|the PulseAudio project site]] and the above link.
  
 === VcXsrv - XP Compatible === === VcXsrv - XP Compatible ===
Line 606: Line 734:
 Note that the files must be installed to the ''VcXsrv'' subfolder of ''dist'' or ''nsis/x2goclient''. Note that the files must be installed to the ''VcXsrv'' subfolder of ''dist'' or ''nsis/x2goclient''.
  
-Building VcXsrv from source is not the part of this Howto. However, it is documented under the [[https://sourceforge.net/u/mikedep333/vcxsrv/ci/xp-latestmsvc2013-x2gochanges/tree/|source repo]]+Building VcXsrv from source is not the part of this howto. However, it is documented in the [[https://sourceforge.net/u/mikedep333/vcxsrv/ci/xp-latestmsvc2013-x2gochanges/tree/|source repo]].
  
 All official X2Go Project builds use the 32-bit builds of VcXsrv. 64-bit builds are probably compatible with the 32-bit X2Go Client, but have not been tested. Furthermore, the XP compatible builds are only offered in 32-bit. All official X2Go Project builds use the 32-bit builds of VcXsrv. 64-bit builds are probably compatible with the 32-bit X2Go Client, but have not been tested. Furthermore, the XP compatible builds are only offered in 32-bit.
- 
-If you are doing an official X2Go Project build of X2Go Client 4.0.3.x, use the version: 1.15.2.3+xp-vc2013+x2go1 
-The "+x2go1" in the version string implies that an X2Go-specific patch, winmultiwindow.patch has been applied. It is believed that this patch cannot be upstreamed. 
  
 If you do install VcXsrv via the setup installer, and you are building X2Go Client 4.0.3.x or later, select to install the fonts. They will be an optional component of X2Go Client for Windows in its installer. If you do install VcXsrv via the setup installer, and you are building X2Go Client 4.0.3.x or later, select to install the fonts. They will be an optional component of X2Go Client for Windows in its installer.
Line 618: Line 743:
  
 Also, if you are doing an official X2Go Project build, remove these files that X2Go Client does not need and would take up extra space: Also, if you are doing an official X2Go Project build, remove these files that X2Go Client does not need and would take up extra space:
-  *iconv.dll +  * ''iconv.dll'' 
-  *libgcc-s-sjlj-1.dll +  * ''libiconv-2.dll'' 
-  *libiconv-2.dll +  * ''libgcc-s-sjlj-1.dll'' 
-  *libwinpthread-1.dll +  * ''libwinpthread-1.dll'' 
-  *libxml2.dll +  * ''libxml2.dll'' 
-  *libxml2-2.dll +  * ''libxml2-2.dll'' 
-  *plink.exe +  * ''plink.exe'' 
-  *uninstall.exe +  * ''uninstall.exe'' 
-  *xauth.exe +  * ''xauth.exe'' 
-  *XCalc +  * ''XCalc'' 
-  *xcalc.exe +  * ''xcalc.exe'' 
-  *XCalc-color +  * ''XCalc-color'' 
-  *XClock +  * ''XClock'' 
-  *xclock.exe +  * ''xclock.exe'' 
-  *XClock-color +  * ''XClock-color'' 
-  *Xcms.txt +  * ''xhost.exe'' 
-  *xhost.exe +  * ''xlaunch.exe'' 
-  *xlaunch.exe +  * ''xrdb.exe'' 
-  *xrdb.exe +  * ''xwininfo.exe''
-  *xwininfo.exe+
  
-Also, if you are doing an official X2Go Project build, create this file in the VcXsrv folder: +Also, if you are doing an official X2Go Project build, before importing it into x2goclient-contrib, remove the timestamps from the ''.gz'' files. 
-  *vcxsrv-version.txt +Using Debian's strip-nondeterminism (a perl script that calls a perl library, both of which can be extracted from their deb's & run fine under Cygwin): 
-And specify the version string of VcXsrv in it. The version string should be the only contents of the file. For example:+<code> 
 +$ cd /cygdrive/c/x2gobuilds/x2goclient-contrib/VcXsrv/1.20.1.4_bin/fonts 
 +$ find . -iname '*.gz' -exec strip-nondeterminism '{}' ';' 
 +</code> 
 +If you are doing an official X2Go Project build, create this file in the VcXsrv folder: 
 +  * ''vcxsrv-version.txt'' 
 +And specify the version string of VcXsrv in it. The version string should be the only content of that file. For example:
  
 1.15.2.3+xp-vc2013+x2go1 1.15.2.3+xp-vc2013+x2go1
 +
 +If you are doing an official X2Go Project build, copy the project's [[https://sourceforge.net/p/vcxsrv/code/ci/master/tree/COPYING|COPYING]] file as:
 +  * ''COPYING.txt''
 +
 +=== x3270-fonts ====
 +
 +For IBM x3270 compatibility, a special set of fonts is necessary. Official builds use the version shipped in the ''x3270-fonts'' subdirectory of x2goclient-contrib.
 +
 +Note that versions prior to 3.6 are classified non-free by major distributions due to their custom, restrictive license. Do **not** use and (re-)distribute older versions than 3.6 with X2Go Client.
 +
 +==== Updating x3270 Fonts Package ====
 +
 +  * Check the current licensing situation. Do **not** update the package if it becomes non-free again.
 +  * Build the x3270 package, download a complete precompiled one or just fetch a binary fonts package. Debian conveniently offers one named [[https://packages.debian.org/sid/xfonts-x3270-misc|xfonts-x3270-misc]].
 +  * Create a new versioned subdirectory in the ''x3270-fonts'' directory.
 +  * Extract the binary fonts.
 +  * Make sure that all binary font files are located in one single directory called ''misc''.
 +  * Get copyright and licensing information and place them into a file called ''copyright-x3270-fonts''. Debian's copyright file is very well suited for this, but please remove content that is not relevant to the fonts themselves.
 +  * Use Debian's ''strip-nondeterminism'' script:
 +<code>
 +$ find misc -iname '*.gz' -exec strip-nondeterminism '{}' ';'
 +</code>
 +  * For official builds, create timestamps script:
 +<code>
 +$ cd ..
 +$ ../generate-timestamps-on-folder.sh <new-versions-directory>
 +</code>
 +  * For official builds, call the timestamps script in x2goclient-contrib's top-directory script called ''current-timestamp-scripts.sh''.
 +  * For official builds, update the [[https://code.x2go.org/gitweb?p=x2goclient.git;a=blob;f=copy-deps-win32.bat;hb=HEAD|copy-deps-win32.bat in x2goclient.git]] copying step to use the new directory.
 +
 === PuTTY === === PuTTY ===
  
-you can download PuTTY for Windows from [[http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html|project site]]. Building PuTTY from source is not the part of this Howto+You can download PuTTY for Windows from [[https://www.chiark.greenend.org.uk/~sgtatham/putty/download.html|project site]]. Building PuTTY from source is not the part of this howto.
  
 These are the only binaries you need from PuTTY. Copy them directly into the ''dist/'' or ''nsis/x2goclient'' folder. These are the only binaries you need from PuTTY. Copy them directly into the ''dist/'' or ''nsis/x2goclient'' folder.
  
-  *plink.exe +  * ''plink.exe'' 
-  *pscp.exe+  * ''pscp.exe'' 
 + 
 +Out of courtesy, we also ship the following additional, not strictly needed binaries: 
 + 
 +  * ''pageant.exe'' 
 +  * ''puttygen.exe'' 
 + 
 ===== Creating an NSIS Installer ===== ===== Creating an NSIS Installer =====
  
-Install NSIS Unicode (currently, 2.46.5): http://www.scratchpaper.com/+Install NSIS (currently, 3.05): https://nsis.sourceforge.io 
 + 
 +Previously, we used NSIS Unicode, but this project is stale and NSIS 3.x nowadays supports Unicode.
  
-Then, edit nsis/x2goclient.nsi to replace all instances of ''X2GOCLIENT_VERSION'' with the actual version, and any string at the end. For example ,if you were doing a test build of fixing bug 123 on top of 4.0.3.2, ''4.0.3.2-bug123''+Then, edit ''nsis/x2goclient.nsi'' and replace all instances of ''X2GOCLIENT_VERSION'' with the actual version, and any string at the end. For example, if you were doing a test build of fixing bug 123 on top of 4.0.3.2, use ''4.0.3.2-bug123'' as the version string.
  
-Then, open nsis\x2goclient.nsi with NSIS Unicode. It will build an installer (*-setup.exe) to the same directory.+Then, open ''nsis\x2goclient.nsi'' with NSIS. It will build an installer (''*-setup.exe''and put it into the same directory.
  
 If you wish to build via the command-line, run: If you wish to build via the command-line, run:
 <code> <code>
-"C:\Program Files (x86)\NSIS\Unicode\makensis.exe" x2goclient.nsi+"C:\Program Files (x86)\NSIS\makensis.exe" x2goclient.nsi
 </code> </code>
 (Adjust path if on 32-bit Windows.) (Adjust path if on 32-bit Windows.)
wiki/development/build-howto-mswin/x2goclient.1426041990.txt.gz · Last modified: 2015/03/11 02:46 by mikedep333