diff --git a/.gitignore b/.gitignore index b52aef9d0..102611e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ hgt client/public/stylesheets/leaflet/leaflet-gesture-handling.css client/public/javascripts/leaflet.nauticscale.js client/public/javascripts/L.Path.Drag.js +/installer/archive/Scripts +/installer/archive/Mods +/installer/installer/DCSOlympus*.exe \ No newline at end of file diff --git a/client/bin/www b/client/bin/www index d4015a1f3..88de1786c 100644 --- a/client/bin/www +++ b/client/bin/www @@ -112,7 +112,7 @@ function onListening() { debug('Listening on ' + bind); } -console.log("DCS Olympus server {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} started correctly!") +console.log("DCS Olympus server {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}} started correctly!") console.log("Waiting for connections...") process.title = `DCS Olympus server {{OLYMPUS_VERSION_NUMBER}} (${port})`; \ No newline at end of file diff --git a/client/configurator.js b/client/configurator.js index c7c588a0c..0a954e8c2 100644 --- a/client/configurator.js +++ b/client/configurator.js @@ -42,7 +42,7 @@ async function run() { console.log('\x1b[36m%s\x1b[0m', "*********************************************************************"); console.log('\x1b[36m%s\x1b[0m', ""); - console.log("DCS Olympus configurator {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}"); + console.log("DCS Olympus configurator {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}"); console.log(""); var newValue; diff --git a/client/views/toolbars/primary.ejs b/client/views/toolbars/primary.ejs index 07e129ad5..70e130b86 100644 --- a/client/views/toolbars/primary.ejs +++ b/client/views/toolbars/primary.ejs @@ -6,7 +6,7 @@

DCS Olympus

-
version {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}
+
version {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}
Discord diff --git a/installer/archive/INSTRUCTIONS.txt b/installer/archive/INSTRUCTIONS.txt index fe251128c..3d57a01a4 100644 --- a/installer/archive/INSTRUCTIONS.txt +++ b/installer/archive/INSTRUCTIONS.txt @@ -7,10 +7,25 @@ __/ | | | |___/ |_| -{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} +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.); +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 \Saved Games\dcs.openbeta); -3) enjoy! \ No newline at end of file + +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://*:/olympus/" user= + +Remember to replace with the BACKEND PORT you select during installation (3001 by default) and with the user that runs the DCS SERVER. diff --git a/prerequisites/node-v20.10.0-x64.msi b/installer/archive/node-v20.10.0-x64.msi similarity index 100% rename from prerequisites/node-v20.10.0-x64.msi rename to installer/archive/node-v20.10.0-x64.msi diff --git a/installer/installer/INSTRUCTIONS.txt b/installer/installer/INSTRUCTIONS.txt index 2833cb4f2..d851ee748 100644 --- a/installer/installer/INSTRUCTIONS.txt +++ b/installer/installer/INSTRUCTIONS.txt @@ -7,10 +7,24 @@ __/ | | | |___/ |_| -{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} +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) enjoy! \ No newline at end of file + +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://*:/olympus/" user= + +Remember to replace with the BACKEND PORT you select during installation (3001 by default) and with the user that runs the DCS SERVER. diff --git a/installer/installer/node-v20.10.0-x64.msi b/installer/installer/node-v20.10.0-x64.msi new file mode 100644 index 000000000..43a1bcdbc Binary files /dev/null and b/installer/installer/node-v20.10.0-x64.msi differ diff --git a/installer/olympus.iss b/installer/olympus.iss index f1aed65ab..df28f68b2 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -1,4 +1,4 @@ -#define version "{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}" +#define version "{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}" [Setup] AppName=DCS Olympus diff --git a/missions/olympus.miz b/missions/olympus.miz deleted file mode 100644 index eaf4b7970..000000000 Binary files a/missions/olympus.miz and /dev/null differ diff --git a/scripts/OlympusCommand.lua b/scripts/OlympusCommand.lua index f218c3c65..45b366bb3 100644 --- a/scripts/OlympusCommand.lua +++ b/scripts/OlympusCommand.lua @@ -1,4 +1,4 @@ -local version = "{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}" +local version = "{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}" local debug = false -- True enables debug printing using DCS messages diff --git a/scripts/OlympusHook.lua b/scripts/OlympusHook.lua index 84f3babd5..2ec6e12ca 100644 --- a/scripts/OlympusHook.lua +++ b/scripts/OlympusHook.lua @@ -1,4 +1,4 @@ -local version = '{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}' +local version = '{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}' local lfs = require("lfs") Olympus = {} diff --git a/src/core/core.rc b/src/core/core.rc index 186fffa19..d3cc6cc9a 100644 --- a/src/core/core.rc +++ b/src/core/core.rc @@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,0 - PRODUCTVERSION 1,0,1,0 + FILEVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0 + PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "DCS Olympus" VALUE "FileDescription", "DCS Olympus" - VALUE "FileVersion", "1.0.2.0" + VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0" VALUE "InternalName", "core.dll" VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "OriginalFilename", "core.dll" VALUE "ProductName", "DCS Olympus" - VALUE "ProductVersion", "1.0.2.0" + VALUE "ProductVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0" END END BLOCK "VarFileInfo" diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 3e004206b..e6e2c79ee 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -182,7 +182,7 @@ false lua.lib; GeographicLib-i.lib;%(AdditionalDependencies) ..\..\third-party\lua - {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} + {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}} diff --git a/src/dcstools/dcstools.aps b/src/dcstools/dcstools.aps deleted file mode 100644 index 5201767d7..000000000 Binary files a/src/dcstools/dcstools.aps and /dev/null differ diff --git a/src/dcstools/dcstools.vcxproj b/src/dcstools/dcstools.vcxproj index 93b246497..ce6b26102 100644 --- a/src/dcstools/dcstools.vcxproj +++ b/src/dcstools/dcstools.vcxproj @@ -142,7 +142,7 @@ Windows true false - {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} + {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}} diff --git a/src/logger/logger.vcxproj b/src/logger/logger.vcxproj index 57cbd6581..89b81e308 100644 --- a/src/logger/logger.vcxproj +++ b/src/logger/logger.vcxproj @@ -141,7 +141,7 @@ Windows true false - {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} + {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}} diff --git a/src/luatools/luatools.vcxproj b/src/luatools/luatools.vcxproj index 331d31d58..699d94b1b 100644 --- a/src/luatools/luatools.vcxproj +++ b/src/luatools/luatools.vcxproj @@ -125,7 +125,7 @@ Windows true false - {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} + {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}} diff --git a/src/olympus/olympus.vcxproj b/src/olympus/olympus.vcxproj index ad4980cf7..170aaed8f 100644 --- a/src/olympus/olympus.vcxproj +++ b/src/olympus/olympus.vcxproj @@ -95,7 +95,7 @@ false lua.lib ..\..\third-party\lua - {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}} + {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}} diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h index ca1916a33..7583e5984 100644 --- a/src/shared/include/defines.h +++ b/src/shared/include/defines.h @@ -1,6 +1,6 @@ #pragma once -#define VERSION "{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}" +#define VERSION "{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}" #define LOG_NAME "Olympus_log.txt" #define REST_ADDRESS "http://localhost:30000" #define REST_URI "olympus" diff --git a/src/utils/resource.h b/src/utils/resource.h new file mode 100644 index 000000000..b9caba47d --- /dev/null +++ b/src/utils/resource.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by utils.rc + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/utils/utils.rc b/src/utils/utils.rc new file mode 100644 index 000000000..3070d7dc7 --- /dev/null +++ b/src/utils/utils.rc @@ -0,0 +1,110 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Italian (Italy) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN +#pragma code_page(1252) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // Italian (Italy) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (United Kingdom) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0 + PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "DCS Olympus" + VALUE "FileDescription", "DCS Olympus" + VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0" + VALUE "InternalName", "utils.dll" + VALUE "LegalCopyright", "Copyright (C) 2023" + VALUE "OriginalFilename", "utils.dll" + VALUE "ProductName", "TODO: " + VALUE "ProductVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (United Kingdom) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/utils/utils.vcxproj b/src/utils/utils.vcxproj index 34ad84dcc..e5ce5cb0e 100644 --- a/src/utils/utils.vcxproj +++ b/src/utils/utils.vcxproj @@ -20,10 +20,14 @@ + + + + 16.0 Win32Proj @@ -65,19 +69,19 @@ - + - + - + - + diff --git a/src/utils/utils.vcxproj.filters b/src/utils/utils.vcxproj.filters index ae6b4d5ac..e7fcfd1b9 100644 --- a/src/utils/utils.vcxproj.filters +++ b/src/utils/utils.vcxproj.filters @@ -14,10 +14,16 @@ Header Files + + Header Files + Source Files + + + \ No newline at end of file