зеркало из https://github.com/mozilla/gecko-dev.git
bug 292268 - Standardize SeaMonkey package/installer filenames based on toolkit's package-name.mk, sr=Neil r+a=bsmedberg
This commit is contained in:
kairo%kairo.at
Родитель
c690974a27
Коммит
86e154a457
|
|
@ -44,154 +44,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
#
|
||||
# This is how we create the Unix binary packages we release to the public.
|
||||
# Currently the only format is tar.gz (TGZ), but it should be fairly easy
|
||||
# to add .rpm (RPM) and .deb (DEB) later.
|
||||
#
|
||||
ifndef MOZ_PKG_FORMAT
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
MOZ_PKG_FORMAT = DMG
|
||||
else
|
||||
ifeq (,$(filter-out OS2 WINNT, $(OS_ARCH)))
|
||||
MOZ_PKG_FORMAT = ZIP
|
||||
INSTALLER_DIR = windows
|
||||
else
|
||||
ifeq (,$(filter-out SunOS, $(OS_ARCH)))
|
||||
MOZ_PKG_FORMAT = BZ2
|
||||
else
|
||||
MOZ_PKG_FORMAT = TGZ
|
||||
endif
|
||||
INSTALLER_DIR = unix
|
||||
endif
|
||||
endif
|
||||
endif # MOZ_PKG_FORMAT
|
||||
ifndef MOZ_PKG_APPNAME
|
||||
MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
|
||||
endif
|
||||
ifndef SDK_PKG_APPNAME
|
||||
SDK_PKG_APPNAME = gecko
|
||||
endif
|
||||
|
||||
MAKE_PACKAGE = echo "Sorry, don't know how to build a $(MOZ_PKG_FORMAT) file yet...."
|
||||
MAKE_SDK =
|
||||
|
||||
PKG_NAME_EXTRAS =
|
||||
ifeq ($(MOZ_ENABLE_XFT)$(MOZ_WIDGET_TOOLKIT),1gtk2)
|
||||
PKG_NAME_EXTRAS := $(PKG_NAME_EXTRAS)-gtk2+xft
|
||||
else
|
||||
ifeq ($(MOZ_ENABLE_XFT),1)
|
||||
PKG_NAME_EXTRAS := $(PKG_NAME_EXTRAS)-xft
|
||||
else
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||
PKG_NAME_EXTRAS := $(PKG_NAME_EXTRAS)-gtk2
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
PKG_BASENAME := $(MOZ_PKG_APPNAME)-$(TARGET_CPU)-$(TARGET_VENDOR)-$(TARGET_OS)$(PKG_NAME_EXTRAS)
|
||||
PACKAGE = $(PKG_BASENAME)$(PKG_SUFFIX)
|
||||
|
||||
SDK_DIR = sdk
|
||||
SDK = $(SDK_PKG_APPNAME)-$(SDK_DIR)-$(TARGET_CPU)-$(TARGET_VENDOR)-$(TARGET_OS)$(PKG_NAME_EXTRAS)$(PKG_SUFFIX)
|
||||
|
||||
TAR_CREATE_FLAGS = -cvhf
|
||||
|
||||
ifeq ($(OS_ARCH),BSD_OS)
|
||||
TAR_CREATE_FLAGS = -cvLf
|
||||
endif
|
||||
|
||||
CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
|
||||
|
||||
ifeq ($(MOZ_PKG_FORMAT),TAR)
|
||||
PKG_SUFFIX = .tar
|
||||
MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_APPNAME) > $(PACKAGE)
|
||||
MAKE_SDK = $(CREATE_FINAL_TAR) - $(SDK_PKG_APPNAME)-$(SDK_DIR) > $(SDK)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),TGZ)
|
||||
PKG_SUFFIX = .tar.gz
|
||||
MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_APPNAME) | gzip -vf9 > $(PACKAGE)
|
||||
MAKE_SDK = $(CREATE_FINAL_TAR) - $(SDK_PKG_APPNAME)-$(SDK_DIR) | gzip -vf9 > $(SDK)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),BZ2)
|
||||
PKG_SUFFIX = .tar.bz2
|
||||
MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_APPNAME) | bzip2 -vf > $(PACKAGE)
|
||||
MAKE_SDK = $(CREATE_FINAL_TAR) - $(SDK_PKG_APPNAME)-$(SDK_DIR) | bzip2 -vf > $(SDK)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),ZIP)
|
||||
PKG_SUFFIX = .zip
|
||||
MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_APPNAME)
|
||||
MAKE_SDK = $(ZIP) -r9D $(SDK) $(SDK_PKG_APPNAME)-$(SDK_DIR)
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),DMG)
|
||||
ifndef MOZ_PKG_APPNAME
|
||||
MOZ_PKG_APPNAME = $(MOZ_APP_DISPLAYNAME)
|
||||
endif
|
||||
ifdef MOZ_DEBUG
|
||||
_APPNAME = $(MOZ_PKG_APPNAME)Debug.app
|
||||
else
|
||||
_APPNAME = $(MOZ_PKG_APPNAME).app
|
||||
endif
|
||||
PKG_SUFFIX = .dmg
|
||||
_ABS_TOPSRCDIR = $(shell cd $(topsrcdir) && pwd)
|
||||
MAKE_PACKAGE = $(_ABS_TOPSRCDIR)/build/package/mac_osx/make-diskimage $(PKG_BASENAME).dmg $(MOZ_PKG_APPNAME) $(MOZ_PKG_APPNAME)
|
||||
MAKE_SDK =
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),RPM)
|
||||
PKG_SUFFIX = .rpm
|
||||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),DEB)
|
||||
PKG_SUFFIX = .deb
|
||||
endif
|
||||
|
||||
# dummy macro if we don't have PSM built
|
||||
SIGN_NSS =
|
||||
ifndef CROSS_COMPILE
|
||||
ifdef MOZ_PSM
|
||||
SIGN_NSS = @echo signing nss libraries;
|
||||
|
||||
SIGN_CMD = $(DIST)/bin/run-mozilla.sh $(DIST)/bin/shlibsign -v -i
|
||||
|
||||
SOFTOKN = $(DIST)/$(MOZ_PKG_APPNAME)/$(DLL_PREFIX)softokn3$(DLL_SUFFIX)
|
||||
FREEBL_HYBRID = $(DIST)/$(MOZ_PKG_APPNAME)/$(DLL_PREFIX)freebl_hybrid_3$(DLL_SUFFIX)
|
||||
FREEBL_PURE = $(DIST)/$(MOZ_PKG_APPNAME)/$(DLL_PREFIX)freebl_pure32_3$(DLL_SUFFIX)
|
||||
|
||||
SIGN_NSS += $(SIGN_CMD) $(SOFTOKN); \
|
||||
if test -f $(FREEBL_HYBRID); then $(SIGN_CMD) $(FREEBL_HYBRID); fi; \
|
||||
if test -f $(FREEBL_PURE); then $(SIGN_CMD) $(FREEBL_PURE); fi;
|
||||
|
||||
endif # MOZ_PSM
|
||||
endif # !CROSS_COMPILE
|
||||
|
||||
TARGETS = $(PACKAGE) $(SDK)
|
||||
|
||||
NSPR_LDIR = $(findstring -L,$(NSPR_LIBS))
|
||||
ifneq ($(NSPR_LDIR),)
|
||||
NSPR_LDIR = $(subst -L,,$(word 1,$(NSPR_LIBS)))
|
||||
endif
|
||||
|
||||
EXCLUDE_LIST = \
|
||||
$(DIST)/bin/core \
|
||||
$(DIST)/bin/bsdecho \
|
||||
$(DIST)/bin/gtscc \
|
||||
$(DIST)/bin/jscpucfg \
|
||||
$(DIST)/bin/nsinstall \
|
||||
$(DIST)/bin/viewer \
|
||||
$(NULL)
|
||||
|
||||
libs:: $(TARGETS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE) $(SDK)
|
||||
|
||||
OSPACKAGE = unix
|
||||
ifdef USE_SHORT_LIBNAME
|
||||
MOZILLA_BIN = $(DIST)/bin/$(MOZ_PKG_APPNAME)$(BIN_SUFFIX)
|
||||
else
|
||||
MOZILLA_BIN = $(DIST)/bin/$(MOZ_PKG_APPNAME)-bin
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),IRIX)
|
||||
STRIP_FLAGS = -f
|
||||
endif
|
||||
|
|
@ -203,77 +56,16 @@ ifeq ($(OS_ARCH),OS2)
|
|||
STRIP = $(srcdir)/os2/strip.cmd
|
||||
STRIP_FLAGS =
|
||||
OSPACKAGE = os2
|
||||
TAR_CREATE_FLAGS = -cvf
|
||||
PLATFORM_EXCLUDE_LIST = ! -name "*.ico"
|
||||
endif
|
||||
|
||||
$(SDK):
|
||||
ifndef NO_GECKO_SDK
|
||||
ifdef MAKE_SDK
|
||||
@rm -rf $(DIST)/$(SDK_PKG_APPNAME)-$(SDK_DIR) $@
|
||||
@mkdir $(DIST)/$(SDK_PKG_APPNAME)-$(SDK_DIR)
|
||||
@cd $(DIST)/$(SDK_DIR) && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(SDK_PKG_APPNAME)-$(SDK_DIR); tar -xf -)
|
||||
cd $(DIST) && $(MAKE_SDK)
|
||||
endif
|
||||
endif
|
||||
NO_PKG_FILES = \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
|
||||
|
||||
$(PACKAGE): $(MOZILLA_BIN)
|
||||
@rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $@ $(EXCLUDE_LIST)
|
||||
# NOTE: this must be a tar now that dist links into the tree so that we
|
||||
# do not strip the binaries actually in the tree.
|
||||
@echo "Creating package directory..."
|
||||
@mkdir $(DIST)/$(MOZ_PKG_APPNAME)
|
||||
ifeq ($(MOZ_PKG_FORMAT),DMG)
|
||||
@cd $(DIST) && rsync -auvL $(_APPNAME) $(MOZ_PKG_APPNAME)
|
||||
else
|
||||
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -)
|
||||
ifdef MOZ_NATIVE_NSPR
|
||||
ifndef EXCLUDE_NSPR_LIBS
|
||||
@echo "Copying NSPR libs..."
|
||||
@cp -p $(NSPR_LDIR)/*$(DLL_SUFFIX) $(DIST)/$(MOZ_PKG_APPNAME)
|
||||
@chmod 755 $(DIST)/$(MOZ_PKG_APPNAME)/*$(DLL_SUFFIX)
|
||||
endif
|
||||
endif
|
||||
endif # DMG
|
||||
@echo "Stripping package directory..."
|
||||
@cd $(DIST)/$(MOZ_PKG_APPNAME); find . ! -type d \
|
||||
! -name "*.js" \
|
||||
! -name "*.xpt" \
|
||||
! -name "*.gif" \
|
||||
! -name "*.jpg" \
|
||||
! -name "*.png" \
|
||||
! -name "*.xpm" \
|
||||
! -name "*.txt" \
|
||||
! -name "*.rdf" \
|
||||
! -name "*.sh" \
|
||||
! -name "*.properties" \
|
||||
! -name "*.dtd" \
|
||||
! -name "*.html" \
|
||||
! -name "*.xul" \
|
||||
! -name "*.css" \
|
||||
! -name "*.xml" \
|
||||
! -name "*.jar" \
|
||||
! -name "*.dat" \
|
||||
! -name "*.tbl" \
|
||||
! -name "*.src" \
|
||||
! -name "*.reg" \
|
||||
$(PLATFORM_EXCLUDE_LIST) \
|
||||
-exec $(STRIP) $(STRIP_FLAGS) {} >/dev/null 2>&1 \;
|
||||
$(SIGN_NSS)
|
||||
ifeq (,$(filter mozilla firefox,$(MOZ_PKG_APPNAME)))
|
||||
@echo "Creating start script $(MOZ_PKG_APPNAME)..."
|
||||
cd $(DIST)/$(MOZ_PKG_APPNAME); if [ -f mozilla ]; then cp mozilla $(MOZ_PKG_APPNAME); fi
|
||||
endif
|
||||
ifdef NO_PKG_FILES
|
||||
@echo "Removing unpackaged files..."
|
||||
ifeq ($(MOZ_PKG_FORMAT),DMG)
|
||||
cd $(DIST)/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS; rm -rf $(NO_PKG_FILES)
|
||||
else
|
||||
cd $(DIST)/$(MOZ_PKG_APPNAME); rm -rf $(NO_PKG_FILES)
|
||||
endif
|
||||
endif
|
||||
@echo "Compressing..."
|
||||
cd $(DIST); $(MAKE_PACKAGE)
|
||||
|
||||
dist: $(MOZILLA_BIN)
|
||||
ifndef MOZ_PKG_DEST
|
||||
|
|
|
|||
|
|
@ -44,33 +44,21 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
|
||||
|
||||
MODULE = xpinstall
|
||||
|
||||
PKG_NAME_EXTRAS =
|
||||
ifeq ($(MOZ_ENABLE_XFT)$(MOZ_WIDGET_TOOLKIT),1gtk2)
|
||||
PKG_NAME_EXTRAS := $(PKG_NAME_EXTRAS)-gtk2+xft
|
||||
else
|
||||
ifeq ($(MOZ_ENABLE_XFT),1)
|
||||
PKG_NAME_EXTRAS := $(PKG_NAME_EXTRAS)-xft
|
||||
else
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||
PKG_NAME_EXTRAS := $(PKG_NAME_EXTRAS)-gtk2
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
B_NAME = $(MOZ_APP_NAME)-$(TARGET_CPU)-$(TARGET_VENDOR)-$(TARGET_OS)$(PKG_NAME_EXTRAS)
|
||||
STUB_NAME = $(B_NAME)-installer
|
||||
SEA_NAME = $(B_NAME)-full-installer
|
||||
STUB_NAME = $(PKG_BASENAME).stub-installer
|
||||
SEA_NAME = $(PKG_BASENAME).installer
|
||||
|
||||
ifndef INSTALLER_URL
|
||||
INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/mozilla/nightly/latest-trunk/linux-xpi"
|
||||
INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/linux-xpi"
|
||||
endif
|
||||
|
||||
installer:
|
||||
$(PERL) $(srcdir)/deliver.pl \
|
||||
-o $(DEPTH) -s $(topsrcdir) \
|
||||
$(MOZILLA_VERSION) $(INSTALLER_URL) $(STUB_NAME) $(SEA_NAME) NO $(MOZ_APP_NAME) $(MOZ_APP_DISPLAYNAME)
|
||||
$(MOZ_APP_VERSION) $(INSTALLER_URL) $(STUB_NAME) $(SEA_NAME) NO $(MOZ_APP_NAME) $(MOZ_APP_DISPLAYNAME)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -49,14 +49,20 @@ else
|
|||
OBJDIR = $(shell cd $(DEPTH) && pwd)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
|
||||
|
||||
MODULE = xpinstall
|
||||
|
||||
STUB_NAME = $(PKG_BASENAME).stub-installer
|
||||
SEA_NAME = $(PKG_BASENAME).installer
|
||||
|
||||
ifeq (,$(INSTALLER_URL))
|
||||
INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/mozilla/nightly/latest-trunk/windows-xpi"
|
||||
INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi"
|
||||
endif
|
||||
|
||||
installer:
|
||||
$(PERL) $(srcdir)/makeall.pl -aurl $(INSTALLER_URL) -objdir $(OBJDIR)
|
||||
$(PERL) $(srcdir)/makeall.pl -aurl $(INSTALLER_URL) -objdir $(OBJDIR) \
|
||||
-instname $(SEA_NAME) -stubname $(STUB_NAME)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -56,22 +56,25 @@ push(@INC, "$topsrcdir/xpinstall/packager");
|
|||
require StageUtils;
|
||||
require "$topsrcdir/config/zipcfunc.pl";
|
||||
|
||||
ParseArgv(@ARGV);
|
||||
|
||||
$topobjdir = "$topsrcdir" if !defined($topobjdir);
|
||||
$inStagePath = "$topobjdir/stage" if !defined($inStagePath);
|
||||
$inDistPath = "$topobjdir/dist" if !defined($inDistPath);
|
||||
$inXpiURL = "ftp://not.supplied.invalid" if !defined($inXpiURL);
|
||||
$inRedirIniURL = $inXpiURL if !defined($inRedirIniURL);
|
||||
$inInstName = "seamonkey-win32-installer" if !defined($inInstName);
|
||||
$inStubName = "seamonkey-win32-stub-installer" if !defined($inStubName);
|
||||
|
||||
$seiFileNameGeneric = "nsinstall.exe";
|
||||
$seiFileNameSpecific = "mozilla-win32-installer.exe";
|
||||
$seiStubRootName = "mozilla-win32-stub-installer";
|
||||
$seiFileNameSpecific = "$inInstName.exe";
|
||||
$seiStubRootName = $inStubName;
|
||||
$seiFileNameSpecificStub = "$seiStubRootName.exe";
|
||||
$seuFileNameSpecific = "MozillaUninstall.exe";
|
||||
$seuzFileNameSpecific = "mozillauninstall.zip";
|
||||
$seuFileNameSpecific = "SeaMonkeyUninstall.exe";
|
||||
$seuzFileNameSpecific = "seamonkeyuninstall.zip";
|
||||
$seiGreFileNameSpecific = "gre-win32-installer.exe";
|
||||
$seizGreFileNameSpecific = "gre-win32-installer.zip";
|
||||
|
||||
ParseArgv(@ARGV);
|
||||
|
||||
$topobjdir = "$topsrcdir" if !defined($topobjdir);
|
||||
$inStagePath = "$topobjdir/stage" if !defined($inStagePath);
|
||||
$inDistPath = "$topobjdir/dist" if !defined($inDistPath);
|
||||
$inXpiURL = "ftp://not.supplied.invalid" if !defined($inXpiURL);
|
||||
$inRedirIniURL = $inXpiURL if !defined($inRedirIniURL);
|
||||
|
||||
if(defined($ENV{DEBUG_INSTALLER_BUILD}))
|
||||
{
|
||||
|
|
@ -474,6 +477,16 @@ sub PrintUsage
|
|||
redirec.ini resides. If not supplied, it
|
||||
will be assumed to be the same as archive
|
||||
url.
|
||||
|
||||
-instname <filename base> : the base of the filename to be used for
|
||||
the installer, e.g.
|
||||
mozilla-1.8b2.en-US.win32.installer
|
||||
(.exe will be appended in any case)
|
||||
|
||||
-stubname <filename base> : the base of the filename to be used for
|
||||
the stub installer, e.g.
|
||||
mozilla-1.8b2.en-US.win32.stub-installer
|
||||
(.exe will be appended in any case)
|
||||
\n";
|
||||
}
|
||||
|
||||
|
|
@ -532,6 +545,22 @@ sub ParseArgv
|
|||
$inRedirIniURL = $myArgv[$counter];
|
||||
}
|
||||
}
|
||||
elsif($myArgv[$counter] =~ /^[-,\/]instname$/i)
|
||||
{
|
||||
if($#myArgv >= ($counter + 1))
|
||||
{
|
||||
++$counter;
|
||||
$inInstName = $myArgv[$counter];
|
||||
}
|
||||
}
|
||||
elsif($myArgv[$counter] =~ /^[-,\/]stubname$/i)
|
||||
{
|
||||
if($#myArgv >= ($counter + 1))
|
||||
{
|
||||
++$counter;
|
||||
$inStubName = $myArgv[$counter];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче