Skip to content

Commit c1f5297

Browse files
committed
Fix build?
1 parent fe575fb commit c1f5297

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

build/jenkins_build.bat

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,29 @@ if "%RELEASE%" == "YES" (
4343
) else (
4444
set RELEASE_VERSION=devel-%GIT_COMMIT:~0,7%
4545
)
46-
if "%RELEASE%" == "YES" set INSTALLBASEDIR=%RELEASE_DIR%\Client
47-
if "%RELEASE%" == "YES" set INSTALLDIR=%INSTALLBASEDIR%
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+
)
4854

4955
if not "%RELEASE%" == "YES" (
5056
if "%IS_E4_DEPLOY%" == "YES" (
5157
set INSTALLBASEDIR=p:\Kits$\CompGroup\ICP\Client_E4
52-
set TARGET_DIR=base\uk.ac.stfc.isis.ibex.e4.client.product\target\products\ibex.product\win32\win32\x86_64
5358
) else (
5459
set INSTALLBASEDIR=p:\Kits$\CompGroup\ICP\Client
55-
set TARGET_DIR=base\uk.ac.stfc.isis.ibex.client.product\target\products\ibex.product\win32\win32\x86_64
5660
)
57-
5861
)
62+
63+
if "%IS_E4_DEPLOY%" == "YES" (
64+
set TARGET_DIR=base\uk.ac.stfc.isis.ibex.e4.client.product\target\products\ibex.product\win32\win32\x86_64
65+
) else (
66+
set TARGET_DIR=base\uk.ac.stfc.isis.ibex.client.product\target\products\ibex.product\win32\win32\x86_64
67+
)
68+
5969
if not "%RELEASE%" == "YES" set INSTALLDIR=%INSTALLBASEDIR%\BUILD%BUILD_NUMBER%
6070
REM Set a symlink for folder BUILD_LATEST to point to most recent build
6171
if not "%RELEASE%" == "YES" set INSTALLLINKDIR=%INSTALLBASEDIR%\BUILD_LATEST

0 commit comments

Comments
 (0)