Skip to content

Commit 18d0ea2

Browse files
mkoscumbThomsonTan
andauthored
Clarify and Improve the version format script so that it doesn't need to manually be updated every year. Also fixed version.txt not requiring a magic 999 value. (#1237)
Co-authored-by: Tom Tan <[email protected]>
1 parent a5bd5a6 commit 18d0ea2

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

Solutions/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.8.999.1
1+
3.year.day.1

tools/version.js

+15-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ function dayNumber() {
1818
return dayOfYear;
1919
}
2020

21+
function yearNumber() {
22+
var thisYear = new Date().getFullYear();
23+
return (thisYear - 2016);
24+
}
25+
2126
var fso = WScript.CreateObject("Scripting.Filesystemobject");
2227

2328
function readAll(filename) {
@@ -27,6 +32,12 @@ function readAll(filename) {
2732
return result;
2833
}
2934

35+
function updateYearAndDay(versionString){
36+
var updatedVersion = versionString.replace("year", yearNumber());
37+
updatedVersion = updatedVersion.replace("day", dayNumber() );
38+
return updatedVersion;
39+
}
40+
3041
function generateVersionHpp() {
3142

3243
var palTxt = "WIN32";
@@ -35,8 +46,7 @@ function generateVersionHpp() {
3546
var ver1 = readAll("..\\Solutions\\version.txt");
3647
// Remove end-of-line
3748
ver1 = ver1.replace("\n", "");
38-
// Replace 999 by today's dayNumber for nightly builds
39-
ver1 = ver1.replace("999", dayNumber() );
49+
ver1 = updateYearAndDay(ver1);
4050
// console.log("version.txt => " + ver1 + "\n");
4151
var ver2 = ver1.split(".").join(",");
4252
var arr = ver1.split(".");
@@ -68,8 +78,9 @@ function generateVersionHpp() {
6878
}
6979

7080
function generateVersionTxt() {
71-
// Read base version and replace '999' with nightly build number
72-
var version = readAll("..\\Solutions\\version.txt").replace("999", dayNumber());
81+
var version = readAll("..\\Solutions\\version.txt")
82+
83+
version = updateYearAndDay(version);
7384

7485
// Create 'out' folder if it doesn't already exist. Otherwise, OpenTextFile below will fail
7586
if (!fso.FolderExists("..\\Solutions\\out")) {

0 commit comments

Comments
 (0)