Bug 787334 - make package for XULRunner builds fails with "run-mozilla.sh: No such file or directory. r=glandium.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Tue, 11 Sep 2012 08:54:43 -0400
changeset 106796 8e80b52fd92c20a955a53bdec1eb02d499fcbda1
parent 106795 a36a323e347e0df7afa79d94408c88c2255602df
child 106797 c36138f30047acb3878f56b6bdd5973295d6120e
push id23448
push userryanvm@gmail.com
push dateWed, 12 Sep 2012 01:39:22 +0000
treeherdermozilla-central@6e78c3efd115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs787334, 785102
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 787334 - make package for XULRunner builds fails with "run-mozilla.sh: No such file or directory. r=glandium. revert 785102 now that we lazy load xul.
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -459,31 +459,19 @@ PRECOMPILE_DIR=XCurProcD
 PRECOMPILE_RESOURCE=app
 PRECOMPILE_GRE=$(LIBXUL_DIST)/bin
 else
 PRECOMPILE_DIR=GreD
 PRECOMPILE_RESOURCE=gre
 PRECOMPILE_GRE=$$PWD
 endif
 
-ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
-# FIXME: not tested on OS/2. Is it using the correct libxul?
-RUN_FROM_PWD = $(_ABS_RUN_TEST_PROGRAM)
-else
-# For non-Windows, just set the library path so we load the libs from the right place.
-ifeq ($(OS_ARCH),Darwin)
-RUN_FROM_PWD = DYLD_LIBRARY_PATH=$(PRECOMPILE_GRE)
-else
-RUN_FROM_PWD = "$$PWD/run-mozilla.sh"
-endif
-endif
-
 # Silence the unzip step so we don't print any binary data from the comment field.
 GENERATE_CACHE = \
-  $(RUN_FROM_PWD) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)', 'startupCache.zip');" && \
+  $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)', 'startupCache.zip');" && \
   rm -rf jsloader jssubloader && \
   $(UNZIP) -q startupCache.zip && \
   rm startupCache.zip && \
   $(ZIP) -r9m $(OMNIJAR_NAME) jsloader/resource/$(PRECOMPILE_RESOURCE) jssubloader/*/resource/$(PRECOMPILE_RESOURCE) && \
   rm -rf jsloader jssubloader
 else
 GENERATE_CACHE = true
 endif