Browse Source

No Issue - Use alternative packaging for Pale Moon and Basilisk

* This adds what will eventually be a rewritten packaging routine while maintaining backwards compatibility with the original mozilla routine
* Changes the build target and installer makefile to use the alternative packaging
* Adds build target to specifically invoke the original mozilla routine
* Update mach commands accordingly
pull/24/head
Matt A. Tobin 3 years ago committed by Roy Tam
parent
commit
94b1e61383
  1. 7
      application/basilisk/build.mk
  2. 2
      application/basilisk/installer/Makefile.in
  3. 7
      application/palemoon/build.mk
  4. 2
      application/palemoon/installer/Makefile.in
  5. 17
      python/mozbuild/mozbuild/mach_commands.py
  6. 23
      toolkit/mozapps/installer/packager-uxp.mk

7
application/basilisk/build.mk

@ -6,13 +6,16 @@ installer:
@$(MAKE) -C application/basilisk/installer installer
package:
@$(MAKE) -C application/basilisk/installer
@$(MAKE) -C application/basilisk/installer make-archive
mozpackage:
@$(MAKE) -C application/basilisk/installer make-package
package-compare:
@$(MAKE) -C application/basilisk/installer package-compare
stage-package:
@$(MAKE) -C application/basilisk/installer stage-package
@$(MAKE) -C application/basilisk/installer stage-package make-buildinfo-file
sdk:
@$(MAKE) -C application/basilisk/installer make-sdk

2
application/basilisk/installer/Makefile.in

@ -98,7 +98,7 @@ endif
INSTALL_SDK = 1
include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager-uxp.mk
ifeq (bundle, $(MOZ_FS_LAYOUT))
BINPATH = $(_BINPATH)

7
application/palemoon/build.mk

@ -6,13 +6,16 @@ installer:
@$(MAKE) -C application/palemoon/installer installer
package:
@$(MAKE) -C application/palemoon/installer
@$(MAKE) -C application/palemoon/installer make-archive
mozpackage:
@$(MAKE) -C application/palemoon/installer make-package
package-compare:
@$(MAKE) -C application/palemoon/installer package-compare
stage-package:
@$(MAKE) -C application/palemoon/installer stage-package
@$(MAKE) -C application/palemoon/installer stage-package make-buildinfo-file
install::
@$(MAKE) -C application/palemoon/installer install

2
application/palemoon/installer/Makefile.in

@ -109,7 +109,7 @@ INSTALL_SDK = 1
endif
include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager-uxp.mk
ifeq (bundle, $(MOZ_FS_LAYOUT))
BINPATH = $(_BINPATH)

17
python/mozbuild/mozbuild/mach_commands.py

@ -1084,7 +1084,7 @@ class Package(MachCommandBase):
"""Package the built product for distribution."""
@Command('package', category='post-build',
description='Package the built product for distribution as an APK, DMG, etc.')
description='Package the built product for distribution as an archive.')
@CommandArgument('-v', '--verbose', action='store_true',
help='Verbose output for what commands the packaging process is running.')
def package(self, verbose=False):
@ -1094,6 +1094,21 @@ class Package(MachCommandBase):
self.notify('Packaging complete')
return ret
@CommandProvider
class Mozpackage(MachCommandBase):
"""Package the built product for distribution."""
@Command('mozpackage', category='post-build',
description='Package the built product for distribution as an archive. (mozilla orginal routine)')
@CommandArgument('-v', '--verbose', action='store_true',
help='Verbose output for what commands the packaging process is running.')
def mozpackage(self, verbose=False):
ret = self._run_make(directory=".", target='mozpackage',
silent=not verbose, ensure_exit_code=False)
if ret == 0:
self.notify('Packaging complete')
return ret
@CommandProvider
class Installer(MachCommandBase):
"""Create the windows installer for the built product."""

23
toolkit/mozapps/installer/packager-uxp.mk

@ -0,0 +1,23 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# We need to include the mozilla packaging routines because we are
# very much still dependent on them
include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk
# This is currently only used on Windows and Linux
# on other platforms such as Mac will fall back to the orginal
# mozilla packaging
make-archive:
ifeq (,$(filter Linux WINNT,$(OS_ARCH)))
$(MAKE) make-package
else
$(MAKE) stage-package make-buildinfo-file
@echo 'Compressing...'
ifeq (WINNT,$(OS_ARCH))
cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR)
else
cd $(DIST); XZ_OPT=-9e $(TAR) cfJv $(PKG_BASENAME).tar.xz $(MOZ_PKG_DIR)
endif
endif
Loading…
Cancel
Save