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

Backed out changeset 884efa9dcbf9 due to OSX debug orange

Browse Source
This commit is contained in:
Mike Hommey 2011-08-15 10:39:10 +02:00
parent 5e94c9cd42
commit d568957d89
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.mk
View File

@ -743,10 +743,10 @@ endif
MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
ifeq (OS2,$(OS_ARCH))
RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(LIBXUL_DIST)"
RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
else
ifneq (WINNT,$(OS_ARCH))
RUN_TEST_PROGRAM = $(LIBXUL_DIST)/bin/run-mozilla.sh
RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
endif # ! WINNT
endif # ! OS2

4
js/src/config/config.mk
View File

@ -743,10 +743,10 @@ endif
MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
ifeq (OS2,$(OS_ARCH))
RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(LIBXUL_DIST)"
RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
else
ifneq (WINNT,$(OS_ARCH))
RUN_TEST_PROGRAM = $(LIBXUL_DIST)/bin/run-mozilla.sh
RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
endif # ! WINNT
endif # ! OS2

14
toolkit/mozapps/installer/packager.mk
View File

@ -390,22 +390,12 @@ ifdef RUN_TEST_PROGRAM
_ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM))
endif
ifdef LIBXUL_SDK
PRECOMPILE_DIR=XCurProcD
PRECOMPILE_RESOURCE=app
PRECOMPILE_GRE=$(LIBXUL_DIST)/bin
else
PRECOMPILE_DIR=GreD
PRECOMPILE_RESOURCE=gre
PRECOMPILE_GRE=$$PWD
endif
GENERATE_CACHE = \
$(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
$(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('omni.jar', 'startupCache.zip');" && \
rm -rf jsloader && \
$(UNZIP) startupCache.zip && \
rm startupCache.zip && \
$(ZIP) -r9m omni.jar jsloader/resource/$(PRECOMPILE_RESOURCE)
$(ZIP) -r9m omni.jar jsloader
endif
endif

10
toolkit/mozapps/installer/precompile_cache.js
View File

@ -69,9 +69,9 @@ function load_entries(entries, prefix) {
}
}
function getDir(prop) {
function getGreDir() {
return Cc["@mozilla.org/file/directory_service;1"].
getService(Ci.nsIProperties).get(prop, Ci.nsIFile);
getService(Ci.nsIProperties).get("GreD", Ci.nsIFile);
}
function openJar(file) {
@ -81,12 +81,12 @@ function openJar(file) {
return zipreader;
}
function populate_startupcache(prop, omnijarName, startupcacheName) {
var file = getDir(prop);
function populate_startupcache(omnijarName, startupcacheName) {
var file = getGreDir();
file.append(omnijarName);
zipreader = openJar(file);
var scFile = getDir(prop);
var scFile = getGreDir();
scFile.append(startupcacheName);
setenv("MOZ_STARTUP_CACHE", scFile.path);