Use two-digit year and month as minor version and build number.

zufuliu · Dec 1, 2018 · f08bff4 · f08bff4
1 parent 62e0808
commit f08bff4
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/metapath/res/metapath.exe.manifest b/metapath/res/metapath.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity name="metapath" processorArchitecture="*" version="4.0.13.1435" type="win32"/>
+	<assemblyIdentity name="metapath" processorArchitecture="*" version="4.18.12.1629" type="win32"/>
 	<description>metapath</description>
 	<dependency>
 		<dependentAssembly>

diff --git a/metapath/src/VersionRev.h b/metapath/src/VersionRev.h
@@ -1,3 +1,5 @@
-#define VERSION_HASH _T("0ee3099")
-#define VERSION_REV 1435
-#define VERSION_REV_FULL _T("r1435 (0ee3099)")
+#define VERSION_MINOR 18
+#define VERSION_BUILD 12
+#define VERSION_HASH _T("62e0808")
+#define VERSION_REV 1629
+#define VERSION_REV_FULL _T("r1629 (62e0808)")
diff --git a/metapath/src/version.h b/metapath/src/version.h
@@ -35,8 +35,6 @@
 #define STRINGIFY(x)		DO_STRINGIFY(x)
 
 #define VERSION_MAJOR		4
-#define VERSION_MINOR		0
-#define VERSION_BUILD		13
 
 #define MY_APPNAME					L"metapath"
 #define VERSION_FILEVERSION_NUM		VERSION_MAJOR,VERSION_MINOR,VERSION_BUILD,VERSION_REV

diff --git a/res/Notepad2.exe.manifest b/res/Notepad2.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity name="Notepad2" processorArchitecture="*" version="4.2.25.1435" type="win32"/>
+	<assemblyIdentity name="Notepad2" processorArchitecture="*" version="4.18.12.1629" type="win32"/>
 	<description>Notepad2</description>
 	<dependency>
 		<dependentAssembly>

diff --git a/src/Version.h b/src/Version.h
@@ -29,8 +29,6 @@
 #define STRINGIFY(x)		DO_STRINGIFY(x)
 
 #define VERSION_MAJOR		4
-#define VERSION_MINOR		2
-#define VERSION_BUILD		25
 
 #define MY_APPNAME					L"Notepad2"
 #define VERSION_FILEVERSION_NUM		VERSION_MAJOR,VERSION_MINOR,VERSION_BUILD,VERSION_REV

diff --git a/src/VersionRev.h b/src/VersionRev.h
@@ -1,3 +1,5 @@
-#define VERSION_HASH _T("0ee3099")
-#define VERSION_REV 1435
-#define VERSION_REV_FULL _T("r1435 (0ee3099)")
+#define VERSION_MINOR 18
+#define VERSION_BUILD 12
+#define VERSION_HASH _T("62e0808")
+#define VERSION_REV 1629
+#define VERSION_REV_FULL _T("r1629 (62e0808)")
diff --git a/version.sh b/version.sh
@@ -60,6 +60,8 @@ fi
 
 ver_full="_T(\"r$ver ($hash)$ver_full\")"
 
+version_info+="#define VERSION_MINOR `date +%y`"$'\n'
+version_info+="#define VERSION_BUILD `date +%m`"$'\n'
 version_info+="#define VERSION_HASH _T(\"$hash\")"$'\n'
 version_info+="#define VERSION_REV $ver"$'\n'
 version_info+="#define VERSION_REV_FULL $ver_full"
@@ -84,8 +86,9 @@ if [[ ! -f "$versionfile" ]] || [[ "$version_info" != "$(<"$versionfile")" ]]; t
 fi
 
 # Update manifest file if version information was changed.
-base_ver="4.2.25"
-newmanifest="$(sed -Ee "s/(${base_ver}.)([0-9]+)/\1${ver}/g" "$manifestfile")"
+base_ver="4"
+new_ver="`date +%y.%m`.${ver}"
+newmanifest="$(sed -Ee "s/(${base_ver}\.)([0-9.]+)/\1${new_ver}/g" "$manifestfile")"
 if [[ "$newmanifest" != "$(<"$manifestfile")" ]]; then
   # Update the revision number in the manifest file
   echo "$newmanifest" > "$manifestfile"
@@ -99,8 +102,8 @@ if [[ $# -ne 0 ]]; then
     echo "$version_info" > "$versionfile"
   fi
 
-  base_ver="4.0.13"
-  newmanifest="$(sed -Ee "s/(${base_ver}.)([0-9]+)/\1${ver}/g" "$manifestfile")"
+  base_ver="4"
+  newmanifest="$(sed -Ee "s/(${base_ver}\.)([0-9.]+)/\1${new_ver}/g" "$manifestfile")"
   if [[ "$newmanifest" != "$(<"$manifestfile")" ]]; then
     echo "$newmanifest" > "$manifestfile"
   fi