From 5bda4b6582522d21b15d62c5c76c71104e924cbc Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 30 Oct 2012 15:11:32 +0100 Subject: Now create a seperate installer for the debug exe and dlls --- xorg-server/installer/packageall.bat | 16 ++----- xorg-server/installer/vcxsrv-debug.nsi | 86 ++++++++++++++++++++++++++++++++++ xorg-server/installer/vcxsrv.nsi | 64 +++++-------------------- 3 files changed, 101 insertions(+), 65 deletions(-) create mode 100644 xorg-server/installer/vcxsrv-debug.nsi (limited to 'xorg-server/installer') diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index 0aa098086..720c29893 100644 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -1,21 +1,13 @@ @echo off -if exist vcxsrv.*.installer.exe del vcxsrv.*.installer.exe -if "%VS2008%"=="1" goto vs2008 +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 "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi +"C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi del msvcr100.dll del msvcr100d.dll del msvcp100.dll - -goto end -:vs2008 - -python genruntimeinclude.py -"C:\Program Files\NSIS\makensis.exe" /DVS2008=1 vcxsrv.nsi -del runtime - -:end - +del msvcp100d.dll diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi new file mode 100644 index 000000000..be435a14f --- /dev/null +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -0,0 +1,86 @@ +/* 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-debug.1.13.0.0.installer.exe" + +; The default installation directory +InstallDir $PROGRAMFILES\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" + +; 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 "..\obj\servdebug\vcxsrv.exe" + File "..\..\xkbcomp\obj\debug\xkbcomp.exe" + File "..\..\apps\xhost\obj\debug\xhost.exe" + File "..\..\apps\xauth\obj\debug\xauth.exe" + File "..\..\apps\xcalc\obj\debug\xcalc.exe" + File "..\..\apps\xclock\obj\debug\xclock.exe" + 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 "..\hw\xwin\swrastwgl_dri\obj\debug\swrastwgl_dri.dll" + File "..\..\dxtn\obj\debug\dxtn.dll" + File "..\..\zlib\obj\debug\zlib1.dll" + File "..\..\libxcb\src\obj\debug\libxcb.dll" + File "..\..\libXau\obj\debug\libXau.dll" + File "..\..\libX11\obj\debug\libX11.dll" + File "..\..\libXext\src\obj\debug\libXext.dll" + File "..\..\libXmu\src\obj\debug\libXmu.dll" + File "msvcr100d.dll" + File "msvcp100d.dll" + +SectionEnd diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 90ec32560..cb031cb52 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -36,7 +36,6 @@ RequestExecutionLevel admin ;-------------------------------- InstType "Full" InstType "Minimal" -InstType "Full with Debug" ; Pages @@ -69,27 +68,27 @@ Section "VcXsrv (required)" ; Put files there File "..\obj\servrelease\vcxsrv.exe" - File "..\protocol.txt" + File "..\dix\protocol.txt" File "..\system.XWinrc" File "..\..\xkbcomp\obj\release\xkbcomp.exe" File "..\..\apps\xhost\obj\release\xhost.exe" File "..\..\apps\xauth\obj\release\xauth.exe" File "..\..\apps\xcalc\obj\release\xcalc.exe" - File "..\xcalc" - File "..\xcalc-color" + File "..\..\apps\xcalc\app-defaults\xcalc" + File "..\..\apps\xcalc\app-defaults\xcalc-color" File "..\..\apps\xclock\obj\release\xclock.exe" - File "..\xclock" - File "..\xclock-color" + File "..\..\apps\xclock\app-defaults\xclock" + File "..\..\apps\xclock\app-defaults\xclock-color" File "..\..\apps\xwininfo\obj\release\xwininfo.exe" File "..\XKeysymDB" - File "..\XErrorDB" + File "..\..\libX11\src\XErrorDB" File "..\XtErrorDB" File "..\.Xdefaults" File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe" File "..\..\tools\plink\obj\release\plink.exe" - File "..\swrast_dri.dll" - File "..\swrastwgl_dri.dll" - File "..\dxtn.dll" + File "..\..\mesalib\windows\VC8\mesa\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 "..\..\zlib\obj\release\zlib1.dll" File "..\..\libxcb\src\obj\release\libxcb.dll" @@ -116,7 +115,7 @@ Section "VcXsrv (required)" 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" @@ -177,43 +176,6 @@ Section "Desktop Shortcuts" SectionEnd -;-------------------------------- -; Optional debug libraries -Section "VcXsrv debug version" VcXsrv_debug_version - SectionIn 3 - - ; Set output path to the installation directory. - SetOutPath $INSTDIR - - ; Put files there - File "..\obj\servdebug\vcxsrv_dbg.exe" - File "..\obj\servdebug\vcxsrv_dbg.pdb" - File "..\swrast_dri_dbg.dll" - File "..\swrastwgl_dri_dbg.dll" - File "..\dxtn_dbg.dll" - File "msvcr100d.dll" - -SectionEnd - -Section -removedbg - SectionGetFlags ${VcXsrv_debug_version} $0 - IntCmp $0 0 nodebug done done - nodebug: - IfFileExists "$INSTDIR\vcxsrv_dbg.exe" 0 +2 - Delete "$INSTDIR\vcxsrv_dbg.exe" - IfFileExists "$INSTDIR\vcxsrv_dbg.pdb" 0 +2 - Delete "$INSTDIR\vcxsrv_dbg.pdb" - IfFileExists "$INSTDIR\swrast_dri_dbg.dll" 0 +2 - Delete "$INSTDIR\swrast_dri_dbg.dll" - IfFileExists "$INSTDIR\swrastwgl_dri_dbg.dll" 0 +2 - Delete "$INSTDIR\swrastwgl_dri_dbg.dll" - IfFileExists "$INSTDIR\dxtn_dbg.dll" 0 +2 - Delete "$INSTDIR\dxtn_dbg.dll" - IfFileExists "$INSTDIR\msvcr100d.dll" 0 +2 - Delete "$INSTDIR\msvcr100d.dll" - done: -SectionEnd - ;-------------------------------- ; Uninstaller @@ -231,8 +193,6 @@ Section "Uninstall" ; Remove files and uninstaller Delete "$INSTDIR\vcxsrv.exe" - Delete "$INSTDIR\vcxsrv_dbg.exe" - Delete "$INSTDIR\vcxsrv_dbg.pdb" Delete "$INSTDIR\uninstall.exe" Delete "$INSTDIR\protocol.txt" Delete "$INSTDIR\system.XWinrc" @@ -251,11 +211,8 @@ Section "Uninstall" Delete "$INSTDIR\xlaunch.exe" Delete "$INSTDIR\plink.exe" Delete "$INSTDIR\swrast_dri.dll" - Delete "$INSTDIR\swrast_dri_dbg.dll" Delete "$INSTDIR\dxtn.dll" - Delete "$INSTDIR\dxtn_dbg.dll" Delete "$INSTDIR\swrastwgl_dri.dll" - Delete "$INSTDIR\swrastwgl_dri_dbg.dll" Delete "$INSTDIR\libxcb.dll" Delete "$INSTDIR\libXau.dll" Delete "$INSTDIR\libX11.dll" @@ -267,6 +224,7 @@ Section "Uninstall" Delete "$INSTDIR\msvcr100.dll" Delete "$INSTDIR\msvcp100.dll" Delete "$INSTDIR\msvcr100d.dll" + Delete "$INSTDIR\msvcp100d.dll" RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\xkbdata" -- cgit v1.2.3