this is an addendem to bug 190389 - GRE installer needs to use new version key format. this patch sets a Build ID var in the windows registry for GRE

xpinstall/packager/win_gre/gre.jst

@@ -37,6 +37,7 @@ function registerKeys()
 
   subkey = regRootKey;
   err    = winreg.setValueString(subkey, "Version", "$UserAgent$");
+  err    = winreg.setValueString(subkey, "BuildID", "$GreBuildID$");
   tmpstr = new String(fProgram);
   err    = winreg.setValueString(subkey, "GreHome", tmpstr.substring(0, tmpstr.length-1));
   err    = winreg.setValueString(subkey, "GreComponentsDir", fProgram + "Components");

xpinstall/packager/win_gre/makeall.pl

@@ -125,6 +125,10 @@ $ENV{WIZ_userAgentShort}       = "$versionMain";
 $ENV{WIZ_xpinstallVersion}     = "$inDefaultProductVersion";
 $ENV{WIZ_distInstallPath}      = "$gDirDistInstall";
 
+# GetProductBuildID() will return the build id for GRE located here:
+#      NS_BUILD_ID in nsBuildID.h: 2003030610
+$ENV{WIZ_greBuildID}       = StageUtils::GetProductBuildID("$topsrcdir/config/nsBuildID.h", "NS_BUILD_ID");
+
 # GetGreFileVersion() will return the actual version of xpcom.dll used by GRE.
 #  ie:
 #      given milestone.txt : 1.4a
@@ -141,6 +145,7 @@ $ENV{WIZ_greFileVersion}       = StageUtils::GetGreFileVersion($topsrcdir);
 $ENV{WIZ_greUniqueID}          = StageUtils::GetGreSpecialID($topsrcdir);
 
 print "\n";
+print " GRE build id       : $ENV{WIZ_greBuildID}\n";
 print " GRE file version   : $ENV{WIZ_greFileVersion}\n";
 print " GRE special version: $ENV{WIZ_greUniqueID}\n";
 print "\n";

xpinstall/packager/win_gre/makecfgini.pl

@@ -93,6 +93,7 @@ $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
 $fileUninstallZip = $ENV{WIZ_fileUninstallZip};
+$greBuildID       = $ENV{WIZ_greBuildID};
 $greFileVersion   = $ENV{WIZ_greFileVersion};
 $greUniqueID      = $ENV{WIZ_greUniqueID};
 
@@ -200,6 +201,7 @@ while($line = <fpInIt>)
     $line =~ s/\$MainExeFile\$/$fileMainExe/gi;
     $line =~ s/\$UninstallFile\$/$fileUninstall/gi;
     $line =~ s/\$UninstallFileZip\$/$fileUninstallZip/gi;
+    $line =~ s/\$GreBuildID\$/$greBuildID/gi;
     $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
     $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
     print fpOutIni $line;

xpinstall/packager/win_gre/makejs.pl

@@ -69,6 +69,9 @@ $nameProduct      = $ENV{WIZ_nameProduct};
 $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
+$greBuildID       = $ENV{WIZ_greBuildID};
+$greFileVersion   = $ENV{WIZ_greFileVersion};
+$greUniqueID      = $ENV{WIZ_greUniqueID};
 
 # Get the name of the file replacing the .jst extension with a .js extension
 @inJstFileSplit   = split(/\./,$inJstFile);
@@ -121,6 +124,9 @@ while($line = <fpInTemplate>)
     $line =~ s/\$ProductNameInternal\$/$nameProductInternal/i;
     $line =~ s/\$MainExeFile\$/$fileMainExe/i;
     $line =~ s/\$UninstallFile\$/$fileUninstall/i;
+    $line =~ s/\$GreBuildID\$/$greBuildID/gi;
+    $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
+    $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
   }
 
   print fpOutJs $line;

xpinstall/packager/win_gre/makeuninstallini.pl

@@ -64,6 +64,7 @@ $nameProduct      = $ENV{WIZ_nameProduct};
 $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
+$greBuildID       = $ENV{WIZ_greBuildID};
 $greFileVersion   = $ENV{WIZ_greFileVersion};
 $greUniqueID      = $ENV{WIZ_greUniqueID};
 
