1 # HG changeset patch

     2 # Parent 84ecc6172ec5f01c80346bdb819520d08f982bac

     3 

     4 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in

     5 --- a/toolkit/content/Makefile.in

     6 +++ b/toolkit/content/Makefile.in

     7 @@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops

     8  ifdef MOZ_SOURCE_STAMP

     9  DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)"

    10  endif

    11  

    12  # strip a trailing slash from the repo URL because it's not always present,

    13  # and we want to construct a working URL in buildconfig.html

    14  # make+shell+sed = awful

    15  _dollar=$$

    16 -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )

    17 +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )

    18  # extra sanity check for old versions of hg

    19  # that don't support showconfig

    20  ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))

    21  DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"

    22  endif

    23  

    24  ifdef MOZ_TOOLKIT_SEARCH

    25  DEFINES += -DMOZ_TOOLKIT_SEARCH

    26 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk

    27 --- a/toolkit/mozapps/installer/package-name.mk

    28 +++ b/toolkit/mozapps/installer/package-name.mk

    29 @@ -154,17 +154,17 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME

    30  TEST_PACKAGE = $(PKG_BASENAME).tests.zip

    31  

    32  ifneq (,$(wildcard $(DIST)/bin/application.ini))

    33  BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)

    34  else

    35  BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)

    36  endif

    37  

    38 -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))

    39 +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))

    40  

    41  # strip a trailing slash from the repo URL because it's not always present,

    42  # and we want to construct a working URL in the sourcestamp file.

    43  # make+shell+sed = awful

    44  _dollar=$$

    45 -MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )

    46 +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )

    47  

    48  MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt

    49 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in

    50 --- a/toolkit/xre/Makefile.in

    51 +++ b/toolkit/xre/Makefile.in

    52 @@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR

    53  endif

    54  endif

    55  

    56  MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))

    57  # strip a trailing slash from the repo URL because it's not always present,

    58  # and we want to construct a working URL in buildconfig.html

    59  # make+shell+sed = awful

    60  _dollar=$$

    61 -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )

    62 +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )

    63  

    64  ifdef MOZ_SOURCE_STAMP

    65  INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)

    66  # extra sanity check for old versions of hg

    67  # that don't support showconfig

    68  ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))

    69  INIARGS += --sourcerepo=$(SOURCE_REPO)

    70  endif