--- a/mozilla-repo.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/mozilla-repo.patch Sat Jun 09 20:36:56 2012 +0200
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent d50497c25f208e4868a386f081edc790a505795c
+# Parent c9af3b8022c3f92070c1bd205553d799887cd1b8
diff --git a/build/Makefile.in b/build/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
-@@ -95,17 +95,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
+@@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null))
@@ -26,7 +26,7 @@
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
-@@ -67,17 +67,17 @@ endif
+@@ -35,17 +35,17 @@ endif
ifeq (Android,$(OS_TARGET))
DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME)
endif
@@ -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
-@@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -128,20 +128,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
TEST_PACKAGE = $(PKG_BASENAME).tests.zip
ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -74,7 +74,7 @@
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -240,20 +240,20 @@ endif
+@@ -220,20 +220,20 @@ endif
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
ifdef MOZ_SOURCE_STAMP
@@ -91,11 +91,11 @@
+ SOURCE_REPO ?= $(strip $(SOURCE_REPO))
+ SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO))
+ SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO))
- $(call errorIfEmpty,SOURCE_REPO)
+
+ # command set should change based on revision control use.
+ # warn for now in case (git, bzr, ...) is in use.
+ $(call warnIfEmpty,SOURCE_REPO)
# extra sanity check for old versions of hg, no showconfig support
ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
INIARGS += --sourcerepo=$(SOURCE_REPO)
- endif
-
- endif # MOZ_SOURCE_STAMP