@@ -93,6 +94,7 @@ while($line = <fpInIt>)
   $line =~ s/\$ProductNameInternal\$/$nameProductInternal/gi;
   $line =~ s/\$MainExeFile\$/$fileMainExe/gi;
   $line =~ s/\$UninstallFile\$/$fileUninstall/gi;
+  $line =~ s/\$GreBuildID\$/$greBuildID/gi;
   $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
   $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
   print fpOutIni $line;

xpinstall/packager/win_mfcembed/makeall.pl

@@ -146,6 +146,10 @@ $ENV{WIZ_userAgentShort}       = "$versionMain";
 $ENV{WIZ_xpinstallVersion}     = "$inDefaultProductVersion";
 $ENV{WIZ_distInstallPath}      = "$gDirDistInstall";
 
+# GetProductBuildID() will return the build id for GRE located here:
+#      NS_BUILD_ID in nsBuildID.h: 2003030610
+$ENV{WIZ_greBuildID}       = StageUtils::GetProductBuildID("$topsrcdir/config/nsBuildID.h", "NS_BUILD_ID");
+
 # GetGreFileVersion() will return the actual version of xpcom.dll used by GRE.
 #  ie:
 #      given milestone.txt : 1.4a

xpinstall/packager/win_mfcembed/makecfgini.pl

@@ -93,6 +93,7 @@ $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
 $fileUninstallZip = $ENV{WIZ_fileUninstallZip};
+$greBuildID       = $ENV{WIZ_greBuildID};
 $greFileVersion   = $ENV{WIZ_greFileVersion};
 $greUniqueID      = $ENV{WIZ_greUniqueID};
 
@@ -200,6 +201,7 @@ while($line = <fpInIt>)
     $line =~ s/\$MainExeFile\$/$fileMainExe/gi;
     $line =~ s/\$UninstallFile\$/$fileUninstall/gi;
     $line =~ s/\$UninstallFileZip\$/$fileUninstallZip/gi;
+    $line =~ s/\$GreBuildID\$/$greBuildID/gi;
     $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
     $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
     print fpOutIni $line;

xpinstall/packager/win_mfcembed/makejs.pl

@@ -69,6 +69,9 @@ $nameProduct      = $ENV{WIZ_nameProduct};
 $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
+$greBuildID       = $ENV{WIZ_greBuildID};
+$greFileVersion   = $ENV{WIZ_greFileVersion};
+$greUniqueID      = $ENV{WIZ_greUniqueID};
 
 # Get the name of the file replacing the .jst extension with a .js extension
 @inJstFileSplit   = split(/\./,$inJstFile);
@@ -121,6 +124,9 @@ while($line = <fpInTemplate>)
     $line =~ s/\$ProductNameInternal\$/$nameProductInternal/i;
     $line =~ s/\$MainExeFile\$/$fileMainExe/i;
     $line =~ s/\$UninstallFile\$/$fileUninstall/i;
+    $line =~ s/\$GreBuildID\$/$greBuildID/gi;
+    $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
+    $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
   }
 
   print fpOutJs $line;

xpinstall/packager/win_mfcembed/makeuninstallini.pl

@@ -64,6 +64,7 @@ $nameProduct      = $ENV{WIZ_nameProduct};
 $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
+$greBuildID       = $ENV{WIZ_greBuildID};
 $greFileVersion   = $ENV{WIZ_greFileVersion};
 $greUniqueID      = $ENV{WIZ_greUniqueID};
 
@@ -93,6 +94,7 @@ while($line = <fpInIt>)
   $line =~ s/\$ProductNameInternal\$/$nameProductInternal/gi;
   $line =~ s/\$MainExeFile\$/$fileMainExe/gi;
   $line =~ s/\$UninstallFile\$/$fileUninstall/gi;
+  $line =~ s/\$GreBuildID\$/$greBuildID/gi;
   $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
   $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
   print fpOutIni $line;

xpinstall/packager/windows/makeall.pl

