From de54c5b749b3eefb75d420840c889533a58aa342 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 24 Jul 2013 14:25:51 +0200 Subject: 64-bit compilation now compiles and runs --- xorg-server/installer/packageall.bat | 22 ++- xorg-server/installer/vcxsrv-64-debug.nsi | 88 +++++++++++ xorg-server/installer/vcxsrv-64.nsi | 248 ++++++++++++++++++++++++++++++ xorg-server/installer/vcxsrv-debug.nsi | 7 +- xorg-server/installer/vcxsrv.nsi | 12 +- 5 files changed, 365 insertions(+), 12 deletions(-) create mode 100644 xorg-server/installer/vcxsrv-64-debug.nsi create mode 100644 xorg-server/installer/vcxsrv-64.nsi (limited to 'xorg-server/installer') diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index 2195223fe..71a1a480b 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -1,10 +1,10 @@ @echo off if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe -copy %systemroot%\system32\msvcr100.dll -copy %systemroot%\system32\msvcp100.dll -copy %systemroot%\system32\msvcr100d.dll -copy %systemroot%\system32\msvcp100d.dll +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcp100.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcr100.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC100.DebugCRT\msvcp100d.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC100.DebugCRT\msvcr100d.dll" if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi @@ -13,6 +13,20 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi ) + +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcp100.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcr100.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC100.DebugCRT\msvcp100d.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC100.DebugCRT\msvcr100d.dll" + +if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( + "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64.nsi + "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64-debug.nsi +) else ( + "C:\Program Files\NSIS\makensis.exe" vcxsrv-64.nsi + "C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi +) + del msvcr100.dll del msvcr100d.dll del msvcp100.dll diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi new file mode 100644 index 000000000..e4cee04fd --- /dev/null +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -0,0 +1,88 @@ +/* This file is part of vcxsrv. + * + * Copyright (C) 2009 Marc Haesen + * + * vcxsrv is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * vcxsrv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with vcxsrv. If not, see . +*/ +;-------------------------------- + +; The name of the installer +Name "VcXsrv" + +; The file to write +OutFile "vcxsrv-64-debug.1.14.2.0.installer.exe" + +; The default installation directory +InstallDir $PROGRAMFILES64\VcXsrv + +; Registry key to check for directory (so if you install again, it will +; overwrite the old one automatically) +InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" + +; Request application privileges for Windows Vista +RequestExecutionLevel admin + +;-------------------------------- +InstType "Full" + +; Pages + +Page components +Page directory +Page instfiles + +UninstPage uninstConfirm +UninstPage instfiles + +SetPluginUnload alwaysoff +; ShowInstDetails show +XPStyle on + +!define FUSION_REFCOUNT_UNINSTALL_SUBKEY_GUID {8cedc215-ac4b-488b-93c0-a50a49cb2fb8} + +;-------------------------------- +; The stuff to install +Section "VcXsrv debug exe and dlls" + + SectionIn RO + SectionIn 1 + + ; Set output path to the installation directory. + SetOutPath $INSTDIR + + ; Put files there + File "..\obj64\servdebug\vcxsrv.exe" + File "..\..\xkbcomp\obj64\debug\xkbcomp.exe" + File "..\..\apps\xhost\obj64\debug\xhost.exe" + File "..\..\apps\xrdb\obj64\debug\xrdb.exe" + File "..\..\apps\xauth\obj64\debug\xauth.exe" + File "..\..\apps\xcalc\obj64\debug\xcalc.exe" + File "..\..\apps\xclock\obj64\debug\xclock.exe" + File "..\..\apps\xwininfo\obj64\debug\xwininfo.exe" + File "..\hw\xwin\xlaunch\obj64\debug\xlaunch.exe" + File "..\..\tools\plink\obj64\debug\plink.exe" + File "..\..\mesalib\windows\VC8\mesa\x64\Debug\swrast_dri.dll" + File "..\hw\xwin\swrastwgl_dri\obj64\debug\swrastwgl_dri.dll" + File "..\..\dxtn\obj64\debug\dxtn.dll" + File "..\..\zlib\obj64\debug\zlib1.dll" + File "..\..\libxcb\src\obj64\debug\libxcb.dll" + File "..\..\libXau\obj64\debug\libXau.dll" + File "..\..\libX11\obj64\debug\libX11.dll" + File "..\..\libXext\src\obj64\debug\libXext.dll" + File "..\..\libXmu\src\obj64\debug\libXmu.dll" + File "msvcr100d.dll" + File "msvcp100d.dll" + + WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR +SectionEnd diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi new file mode 100644 index 000000000..a0510cb31 --- /dev/null +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -0,0 +1,248 @@ +/* This file is part of vcxsrv. + * + * Copyright (C) 2009 Marc Haesen + * + * vcxsrv is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * vcxsrv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with vcxsrv. If not, see . +*/ +;-------------------------------- + +; The name of the installer +Name "VcXsrv" + +; The file to write +OutFile "vcxsrv-64.1.14.2.0.installer.exe" + +; The default installation directory +InstallDir $programfiles64\VcXsrv + +; Registry key to check for directory (so if you install again, it will +; overwrite the old one automatically) +InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" + +; Request application privileges for Windows Vista +RequestExecutionLevel admin + +;-------------------------------- +InstType "Full" +InstType "Minimal" + +; Pages + +Page components +Page directory +Page instfiles + +UninstPage uninstConfirm +UninstPage instfiles + +SetPluginUnload alwaysoff +; ShowInstDetails show +XPStyle on + +!define FUSION_REFCOUNT_UNINSTALL_SUBKEY_GUID {8cedc215-ac4b-488b-93c0-a50a49cb2fb8} + +;-------------------------------- +; The stuff to install +Section "VcXsrv (required)" + + SectionIn RO + SectionIn 1 2 3 + + ; Set output path to the installation directory. + SetOutPath $INSTDIR + + ; Remove old opengl32.dll file if it extits + IfFileExists "$INSTDIR\opengl32.dll" 0 +2 + Delete "$INSTDIR\opengl32.dll" + + ; Put files there + File "..\obj64\servrelease\vcxsrv.exe" + File "..\dix\protocol.txt" + File "..\system.XWinrc" + File "..\..\xkbcomp\obj64\release\xkbcomp.exe" + File "..\..\apps\xhost\obj64\release\xhost.exe" + File "..\..\apps\xrdb\obj64\release\xrdb.exe" + File "..\..\apps\xauth\obj64\release\xauth.exe" + File "..\..\apps\xcalc\obj64\release\xcalc.exe" + File "..\..\apps\xcalc\app-defaults\xcalc" + File "..\..\apps\xcalc\app-defaults\xcalc-color" + File "..\..\apps\xclock\obj64\release\xclock.exe" + File "..\..\apps\xclock\app-defaults\xclock" + File "..\..\apps\xclock\app-defaults\xclock-color" + File "..\..\apps\xwininfo\obj64\release\xwininfo.exe" + File "..\XKeysymDB" + File "..\..\libX11\src\XErrorDB" + File "..\..\libX11\src\xcms\Xcms.txt" + File "..\XtErrorDB" + File "..\.Xdefaults" + File "..\hw\xwin\xlaunch\obj64\release\xlaunch.exe" + File "..\..\tools\plink\obj64\release\plink.exe" + File "..\..\mesalib\windows\VC8\mesa\x64\Release\swrast_dri.dll" + File "..\hw\xwin\swrastwgl_dri\obj64\release\swrastwgl_dri.dll" + File "..\..\dxtn\obj64\release\dxtn.dll" + File "..\..\libxml2\bin64\libxml2-2.dll" + File "..\..\libxml2\bin64\libgcc_s_sjlj-1.dll" + File "..\..\libxml2\bin64\libiconv-2.dll" + File "..\..\libxml2\bin64\libwinpthread-1.dll" + File "..\..\zlib\obj64\release\zlib1.dll" + File "..\..\libxcb\src\obj64\release\libxcb.dll" + File "..\..\libXau\obj64\release\libXau.dll" + File "..\..\libX11\obj64\release\libX11.dll" + File "..\..\libXext\src\obj64\release\libXext.dll" + File "..\..\libXmu\src\obj64\release\libXmu.dll" + File "msvcr100.dll" + File "msvcp100.dll" + SetOutPath $INSTDIR\xkbdata + File /r "..\xkbdata\*.*" + SetOutPath $INSTDIR\locale + File /r "..\locale\*.*" + SetOutPath $INSTDIR\bitmaps + File /r "..\bitmaps\*.*" + + ; Write the installation path into the registry + WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR + + ; Write the uninstall keys for Windows + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "VcXsrv" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1 + WriteUninstaller "uninstall.exe" + + ; Register the xlaunch file extension + WriteRegStr HKCR ".xlaunch" "" "XLaunchFile" + WriteRegStr HKCR "XLaunchFile" "" "XLaunch Configuration" + WriteRegStr HKCR "XLaunchFile\DefaultIcon" "" "$INSTDIR\xlaunch.exe,0" + WriteRegStr HKCR "XLaunchFile\shell" "" 'open' + WriteRegStr HKCR "XLaunchFile\shell\open\command" "" '"$INSTDIR\XLaunch.exe" -run "%1"' + WriteRegStr HKCR "XLaunchFile\shell\open\ddeexec\Application" "" "XLaunch" + WriteRegStr HKCR "XLaunchFile\shell\open\ddeexec\Topic" "" "System" + WriteRegStr HKCR "XLaunchFile\shell\edit\command" "" '"$INSTDIR\XLaunch.exe" -load "%1"' + WriteRegStr HKCR "XLaunchFile\shell\edit\ddeexec\Application" "" "XLaunch" + WriteRegStr HKCR "XLaunchFile\shell\edit\ddeexec\Topic" "" "System" + WriteRegStr HKCR "XLaunchFile\shell\Validate\command" "" '"$INSTDIR\XLaunch.exe" -validate "%1"' + WriteRegStr HKCR "XLaunchFile\shell\Validate\ddeexec\Application" "" "XLaunch" + WriteRegStr HKCR "XLaunchFile\shell\Validate\ddeexec\Topic" "" "System" + + WriteRegStr HKCR "Applications\xlaunch.exe\shell" "" 'open' + WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\command" "" '"$INSTDIR\XLaunch.exe" -run "%1"' + WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\ddeexec\Application" "" "XLaunch" + WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\ddeexec\Topic" "" "System" + WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\command" "" '"$INSTDIR\XLaunch.exe" -load "%1"' + WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\ddeexec\Application" "" "XLaunch" + WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\ddeexec\Topic" "" "System" + WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\command" "" '"$INSTDIR\XLaunch.exe" -validate "%1"' + WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Application" "" "XLaunch" + WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Topic" "" "System" + +SectionEnd + +; Optional section (can be disabled by the user) +Section "Fonts" + SectionIn 1 3 + + SetOutPath $INSTDIR\fonts + CreateDirectory "$SMPROGRAMS\VcXsrv" + File /r "..\fonts\*.*" + +SectionEnd + +; Optional section (can be disabled by the user) +Section "Start Menu Shortcuts" + SectionIn 1 3 + + SetOutPath $INSTDIR + CreateDirectory "$SMPROGRAMS\VcXsrv" + CreateShortCut "$SMPROGRAMS\VcXsrv\Uninstall VcXsrv.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 + CreateShortCut "$SMPROGRAMS\VcXsrv\VcXsrv.lnk" "$INSTDIR\vcxsrv.exe" " :0 -ac -terminate -lesspointer -multiwindow -clipboard -wgl" "$INSTDIR\vcxsrv.exe" 0 + CreateShortCut "$SMPROGRAMS\VcXsrv\XLaunch.lnk" "$INSTDIR\xlaunch.exe" "" "$INSTDIR\xlaunch.exe" 0 + +SectionEnd + +; Optional section (can be disabled by the user) +Section "Desktop Shortcuts" + SectionIn 1 3 + + SetOutPath $INSTDIR + CreateShortCut "$DESKTOP\VcXsrv.lnk" "$INSTDIR\vcxsrv.exe" " :0 -ac -terminate -lesspointer -multiwindow -clipboard -wgl" "$INSTDIR\vcxsrv.exe" 0 + CreateShortCut "$DESKTOP\XLaunch.lnk" "$INSTDIR\xlaunch.exe" "" "$INSTDIR\xlaunch.exe" 0 + +SectionEnd + +;-------------------------------- + +; Uninstaller + +Section "Uninstall" + + ; Remove registry keys + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" + DeleteRegKey HKLM SOFTWARE\VcXsrv + + ; Register the xlaunch file extension + DeleteRegKey HKCR ".xlaunch" + DeleteRegKey HKCR "XLaunchFile" + DeleteRegKey HKCR "Applications\xlaunch.exe" + + ; Remove files and uninstaller + Delete "$INSTDIR\vcxsrv.exe" + Delete "$INSTDIR\uninstall.exe" + Delete "$INSTDIR\protocol.txt" + Delete "$INSTDIR\system.XWinrc" + Delete "$INSTDIR\xkbcomp.exe" + Delete "$INSTDIR\xcalc.exe" + Delete "$INSTDIR\xcalc" + Delete "$INSTDIR\xcalc-color" + Delete "$INSTDIR\xclock.exe" + Delete "$INSTDIR\xclock" + Delete "$INSTDIR\xclock-color" + Delete "$INSTDIR\xwininfo.exe" + Delete "$INSTDIR\XKeysymDB" + Delete "$INSTDIR\XErrorDB" + Delete "$INSTDIR\Xcms.txt" + Delete "$INSTDIR\XtErrorDB" + Delete "$INSTDIR\.Xdefaults" + Delete "$INSTDIR\xlaunch.exe" + Delete "$INSTDIR\plink.exe" + Delete "$INSTDIR\swrast_dri.dll" + Delete "$INSTDIR\dxtn.dll" + Delete "$INSTDIR\swrastwgl_dri.dll" + Delete "$INSTDIR\libxcb.dll" + Delete "$INSTDIR\libXau.dll" + Delete "$INSTDIR\libX11.dll" + Delete "$INSTDIR\libXext.dll" + Delete "$INSTDIR\libXmu.dll" + Delete "$INSTDIR\libxml2.dll" + Delete "$INSTDIR\zlib1.dll" + Delete "$INSTDIR\iconv.dll" + Delete "$INSTDIR\msvcr100.dll" + Delete "$INSTDIR\msvcp100.dll" + Delete "$INSTDIR\msvcr100d.dll" + Delete "$INSTDIR\msvcp100d.dll" + + RMDir /r "$INSTDIR\fonts" + RMDir /r "$INSTDIR\xkbdata" + RMDir /r "$INSTDIR\locale" + + ; Remove shortcuts, if any + Delete "$SMPROGRAMS\VcXsrv\*.*" + Delete "$DESKTOP\VcXsrv.lnk" + Delete "$DESKTOP\XLaunch.lnk" + + ; Remove directories used + RMDir "$SMPROGRAMS\VcXsrv" + RMDir "$INSTDIR" + +SectionEnd + diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index 875a7dd3d..654e0239f 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -24,11 +24,11 @@ Name "VcXsrv" OutFile "vcxsrv-debug.1.14.2.0.installer.exe" ; The default installation directory -InstallDir $PROGRAMFILES\VcXsrv +InstallDir $PROGRAMFILES32\VcXsrv ; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) -InstallDirRegKey HKLM "Software\VcXsrv" "Install_Dir" +InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -72,7 +72,7 @@ Section "VcXsrv debug exe and dlls" File "..\..\apps\xwininfo\obj\debug\xwininfo.exe" File "..\hw\xwin\xlaunch\obj\debug\xlaunch.exe" File "..\..\tools\plink\obj\debug\plink.exe" - File "..\..\mesalib\windows\VC8\mesa\Debug\swrast_dri.dll" + File "..\..\mesalib\windows\VC8\mesa\Win32\Debug\swrast_dri.dll" File "..\hw\xwin\swrastwgl_dri\obj\debug\swrastwgl_dri.dll" File "..\..\dxtn\obj\debug\dxtn.dll" File "..\..\zlib\obj\debug\zlib1.dll" @@ -84,4 +84,5 @@ Section "VcXsrv debug exe and dlls" File "msvcr100d.dll" File "msvcp100d.dll" + WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR" SectionEnd diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 9063f2bc5..023b4e5ee 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -24,11 +24,11 @@ Name "VcXsrv" OutFile "vcxsrv.1.14.2.0.installer.exe" ; The default installation directory -InstallDir $PROGRAMFILES\VcXsrv +InstallDir $PROGRAMFILES32\VcXsrv ; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) -InstallDirRegKey HKLM "Software\VcXsrv" "Install_Dir" +InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -88,17 +88,19 @@ Section "VcXsrv (required)" File "..\.Xdefaults" File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe" File "..\..\tools\plink\obj\release\plink.exe" - File "..\..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll" + File "..\..\mesalib\windows\VC8\mesa\Win32\Release\swrast_dri.dll" File "..\hw\xwin\swrastwgl_dri\obj\release\swrastwgl_dri.dll" File "..\..\dxtn\obj\release\dxtn.dll" - File "..\..\libxml2\bin\libxml2.dll" + File "..\..\libxml2\bin\libxml2-2.dll" + File "..\..\libxml2\bin\libgcc_s_sjlj-1.dll" + File "..\..\libxml2\bin\libiconv-2.dll" + File "..\..\libxml2\bin\libwinpthread-1.dll" File "..\..\zlib\obj\release\zlib1.dll" File "..\..\libxcb\src\obj\release\libxcb.dll" File "..\..\libXau\obj\release\libXau.dll" File "..\..\libX11\obj\release\libX11.dll" File "..\..\libXext\src\obj\release\libXext.dll" File "..\..\libXmu\src\obj\release\libXmu.dll" - File "..\..\libxml2\bin\iconv.dll" File "msvcr100.dll" File "msvcp100.dll" SetOutPath $INSTDIR\xkbdata -- cgit v1.2.3