Backed out changeset 884efa9dcbf9 due to OSX debug orange
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 15 Aug 2011 10:39:10 +0200
changeset 75296 22af0a57b683f4be8a8f128107bb5ccb33db36f4
parent 75295 884efa9dcbf9895c228e46bff9881dc428e124aa
child 75297 0120977c967689abfab756ce764831f39ee4863c
child 75315 2c026a7ff7304916b818b167a0f88bde9f596529
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone8.0a1
backs out884efa9dcbf9895c228e46bff9881dc428e124aa
Backed out changeset 884efa9dcbf9 due to OSX debug orange
config/config.mk
js/src/config/config.mk
toolkit/mozapps/installer/packager.mk
toolkit/mozapps/installer/precompile_cache.js
--- a/config/config.mk
+++ b/config/config.mk
@@ -738,20 +738,20 @@ MERGE_FILE = $(firstword \
   $(wildcard $(LOCALE_SRCDIR)/$(1)) \
   $(srcdir)/en-US/$(1) )
 else
 MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
 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
 
 #
 # Java macros
 #
 
 # Make sure any compiled classes work with at least JVM 1.4
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -738,20 +738,20 @@ MERGE_FILE = $(firstword \
   $(wildcard $(LOCALE_SRCDIR)/$(1)) \
   $(srcdir)/en-US/$(1) )
 else
 MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
 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
 
 #
 # Java macros
 #
 
 # Make sure any compiled classes work with at least JVM 1.4
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -385,32 +385,22 @@ endif
 ifdef MOZ_OMNIJAR
 
 ifdef GENERATE_CACHE
 ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY))
 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
 
 GENERATE_CACHE ?= true
 
 OMNIJAR_FILES	= \
   chrome \
   chrome.manifest \
--- a/toolkit/mozapps/installer/precompile_cache.js
+++ b/toolkit/mozapps/installer/precompile_cache.js
@@ -64,34 +64,34 @@ function load(url) {
 
 function load_entries(entries, prefix) {
   while (entries.hasMore()) {
     var c = entries.getNext();
     load(prefix + c);
   }
 }
 
-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) {
   var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
     createInstance(Ci.nsIZipReader);
   zipreader.open(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);
 
   let prefix = "resource:///";
 
   load_entries(zipreader.findEntries("components/*js"), prefix);
   load_entries(zipreader.findEntries("modules/*js"), prefix);
   load_entries(zipreader.findEntries("modules/*jsm"), prefix);