equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent c9af3b8022c3f92070c1bd205553d799887cd1b8 |
2 # Parent 7820633b718ca1983da7b105d7868c455809cff1 |
3 |
3 |
4 diff --git a/build/Makefile.in b/build/Makefile.in |
4 diff --git a/build/Makefile.in b/build/Makefile.in |
5 --- a/build/Makefile.in |
5 --- a/build/Makefile.in |
6 +++ b/build/Makefile.in |
6 +++ b/build/Makefile.in |
7 @@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
7 @@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ |
46 BUILD_HOSTNAME = $(shell hostname -s || hostname) |
46 BUILD_HOSTNAME = $(shell hostname -s || hostname) |
47 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" |
47 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" |
48 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
48 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
49 --- a/toolkit/mozapps/installer/package-name.mk |
49 --- a/toolkit/mozapps/installer/package-name.mk |
50 +++ b/toolkit/mozapps/installer/package-name.mk |
50 +++ b/toolkit/mozapps/installer/package-name.mk |
51 @@ -128,20 +128,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
51 @@ -131,22 +131,22 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME |
52 TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
52 TEST_PACKAGE = $(PKG_BASENAME).tests.zip |
53 |
53 |
54 ifneq (,$(wildcard $(DIST)/bin/application.ini)) |
54 ifneq (,$(wildcard $(DIST)/bin/application.ini)) |
55 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) |
55 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) |
56 else |
56 else |
69 |
69 |
70 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt |
70 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt |
71 |
71 |
72 # JavaScript Shell |
72 # JavaScript Shell |
73 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
73 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
|
74 |
|
75 endif # PACKAGE_NAME_MK_INCLUDED |
74 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
76 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
75 --- a/toolkit/xre/Makefile.in |
77 --- a/toolkit/xre/Makefile.in |
76 +++ b/toolkit/xre/Makefile.in |
78 +++ b/toolkit/xre/Makefile.in |
77 @@ -220,20 +220,20 @@ endif |
79 @@ -218,20 +218,20 @@ endif |
78 |
80 |
79 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
81 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
80 ifdef MOZ_SOURCE_STAMP |
82 ifdef MOZ_SOURCE_STAMP |
81 |
83 |
82 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
84 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |