Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
peterv%netscape.com 2001-06-30 14:30:54 +00:00
parent 70353aa937
commit be9c7685a6
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/mac/build_scripts/BuildMozilla.pl
View File

@ -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;

3
build/mac/build_scripts/BuildMozillaDebug.pl
View File

@ -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;

2
build/mac/build_scripts/Moz/BuildCore.pm
View File

@ -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();

5
build/mac/build_scripts/Moz/BuildUtils.pm
View File

@ -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;
}

1
build/mac/build_scripts/MozillaBuildList.pm
View File

@ -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:");

2
build/mac/build_scripts/PullMozilla.pl
View File

@ -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;