From be9c7685a61609bfd6432bd89edf57a5fe729b3d Mon Sep 17 00:00:00 2001
From: "peterv%netscape.com" <peterv%netscape.com>
Date: Sat, 30 Jun 2001 14:30:54 +0000
Subject: [PATCH] Fix for bug 83589 (Doing a commercial build clobbers
 DefinesOptions.h, forcing an entire rebuild). We now have separate headers
 for the optional defines for mozilla/commercial and debug/optimized.
 sr=sfraser.

---
 build/mac/build_scripts/BuildMozilla.pl      | 3 ++-
 build/mac/build_scripts/BuildMozillaDebug.pl | 3 ++-
 build/mac/build_scripts/Moz/BuildCore.pm     | 2 +-
 build/mac/build_scripts/Moz/BuildUtils.pm    | 5 +++--
 build/mac/build_scripts/MozillaBuildList.pm  | 1 +
 build/mac/build_scripts/PullMozilla.pl       | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/mac/build_scripts/BuildMozilla.pl b/build/mac/build_scripts/BuildMozilla.pl
index ce6c1f4ad35e..47c90fbf25ac 100644
--- a/build/mac/build_scripts/BuildMozilla.pl
+++ b/build/mac/build_scripts/BuildMozilla.pl
@@ -44,6 +44,7 @@ use Moz::BuildCore;
 #-------------------------------------------------------------
 
 my($prefs_file_name) = "Mozilla opt build prefs";
+my($config_header_file_name) = ":mozilla:config:mac:MozillaDefinesOptions.h";
 
 #-------------------------------------------------------------
 # hashes to hold build options
@@ -70,7 +71,7 @@ SetupBuildRootDir(":mozilla:build:mac:build_scripts");
 
 # Set up all the flags on $main::, like DEBUG, CARBON etc.
 # Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:");
+SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", $config_header_file_name);
 
 my($do_checkout)    = 0;
 my($do_build)       = 1;
diff --git a/build/mac/build_scripts/BuildMozillaDebug.pl b/build/mac/build_scripts/BuildMozillaDebug.pl
index b83ff599d6ee..90d6dbe64348 100644
--- a/build/mac/build_scripts/BuildMozillaDebug.pl
+++ b/build/mac/build_scripts/BuildMozillaDebug.pl
@@ -44,6 +44,7 @@ use Moz::BuildCore;
 #-------------------------------------------------------------
 
 my($prefs_file_name) = "Mozilla debug build prefs";
+my($config_header_file_name) = ":mozilla:config:mac:MozillaDebugDefinesOptions.h";
 
 #-------------------------------------------------------------
 # hashes to hold build options
@@ -70,7 +71,7 @@ SetupBuildRootDir(":mozilla:build:mac:build_scripts");
 
 # Set up all the flags on $main::, like DEBUG, CARBON etc.
 # Override the defaults using the preferences files.
-SetupDefaultBuildOptions(1, ":mozilla:dist:viewer_debug:");
+SetupDefaultBuildOptions(1, ":mozilla:dist:viewer_debug:", $config_header_file_name);
 
 my($do_pull)        = 0;    # overridden by flags and prefs
 my($do_build)       = 1;
diff --git a/build/mac/build_scripts/Moz/BuildCore.pm b/build/mac/build_scripts/Moz/BuildCore.pm
index 6026d440fdb5..62d03809e8ee 100644
--- a/build/mac/build_scripts/Moz/BuildCore.pm
+++ b/build/mac/build_scripts/Moz/BuildCore.pm
@@ -182,7 +182,7 @@ sub ConfigureBuildSystem()
 
     printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $main::UNIVERSAL_INTERFACES_VERSION);
 
-    UpdateConfigHeader(":mozilla:config:mac:DefinesOptions.h");
+    UpdateConfigHeader($main::DEFINESOPTIONS_FILE);
 
     # alias required CodeWarrior libs into the Essential Files folder (only the Profiler lib now)
     MakeLibAliases();
diff --git a/build/mac/build_scripts/Moz/BuildUtils.pm b/build/mac/build_scripts/Moz/BuildUtils.pm
index aa5a20054c12..d36aeb5ff27e 100644
--- a/build/mac/build_scripts/Moz/BuildUtils.pm
+++ b/build/mac/build_scripts/Moz/BuildUtils.pm
@@ -47,9 +47,9 @@ use vars qw(@ISA @EXPORT);
 #//--------------------------------------------------------------------------------------------------
 #// SetupDefaultBuildOptions
 #//--------------------------------------------------------------------------------------------------
-sub SetupDefaultBuildOptions($$)
+sub SetupDefaultBuildOptions($$$)
 {
-    my($debug, $bin_dir) = @_;
+    my($debug, $bin_dir, $config_header_file_name) = @_;
 
     # Here we set up defaults for the various build flags.
     # If you want to override any of these, it's best to do
@@ -98,6 +98,7 @@ sub SetupDefaultBuildOptions($$)
     #-------------------------------------------------------------
     
     $main::BIN_DIRECTORY = $bin_dir;
+    $main::DEFINESOPTIONS_FILE = $config_header_file_name;
 }
 
 
diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm
index 0f358c8aa613..8cd57db3e50e 100644
--- a/build/mac/build_scripts/MozillaBuildList.pm
+++ b/build/mac/build_scripts/MozillaBuildList.pm
@@ -463,6 +463,7 @@ sub BuildRuntimeDist()
     InstallFromManifest(":mozilla:config:MANIFEST_xpfe",                           "$distdirectory:xpfe:");
     InstallFromManifest(":mozilla:config:mac:MANIFEST",                            "$distdirectory:config:");
     InstallFromManifest(":mozilla:config:mac:MANIFEST_config",                     "$distdirectory:config:");
+    MakeAlias($main::DEFINESOPTIONS_FILE,                                          "$distdirectory:config:DefinesOptions.h");
     
     #NSPR 
     InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST",                    "$distdirectory:nspr:");
diff --git a/build/mac/build_scripts/PullMozilla.pl b/build/mac/build_scripts/PullMozilla.pl
index 32309c9f7fd7..8ec52f14325c 100644
--- a/build/mac/build_scripts/PullMozilla.pl
+++ b/build/mac/build_scripts/PullMozilla.pl
@@ -70,7 +70,7 @@ SetupBuildRootDir(":mozilla:build:mac:build_scripts");
 
 # Set up all the flags on $main::, like DEBUG, CARBON etc.
 # Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:");
+SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", "");
 
 my($do_checkout)    = 1;
 my($do_build)       = 0;