[Winmerge-svn] SF.net SVN: winmerge: [4220] trunk/Src

[<ge...@us...>]

Revision: 4220
          http://svn.sourceforge.net/winmerge/?rev=4220&view=rev
Author:   gerundt
Date:     2007-04-01 14:28:17 -0700 (Sun, 01 Apr 2007)

Log Message:
-----------
PATCH: [ 1692033 ] Use SetResourceVersions.wsf with 3 version numbers

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/SetResourceVersions.wsf

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2007-03-31 19:58:25 UTC (rev 4219)
+++ trunk/Src/Changes.txt	2007-04-01 21:28:17 UTC (rev 4220)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-04-01 Tim
+ PATCH: [ 1692033 ] Use SetResourceVersions.wsf with 3 version numbers
+  Src: SetResourceVersions.wsf
+
 2007-03-31 Takashi
  BUG: [ 1630762 ] Cannot save project file if including non-ascii chars
   Src: Merge.dsp ProjectFile.cpp

Modified: trunk/Src/SetResourceVersions.wsf
===================================================================
--- trunk/Src/SetResourceVersions.wsf	2007-03-31 19:58:25 UTC (rev 4219)
+++ trunk/Src/SetResourceVersions.wsf	2007-04-01 21:28:17 UTC (rev 4220)
@@ -53,7 +53,7 @@
   }
   else
   {
-    var Message = "Enter new version number (eg, 1.2.3.4)";
+    var Message = "Enter new version number (eg, 1.2.3.4 or 1.2.3)";
     var Title = "Version Number";
     var defval = "";
     var result = PromptBox(Message, Title, defval);
@@ -116,11 +116,12 @@
  ***************************************************/
 function DecodeVersion(version, params)
 {
-  var regex = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
+  //BUG: "1.2.3." is accepted as valid!
+  var regex = /^(\d+)\.(\d+)\.(\d+)\.?(\d*)$/;
   var results= regex.exec(version)
   if (results == null || results.length!=5)
   {
-    WScript.Echo("Bad version string (must be format 1.2.3.4): Aborting.");
+    WScript.Echo("Bad version string (must be format 1.2.3.4 or 1.2.3): Aborting.");
     return false;
   }
   params.v1 = results[1];
@@ -207,7 +208,7 @@
 
   params.found1=0; // PRODUCTVERSION
   params.found2=0; // ProductVersion
-  params.found3=0; // FILEVERSIOn
+  params.found3=0; // FILEVERSION
   params.found4=0; // FileVersion
   params.found5=0; // PrivateBuild 0x8L
   
@@ -260,19 +261,27 @@
       return line;
     }
     var start = line.search(/\d+/);
-    line = line.substring(0, start) 
-      + params.v1 + "," + params.v2 + "," + params.v3 + "," + params.v4;
+    if (params.v4 != '')
+      line = line.substring(0, start) 
+        + params.v1 + "," + params.v2 + "," + params.v3 + "," + params.v4;
+    else
+      line = line.substring(0, start) 
+        + params.v1 + "," + params.v2 + "," + params.v3 + ",0";
     return line;
   }
 
-  var regexString = /^ *VALUE "ProductVersion", "(\d+).(\d+).(\d+).(\d+)(\\0|)" *$/;
+  var regexString = /^ *VALUE "ProductVersion", "(\d+).(\d+).(\d+).?(\d*)(\\0|)" *$/;
   if (regexString.test(line))
   {
     ++params.found2;
     // Allow multiple hits on this, as MergeCatalan.rc has more than one
     var start = line.search(/\d+/);
-    line = line.substring(0, start) 
-      + params.v1 + "." + params.v2 + "." + params.v3 + "." + params.v4 + "\"";
+    if (params.v4 != '')
+      line = line.substring(0, start) 
+        + params.v1 + "." + params.v2 + "." + params.v3 + "." + params.v4 + "\"";
+    else
+      line = line.substring(0, start) 
+        + params.v1 + "." + params.v2 + "." + params.v3 + "\"";
     return line;
   }
 
@@ -289,19 +298,27 @@
       return line;
     }
     var start = line.search(/\d+/);
-    line = line.substring(0, start) 
-      + params.v1 + "," + params.v2 + "," + params.v3 + "," + params.v4;
+    if (params.v4 != '')
+      line = line.substring(0, start) 
+        + params.v1 + "," + params.v2 + "," + params.v3 + "," + params.v4;
+    else
+      line = line.substring(0, start) 
+        + params.v1 + "," + params.v2 + "," + params.v3 + ",0";
     return line;
   }
 
-  var regexString = /^ *VALUE "FileVersion", "(\d+).(\d+).(\d+).(\d+)(\\0|)" *$/;
+  var regexString = /^ *VALUE "FileVersion", "(\d+).(\d+).(\d+).?(\d*)(\\0|)" *$/;
   if (regexString.test(line))
   {
     ++params.found4;
     // Allow multiple hits on this, as MergeCatalan.rc has more than one
     var start = line.search(/\d+/);
-    line = line.substring(0, start) 
-      + params.v1 + "." + params.v2 + "." + params.v3 + "." + params.v4 + "\"";
+    if (params.v4 != '')
+      line = line.substring(0, start) 
+        + params.v1 + "." + params.v2 + "." + params.v3 + "." + params.v4 + "\"";
+    else
+      line = line.substring(0, start) 
+        + params.v1 + "." + params.v2 + "." + params.v3 + "\"";
     return line;
   }
 
@@ -328,7 +345,7 @@
  ***************************************************/
 function ShowUsage()
 {
-  WScript.Echo("SetLanguageVersions [x.y.z.w]");
+  WScript.Echo("SetLanguageVersions [x.y.z(.w)]");
 }
 
 /***************************************************


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.