mozilla-repo.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Fri, 16 Mar 2012 07:48:35 +0100
changeset 410 0af1b0003b9f
parent 382 67f876aafae8
child 419 f6b055dd94bc
permissions -rw-r--r--
working 12.0b1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
279
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 382
diff changeset
     2
# Parent 8ea0f829916d7d9dc54567813367bcdfe6cee179
279
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
382
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
     4
diff --git a/build/Makefile.in b/build/Makefile.in
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
     5
--- a/build/Makefile.in
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
     6
+++ b/build/Makefile.in
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 382
diff changeset
     7
@@ -91,17 +91,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
382
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
     8
 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
280
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
     9
 
382
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    10
 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
280
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    11
 ifdef MOZ_SOURCE_STAMP
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    12
 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    13
 endif
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    14
 
382
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    15
 _dollar=$$
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    16
-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    17
+SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
280
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    18
 ifdef SOURCE_REPO
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    19
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    20
 endif
37650d092283 modify one more SOURCE_REPO occurrence to fix application.ini reference
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 279
diff changeset
    21
 
382
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    22
 DEFINES += \
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    23
   -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    24
   -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \
67f876aafae8 lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
    25
   -DMOZ_APP_ID="$(MOZ_APP_ID)" \
279
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
--- a/toolkit/content/Makefile.in
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
+++ b/toolkit/content/Makefile.in
340
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    29
@@ -65,17 +65,17 @@ endif
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    30
 ifeq (Android,$(OS_TARGET))
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    31
 DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME)
279
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
 endif
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
 
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
 # strip a trailing slash from the repo URL because it's not always present,
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
 # and we want to construct a working URL in buildconfig.html
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
 # make+shell+sed = awful
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 _dollar=$$
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
+SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
 # extra sanity check for old versions of hg
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
 # that don't support showconfig
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
 DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
 endif
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
 
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
 ifdef MOZ_TOOLKIT_SEARCH
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 DEFINES += -DMOZ_TOOLKIT_SEARCH
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
--- a/toolkit/mozapps/installer/package-name.mk
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
+++ b/toolkit/mozapps/installer/package-name.mk
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 382
diff changeset
    51
@@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
279
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
 TEST_PACKAGE = $(PKG_BASENAME).tests.zip
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    53
 
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    54
 ifneq (,$(wildcard $(DIST)/bin/application.ini))
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    55
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    56
 else
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    57
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    58
 endif
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    59
 
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    60
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    61
+#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    62
 
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    63
 # strip a trailing slash from the repo URL because it's not always present,
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    64
 # and we want to construct a working URL in the sourcestamp file.
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    65
 # make+shell+sed = awful
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    66
 _dollar=$$
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    67
-MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    68
+#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    69
 
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 382
diff changeset
    70
 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt
294
5330447b83a3 update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
    71
 
5330447b83a3 update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
    72
 # JavaScript Shell
5330447b83a3 update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
    73
 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
279
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    74
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    75
--- a/toolkit/xre/Makefile.in
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    76
+++ b/toolkit/xre/Makefile.in
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 382
diff changeset
    77
@@ -236,17 +236,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
279
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    78
 endif
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    79
 endif
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    80
 
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    81
 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    82
 # strip a trailing slash from the repo URL because it's not always present,
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    83
 # and we want to construct a working URL in buildconfig.html
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    84
 # make+shell+sed = awful
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    85
 _dollar=$$
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    86
-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    87
+SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    88
 
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    89
 ifdef MOZ_SOURCE_STAMP
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    90
 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    91
 # extra sanity check for old versions of hg
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    92
 # that don't support showconfig
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    93
 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    94
 INIARGS += --sourcerepo=$(SOURCE_REPO)
eb9e33036fb4 update to 5.0b6
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    95
 endif