From 484d3dd28fea5cbff1b3ca88a9776c466fd0f683 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Tue, 12 Dec 2023 15:02:39 +0100 Subject: [PATCH] Removed node bundling --- client/install_modules.bat | 1 - installer/olympus.iss | 20 +++----------------- node/install.bat | 2 ++ node/install_modules.bat | 1 - package.bat | 1 - 5 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 client/install_modules.bat create mode 100644 node/install.bat delete mode 100644 node/install_modules.bat diff --git a/client/install_modules.bat b/client/install_modules.bat deleted file mode 100644 index b13074ad..00000000 --- a/client/install_modules.bat +++ /dev/null @@ -1 +0,0 @@ -call npm install --omit=dev \ No newline at end of file diff --git a/installer/olympus.iss b/installer/olympus.iss index 22a6c1f3..9d51abca 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -5,11 +5,7 @@ AppName=DCS Olympus AppVerName=DCS Olympus {#version} DefaultDirName={usersavedgames}\DCS.openbeta DefaultGroupName=DCSOlympus -#ifdef Node -OutputBaseFilename=DCSOlympus_{#version}_node -#else OutputBaseFilename=DCSOlympus_{#version} -#endif UninstallFilesDir={app}\Mods\Services\Olympus SetupIconFile="..\img\olympus.ico" DirExistsWarning=no @@ -49,10 +45,9 @@ Source: "..\client\app.js"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags Source: "..\client\demo.js"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; Source: "..\client\package.json"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; Source: "..\client\run_client.js"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; -Source: "..\client\install_modules.bat"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; Source: "..\node\configurator.js"; DestDir: "{app}\Mods\Services\Olympus\node"; Flags: ignoreversion; -Source: "..\node\install_modules.bat"; DestDir: "{app}\Mods\Services\Olympus\node"; Flags: ignoreversion; +Source: "..\node\install.bat"; DestDir: "{app}\Mods\Services\Olympus\node"; Flags: ignoreversion; Source: "..\img\olympus.ico"; DestDir: "{app}\Mods\Services\Olympus\img"; Flags: ignoreversion; Source: "..\img\olympus_server.ico"; DestDir: "{app}\Mods\Services\Olympus\img"; Flags: ignoreversion; @@ -61,18 +56,9 @@ Source: "..\img\configurator_logo.png"; DestDir: "{app}\Mods\Services\Olympus\im Source: "..\LEGAL"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion; -#ifdef Node -Source: "..\prerequisites\node-v20.10.0-x64.msi"; DestDir: "{app}\Mods\Services\Olympus\temp"; Flags: ignoreversion deleteafterinstall; -#endif - [Run] -#ifdef Node -Filename: "msiexec.exe"; Parameters: "/i ""{app}\Mods\Services\Olympus\temp\node-v20.10.0-x64.msi"" /qb"; WorkingDir: {tmp}; -#endif - -Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\node"; Parameters: configurator.js -a {code:GetAddress} -c {code:GetClientPort} -b {code:GetBackendPort} -p {code:GetPassword} --bp {code:GetBluePassword} --rp {code:GetRedPassword}; Check: CheckCallConfigurator; Description: Apply configuration; Flags: postinstall runhidden; -Filename: "{app}\Mods\Services\Olympus\node\install_modules.bat"; WorkingDir:"{app}\Mods\Services\Olympus\node"; Description: Install node dependencies; Flags: postinstall; -Filename: "{app}\Mods\Services\Olympus\client\install_modules.bat"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Description: Install main dependencies; Flags: postinstall; +Filename: "{app}\Mods\Services\Olympus\node\install.bat"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Flags: runhidden; StatusMsg: "Installing node.js modules, this may take some time..."; +Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\node"; Parameters: configurator.js -a {code:GetAddress} -c {code:GetClientPort} -b {code:GetBackendPort} -p {code:GetPassword} --bp {code:GetBluePassword} --rp {code:GetRedPassword}; Check: CheckCallConfigurator; Flags: runhidden; StatusMsg: "Applying configuration..."; [Icons] Name: "{userdesktop}\DCS Olympus Client"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus.ico"; Check: CheckLocalInstall; Parameters: "run_client.js"; Flags: runminimized; diff --git a/node/install.bat b/node/install.bat new file mode 100644 index 00000000..ae6c6450 --- /dev/null +++ b/node/install.bat @@ -0,0 +1,2 @@ +call npm install --omit=dev +call npm install yargs prompt-sync sha256 tcp-ping-port \ No newline at end of file diff --git a/node/install_modules.bat b/node/install_modules.bat deleted file mode 100644 index efaeb988..00000000 --- a/node/install_modules.bat +++ /dev/null @@ -1 +0,0 @@ -call npm install yargs prompt-sync sha256 tcp-ping-port diff --git a/package.bat b/package.bat index 5932cf9e..0ecb9020 100644 --- a/package.bat +++ b/package.bat @@ -1,2 +1 @@ call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" installer\olympus.iss -call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" installer\olympus.iss /DNode