зеркало из https://github.com/mozilla/pjs.git
Bug 524519 - use UPLOAD_EXTRA_FILES to upload the deb files (no need for new update targets); add the ability to call 'make upload' from root of mobile's objdir - r=mark.finkle,l10n
This commit is contained in:
Родитель
0482b5a6d7
Коммит
c8923c1a47
|
@ -67,6 +67,9 @@ install::
|
||||||
@echo "Mobile can't be installed directly."
|
@echo "Mobile can't be installed directly."
|
||||||
@exit 1
|
@exit 1
|
||||||
|
|
||||||
|
upload::
|
||||||
|
@$(MAKE) -C mobile/installer upload
|
||||||
|
|
||||||
ifeq ($(OS_TARGET),Linux)
|
ifeq ($(OS_TARGET),Linux)
|
||||||
deb: installer
|
deb: installer
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -163,3 +163,10 @@ installer: stage-package package-xulrunner
|
||||||
cd $(DIST) && $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py $(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab" && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) && echo "Installer $(PKG_PATH)$(PKG_BASENAME).cab created!"
|
cd $(DIST) && $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py $(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab" && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) && echo "Installer $(PKG_PATH)$(PKG_BASENAME).cab created!"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
||||||
|
# package name comes from mobile/installer/debian/changelog.in
|
||||||
|
DEB_PKG_NAME = $(MOZ_PKG_APPNAME)_$(MOZ_APP_VERSION)_$(DEB_BUILD_ARCH).deb
|
||||||
|
# relative to $(DIST)
|
||||||
|
UPLOAD_EXTRA_FILES += ../mobile/$(DEB_PKG_NAME)
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
# if the naming changes please modify DEB_PKG_NAME in mobile/installer/Makefile.in as well
|
||||||
fennec (@MOZ_APP_VERSION@) unstable; urgency=low
|
fennec (@MOZ_APP_VERSION@) unstable; urgency=low
|
||||||
|
|
||||||
* Mozilla Nightly (Closes: #nnnn) <nnnn is the bug number of your ITP>
|
* Mozilla Nightly (Closes: #nnnn) <nnnn is the bug number of your ITP>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче