Merge branch 'develop' into feature/game-ui-themes

# Conflicts:
#	.gitignore

.github/workflows/deployment.yml

@@ -90,14 +90,14 @@ jobs:
  uses: actions/upload-artifact@v3
  with:
  name: installer
- path: ./tools/build-installer/CnCNet5_YR_Installer.exe
+ path: ./CnCNet5_YR_Installer.exe
  if-no-files-found: error
 
  # Upload installer to any relevant releases for current tag
  # If there is no release/tag, this will not do anything
  - name: Upload Installer Release Asset
  working-directory: tools
- run: npm run release-asset-uploader -- --token ${{ secrets.GITHUB_TOKEN }} --assetName CnCNet5_YR_Installer_${{env.GitVersion_SemVer}}.exe --assetPath ./installer/CnCNet5_YR_Installer.exe
+ run: npm run release-asset-uploader -- --token ${{ secrets.GITHUB_TOKEN }} --assetName CnCNet5_YR_Installer_${{env.GitVersion_SemVer}}.exe --assetPath ../CnCNet5_YR_Installer.exe
 
  # This job downloads the package artifact from the previous job and deploys it to the server.
  deploy-package:

.gitignore

@@ -6,6 +6,8 @@
 /package/VersionWriter.exe
 /package/version
 /package/Qt/QM/
+/package/VersionWriter.exe
+/package/VersionWriter-CopiedFiles
 /logs
 /gitversion.json
 ddraw.dll
@@ -18,4 +20,5 @@ version_u
 .idea
 .idea/*
 /tools/node_modules
-package/Client
+/CnCNet5_YR_Installer.exe
+/package.tar.gz

package/Resources/GameOptions.ini

@@ -4,6 +4,10 @@
 ; If you use or redistribute the client in any public projects, please include
 ; Rampastring and The Dawn of the Tiberium Age in your project's credits.
 
+[RandomSelectors]
+Allied=0,1,2,3,4
+Soviet=5,6,7,8
+
 [General]
 Sides=America,Korea,France,Germany,Great Britain,Libya,Iraq,Cuba,Russia,Yuri
 StartingLocationAngularVelocity=0.01
@@ -31,4 +35,4 @@ AttackNeutralUnits=yes
 ReconnectTimeout=1400
 Protocol=0
 FrameSendRate=2
-MaxLatencyLevel=4
+MaxLatencyLevel=4

package/preupdateexec

@@ -25,5 +25,4 @@ wcrate.sno
 wcrate.tem
 wcrate.ubn
 wcrate.urb
-expandspawn09.mix
-do_not_remove_this_line
+do_not_remove_this_line

package/versionconfig.ini

@@ -30,6 +30,7 @@ CnCNetYRLauncher.exe
 gamemd-spawn.exe
 qres.dat
 qres32.dll
+updateconfig.ini
 
 ; Files (not directories) to be excluded from included files list.
 ; User-generated (settings etc), temporary and log files should be listed here.

tools/build-installer/.gitignore

@@ -1 +1 @@
-/CnCNet5_YR_Installer.exe
+/inno/installer.iss

tools/build-installer/class/index.ts

@@ -0,0 +1,2 @@
+export * from './template-model.class';
+export * from './template-app-model.class';

tools/build-installer/class/template-app-model.class.ts

@@ -0,0 +1,9 @@
+export class TemplateAppModel {
+ name: string;
+ version: string;
+ versionName: string;
+ publisher: string;
+ publisherUrl: string;
+ supportUrl: string;
+ updatesUrl: string;
+}

tools/build-installer/class/template-model.class.ts

@@ -0,0 +1,13 @@
+import { TemplateAppModel } from './template-app-model.class';
+
+export class TemplateModel {
+ app: TemplateAppModel;
+ sourceDir: string;
+ outputDir: string;
+ setupIconFile: string;
+ licenseFile: string;
+ outputBaseFilename: string;
+ installDeleteFiles: string[];
+ excludedInstallerFiles: string;
+ netCoreCheckPath: string;
+}

tools/build-installer/constants.ts

@@ -1,12 +1,49 @@
 import { resolve } from 'path';
 
-const installerBinary = resolve(__dirname, 'inno/bin/ISCC.exe');
-const installerScript = resolve(__dirname, 'inno/installer.iss');
+const repoPath = resolve(__dirname, '../../');
+const packagePath = resolve(repoPath, 'package');
+const versionFilePath = resolve(packagePath, 'version');
+const innoPath = resolve(__dirname, 'inno');
+const innoResourcesPath = resolve(innoPath, 'Resources');
+const setupIconPath = resolve(innoResourcesPath, 'cncnet5.ico');
+const licenseFilePath = resolve(innoResourcesPath, 'License-YurisRevenge.txt');
+const installerBinary = resolve(innoPath, 'bin/ISCC.exe');
+const installerTemplate = resolve(innoPath, 'installer.twig');
+const installerScript = resolve(innoPath, 'installer.iss');
+const preUpdateExecFilename = 'preupdateexec';
+const updateExecFilename = 'updateexec';
+const preUpdateExecFilePath = resolve(packagePath, preUpdateExecFilename);
+const updateExecFilePath = resolve(packagePath, updateExecFilename);
+const netCoreCheckPath = resolve(innoPath, 'libs/InnoDependencyInstaller/netcorecheck');
 
 const constants = {
+ app: {
+ name: 'CnCNet Yuri\'s Revenge',
+ publisher: 'cncnet.org',
+ publisherUrl: 'https://cncnet.org',
+ supportUrl: 'https://cncnet.org',
+ updatesUrl: 'https://cncnet.org'
+ },
+ outputBaseFilename: 'CnCNet5_YR_Installer',
  paths: {
  installerBinary,
+ installerTemplate,
  installerScript,
- }
+ repoPath,
+ packagePath,
+ setupIconPath,
+ licenseFilePath,
+ versionFilePath,
+ preUpdateExecFilePath,
+ updateExecFilePath,
+ netCoreCheckPath
+ },
+ excludedInstallerFiles: [
+ preUpdateExecFilename,
+ updateExecFilename,
+ 'VersionWriter-CopiedFiles',
+ 'versionconfig.ini',
+ 'RA2MD.ini'
+ ]
 }
 export { constants };