Traktor: More cleanup in actions; also building Traktor installer las…

…t if action succeeds.

.github/workflows/c-cpp.yml → .github/workflows/build-linux.yml

@@ -1,4 +1,4 @@
-name: C/C++ CI
+name: Build Linux
 
 on:
   push:

.github/workflows/build-windows.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install 3rdp dependencies
-      run: ./scripts/update-3rdp.bat
+      run: ./bin/win64/releasestatic/Traktor.Run.App ./scripts/misc/update-3rdp.run
     - name: Generate build files
       run: ./scripts/build-projects-vs2022-win64.bat
     - name: Build DebugShared
@@ -25,3 +25,5 @@ jobs:
       run: ./bin/latest/win64/debugshared/Traktor.Run.App ./scripts/unittest/UnitTest.run
     - name: Unit tests ReleaseShared
       run: ./bin/latest/win64/releaseshared/Traktor.Run.App ./scripts/unittest/UnitTest.run
+    - name: Create Installer
+      run: ./scripts/autobuild/autobuild-installer-win64.bat

code/Installer/Traktor.wxs

@@ -27,21 +27,19 @@
 			<Directory Id="INSTALLLOCATION" Name="Traktor">
 				<Directory Id="bin" Name="bin">
 					<Directory Id="bin_latest" Name="latest">
+						<!--
 						<Directory Id="bin_latest_android" Name="android"/>
 						<Directory Id="bin_latest_linux" Name="linux"/>
 						<Directory Id="bin_latest_ios" Name="ios"/>
 						<Directory Id="bin_latest_osx" Name="osx"/>
 						<Directory Id="bin_latest_rpi" Name="rpi"/>
+						-->
 						<Directory Id="bin_latest_win64" Name="win64"/>
 					</Directory>
 				</Directory>
 				<Directory Id="data" Name="data"/>
 				<Directory Id="resources" Name="resources"/>
-				<Directory Id="scripts" Name="scripts">
-					<Component Id="cmp_scripts_config">
-						<File Id="scripts_config" Name="config-vs-x64.bat" Source="$(env.TRAKTOR_HOME)/scripts/config.bat" DiskId="1" />
-					</Component>
-				</Directory>
+				<Directory Id="scripts" Name="scripts"/>
 			</Directory>
 		</Directory>
 
@@ -63,11 +61,13 @@
 	</Directory>
 
 	<Feature Id="ProductFeature" Title="Traktor" Level="1">
+		<!--
 		<ComponentGroupRef Id="cmp_bin_latest_android" />
 		<ComponentGroupRef Id="cmp_bin_latest_linux" />
 		<ComponentGroupRef Id="cmp_bin_latest_ios" />
 		<ComponentGroupRef Id="cmp_bin_latest_osx" />
 		<ComponentGroupRef Id="cmp_bin_latest_rpi" />
+		-->
 		<ComponentGroupRef Id="cmp_bin_latest_win64" />
 		<ComponentGroupRef Id="cmp_data_assets" />
 		<ComponentGroupRef Id="cmp_data_source" />

scripts/autobuild/autobuild-installer-win64.bat

@@ -7,24 +7,24 @@ mkdir "%TRAKTOR_HOME%/build/installer"
 pushd "%TRAKTOR_HOME%/build/installer"
 
 :: Create a file list of "android binaries".
-%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/android/releasestatic" -gg -sfrag -sreg -cg cmp_bin_latest_android -dr bin_latest_android -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Android_ReleaseStatic.wxs
-%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/android/releasestatic" Traktor_Bin_Latest_Android_ReleaseStatic.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/android/releasestatic" -gg -sfrag -sreg -cg cmp_bin_latest_android -dr bin_latest_android -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Android_ReleaseStatic.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/android/releasestatic" Traktor_Bin_Latest_Android_ReleaseStatic.wxs
 
 :: Create a file list of "linux binaries".
-%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/linux/releaseshared" -gg -sfrag -sreg -cg cmp_bin_latest_linux -dr bin_latest_linux -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Linux_ReleaseShared.wxs
-%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/linux/releaseshared" Traktor_Bin_Latest_Linux_ReleaseShared.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/linux/releaseshared" -gg -sfrag -sreg -cg cmp_bin_latest_linux -dr bin_latest_linux -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Linux_ReleaseShared.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/linux/releaseshared" Traktor_Bin_Latest_Linux_ReleaseShared.wxs
 
 :: Create a file list of "ios binaries".
-%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/ios/releasestatic" -gg -sfrag -sreg -cg cmp_bin_latest_ios -dr bin_latest_ios -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Ios_ReleaseStatic.wxs
-%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/ios/releasestatic" Traktor_Bin_Latest_Ios_ReleaseStatic.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/ios/releasestatic" -gg -sfrag -sreg -cg cmp_bin_latest_ios -dr bin_latest_ios -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Ios_ReleaseStatic.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/ios/releasestatic" Traktor_Bin_Latest_Ios_ReleaseStatic.wxs
 
 :: Create a file list of "osx binaries".
-%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/osx/releaseshared" -gg -sfrag -sreg -cg cmp_bin_latest_osx -dr bin_latest_osx -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Osx_ReleaseShared.wxs
-%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/osx/releaseshared" Traktor_Bin_Latest_Osx_ReleaseShared.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/osx/releaseshared" -gg -sfrag -sreg -cg cmp_bin_latest_osx -dr bin_latest_osx -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Osx_ReleaseShared.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/osx/releaseshared" Traktor_Bin_Latest_Osx_ReleaseShared.wxs
 
 :: Create a file list of "rpi binaries".
-%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/rpi/releaseshared" -gg -sfrag -sreg -cg cmp_bin_latest_rpi -dr bin_latest_rpi -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Rpi_ReleaseShared.wxs
-%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/rpi/releaseshared" Traktor_Bin_Latest_Rpi_ReleaseShared.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/rpi/releaseshared" -gg -sfrag -sreg -cg cmp_bin_latest_rpi -dr bin_latest_rpi -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Rpi_ReleaseShared.wxs
+::%TRAKTOR_HOME%/3rdp/wix-windows/candle -arch x64 -dTRAKTOR_WHERE="%TRAKTOR_HOME%/bin/latest/rpi/releaseshared" Traktor_Bin_Latest_Rpi_ReleaseShared.wxs
 
 :: Create a file list of "win64 binaries".
 %TRAKTOR_HOME%/3rdp/wix-windows/heat dir "%TRAKTOR_HOME%/bin/latest/win64/releaseshared" -gg -sfrag -sreg -cg cmp_bin_latest_win64 -dr bin_latest_win64 -var var.TRAKTOR_WHERE -template fragment -t "%TRAKTOR_HOME%/code/Installer/Filter.xslt" -out Traktor_Bin_Latest_Win64_ReleaseShared.wxs
@@ -53,11 +53,6 @@ pushd "%TRAKTOR_HOME%/build/installer"
 %TRAKTOR_HOME%/3rdp/wix-windows/light ^
 	-ext WixUIExtension ^
 	Traktor.wixobj ^
-	Traktor_Bin_Latest_Android_ReleaseStatic.wixobj ^
-	Traktor_Bin_Latest_Linux_ReleaseShared.wixobj ^
-	Traktor_Bin_Latest_Ios_ReleaseStatic.wixobj ^
-	Traktor_Bin_Latest_Osx_ReleaseShared.wixobj ^
-	Traktor_Bin_Latest_Rpi_ReleaseShared.wixobj ^
 	Traktor_Bin_Latest_Win64_ReleaseShared.wixobj ^
 	Traktor_Data_Assets.wixobj ^
 	Traktor_Data_Source.wixobj ^