Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-repo.patch
changeset 294 5330447b83a3
parent 289 3c0dff7ca9c4
child 340 aabcc7895695 
--- a/mozilla-repo.patch	Sat Jul 23 15:16:24 2011 +0200
+++ b/mozilla-repo.patch	Sat Jul 23 15:31:44 2011 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 1eb30390d6af83e41be9143c5d8c5fedf2ef69ef
+# Parent 732243388ea9cc592d30e1951f29a94a0ce5a035
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc
+@@ -68,17 +68,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc
  
  DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
  
@@ -48,7 +48,7 @@
 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
 --- a/toolkit/mozapps/installer/package-name.mk
 +++ b/toolkit/mozapps/installer/package-name.mk
-@@ -154,17 +154,17 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -154,20 +154,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
  TEST_PACKAGE = $(PKG_BASENAME).tests.zip
  
  ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -68,10 +68,13 @@
 +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
  
  MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt
+ 
+ # JavaScript Shell
+ PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+@@ -231,17 +231,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
  endif
  endif
mozilla