Skip to content

Commit f715179

Browse files
committed
Fix build?
1 parent c1f5297 commit f715179

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

build/jenkins_build.bat

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,15 @@ if "%RELEASE%" == "YES" (
4343
) else (
4444
set RELEASE_VERSION=devel-%GIT_COMMIT:~0,7%
4545
)
46-
if "%RELEASE%" == "YES" (
47-
if "%IS_E4_DEPLOY%" == "YES" (
48-
set INSTALLBASEDIR=%RELEASE_DIR%\Client_E4
49-
) else (
50-
set INSTALLBASEDIR=%RELEASE_DIR%\Client
51-
)
52-
set INSTALLDIR=%INSTALLBASEDIR%
53-
)
46+
if "%RELEASE%" == "YES" set INSTALLBASEDIR=%RELEASE_DIR%\Client
47+
if "%RELEASE%" == "YES" set INSTALLDIR=%INSTALLBASEDIR%
5448

5549
if not "%RELEASE%" == "YES" (
5650
if "%IS_E4_DEPLOY%" == "YES" (
5751
set INSTALLBASEDIR=p:\Kits$\CompGroup\ICP\Client_E4
5852
) else (
5953
set INSTALLBASEDIR=p:\Kits$\CompGroup\ICP\Client
60-
)
54+
)
6155
)
6256

6357
if "%IS_E4_DEPLOY%" == "YES" (
@@ -66,6 +60,8 @@ if "%IS_E4_DEPLOY%" == "YES" (
6660
set TARGET_DIR=base\uk.ac.stfc.isis.ibex.client.product\target\products\ibex.product\win32\win32\x86_64
6761
)
6862

63+
set INSTALLDIR=%INSTALLBASEDIR%
64+
6965
if not "%RELEASE%" == "YES" set INSTALLDIR=%INSTALLBASEDIR%\BUILD%BUILD_NUMBER%
7066
REM Set a symlink for folder BUILD_LATEST to point to most recent build
7167
if not "%RELEASE%" == "YES" set INSTALLLINKDIR=%INSTALLBASEDIR%\BUILD_LATEST

0 commit comments

Comments
 (0)