Fixed versioning tag

Pax1601 · Dec 14, 2023 · 2c403a9 · 2c403a9
1 parent 27c78d6
commit 2c403a9
Show file tree

Hide file tree

Showing 24 changed files with 191 additions and 25 deletions.
diff --git 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
diff --git 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})`;
diff --git 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
@@ -6,7 +6,7 @@
         <div class="ol-select-options">
             <div id="toolbar-summary">
                 <h3>DCS Olympus</h3>
-                <div class="accent-green app-version-number">version {{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}</div>
+                <div class="accent-green app-version-number">version {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</div>
             </div>
             <div>
                 <a href="https://discord.gg/wWXyVVBZT7" target="_blank">Discord</a>

diff --git 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 <user folder>\Saved Games\dcs.openbeta);
-3) enjoy!
+
+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.
diff --git a/prerequisites/node-v20.10.0-x64.msi → installer/archive/node-v20.10.0-x64.msi b/prerequisites/node-v20.10.0-x64.msi → installer/archive/node-v20.10.0-x64.msi
diff --git 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!
+
+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.
diff --git a/installer/installer/node-v20.10.0-x64.msi b/installer/installer/node-v20.10.0-x64.msi
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -182,7 +182,7 @@
       <EnableUAC>false</EnableUAC>
       <AdditionalDependencies>lua.lib; GeographicLib-i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\third-party\lua</AdditionalLibraryDirectories>
-      <Version>{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}</Version>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/src/dcstools/dcstools.aps b/src/dcstools/dcstools.aps
diff --git a/src/dcstools/dcstools.vcxproj b/src/dcstools/dcstools.vcxproj
@@ -142,7 +142,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <Version>{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}</Version>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/src/logger/logger.vcxproj b/src/logger/logger.vcxproj
@@ -141,7 +141,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <Version>{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}</Version>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/src/luatools/luatools.vcxproj b/src/luatools/luatools.vcxproj
@@ -125,7 +125,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <Version>{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}</Version>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/src/olympus/olympus.vcxproj b/src/olympus/olympus.vcxproj
@@ -95,7 +95,7 @@
       <EnableUAC>false</EnableUAC>
       <AdditionalDependencies>lua.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\third-party\lua</AdditionalLibraryDirectories>
-      <Version>{{OLYMPUS_VERSION_NUMBER}}_{{OLYMPUS_COMMIT_HASH}}</Version>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git 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
@@ -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
@@ -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: <Product name>"
+            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
@@ -20,10 +20,14 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\utils.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="utils.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -65,19 +69,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/src/utils/utils.vcxproj.filters b/src/utils/utils.vcxproj.filters
@@ -14,10 +14,16 @@
     <ClInclude Include="include\utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="utils.rc" />
+  </ItemGroup>
 </Project>