mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 1062546 - Upload mozinfo.json to the build directory, r=ted
This commit is contained in:
parent
37ea61cf99
commit
ab1a5ceec2
@ -154,6 +154,7 @@ endif
|
|||||||
|
|
||||||
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
|
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
|
||||||
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
|
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
|
||||||
|
MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json
|
||||||
|
|
||||||
# JavaScript Shell
|
# JavaScript Shell
|
||||||
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
|
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
|
||||||
|
@ -753,7 +753,7 @@ endif # Darwin
|
|||||||
|
|
||||||
prepare-package: stage-package
|
prepare-package: stage-package
|
||||||
|
|
||||||
make-package-internal: prepare-package make-sourcestamp-file make-buildinfo-file
|
make-package-internal: prepare-package make-sourcestamp-file make-buildinfo-file make-mozinfo-file
|
||||||
@echo 'Compressing...'
|
@echo 'Compressing...'
|
||||||
cd $(DIST) && $(MAKE_PACKAGE)
|
cd $(DIST) && $(MAKE_PACKAGE)
|
||||||
|
|
||||||
@ -779,6 +779,10 @@ make-buildinfo-file:
|
|||||||
MOZ_SOURCE_STAMP=$(MOZ_SOURCE_STAMP) \
|
MOZ_SOURCE_STAMP=$(MOZ_SOURCE_STAMP) \
|
||||||
MOZ_PKG_PLATFORM=$(MOZ_PKG_PLATFORM)
|
MOZ_PKG_PLATFORM=$(MOZ_PKG_PLATFORM)
|
||||||
|
|
||||||
|
.PHONY: make-mozinfo-file
|
||||||
|
make-mozinfo-file:
|
||||||
|
cp $(DEPTH)/mozinfo.json $(MOZ_MOZINFO_FILE)
|
||||||
|
|
||||||
# The install target will install the application to prefix/lib/appname-version
|
# The install target will install the application to prefix/lib/appname-version
|
||||||
# In addition if INSTALL_SDK is set, it will install the development headers,
|
# In addition if INSTALL_SDK is set, it will install the development headers,
|
||||||
# libraries, and IDL files as follows:
|
# libraries, and IDL files as follows:
|
||||||
@ -892,6 +896,7 @@ UPLOAD_FILES= \
|
|||||||
$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
|
$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
|
||||||
$(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \
|
$(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \
|
||||||
$(call QUOTED_WILDCARD,$(MOZ_BUILDINFO_FILE)) \
|
$(call QUOTED_WILDCARD,$(MOZ_BUILDINFO_FILE)) \
|
||||||
|
$(call QUOTED_WILDCARD,$(MOZ_MOZINFO_FILE)) \
|
||||||
$(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \
|
$(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \
|
||||||
$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
|
$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user