From b3ecf52745fdc98a01e395bb173fb8a9e8589e50 Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Tue, 25 Aug 2020 13:36:47 +0200 Subject: [PATCH 1/4] SDA-2386 Invoking wix# build script from main build scrip --- scripts/jenkins-win64.bat | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/jenkins-win64.bat b/scripts/jenkins-win64.bat index e65c5378..161eea8f 100644 --- a/scripts/jenkins-win64.bat +++ b/scripts/jenkins-win64.bat @@ -95,3 +95,8 @@ if NOT EXIST %AIP%-SetupFiles/%AIP%.msi ( echo "copy msi result to target dir" copy "%AIP%-SetupFiles\%AIP%.msi" "%targetsDir%\%archiveName%.msi" + +echo Building new installer with wix# +pushd "installer\win" +call "BuildWixSharpInstaller.bat" +popd \ No newline at end of file From 5bc15dc36b9683ad641ce0dbcd0a6cdf1f9a5cab Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Tue, 25 Aug 2020 13:57:00 +0200 Subject: [PATCH 2/4] SDA-2386 Removed command to change dir as we are already in right dir --- scripts/jenkins-win64.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/jenkins-win64.bat b/scripts/jenkins-win64.bat index 161eea8f..923d22c7 100644 --- a/scripts/jenkins-win64.bat +++ b/scripts/jenkins-win64.bat @@ -97,6 +97,6 @@ echo "copy msi result to target dir" copy "%AIP%-SetupFiles\%AIP%.msi" "%targetsDir%\%archiveName%.msi" echo Building new installer with wix# -pushd "installer\win" +REM pushd "installer\win" call "BuildWixSharpInstaller.bat" -popd \ No newline at end of file +REM popd From 89ebfa0fecf40884ccac9e174fe3a2301acbadf8 Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Tue, 25 Aug 2020 14:43:14 +0200 Subject: [PATCH 3/4] SDA-2386 Archiving wix# msi --- scripts/jenkins-win64.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/jenkins-win64.bat b/scripts/jenkins-win64.bat index 923d22c7..5132c242 100644 --- a/scripts/jenkins-win64.bat +++ b/scripts/jenkins-win64.bat @@ -97,6 +97,5 @@ echo "copy msi result to target dir" copy "%AIP%-SetupFiles\%AIP%.msi" "%targetsDir%\%archiveName%.msi" echo Building new installer with wix# -REM pushd "installer\win" call "BuildWixSharpInstaller.bat" -REM popd +copy "Symphony.msi" "%targetsDir%\Wix-%archiveName%.msi" From 422a0cef9bb386b3b5bb5852fc4723f7db7c1399 Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Tue, 25 Aug 2020 15:21:31 +0200 Subject: [PATCH 4/4] SDA-2386 Renamed wix# artifact to Experimental --- scripts/jenkins-win64.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/jenkins-win64.bat b/scripts/jenkins-win64.bat index 5132c242..ee556c5e 100644 --- a/scripts/jenkins-win64.bat +++ b/scripts/jenkins-win64.bat @@ -98,4 +98,4 @@ copy "%AIP%-SetupFiles\%AIP%.msi" "%targetsDir%\%archiveName%.msi" echo Building new installer with wix# call "BuildWixSharpInstaller.bat" -copy "Symphony.msi" "%targetsDir%\Wix-%archiveName%.msi" +copy "Symphony.msi" "%targetsDir%\Experimental-%archiveName%.msi"