mirror of
https://github.com/Pax1601/DCSOlympus.git
synced 2025-10-29 16:56:34 +00:00
Updated installation method, remove installer
This commit is contained in:
Pax1601
parent
b5f1a459c2
commit
9c65411733
2
.github/workflows/build_package.yml
vendored
2
.github/workflows/build_package.yml
vendored
@ -34,5 +34,5 @@ jobs:
|
||||
uses: actions/upload-artifact@v3.1.3
|
||||
with:
|
||||
name: latest
|
||||
path: installer/Output/*.exe
|
||||
path: ./package
|
||||
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -27,3 +27,5 @@ client/public/javascripts/L.Path.Drag.js
|
||||
L.Path.Drag.js
|
||||
leaflet-gesture-handling.css
|
||||
package-lock.json
|
||||
|
||||
/package
|
||||
18
INSTRUCTIONS.txt
Normal file
18
INSTRUCTIONS.txt
Normal file
@ -0,0 +1,18 @@
|
||||
_____ _____ _____ ____ _
|
||||
| __ \ / ____|/ ____| / __ \| |
|
||||
| | | | | | (___ | | | | |_ _ _ __ ___ _ __ _ _ ___
|
||||
| | | | | \___ \ | | | | | | | | '_ ` _ \| '_ \| | | / __|
|
||||
| |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \__ \
|
||||
|_____/ \_____|_____/ \____/|_|\__, |_| |_| |_| .__/ \__,_|___/
|
||||
__/ | | |
|
||||
|___/ |_|
|
||||
|
||||
v{{OLYMPUS_VERSION_NUMBER}}
|
||||
|
||||
INSTALLATION INSTRUCTIONS
|
||||
|
||||
1) Close any applications which may interfere with installation, including Digital Combat Simulator (DCS) and previous versions of Olympus.
|
||||
|
||||
2) Execute the "install.bat" script by double-clicking on it. NOTE: depending on your Windows configuration, the script may be called "install" (without .bat at the end);
|
||||
|
||||
3) For more information visit the wiki located at https://github.com/Pax1601/DCSOlympus/wiki
|
||||
@ -8,7 +8,6 @@ cd client
|
||||
rmdir /s /q "hgt"
|
||||
call npm install
|
||||
call npm run emit-declarations
|
||||
call npm run copy
|
||||
call npm run build-release
|
||||
|
||||
cd "plugins\controltips"
|
||||
|
||||
9318
client/package-lock.json
generated
9318
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -13076,6 +13076,50 @@
|
||||
"CAP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"name": "AIM-9X Sidewinder IR AAM",
|
||||
"quantity": 2
|
||||
},
|
||||
{
|
||||
"name": "AIM-120C-5 AMRAAM Active Rdr AAM",
|
||||
"quantity": 6
|
||||
},
|
||||
{
|
||||
"name": "FPU-8A Fuel Tank 330 gallons",
|
||||
"quantity": 2
|
||||
}
|
||||
],
|
||||
"enabled": true,
|
||||
"code": "AIM-9X*2, AIM-120C-5*6, FUEL*2",
|
||||
"name": "AIM-9X*2, AIM-120C-5*6, FUEL*2",
|
||||
"roles": [
|
||||
"CAP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"name": "AIM-9X Sidewinder IR AAM",
|
||||
"quantity": 2
|
||||
},
|
||||
{
|
||||
"name": "AIM-120C-5 AMRAAM Active Rdr AAM",
|
||||
"quantity": 2
|
||||
},
|
||||
{
|
||||
"name": "FPU-8A Fuel Tank 330 gallons",
|
||||
"quantity": 1
|
||||
}
|
||||
],
|
||||
"enabled": true,
|
||||
"code": "AIM-9X*2, AIM-120C-5*2, FUEL*1",
|
||||
"name": "AIM-9X*2, AIM-120C-5*2, FUEL*1",
|
||||
"roles": [
|
||||
"CAP"
|
||||
]
|
||||
},
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
"canRearm": false,
|
||||
"barrelHeight": 1,
|
||||
"muzzleVelocity": 325,
|
||||
"aimTime": 45,
|
||||
"aimTime": 300,
|
||||
"shotsToFire": 2,
|
||||
"markerFile": "groundunit-artillery",
|
||||
"tags": "120mm",
|
||||
@ -8246,7 +8246,7 @@
|
||||
"canAAA": true,
|
||||
"aimMethodRange": 4000,
|
||||
"targetingRange": 200,
|
||||
"shotsBaseInterval": 5,
|
||||
"shotsBaseInterval": 15,
|
||||
"shotsBaseScatter": 5,
|
||||
"alertnessTimeConstant": 5
|
||||
},
|
||||
@ -8275,7 +8275,7 @@
|
||||
"canAAA": true,
|
||||
"alertnessTimeConstant": 5,
|
||||
"shotsBaseScatter": 5,
|
||||
"shotsBaseInterval": 5,
|
||||
"shotsBaseInterval": 15,
|
||||
"aimMethodRange": 4500,
|
||||
"targetingRange": 100
|
||||
},
|
||||
|
||||
2
install.bat
Normal file
2
install.bat
Normal file
@ -0,0 +1,2 @@
|
||||
echo off
|
||||
powershell ".\scripts\install.bat | tee output.log"
|
||||
@ -1,31 +0,0 @@
|
||||
_____ _____ _____ ____ _
|
||||
| __ \ / ____|/ ____| / __ \| |
|
||||
| | | | | | (___ | | | | |_ _ _ __ ___ _ __ _ _ ___
|
||||
| | | | | \___ \ | | | | | | | | '_ ` _ \| '_ \| | | / __|
|
||||
| |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \__ \
|
||||
|_____/ \_____|_____/ \____/|_|\__, |_| |_| |_| .__/ \__,_|___/
|
||||
__/ | | |
|
||||
|___/ |_|
|
||||
|
||||
v1.0.3
|
||||
|
||||
INSTALLATION INSTRUCTIONS
|
||||
|
||||
1) install node.js by running the node-v20.10.0-x64.msi installer (NOTE: Feel free to check the settings, provided you do not prevent it from keeping the add to path option.
|
||||
You can click straight through the pages without changes if you wish, and it will install correctly.);
|
||||
|
||||
2) install DCS Olympus by copying the Mods and Scripts folder into your DCS Saved Games folder (by default <user folder>\Saved Games\dcs.openbeta);
|
||||
|
||||
3) start a mission and enjoy!
|
||||
|
||||
!!!!!!!!!!!!!!!!!!!!!!IMPORTANT NOTE!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
If you are installing DCS Olympus on a dedicated server and want other people to connect to it remotely you need to EITHER:
|
||||
|
||||
1) Run DCS SERVER as admin;
|
||||
|
||||
2) Run the following command in an admin cmd console:
|
||||
|
||||
netsh http add urlacl url="http://*:<port>/olympus/" user=<user-running-dcs>
|
||||
|
||||
Remember to replace <port> with the BACKEND PORT you select during installation (3001 by default) and <user-running-dcs> with the user that runs the DCS SERVER.
|
||||
@ -1,30 +0,0 @@
|
||||
_____ _____ _____ ____ _
|
||||
| __ \ / ____|/ ____| / __ \| |
|
||||
| | | | | | (___ | | | | |_ _ _ __ ___ _ __ _ _ ___
|
||||
| | | | | \___ \ | | | | | | | | '_ ` _ \| '_ \| | | / __|
|
||||
| |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \__ \
|
||||
|_____/ \_____|_____/ \____/|_|\__, |_| |_| |_| .__/ \__,_|___/
|
||||
__/ | | |
|
||||
|___/ |_|
|
||||
|
||||
v1.0.3
|
||||
|
||||
INSTALLATION INSTRUCTIONS
|
||||
|
||||
1) install node.js by running the node-v20.10.0-x64.msi installer (NOTE: Feel free to check the settings, provided you do not prevent it from keeping the add to path option. You can click straight through the pages without changes if you wish, and it will install correctly.);
|
||||
|
||||
2) install DCS Olympus by running the provided installer;
|
||||
|
||||
3) start a mission and enjoy!
|
||||
|
||||
!!!!!!!!!!!!!!!!!!!!!!IMPORTANT NOTE!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
If you are installing DCS Olympus on a dedicated server and want other people to connect to it remotely you need to EITHER:
|
||||
|
||||
1) Run DCS SERVER as admin;
|
||||
|
||||
2) Run the following command in an admin cmd console:
|
||||
|
||||
netsh http add urlacl url="http://*:<port>/olympus/" user=<user-running-dcs>
|
||||
|
||||
Remember to replace <port> with the BACKEND PORT you select during installation (3001 by default) and <user-running-dcs> with the user that runs the DCS SERVER.
|
||||
Binary file not shown.
@ -1,78 +0,0 @@
|
||||
#define version "{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}"
|
||||
|
||||
[Setup]
|
||||
AppName=DCS Olympus
|
||||
AppVerName=DCS Olympus {#version}
|
||||
DefaultDirName={usersavedgames}\DCS Olympus
|
||||
DefaultGroupName=DCSOlympus
|
||||
OutputBaseFilename=DCSOlympus_{#version}
|
||||
UninstallFilesDir={app}
|
||||
SetupIconFile="..\img\olympus.ico"
|
||||
DirExistsWarning=no
|
||||
AppendDefaultDirName=no
|
||||
LicenseFile="..\LEGAL.txt"
|
||||
PrivilegesRequired=lowest
|
||||
InfoBeforeFile="..\notes.txt"
|
||||
|
||||
[Messages]
|
||||
WizardSelectDir=Select the location of DCS's Saved Games folder
|
||||
SelectDirDesc=Where is DCS's Saved Games folder?
|
||||
SelectDirLabel3=DCS Olympus must be installed within DCS's Saved Games folder.
|
||||
SelectDirBrowseLabel=This is the detected path. If this is incorrect, click Browse to set the correct folder.
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "Create desktop shortcut"; GroupDescription: "Additional icons"; Flags: unchecked
|
||||
Name: "installmodules"; Description: "Install node.js modules"; GroupDescription: "Dependencies";
|
||||
|
||||
[Files]
|
||||
Source: "..\olympus.json"; DestDir: "{app}";
|
||||
|
||||
Source: "..\scripts\OlympusHook.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion
|
||||
Source: "..\scripts\OlympusCommand.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion
|
||||
Source: "..\scripts\unitPayloads.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion
|
||||
Source: "..\scripts\templates.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion
|
||||
Source: "..\scripts\mist.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion
|
||||
Source: "..\scripts\mods.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion
|
||||
|
||||
Source: "..\mod\*"; DestDir: "{app}\mod"; Flags: ignoreversion recursesubdirs;
|
||||
Source: "..\bin\*.dll"; DestDir: "{app}\mod\bin"; Flags: ignoreversion;
|
||||
Source: "..\client\public\databases\*"; DestDir: "{app}\mod\databases"; Flags: ignoreversion recursesubdirs;
|
||||
|
||||
Source: "..\client\bin\*"; DestDir: "{app}\client\bin"; Flags: ignoreversion;
|
||||
Source: "..\client\public\*"; DestDir: "{app}\client\public"; Flags: ignoreversion recursesubdirs;
|
||||
Source: "..\client\routes\*"; DestDir: "{app}\client\routes"; Flags: ignoreversion recursesubdirs;
|
||||
Source: "..\client\views\*"; DestDir: "{app}\client\views"; Flags: ignoreversion recursesubdirs;
|
||||
Source: "..\client\app.js"; DestDir: "{app}\client"; Flags: ignoreversion;
|
||||
Source: "..\client\demo.js"; DestDir: "{app}\client"; Flags: ignoreversion;
|
||||
Source: "..\client\client.js"; DestDir: "{app}\client"; Flags: ignoreversion;
|
||||
Source: "..\client\package.json"; DestDir: "{app}\client"; Flags: ignoreversion;
|
||||
Source: "..\client\configurator.js"; DestDir: "{app}\client"; Flags: ignoreversion;
|
||||
Source: "..\client\install.bat"; DestDir: "{app}\client"; Flags: ignoreversion;
|
||||
Source: "..\client\*.vbs"; DestDir: "{app}\client"; Flags: ignoreversion;
|
||||
|
||||
Source: "..\manager\icons\*"; DestDir: "{app}\manager\icons"; Flags: ignoreversion;
|
||||
Source: "..\manager\ejs\*"; DestDir: "{app}\manager\ejs"; Flags: ignoreversion;
|
||||
Source: "..\manager\javascripts\*"; DestDir: "{app}\manager\javascripts"; Flags: ignoreversion;
|
||||
Source: "..\manager\stylesheets\*"; DestDir: "{app}\manager\stylesheets"; Flags: ignoreversion;
|
||||
Source: "..\manager\*"; DestDir: "{app}\manager"; Flags: ignoreversion;
|
||||
|
||||
Source: "..\img\olympus.ico"; DestDir: "{app}\img"; Flags: ignoreversion;
|
||||
Source: "..\img\olympus_server.ico"; DestDir: "{app}\img"; Flags: ignoreversion;
|
||||
Source: "..\img\olympus_configurator.ico"; DestDir: "{app}\img"; Flags: ignoreversion;
|
||||
Source: "..\img\configurator_logo.png"; DestDir: "{app}\img"; Flags: ignoreversion;
|
||||
Source: "..\img\OlympusLogoFinal_4k.png"; DestDir: "{app}\img"; Flags: ignoreversion;
|
||||
|
||||
Source: "..\LEGAL.txt"; DestDir: "{app}"; Flags: ignoreversion;
|
||||
|
||||
[Run]
|
||||
Filename: "{app}\client\install.bat"; Description: "Installing node.js modules, this may take some time..."; Tasks: installmodules;
|
||||
Filename: "{app}\manager\install.bat"; Description: "Installing node.js modules, this may take some time..."; Tasks: installmodules;
|
||||
Filename: "{app}\manager\manager.vbs"; WorkingDir: "{app}\manager"; Description: "Launch the Olympus manager"; Flags: postinstall shellexec;
|
||||
|
||||
[Icons]
|
||||
Name: "{userdesktop}\DCS Olympus Manager"; Filename: "{app}\manager\manager.vbs"; Tasks: desktopicon; IconFilename: "{app}\img\olympus_configurator.ico";
|
||||
Name: "{app}\DCS Olympus Manager"; Filename: "{app}\manager\manager.vbs"; IconFilename: "{app}\img\olympus_configurator.ico";
|
||||
|
||||
[UninstallDelete]
|
||||
Type: filesandordirs; Name: "{app}"
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;600;700;800&display=swap" />
|
||||
|
||||
<meta charset="UTF-8">
|
||||
<title>DCS Olympus Manager {{OLYMPUS_VERSION_NUMBER}}</title>
|
||||
<title>DCS Olympus Manager v1.0.4</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
@ -24,7 +24,7 @@
|
||||
<img class="main-icon" src="../img/OlympusLogoFinal_4k.png" \>
|
||||
<div>
|
||||
<div> DCS Olympus Manager</div>
|
||||
<div class="accent-green">{{OLYMPUS_VERSION_NUMBER}}</div>
|
||||
<div class="accent-green">v1.0.4</div>
|
||||
</div>
|
||||
<div>
|
||||
These are the DCS instances that the Olympus Manager has automatically detected in your system. <br>
|
||||
|
||||
@ -1 +0,0 @@
|
||||
npm install --omit=dev
|
||||
52
package.bat
52
package.bat
@ -1 +1,51 @@
|
||||
call iscc.exe installer\olympus.iss
|
||||
rmdir /s /q package
|
||||
|
||||
mkdir package
|
||||
|
||||
echo F|xcopy /Y .\olympus.json .\package\olympus.json
|
||||
|
||||
echo F|xcopy /Y .\scripts\OlympusHook.lua .\package\Scripts\OlympusHook.lua
|
||||
echo F|xcopy /Y .\scripts\install.bat .\package\Scripts\install.bat
|
||||
echo F|xcopy /Y .\scripts\OlympusCommand.lua .\package\mod\scripts\OlympusCommand.lua
|
||||
echo F|xcopy /Y .\scripts\unitPayloads.lua .\package\mod\scripts\unitPayloads.lua
|
||||
echo F|xcopy /Y .\scripts\templates.lua .\package\mod\scripts\templates.lua
|
||||
echo F|xcopy /Y .\scripts\mist.lua .\package\mod\scripts\mist.lua
|
||||
echo F|xcopy /Y .\scripts\mods.lua .\package\mod\scripts\mods.lua
|
||||
|
||||
echo D|xcopy /Y /S /E .\mod .\package\mod
|
||||
|
||||
echo F|xcopy /Y /I .\bin\*.dll .\package\mod\bin
|
||||
|
||||
echo D|xcopy /Y /S /E .\client\public\databases .\package\mod\databases
|
||||
|
||||
echo D|xcopy /Y /S /E .\client\bin .\package\client\bin
|
||||
echo D|xcopy /Y /S /E .\client\public .\package\client\public
|
||||
echo D|xcopy /Y /S /E .\client\routes .\package\client\routes
|
||||
echo D|xcopy /Y /S /E .\client\views .\package\client\views
|
||||
|
||||
echo F|xcopy /Y .\client\app.js .\package\client\app.js
|
||||
echo F|xcopy /Y .\client\client.js .\package\client\client.js
|
||||
echo F|xcopy /Y .\client\package.json .\package\client\package.json
|
||||
echo F|xcopy /Y .\client\configurator.js .\package\client\configurator.js
|
||||
|
||||
echo F|xcopy /Y /I .\client\*.vbs .\package\client
|
||||
|
||||
echo D|xcopy /Y /S /E .\manager\icons .\package\manager\icons
|
||||
echo D|xcopy /Y /S /E .\manager\ejs .\package\manager\ejs
|
||||
echo D|xcopy /Y /S /E .\manager\javascripts .\package\manager\javascripts
|
||||
echo D|xcopy /Y /S /E .\manager\stylesheets .\package\manager\stylesheets
|
||||
|
||||
echo F|xcopy /Y /I .\manager\*.* .\package\manager
|
||||
|
||||
echo F|xcopy /Y .\img\olympus.ico .\package\img\olympus.ico
|
||||
echo F|xcopy /Y .\img\olympus_server.ico .\package\img\olympus_server.ico
|
||||
echo F|xcopy /Y .\img\olympus_configurator.ico .\package\img\olympus_configurator.ico
|
||||
echo F|xcopy /Y .\img\configurator_logo.png .\package\img\configurator_logo.png
|
||||
echo F|xcopy /Y .\img\OlympusLogoFinal_4k.png .\package\img\OlympusLogoFinal_4k.png
|
||||
|
||||
echo F|xcopy /Y .\LEGAL.txt .\package\LEGAL.txt
|
||||
echo F|xcopy /Y .\INSTRUCTIONS.txt .\package\INSTRUCTIONS.txt
|
||||
|
||||
echo D|xcopy /Y /S /E .\dependencies .\package\dependencies
|
||||
|
||||
echo F|xcopy /Y .\install.bat .\package\install.bat
|
||||
58
scripts/install.bat
Normal file
58
scripts/install.bat
Normal file
@ -0,0 +1,58 @@
|
||||
@echo OFF
|
||||
echo [36m"*********************************************************************"[0m
|
||||
echo [36m"* _____ _____ _____ ____ _ *"[0m
|
||||
echo [36m"* | __ \ / ____|/ ____| / __ \| | *"[0m
|
||||
echo [36m"* | | | | | | (___ | | | | |_ _ _ __ ___ _ __ _ _ ___ *"[0m
|
||||
echo [36m"* | | | | | \___ \ | | | | | | | | '_ ` _ \| '_ \| | | / __| *"[0m
|
||||
echo [36m"* | |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \__ \ *"[0m
|
||||
echo [36m"* |_____/ \_____|_____/ \____/|_|\__, |_| |_| |_| .__/ \__,_|___/ *"[0m
|
||||
echo [36m"* __/ | | | *"[0m
|
||||
echo [36m"* |___/ |_| *"[0m
|
||||
echo [36m"*********************************************************************"[0m
|
||||
echo [36mWelcome to the DCS Olympus v{{OLYMPUS_VERSION_NUMBER}} installation script. Please wait while the necessary dependencies are installed![0m
|
||||
echo:
|
||||
echo [30m[106mThe output of this script is also available in the file %CD%\output.log. If you encounter any error, make sure to attach that file to your help request![0m
|
||||
timeout /t 5
|
||||
|
||||
echo Checking if node.js framework is installed...
|
||||
|
||||
REM Check if node is installed
|
||||
node -v 2> Nul
|
||||
if "%errorlevel%" == "9009" (
|
||||
echo node.js could not be found, installing it...
|
||||
msiexec /i "%CD%\dependencies\node-v20.10.0-x64.msi" /passive
|
||||
set "PATH=%PATH%;%programfiles%\nodejs"
|
||||
) else (
|
||||
echo node.js is already installed, continuing installation!
|
||||
)
|
||||
|
||||
echo Installing node modules for client application...
|
||||
cd .\client
|
||||
call npm install --omit=dev --silent
|
||||
cd..
|
||||
|
||||
echo Installing node modules for manager application...
|
||||
cd .\manager
|
||||
call npm install --omit=dev --silent
|
||||
cd..
|
||||
|
||||
echo Generating shortcuts...
|
||||
set SCRIPT="%TEMP%\%RANDOM%-%RANDOM%-%RANDOM%-%RANDOM%.vbs"
|
||||
echo Set oWS = WScript.CreateObject("WScript.Shell") >> %SCRIPT%
|
||||
echo sLinkFile = "%USERPROFILE%\Desktop\DCS Olympus Manager.lnk" >> %SCRIPT%
|
||||
echo Set oLink = oWS.CreateShortcut(sLinkFile) >> %SCRIPT%
|
||||
echo oLink.TargetPath = "%CD%\manager\manager.vbs" >> %SCRIPT%
|
||||
echo oLink.WorkingDirectory = "%CD%\manager" >> %SCRIPT%
|
||||
echo oLink.IconLocation = "%CD%\img\olympus_configurator.ico" >> %SCRIPT%
|
||||
|
||||
echo oLink.Save >> %SCRIPT%
|
||||
|
||||
cscript /nologo %SCRIPT%
|
||||
del %SCRIPT%
|
||||
|
||||
echo [32mAll done! This window will close in 5 seconds. It may take a couple of seconds for the Olympus Manager to start, please wait... [0m
|
||||
|
||||
timeout /t 5
|
||||
|
||||
cd manager
|
||||
start cscript manager.vbs
|
||||
Loading…
x
Reference in New Issue
Block a user