зеркало из https://github.com/mozilla/gecko-dev.git
Changes to allow packaging of statically-linked build (87213). r=cathleen, sr=waterson, a=blizzard
This commit is contained in:
mcafee%netscape.com
Родитель
042abf08fc
Коммит
85c115904e
|
|
@ -28,6 +28,12 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(srcdir)/objs.mk
|
||||
|
||||
# Make this a true dynamic component even in static builds because
|
||||
# this component is shared by installer
|
||||
MOZ_STATIC_COMPONENT_LIBS=
|
||||
BUILD_STATIC_LIBS=
|
||||
BUILD_SHARED_LIBS=1
|
||||
|
||||
# Linux and Solaris installer needs standalone libjar
|
||||
ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
|
||||
DIRS = standalone
|
||||
|
|
|
|||
|
|
@ -0,0 +1,250 @@
|
|||
; Package file for Unix
|
||||
;
|
||||
; File format:
|
||||
;
|
||||
; [] designates a toplevel component. Example: [core]
|
||||
; - in front of a file specifies it to be removed from the destination
|
||||
; * wildcard support to recursively copy the entire directory
|
||||
; ; file comment
|
||||
;
|
||||
|
||||
[langenus]
|
||||
;
|
||||
; en-US
|
||||
bin/chrome/en-US.jar
|
||||
bin/chrome/en-unix.jar
|
||||
bin/chrome/en-win.jar
|
||||
|
||||
[regus]
|
||||
;
|
||||
; US
|
||||
bin/chrome/US.jar
|
||||
bin/defaults/profile/US/*
|
||||
bin/searchplugins/*
|
||||
|
||||
[deflenus]
|
||||
;
|
||||
; default files for US
|
||||
bin/defaults/profile/bookmarks.html
|
||||
bin/defaults/profile/panels.rdf
|
||||
bin/defaults/profile/localstore.rdf
|
||||
bin/defaults/profile/search.rdf
|
||||
bin/defaults/profile/mimeTypes.rdf
|
||||
|
||||
[xpcom]
|
||||
bin/libnspr4.so
|
||||
bin/libplc4.so
|
||||
bin/libplds4.so
|
||||
bin/libxpcom.so
|
||||
bin/libxpistub.so
|
||||
bin/components/libxpinstall.so
|
||||
bin/components/libjar50.so
|
||||
|
||||
[browser]
|
||||
bin/mozilla
|
||||
bin/mozilla-bin
|
||||
bin/icons/*
|
||||
bin/run-mozilla.sh
|
||||
bin/regExport
|
||||
bin/regxpcom
|
||||
bin/regchrome
|
||||
bin/splash.xpm
|
||||
bin/xpicleanup
|
||||
bin/res/cmessage.txt
|
||||
; this is used by gtk embedding clients
|
||||
|
||||
|
||||
bin/components/bookmarks.xpt
|
||||
bin/components/directory.xpt
|
||||
bin/components/history.xpt
|
||||
bin/components/timebomb.xpt
|
||||
bin/components/related.xpt
|
||||
bin/components/urlbarhistory.xpt
|
||||
bin/components/search.xpt
|
||||
bin/components/autocomplete.xpt
|
||||
bin/components/appshell.xpt
|
||||
bin/components/caps.xpt
|
||||
bin/components/cookie.xpt
|
||||
bin/components/dom.xpt
|
||||
bin/components/dom_base.xpt
|
||||
bin/components/dom_core.xpt
|
||||
bin/components/dom_css.xpt
|
||||
bin/components/dom_events.xpt
|
||||
bin/components/dom_html.xpt
|
||||
bin/components/dom_range.xpt
|
||||
bin/components/dom_stylesheets.xpt
|
||||
bin/components/dom_views.xpt
|
||||
bin/components/dom_xbl.xpt
|
||||
bin/components/dom_xul.xpt
|
||||
bin/components/editor.xpt
|
||||
bin/components/find.xpt
|
||||
bin/components/gfx.xpt
|
||||
bin/components/gfx2.xpt
|
||||
bin/components/intl.xpt
|
||||
bin/components/imglib2.xpt
|
||||
bin/components/chardet.xpt
|
||||
bin/components/jar.xpt
|
||||
bin/components/jsconsole-clhandler.js
|
||||
bin/components/locale.xpt
|
||||
bin/components/mozbrwsr.xpt
|
||||
bin/components/mozcomps.xpt
|
||||
bin/components/mozfind.xpt
|
||||
bin/components/mozxfer.xpt
|
||||
bin/components/necko.xpt
|
||||
bin/components/mimetype.xpt
|
||||
bin/components/necko_cache.xpt
|
||||
bin/components/necko_strconv.xpt
|
||||
bin/components/necko_about.xpt
|
||||
bin/components/necko_data.xpt
|
||||
bin/components/necko_dns.xpt
|
||||
bin/components/necko_ftp.xpt
|
||||
bin/components/necko_http.xpt
|
||||
bin/components/necko_jar.xpt
|
||||
bin/components/necko_res.xpt
|
||||
bin/components/necko_socket.xpt
|
||||
bin/components/nsFilePicker.js
|
||||
bin/components/nsSidebar.js
|
||||
bin/components/xpcom_xpti.xpt
|
||||
bin/components/xpinstall.xpt
|
||||
bin/components/oji.xpt
|
||||
bin/components/pref.xpt
|
||||
bin/components/proxyObjInst.xpt
|
||||
bin/components/rdf.xpt
|
||||
bin/components/shistory.xpt
|
||||
bin/components/sidebar.xpt
|
||||
bin/components/signonviewer.xpt
|
||||
bin/components/unicharutil.xpt
|
||||
bin/components/uriloader.xpt
|
||||
bin/components/exthandler.xpt
|
||||
bin/components/wallet.xpt
|
||||
bin/components/walleteditor.xpt
|
||||
bin/components/walletpreview.xpt
|
||||
bin/components/webshell_idls.xpt
|
||||
bin/components/widget.xpt
|
||||
bin/components/xpcom_base.xpt
|
||||
bin/components/xpcom_ds.xpt
|
||||
bin/components/xpcom_io.xpt
|
||||
bin/components/xpconnect.xpt
|
||||
bin/components/chrome.xpt
|
||||
bin/components/docshell.xpt
|
||||
bin/components/jsurl.xpt
|
||||
bin/components/layout_base.xpt
|
||||
bin/components/layout_xul.xpt
|
||||
bin/components/layout_xul_outliner.xpt
|
||||
bin/components/xuldoc.xpt
|
||||
bin/components/xultmpl.xpt
|
||||
bin/components/prefmigr.xpt
|
||||
bin/components/profile.xpt
|
||||
bin/components/regviewer.xpt
|
||||
bin/components/uconv.xpt
|
||||
bin/components/util.xpt
|
||||
bin/components/xpcom_components.xpt
|
||||
bin/components/xpcom_threads.xpt
|
||||
bin/components/xml-rpc.xpt
|
||||
bin/components/nsDictionary.js
|
||||
bin/components/nsProxyAutoConfig.js
|
||||
bin/components/nsXmlRpcClient.js
|
||||
bin/components/windowwatcher.xpt
|
||||
bin/components/xmlextras.xpt
|
||||
bin/components/nsHelperAppDlg.js
|
||||
bin/components/helperAppDlg.xpt
|
||||
bin/components/transformiix.xpt
|
||||
|
||||
bin/chrome/help.jar
|
||||
bin/chrome/toolkit.jar
|
||||
bin/chrome/comm.jar
|
||||
bin/chrome/content-packs.jar
|
||||
bin/chrome/modern.jar
|
||||
bin/chrome/classic.jar
|
||||
bin/chrome/embed.jar
|
||||
bin/chrome/installed-chrome.txt
|
||||
;-bin/chrome/comm/content/editor/EditorInitPage.html
|
||||
;-bin/chrome/comm/content/editor/content/EditorInitPagePlain.html
|
||||
;Include this for "debug" testing - remove for actual beta release:
|
||||
;-bin/chrome/comm/content/editor/content/TextEditorAppShell.xul
|
||||
;-bin/chrome/comm/content/editor/content/sb-bookmarks-panel.xul
|
||||
;-bin/chrome/comm/content/editor/content/sb-bookmarks.js
|
||||
;-bin/chrome/comm/content/editor/content/sb-file-contextMenu.js
|
||||
;-bin/chrome/comm/content/editor/content/sb-file-panel.js
|
||||
;-bin/chrome/comm/content/editor/content/sb-file-panel.xul
|
||||
;-bin/chrome/comm/content/editor/content/sb-FileWidgetFileHandler.js
|
||||
|
||||
; all the pref files must be part of base
|
||||
; to prevent migration bugs
|
||||
bin/defaults/pref/*
|
||||
; this is only here if you have plugins -blizzard
|
||||
; bin/plugins/*
|
||||
bin/res/entityTables/*
|
||||
bin/defaults/wallet/FieldSchema.tbl
|
||||
bin/defaults/wallet/VcardSchema.tbl
|
||||
bin/defaults/wallet/SchemaConcat.tbl
|
||||
bin/defaults/wallet/DistinguishedSchema.tbl
|
||||
bin/defaults/wallet/SchemaStrings.tbl
|
||||
bin/defaults/wallet/PositionalSchema.tbl
|
||||
bin/defaults/wallet/StateSchema.tbl
|
||||
bin/res/arrow.gif
|
||||
bin/res/charsetalias.properties
|
||||
bin/res/acceptlanguage.properties
|
||||
bin/res/unixcharset.properties
|
||||
bin/res/charsetData.properties
|
||||
bin/res/langGroups.properties
|
||||
bin/res/language.properties
|
||||
bin/res/html.css
|
||||
bin/res/quirk.css
|
||||
bin/res/viewsource.css
|
||||
bin/res/html/*
|
||||
bin/res/rdf/article.gif
|
||||
bin/res/rdf/document.gif
|
||||
bin/res/rdf/folder-closed.gif
|
||||
bin/res/rdf/folder-open.gif
|
||||
bin/res/rdf/loading.gif
|
||||
bin/res/ua.css
|
||||
bin/res/forms.css
|
||||
;debug menus reference samples dir - remove for actual releases:
|
||||
bin/res/samples/*
|
||||
bin/res/builtin/htmlBindings.xml
|
||||
bin/res/builtin/platformHTMLBindings.xml
|
||||
|
||||
|
||||
[mail]
|
||||
bin/libldap40.so
|
||||
bin/liblber40.so
|
||||
bin/components/addrbook.xpt
|
||||
bin/components/mailnews.xpt
|
||||
bin/components/mime.xpt
|
||||
bin/components/mozldap.xpt
|
||||
bin/components/msgbase.xpt
|
||||
bin/components/msgcompose.xpt
|
||||
bin/components/msgdb.xpt
|
||||
bin/components/msgimap.xpt
|
||||
bin/components/msglocal.xpt
|
||||
bin/components/msgnews.xpt
|
||||
bin/components/msgsearch.xpt
|
||||
bin/components/nsLDAPPrefsService.js
|
||||
bin/components/txmgr.xpt
|
||||
bin/components/import.xpt
|
||||
bin/components/absync.xpt
|
||||
bin/chrome/messenger.jar
|
||||
|
||||
|
||||
[chatzilla]
|
||||
bin/components/chatzilla-service.js
|
||||
bin/chrome/chatzilla.jar
|
||||
|
||||
|
||||
[talkback]
|
||||
; Dummy talkback.xpi must be generated so deliver.pl and
|
||||
; the linux installer generated by deliver.pl don't break.
|
||||
;
|
||||
; NOTE: This doesn't actually make it to release builds, merely
|
||||
; here so that deliver.pl works in test mode when used by
|
||||
; developers to create an installer. Release builds contain
|
||||
; a legitimate, working talkback.xpi.
|
||||
bin/components/nsSample.js
|
||||
|
||||
[psm]
|
||||
bin/libnssckbi.so
|
||||
bin/components/pipnss.xpt
|
||||
bin/components/pippki.xpt
|
||||
bin/chrome/pipnss.jar
|
||||
bin/chrome/pippki.jar
|
||||
|
|
@ -0,0 +1,181 @@
|
|||
#!perl
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1999 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Samir Gehani <sgehani@netscape.com>
|
||||
#
|
||||
#
|
||||
# Borrowed from deliver.pl
|
||||
#
|
||||
|
||||
#==============================================================================
|
||||
# usage: perl deliver.pl version URLPath stubName blobName buildWizard
|
||||
# e.g. perl deliver.pl 5.0.0.1 ftp://foo/ mozilla-installer mozilla-installer
|
||||
#
|
||||
# Delivers the stub and blob installers to mozilla/installer/stub
|
||||
# and mozilla/installer/sea, respectively. Also, delivers the .xpis
|
||||
# to mozilla/installer/raw/xpi.
|
||||
#
|
||||
# NOTE:
|
||||
# -----
|
||||
# * all args are optional
|
||||
# * version is used by xpinstall and needs to bumped every build
|
||||
# * URLPath must have a trailing slash
|
||||
# * if you are not building a release version no need to pass any args
|
||||
# * pass in "buildwizard" as the last arg to build the wizard too
|
||||
# * you must be in deliver.pl's dir when calling it since it assumes DEPTH
|
||||
#==============================================================================
|
||||
|
||||
use Cwd;
|
||||
|
||||
#// constants
|
||||
$SUBDIR = "mozilla-installer";
|
||||
$_DEPTH = "../../..";
|
||||
$_orig = cwd();
|
||||
chdir($_DEPTH); # resolve absolute path
|
||||
$TREETOP = cwd();
|
||||
chdir($_orig);
|
||||
|
||||
$WIZARD = $TREETOP."/xpinstall/wizard/unix/src2";
|
||||
$ROOT = $TREETOP."/installer";
|
||||
$STAGE = $ROOT."/stage";
|
||||
$RAW = $ROOT."/raw";
|
||||
$XPI = $RAW."/xpi";
|
||||
$BLOB = $ROOT."/sea";
|
||||
$STUB = $ROOT."/stub";
|
||||
|
||||
#// default args
|
||||
$aVersion = "5.0.0.0";
|
||||
$aURLPath = "ftp://ftp.mozilla.org/";
|
||||
$aStubName = "mozilla-installer";
|
||||
$aBlobName = "mozilla-installer";
|
||||
$aBuildWizard = "NO";
|
||||
|
||||
#// parse args
|
||||
# all optional args: version, URLPath, stubName, blobName
|
||||
if ($#ARGV >= 4) { $aBuildWizard = $ARGV[4]; }
|
||||
if ($#ARGV >= 3) { $aBlobName = $ARGV[3]; }
|
||||
if ($#ARGV >= 2) { $aStubName = $ARGV[2]; }
|
||||
if ($#ARGV >= 1) { $aURLPath = $ARGV[1]; }
|
||||
if ($#ARGV >= 0) { $aVersion = $ARGV[0]; }
|
||||
|
||||
#// create dist structure (mozilla/installer/{stage,raw,stub,sea})
|
||||
if (-e $ROOT)
|
||||
{
|
||||
if (-w $ROOT)
|
||||
{ system("rm -rf $ROOT"); }
|
||||
else
|
||||
{ die "--- deliver.pl: check perms on mozilla/installer: $!"; }
|
||||
}
|
||||
|
||||
mkdir($ROOT, 0777) || die "--- deliver.pl: couldn't mkdir root: $!";
|
||||
mkdir($STAGE, 0777) || die "--- deliver.pl: couldn't mkdir stage: $!";
|
||||
mkdir($RAW, 0777) || die "--- deliver.pl: couldn't mkdir raw: $!";
|
||||
mkdir($XPI, 0777) || die "--- deliver.pl: couldn't mkdir xpi: $!";
|
||||
mkdir($BLOB, 0777) || die "--- deliver.pl: couldn't mkdir sea: $!";
|
||||
mkdir($STUB, 0777) || die "--- deliver.pl: couldn't mkdir stub: $!";
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Deliver wizard
|
||||
#-------------------------------------------------------------------------
|
||||
#// build the wizard
|
||||
if ($aBuildWizard eq "buildwizard")
|
||||
{
|
||||
chdir($WIZARD);
|
||||
system($TREETOP."/build/autoconf/update-makefile.sh");
|
||||
|
||||
#// make unix wizard
|
||||
system("make");
|
||||
chdir($_orig);
|
||||
}
|
||||
|
||||
#// deliver wizard to staging area (mozilla/installer/stage)
|
||||
copy("$WIZARD/mozilla-installer", $RAW);
|
||||
copy("$WIZARD/mozilla-installer-bin", $RAW);
|
||||
copy("$WIZARD/installer.ini", $RAW);
|
||||
copy("$WIZARD/README", $RAW);
|
||||
copy("$WIZARD/MPL-1.1.txt", $RAW);
|
||||
chmod(0755, "$RAW/mozilla-installer"); #// ensure shell script is executable
|
||||
|
||||
spew("Completed delivering wizard");
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Make .xpis
|
||||
#-------------------------------------------------------------------------
|
||||
#// call pkgcp.pl
|
||||
chdir("$TREETOP/xpinstall/packager");
|
||||
system("perl pkgcp.pl -o unix -s $TREETOP/dist -d $STAGE -f $TREETOP/xpinstall/packager/packages-static-unix -v");
|
||||
spew("Completed copying build files for STATIC BUILD");
|
||||
|
||||
#// call xptlink.pl to make big .xpt files/component
|
||||
system("perl xptlink.pl -o unix -s $TREETOP/dist -d $STAGE -v");
|
||||
spew("Completed xptlinking");
|
||||
|
||||
#// call makeall.pl tunneling args (delivers .xpis to mozilla/installer/stage)
|
||||
chdir("$TREETOP/xpinstall/packager/unix");
|
||||
system("perl makeall.pl $aVersion $aURLPath $STAGE $XPI");
|
||||
system("mv $TREETOP/xpinstall/packager/unix/config.ini $RAW");
|
||||
spew("Completed making .xpis");
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Package stub and sea
|
||||
#-------------------------------------------------------------------------
|
||||
#// tar and gzip mozilla-installer, mozilla-installer-bin, README, license,
|
||||
#// config.ini, installer.ini into stub
|
||||
spew("Creating stub installer tarball...");
|
||||
chdir("$RAW/..");
|
||||
system("mv $RAW $ROOT/$SUBDIR");
|
||||
system("tar cvf $STUB/$aStubName.tar ./$SUBDIR/mozilla-installer ./$SUBDIR/mozilla-installer-bin ./$SUBDIR/installer.ini ./$SUBDIR/README ./$SUBDIR/config.ini ./$SUBDIR/MPL-1.1.txt");
|
||||
system("mv $ROOT/$SUBDIR $RAW");
|
||||
system("gzip $STUB/$aStubName.tar");
|
||||
spew("Completed creating stub installer tarball");
|
||||
|
||||
#// tar and gzip mozilla-installer, mozilla-installer-bin, README, license,
|
||||
#// config.ini, installer.ini and .xpis into sea
|
||||
spew("Creating blob (aka full or sea) installer tarball...");
|
||||
system("mv $RAW $ROOT/$SUBDIR");
|
||||
system("tar cvf $BLOB/$aBlobName.tar ./$SUBDIR/");
|
||||
system("mv $ROOT/$SUBDIR $RAW");
|
||||
system("gzip $BLOB/$aBlobName.tar");
|
||||
spew("Completed creating blob (aka full or sea) installer tarball");
|
||||
chdir($_orig);
|
||||
|
||||
spew("Completed packaging stub and sea");
|
||||
spew("Installers built (see mozilla/installer/{stub,sea})");
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Utilities
|
||||
#-------------------------------------------------------------------------
|
||||
sub spew
|
||||
{
|
||||
print "+++ deliver.pl: ".$_[0]."\n";
|
||||
}
|
||||
|
||||
sub copy
|
||||
{
|
||||
if (! -e $_[0])
|
||||
{
|
||||
die "--- deliver.pl: couldn't cp cause ".$_[0]." doesn't exist: $!";
|
||||
}
|
||||
system ("cp ".$_[0]." ".$_[1]);
|
||||
}
|
||||
|
|
@ -1,27 +1,25 @@
|
|||
#!perl
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# The contents of this file are subject to the Mozilla Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/NPL/
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code,
|
||||
# released March 31, 1998.
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1999 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Samir Gehani <sgehani@netscape.com>
|
||||
#
|
||||
|
||||
#==============================================================================
|
||||
# usage: perl deliver.pl version URLPath stubName blobName buildWizard
|
||||
# e.g. perl deliver.pl 5.0.0.1 ftp://foo/ mozilla-installer mozilla-installer
|
||||
|
|
|
|||
|
|
@ -28,6 +28,12 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# Make this a true dynamic component even in static builds because
|
||||
# this component is shared by installer
|
||||
MOZ_STATIC_COMPONENT_LIBS=
|
||||
BUILD_STATIC_LIBS=
|
||||
BUILD_SHARED_LIBS=1
|
||||
|
||||
MODULE = xpistub
|
||||
LIBRARY_NAME = xpistub
|
||||
REQUIRES = xpcom string xpinstall dom
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче