diff --git a/increase_version.js b/increase_version.js
index 0f62973a..9921a029 100644
--- a/increase_version.js
+++ b/increase_version.js
@@ -41,23 +41,23 @@ fs.readFile("./version.json", "utf8", (error, data) => {
if (err) {
return console.log(err);
}
- if (data.search(/{{OLYMPUS_VERSION_NUMBER}}/g) >= 0) {
- console.log(`Replacing version in ${file}`);
+ //if (data.search(/{{OLYMPUS_VERSION_NUMBER}}/g) >= 0) {
+ // console.log(`Replacing version in ${file}`);
+ //
+ // data = data.replace(/{{OLYMPUS_VERSION_NUMBER}}/g, `v${major}.${minor}.${minorminor}`);
+ // data = data.replace(/{{OLYMPUS_COMMIT_HASH}}/g, revision);
+ // fileChanged = true;
+ //}
- data = data.replace(/{{OLYMPUS_VERSION_NUMBER}}/g, `v${major}.${minor}.${minorminor}`);
- data = data.replace(/{{OLYMPUS_COMMIT_HASH}}/g, revision);
+ if (data.search(/FILEVERSION \d,\d,\d/g) >= 0) {
+ console.log(`Replacing version in ${file}`);
+ var data = data.replace(/FILEVERSION \d,\d,\d/g, `FILEVERSION ${major},${minor},${minorminor}`);
fileChanged = true;
}
- if (data.search(/{{OLYMPUS_VS_VERSION_NUMBER_1}}/g) >= 0) {
+ if (data.search(/VALUE "FileVersion", "\d.\d.\d.0"/g) >= 0) {
console.log(`Replacing version in ${file}`);
- var data = data.replace(/{{OLYMPUS_VS_VERSION_NUMBER_1}}/g, `${major},${minor},${minorminor}`);
- fileChanged = true;
- }
-
- if (data.search(/{{OLYMPUS_VS_VERSION_NUMBER_2}}/g) >= 0) {
- console.log(`Replacing version in ${file}`);
- data = data.replace(/{{OLYMPUS_VS_VERSION_NUMBER_2}}/g, `${major}.${minor}.${minorminor}`);
+ data = data.replace(/VALUE "FileVersion", "\d.\d.\d.0"/g, `VALUE "FileVersion", "${major}.${minor}.${minorminor}.0" `);
fileChanged = true;
}
diff --git a/src/core/core.rc b/src/core/core.rc
index d3cc6cc9..eb23d8af 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 {{OLYMPUS_VS_VERSION_NUMBER_1}},0
- PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
+ FILEVERSION 1,0,3,0
+ PRODUCTVERSION 1,0,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "DCS Olympus"
VALUE "FileDescription", "DCS Olympus"
- VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "FileVersion", "1.0.3.0"
VALUE "InternalName", "core.dll"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "core.dll"
VALUE "ProductName", "DCS Olympus"
- VALUE "ProductVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "ProductVersion", "1.0.3.0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index e6e2c79e..63b90dd3 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}}
+ v1.0.3.7bb90b4a8
diff --git a/src/dcstools/dcstools.rc b/src/dcstools/dcstools.rc
index d44a7214..390faf2a 100644
--- a/src/dcstools/dcstools.rc
+++ b/src/dcstools/dcstools.rc
@@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
- PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
+ FILEVERSION 1,0,3,0
+ PRODUCTVERSION 1,0,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "DCS Olympus"
VALUE "FileDescription", "DCS Olympus"
- VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "FileVersion", "1.0.3.0"
VALUE "InternalName", "dcstools.dll"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "dcstools.dll"
VALUE "ProductName", "DCS Olympus"
- VALUE "ProductVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "ProductVersion", "1.0.3.0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/dcstools/dcstools.vcxproj b/src/dcstools/dcstools.vcxproj
index ce6b2610..11adb332 100644
--- a/src/dcstools/dcstools.vcxproj
+++ b/src/dcstools/dcstools.vcxproj
@@ -142,7 +142,7 @@
Windows
true
false
- {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}
+ v1.0.3.7bb90b4a8
diff --git a/src/logger/logger.rc b/src/logger/logger.rc
index 519a4f51..c7f0d6ab 100644
--- a/src/logger/logger.rc
+++ b/src/logger/logger.rc
@@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
- PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
+ FILEVERSION 1,0,3,0
+ PRODUCTVERSION 1,0,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "DCS Olympus"
VALUE "FileDescription", "DCS Olympus"
- VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "FileVersion", "1.0.3.0"
VALUE "InternalName", "logger.dll"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "logger.dll"
VALUE "ProductName", "DCS Olympus"
- VALUE "ProductVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "ProductVersion", "1.0.3.0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/logger/logger.vcxproj b/src/logger/logger.vcxproj
index 89b81e30..d4b779d5 100644
--- a/src/logger/logger.vcxproj
+++ b/src/logger/logger.vcxproj
@@ -141,7 +141,7 @@
Windows
true
false
- {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}
+ v1.0.3.7bb90b4a8
diff --git a/src/luatools/luatools.rc b/src/luatools/luatools.rc
index 37a3f4d2..e5ba2c61 100644
--- a/src/luatools/luatools.rc
+++ b/src/luatools/luatools.rc
@@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
- PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
+ FILEVERSION 1,0,3,0
+ PRODUCTVERSION 1,0,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "DCS Olympus"
VALUE "FileDescription", "DCS Olympus"
- VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "FileVersion", "1.0.3.0"
VALUE "InternalName", "luatools.dll"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "luatools.dll"
VALUE "ProductName", "DCS Olympus"
- VALUE "ProductVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "ProductVersion", "1.0.3.0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/luatools/luatools.vcxproj b/src/luatools/luatools.vcxproj
index 699d94b1..c1b64675 100644
--- a/src/luatools/luatools.vcxproj
+++ b/src/luatools/luatools.vcxproj
@@ -125,7 +125,7 @@
Windows
true
false
- {{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}
+ v1.0.3.7bb90b4a8
diff --git a/src/olympus/olympus.rc b/src/olympus/olympus.rc
index 654fba2f..d03c3f03 100644
--- a/src/olympus/olympus.rc
+++ b/src/olympus/olympus.rc
@@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
- PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
+ FILEVERSION 1,0,3,0
+ PRODUCTVERSION 1,0,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "DCS Olympus"
VALUE "FileDescription", "DCS Olympus"
- VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "FileVersion", "1.0.3.0"
VALUE "InternalName", "olympus.dll"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "olympus.dll"
VALUE "ProductName", "DCS Olympus"
- VALUE "ProductVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "ProductVersion", "1.0.3.0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/olympus/olympus.vcxproj b/src/olympus/olympus.vcxproj
index 170aaed8..5f68e7f6 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}}
+ v1.0.3.7bb90b4a8
diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h
index 7583e598..0f3f4116 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 "v1.0.3.7bb90b4a8"
#define LOG_NAME "Olympus_log.txt"
#define REST_ADDRESS "http://localhost:30000"
#define REST_URI "olympus"
diff --git a/src/utils/utils.rc b/src/utils/utils.rc
index 3070d7dc..e03ae40f 100644
--- a/src/utils/utils.rc
+++ b/src/utils/utils.rc
@@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
- PRODUCTVERSION {{OLYMPUS_VS_VERSION_NUMBER_1}},0
+ FILEVERSION 1,0,3,0
+ PRODUCTVERSION 1,0,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "DCS Olympus"
VALUE "FileDescription", "DCS Olympus"
- VALUE "FileVersion", "{{OLYMPUS_VS_VERSION_NUMBER_2}}.0"
+ VALUE "FileVersion", "1.0.3.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"
+ VALUE "ProductVersion", "1.0.3.0"
END
END
BLOCK "VarFileInfo"