corrections #2321.

TerraME · Aug 18, 2020 · 118331b · 118331b
1 parent b9fc097
commit 118331b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build/scripts/win/terrame-conf.bat b/build/scripts/win/terrame-conf.bat
@@ -69,7 +69,7 @@ if "%_TERRAME_VLD_DIR%" == "" (
 )
 
 if "%_TERRAME_CPACK_GENERATOR%" == "" (
-  set _TERRAME_CPACK_GENERATOR="NSIS"
+  set _TERRAME_CPACK_GENERATOR=NSIS
 )
 
 mkdir %_TERRAME_OUT_DIR%

diff --git a/jenkins/win/terrame-installer-windows-10.bat b/jenkins/win/terrame-installer-windows-10.bat
@@ -35,14 +35,15 @@ call terrame-conf.bat
 :: Packing NSIS
 cmake --build . --target PACKAGE --config Release
 copy terrame*.exe %WORKSPACE%
-
 set "RESULT=%ERRORLEVEL%"
 
+cd ..
+
 set "_TERRAME_CPACK_GENERATOR=ZIP"
 call terrame-conf.bat
 :: Packing ZIP Portable
 cmake --build . --target PACKAGE --config Release
 copy terrame*.zip %WORKSPACE%
-
 set /a "RESULT=%RESULT%+%ERRORLEVEL%"
+
 exit %RESULT%