This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.15.2.2-xp+vc2013+x2go1 in repository vcxsrv. commit 212ca5c6023b6b7455ad64b2c29aeff82f301a03 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Oct 18 22:17:57 2014 -0400 Call makensis.exe from the PATH --- xorg-server/installer/packageall.bat | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index 9b5e543..458c02a 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -8,13 +8,8 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcp120d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcr120d.dll" -if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( - "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv.nsi - "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-debug.nsi -) else ( - "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi - "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi -) +makensis.exe vcxsrv.nsi +makensis.exe vcxsrv-debug.nsi :skipx86 if "%1"=="nox64" goto skipx64 @@ -24,13 +19,8 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcp120d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcr120d.dll" -if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( - "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64.nsi - "C:\Program Files (x86)\NSIS\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 -) +makensis.exe vcxsrv-64.nsi +makensis.exe vcxsrv-64-debug.nsi :skipx64 -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git