mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +00:00
update build scripts to look for profile in the new locations... r=bryner
This commit is contained in:
parent
16dd4f524b
commit
28b6042575
@ -24,7 +24,7 @@ use Config; # for $Config{sig_name} and $Config{sig_num}
|
||||
use File::Find ();
|
||||
use File::Copy;
|
||||
|
||||
$::UtilsVersion = '$Revision: 1.257 $ ';
|
||||
$::UtilsVersion = '$Revision: 1.258 $ ';
|
||||
|
||||
package TinderUtils;
|
||||
|
||||
@ -1096,15 +1096,25 @@ sub get_profile_dir {
|
||||
$profile_dir = $ENV{APPDATA} || "C:\\_UNKNOWN_";
|
||||
}
|
||||
}
|
||||
$profile_dir .= "\\$Settings::ProductName\\Profiles\\$Settings::MozProfileName";
|
||||
if ($Settings::VendorName) {
|
||||
$profile_dir .= "\\$Settings::VendorName\\$Settings::ProductName\\Profiles\\$Settings::MozProfileName";
|
||||
}
|
||||
else {
|
||||
$profile_dir .= "\\$Settings::ProductName\\Profiles\\$Settings::MozProfileName";
|
||||
}
|
||||
$profile_dir =~ s|\\|/|g;
|
||||
} elsif ($Settings::OS eq "BeOS") {
|
||||
$profile_dir = "/boot/home/config/settings/Mozilla/$Settings::MozProfileName";
|
||||
} elsif ($Settings::OS eq "Darwin") {
|
||||
$profile_dir = "$ENV{HOME}/Library/$Settings::ProductName/Profiles/$Settings::MozProfileName";
|
||||
$profile_dir = "$ENV{HOME}/Library/Application Support/$Settings::ProductName/Profiles/$Settings::MozProfileName";
|
||||
} else {
|
||||
# *nix
|
||||
$profile_dir = "$build_dir/.".lc($Settings::ProductName)."/$Settings::MozProfileName";
|
||||
if ($Settings::VendorName) {
|
||||
$profile_dir = "$build_dir/.".lc($Settings::VendorName)."/".lc($Settings::ProductName)."/$Settings::MozProfileName";
|
||||
}
|
||||
else {
|
||||
$profile_dir = "$build_dir/.".lc($Settings::ProductName)."/$Settings::MozProfileName";
|
||||
}
|
||||
}
|
||||
|
||||
return $profile_dir;
|
||||
|
@ -21,6 +21,7 @@ $SkipMozilla = 0; # Use to debug post-mozilla.pl scripts.
|
||||
$CleanProfile = 0;
|
||||
$ResetHomeDirForTests = 1;
|
||||
$ProductName = "Mozilla";
|
||||
$VendorName = '';
|
||||
|
||||
$RunMozillaTests = 1; # Allow turning off of all tests if needed.
|
||||
$RegxpcomTest = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user