@@ -142,6 +142,10 @@ $ENV{WIZ_userAgentShort}       = "$versionMain";
 $ENV{WIZ_xpinstallVersion}     = "$inDefaultProductVersion";
 $ENV{WIZ_distInstallPath}      = "$gDirDistInstall";
 
+# GetProductBuildID() will return the build id for GRE located here:
+#      NS_BUILD_ID in nsBuildID.h: 2003030610
+$ENV{WIZ_greBuildID}       = StageUtils::GetProductBuildID("$topsrcdir/config/nsBuildID.h", "NS_BUILD_ID");
+
 # GetGreFileVersion() will return the actual version of xpcom.dll used by GRE.
 #  ie:
 #      given milestone.txt : 1.4a
@@ -158,6 +162,7 @@ $ENV{WIZ_greFileVersion}       = StageUtils::GetGreFileVersion($topsrcdir);
 $ENV{WIZ_greUniqueID}          = StageUtils::GetGreSpecialID($topsrcdir);
 
 print "\n";
+print " GRE build id       : $ENV{WIZ_greBuildID}\n";
 print " GRE file version   : $ENV{WIZ_greFileVersion}\n";
 print " GRE special version: $ENV{WIZ_greUniqueID}\n";
 print "\n";

xpinstall/packager/windows/makecfgini.pl

@@ -93,6 +93,7 @@ $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
 $fileUninstallZip = $ENV{WIZ_fileUninstallZip};
+$greBuildID       = $ENV{WIZ_greBuildID};
 $greFileVersion   = $ENV{WIZ_greFileVersion};
 $greUniqueID      = $ENV{WIZ_greUniqueID};
 
@@ -205,6 +206,7 @@ while($line = <fpInIt>)
     $line =~ s/\$MainExeFile\$/$fileMainExe/gi;
     $line =~ s/\$UninstallFile\$/$fileUninstall/gi;
     $line =~ s/\$UninstallFileZip\$/$fileUninstallZip/gi;
+    $line =~ s/\$GreBuildID\$/$greBuildID/gi;
     $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
     $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
     print fpOutIni $line;

xpinstall/packager/windows/makejs.pl

@@ -69,6 +69,9 @@ $nameProduct      = $ENV{WIZ_nameProduct};
 $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
+$greBuildID       = $ENV{WIZ_greBuildID};
+$greFileVersion   = $ENV{WIZ_greFileVersion};
+$greUniqueID      = $ENV{WIZ_greUniqueID};
 
 # Get the name of the file replacing the .jst extension with a .js extension
 @inJstFileSplit   = split(/\./,$inJstFile);
@@ -121,6 +124,9 @@ while($line = <fpInTemplate>)
     $line =~ s/\$ProductNameInternal\$/$nameProductInternal/gi;
     $line =~ s/\$MainExeFile\$/$fileMainExe/i;
     $line =~ s/\$UninstallFile\$/$fileUninstall/i;
+    $line =~ s/\$GreBuildID\$/$greBuildID/gi;
+    $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
+    $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
   }
 
   print fpOutJs $line;

xpinstall/packager/windows/makeuninstallini.pl

@@ -64,6 +64,7 @@ $nameProduct      = $ENV{WIZ_nameProduct};
 $nameProductInternal = $ENV{WIZ_nameProductInternal};
 $fileMainExe      = $ENV{WIZ_fileMainExe};
 $fileUninstall    = $ENV{WIZ_fileUninstall};
+$greBuildID       = $ENV{WIZ_greBuildID};
 $greFileVersion   = $ENV{WIZ_greFileVersion};
 $greUniqueID      = $ENV{WIZ_greUniqueID};
 
@@ -93,6 +94,7 @@ while($line = <fpInIt>)
   $line =~ s/\$ProductNameInternal\$/$nameProductInternal/gi;
   $line =~ s/\$MainExeFile\$/$fileMainExe/gi;
   $line =~ s/\$UninstallFile\$/$fileUninstall/gi;
+  $line =~ s/\$GreBuildID\$/$greBuildID/gi;
   $line =~ s/\$GreFileVersion\$/$greFileVersion/gi;
   $line =~ s/\$GreUniqueID\$/$greUniqueID/gi;
   print fpOutIni $line;