Fix build?

ISISComputingGroup · Aug 29, 2018 · f3184e4 · f3184e4
1 parent f715179
commit f3184e4
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/build/jenkins_build.bat b/build/jenkins_build.bat
@@ -36,10 +36,16 @@ net use p: \\isis\inst$ /user:isis\IBEXbuilder %BUILDERPW%
 
 python.exe purge_archive_client.py
 
+if "%IS_E4_DEPLOY%" == "YES" (
+    set TARGET_DIR=base\uk.ac.stfc.isis.ibex.e4.client.product\target\products\ibex.product\win32\win32\x86_64
+) else (
+    set TARGET_DIR=base\uk.ac.stfc.isis.ibex.client.product\target\products\ibex.product\win32\win32\x86_64
+)
+
 REM Don't group these. Bat expands whole if at once, not sequentially
 if "%RELEASE%" == "YES" (
     set RELEASE_DIR=p:\Kits$\CompGroup\ICP\Releases\%GIT_BRANCH:~8%
-    set RELEASE_VERSION=%GIT_BRANCH:~8%
+    set RELEASE_VERSION=%GIT_BRANCH:~8%    
 ) else (
     set RELEASE_VERSION=devel-%GIT_COMMIT:~0,7%
 )
@@ -51,17 +57,9 @@ if not "%RELEASE%" == "YES" (
         set INSTALLBASEDIR=p:\Kits$\CompGroup\ICP\Client_E4
     ) else (
         set INSTALLBASEDIR=p:\Kits$\CompGroup\ICP\Client
-    ) 
+    )
 ) 
 
-if "%IS_E4_DEPLOY%" == "YES" (
-    set TARGET_DIR=base\uk.ac.stfc.isis.ibex.e4.client.product\target\products\ibex.product\win32\win32\x86_64
-) else (
-    set TARGET_DIR=base\uk.ac.stfc.isis.ibex.client.product\target\products\ibex.product\win32\win32\x86_64
-)
-
-set INSTALLDIR=%INSTALLBASEDIR%
-
 if not "%RELEASE%" == "YES" set INSTALLDIR=%INSTALLBASEDIR%\BUILD%BUILD_NUMBER%
 REM Set a symlink for folder BUILD_LATEST to point to most recent build
 if not "%RELEASE%" == "YES" set INSTALLLINKDIR=%INSTALLBASEDIR%\BUILD_LATEST