2007-03-22 10:30:00 -07:00
|
|
|
# ***** BEGIN LICENSE BLOCK *****
|
|
|
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
|
|
#
|
|
|
|
# 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 Communicator client code, released
|
|
|
|
# March 31, 1998.
|
|
|
|
#
|
|
|
|
# The Initial Developer of the Original Code is
|
|
|
|
# Netscape Communications Corporation.
|
|
|
|
# Portions created by the Initial Developer are Copyright (C) 1998
|
|
|
|
# the Initial Developer. All Rights Reserved.
|
|
|
|
#
|
|
|
|
# Contributor(s):
|
|
|
|
# Benjamin Smedberg <bsmedberg@covad.net>
|
|
|
|
# Arthur Wiebe <artooro@gmail.com>
|
|
|
|
# Mark Mentovai <mark@moxienet.com>
|
|
|
|
#
|
|
|
|
# Alternatively, the contents of this file may be used under the terms of
|
|
|
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
|
|
|
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
|
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
|
|
|
# of those above. If you wish to allow use of your version of this file only
|
|
|
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
|
|
|
# use your version of this file under the terms of the MPL, indicate your
|
|
|
|
# decision by deleting the provisions above and replace them with the notice
|
|
|
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
|
|
|
# the provisions above, a recipient may use your version of this file under
|
|
|
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
|
|
|
#
|
|
|
|
# ***** END LICENSE BLOCK *****
|
|
|
|
|
2008-07-06 13:30:32 -07:00
|
|
|
include $(MOZILLA_DIR)/toolkit/mozapps/installer/package-name.mk
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2009-09-15 15:11:42 -07:00
|
|
|
# This is how we create the binary packages we release to the public.
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
ifndef MOZ_PKG_FORMAT
|
|
|
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
|
|
|
MOZ_PKG_FORMAT = DMG
|
|
|
|
else
|
2009-08-10 20:50:32 -07:00
|
|
|
ifeq (,$(filter-out OS2 WINNT WINCE BeOS, $(OS_ARCH)))
|
2007-03-22 10:30:00 -07:00
|
|
|
MOZ_PKG_FORMAT = ZIP
|
2009-09-15 15:11:42 -07:00
|
|
|
else
|
|
|
|
ifeq (,$(filter-out SunOS, $(OS_ARCH)))
|
|
|
|
MOZ_PKG_FORMAT = BZ2
|
|
|
|
else
|
|
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
|
|
|
MOZ_PKG_FORMAT = BZ2
|
|
|
|
else
|
|
|
|
MOZ_PKG_FORMAT = TGZ
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif # MOZ_PKG_FORMAT
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
ifeq ($(OS_ARCH),OS2)
|
|
|
|
INSTALLER_DIR = os2
|
|
|
|
else
|
2009-08-10 20:50:32 -07:00
|
|
|
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
2007-03-22 10:30:00 -07:00
|
|
|
INSTALLER_DIR = windows
|
|
|
|
else
|
2009-09-15 15:11:42 -07:00
|
|
|
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
2007-03-22 10:30:00 -07:00
|
|
|
INSTALLER_DIR = unix
|
|
|
|
endif
|
|
|
|
endif
|
2009-09-15 15:11:42 -07:00
|
|
|
endif
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2008-09-17 13:53:09 -07:00
|
|
|
PACKAGE = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2007-08-09 12:53:08 -07:00
|
|
|
# By default, the SDK uses the same packaging type as the main bundle,
|
|
|
|
# but on mac it is a .tar.bz2
|
|
|
|
SDK_SUFFIX = $(PKG_SUFFIX)
|
2008-09-17 13:53:09 -07:00
|
|
|
SDK = $(PKG_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX)
|
2007-08-09 12:53:08 -07:00
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
MAKE_PACKAGE = $(error What is a $(MOZ_PKG_FORMAT) package format?);
|
|
|
|
|
|
|
|
CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \
|
|
|
|
--mode="go-w" -f
|
2009-05-15 16:14:15 -07:00
|
|
|
UNPACK_TAR = tar -xf-
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
ifeq ($(MOZ_PKG_FORMAT),TAR)
|
|
|
|
PKG_SUFFIX = .tar
|
2008-12-05 09:00:33 -08:00
|
|
|
MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) > $(PACKAGE)
|
2007-03-22 10:30:00 -07:00
|
|
|
UNMAKE_PACKAGE = $(UNPACK_TAR) < $(UNPACKAGE)
|
2007-08-09 12:53:08 -07:00
|
|
|
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > $(SDK)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
ifeq ($(MOZ_PKG_FORMAT),TGZ)
|
|
|
|
PKG_SUFFIX = .tar.gz
|
2008-12-05 09:00:33 -08:00
|
|
|
MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | gzip -vf9 > $(PACKAGE)
|
2007-03-22 10:30:00 -07:00
|
|
|
UNMAKE_PACKAGE = gunzip -c $(UNPACKAGE) | $(UNPACK_TAR)
|
2007-08-09 12:53:08 -07:00
|
|
|
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | gzip -vf9 > $(SDK)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
ifeq ($(MOZ_PKG_FORMAT),BZ2)
|
|
|
|
PKG_SUFFIX = .tar.bz2
|
2008-12-05 09:00:33 -08:00
|
|
|
MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | bzip2 -vf > $(PACKAGE)
|
2007-03-22 10:30:00 -07:00
|
|
|
UNMAKE_PACKAGE = bunzip2 -c $(UNPACKAGE) | $(UNPACK_TAR)
|
2007-08-09 12:53:08 -07:00
|
|
|
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
ifeq ($(MOZ_PKG_FORMAT),ZIP)
|
|
|
|
PKG_SUFFIX = .zip
|
2008-12-05 09:00:33 -08:00
|
|
|
MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR)
|
2007-03-22 10:30:00 -07:00
|
|
|
UNMAKE_PACKAGE = $(UNZIP) $(UNPACKAGE)
|
2007-08-11 13:29:48 -07:00
|
|
|
MAKE_SDK = $(ZIP) -r9D $(SDK) $(MOZ_APP_NAME)-sdk
|
2009-02-03 19:00:06 -08:00
|
|
|
endif
|
2009-09-15 15:11:42 -07:00
|
|
|
ifeq ($(MOZ_PKG_FORMAT),CAB)
|
|
|
|
PKG_SUFFIX = .cab
|
|
|
|
ifndef WINCE_WINDOWS_MOBILE
|
|
|
|
CABARGS += -s
|
|
|
|
endif
|
2009-09-17 21:34:11 -07:00
|
|
|
ifdef MOZ_FASTSTART
|
|
|
|
CABARGS += -faststart
|
|
|
|
endif
|
2009-09-15 15:11:42 -07:00
|
|
|
VSINSTALLDIR ?= $(error VSINSTALLDIR not set, must be set to the Visual Studio install directory)
|
|
|
|
MAKE_PACKAGE = $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py \
|
|
|
|
$(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" \
|
|
|
|
"$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PACKAGE)"
|
|
|
|
UNMAKE_PACKAGE = $(error Unpacking CAB files is not supported)
|
|
|
|
endif
|
2007-03-22 10:30:00 -07:00
|
|
|
ifeq ($(MOZ_PKG_FORMAT),DMG)
|
|
|
|
ifndef _APPNAME
|
|
|
|
ifdef MOZ_DEBUG
|
|
|
|
_APPNAME = $(MOZ_APP_DISPLAYNAME)Debug.app
|
|
|
|
else
|
|
|
|
_APPNAME = $(MOZ_APP_DISPLAYNAME).app
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
ifndef _BINPATH
|
|
|
|
_BINPATH = /$(_APPNAME)/Contents/MacOS
|
|
|
|
endif # _BINPATH
|
|
|
|
PKG_SUFFIX = .dmg
|
|
|
|
PKG_DMG_FLAGS =
|
|
|
|
ifneq (,$(MOZ_PKG_MAC_DSSTORE))
|
|
|
|
PKG_DMG_FLAGS += --copy "$(MOZ_PKG_MAC_DSSTORE):/.DS_Store"
|
|
|
|
endif
|
|
|
|
ifneq (,$(MOZ_PKG_MAC_BACKGROUND))
|
|
|
|
PKG_DMG_FLAGS += --mkdir /.background --copy "$(MOZ_PKG_MAC_BACKGROUND):/.background"
|
|
|
|
endif
|
|
|
|
ifneq (,$(MOZ_PKG_MAC_ICON))
|
|
|
|
PKG_DMG_FLAGS += --icon "$(MOZ_PKG_MAC_ICON)"
|
|
|
|
endif
|
|
|
|
ifneq (,$(MOZ_PKG_MAC_RSRC))
|
|
|
|
PKG_DMG_FLAGS += --resource "$(MOZ_PKG_MAC_RSRC)"
|
|
|
|
endif
|
|
|
|
ifneq (,$(MOZ_PKG_MAC_EXTRA))
|
|
|
|
PKG_DMG_FLAGS += $(MOZ_PKG_MAC_EXTRA)
|
|
|
|
endif
|
2008-07-06 13:30:32 -07:00
|
|
|
_ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd)
|
2007-03-22 10:30:00 -07:00
|
|
|
ifdef UNIVERSAL_BINARY
|
|
|
|
STAGEPATH = universal/
|
|
|
|
endif
|
|
|
|
ifndef PKG_DMG_SOURCE
|
2008-12-05 09:00:33 -08:00
|
|
|
PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_DIR)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
2008-07-06 13:30:32 -07:00
|
|
|
MAKE_PACKAGE = $(_ABS_MOZSRCDIR)/build/package/mac_osx/pkg-dmg \
|
2007-03-22 10:30:00 -07:00
|
|
|
--source "$(PKG_DMG_SOURCE)" --target "$(PACKAGE)" \
|
|
|
|
--volname "$(MOZ_APP_DISPLAYNAME)" $(PKG_DMG_FLAGS)
|
2009-07-06 09:13:57 -07:00
|
|
|
_ABS_DIST = $(call core_abspath,$(DIST))
|
2007-03-22 10:30:00 -07:00
|
|
|
UNMAKE_PACKAGE = \
|
|
|
|
set -ex; \
|
2009-07-06 09:13:57 -07:00
|
|
|
rm -rf $(_ABS_DIST)/unpack.tmp; \
|
|
|
|
mkdir -p $(_ABS_DIST)/unpack.tmp; \
|
|
|
|
$(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(_ABS_DIST)/unpack.tmp; \
|
|
|
|
rsync -a "$(_ABS_DIST)/unpack.tmp/$(_APPNAME)" $(MOZ_PKG_DIR); \
|
2007-03-22 10:30:00 -07:00
|
|
|
test -n "$(MOZ_PKG_MAC_DSSTORE)" && \
|
2009-07-06 09:13:57 -07:00
|
|
|
rsync -a "$(_ABS_DIST)/unpack.tmp/.DS_Store" "$(MOZ_PKG_MAC_DSSTORE)"; \
|
2007-03-22 10:30:00 -07:00
|
|
|
test -n "$(MOZ_PKG_MAC_BACKGROUND)" && \
|
2009-07-06 09:13:57 -07:00
|
|
|
rsync -a "$(_ABS_DIST)/unpack.tmp/.background/`basename "$(MOZ_PKG_MAC_BACKGROUND)"`" "$(MOZ_PKG_MAC_BACKGROUND)"; \
|
2007-03-22 10:30:00 -07:00
|
|
|
test -n "$(MOZ_PKG_MAC_ICON)" && \
|
2009-07-06 09:13:57 -07:00
|
|
|
rsync -a "$(_ABS_DIST)/unpack.tmp/.VolumeIcon.icns" "$(MOZ_PKG_MAC_ICON)"; \
|
|
|
|
rm -rf $(_ABS_DIST)/unpack.tmp; \
|
2007-03-22 10:30:00 -07:00
|
|
|
if test -n "$(MOZ_PKG_MAC_RSRC)" ; then \
|
|
|
|
cp $(UNPACKAGE) $(MOZ_PKG_APPNAME).tmp.dmg && \
|
|
|
|
hdiutil unflatten $(MOZ_PKG_APPNAME).tmp.dmg && \
|
|
|
|
{ /Developer/Tools/DeRez -skip plst -skip blkx $(MOZ_PKG_APPNAME).tmp.dmg > "$(MOZ_PKG_MAC_RSRC)" || { rm -f $(MOZ_PKG_APPNAME).tmp.dmg && false; }; } && \
|
|
|
|
rm -f $(MOZ_PKG_APPNAME).tmp.dmg; \
|
|
|
|
fi; \
|
|
|
|
$(NULL)
|
|
|
|
# The plst and blkx resources are skipped because they belong to each
|
|
|
|
# individual dmg and are created by hdiutil.
|
2007-08-09 12:53:08 -07:00
|
|
|
SDK_SUFFIX = .tar.bz2
|
2008-04-10 07:50:48 -07:00
|
|
|
SDK = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX)
|
2007-08-09 12:53:08 -07:00
|
|
|
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
|
|
|
|
# dummy macro if we don't have PSM built
|
|
|
|
SIGN_NSS =
|
|
|
|
ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY))
|
|
|
|
ifdef MOZ_PSM
|
|
|
|
SIGN_NSS = @echo signing nss libraries;
|
|
|
|
|
2008-04-28 12:14:12 -07:00
|
|
|
NSS_DLL_SUFFIX = $(DLL_SUFFIX)
|
2007-03-22 10:30:00 -07:00
|
|
|
ifdef UNIVERSAL_BINARY
|
|
|
|
NATIVE_ARCH = $(shell uname -p | sed -e s/powerpc/ppc/)
|
2008-07-21 10:53:22 -07:00
|
|
|
NATIVE_DIST = $(DIST:$(DEPTH)/%=$(DEPTH)/../$(NATIVE_ARCH)/%)
|
2007-03-22 10:30:00 -07:00
|
|
|
SIGN_CMD = $(NATIVE_DIST)/bin/run-mozilla.sh $(NATIVE_DIST)/bin/shlibsign -v -i
|
|
|
|
else
|
2008-03-13 17:39:33 -07:00
|
|
|
ifeq ($(OS_ARCH),OS2)
|
2008-04-28 12:14:12 -07:00
|
|
|
# uppercase extension to get the correct output file from shlibsign
|
|
|
|
NSS_DLL_SUFFIX = .DLL
|
2008-07-06 13:30:32 -07:00
|
|
|
SIGN_CMD = $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/sign.cmd $(DIST)
|
2008-03-13 17:39:33 -07:00
|
|
|
else
|
2007-04-17 13:42:54 -07:00
|
|
|
SIGN_CMD = $(RUN_TEST_PROGRAM) $(DIST)/bin/shlibsign -v -i
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
2008-03-13 17:39:33 -07:00
|
|
|
endif
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2008-12-05 09:00:33 -08:00
|
|
|
SOFTOKN = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)softokn3$(NSS_DLL_SUFFIX)
|
2009-08-10 20:45:40 -07:00
|
|
|
NSSDBM = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)nssdbm3$(NSS_DLL_SUFFIX)
|
2009-09-16 19:49:20 -07:00
|
|
|
FREEBL = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl3$(NSS_DLL_SUFFIX)
|
2008-12-05 09:00:33 -08:00
|
|
|
FREEBL_32FPU = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32fpu_3$(DLL_SUFFIX)
|
|
|
|
FREEBL_32INT = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int_3$(DLL_SUFFIX)
|
|
|
|
FREEBL_32INT64 = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int64_3$(DLL_SUFFIX)
|
|
|
|
FREEBL_64FPU = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64fpu_3$(DLL_SUFFIX)
|
|
|
|
FREEBL_64INT = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64int_3$(DLL_SUFFIX)
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
SIGN_NSS += $(SIGN_CMD) $(SOFTOKN); \
|
2009-09-04 18:28:54 -07:00
|
|
|
$(SIGN_CMD) $(NSSDBM); \
|
2007-03-22 10:30:00 -07:00
|
|
|
if test -f $(FREEBL); then $(SIGN_CMD) $(FREEBL); fi; \
|
|
|
|
if test -f $(FREEBL_32FPU); then $(SIGN_CMD) $(FREEBL_32FPU); fi; \
|
|
|
|
if test -f $(FREEBL_32INT); then $(SIGN_CMD) $(FREEBL_32INT); fi; \
|
|
|
|
if test -f $(FREEBL_32INT64); then $(SIGN_CMD) $(FREEBL_32INT64); fi; \
|
|
|
|
if test -f $(FREEBL_64FPU); then $(SIGN_CMD) $(FREEBL_64FPU); fi; \
|
|
|
|
if test -f $(FREEBL_64INT); then $(SIGN_CMD) $(FREEBL_64INT); fi;
|
|
|
|
|
|
|
|
endif # MOZ_PSM
|
|
|
|
endif # !CROSS_COMPILE
|
|
|
|
|
|
|
|
NO_PKG_FILES += \
|
|
|
|
core \
|
|
|
|
bsdecho \
|
|
|
|
gtscc \
|
2009-02-07 13:50:21 -08:00
|
|
|
js \
|
Bug 97954: Allow SpiderMonkey to be built on its own, or as part of Mozilla.
Give SpiderMonkey its own configure script and top-level Makefile.
Adjust js/src/Makefile as appropriate for life as a stand-alone
makefile, instead of a 'make export; make libs'-style Mozilla tier
makefile. Have the configure script accept '--with-nspr-cflags' and
'--with-nspr-libs' options for using an in-tree NSPR. Also accept
'--with-system-nspr', '--with-nspr-prefix', and
'--with-nspr-exec-prefix' flags for using an installed NSPR. Default
to --disable-jemalloc, assuming we don't have that part of the tree
available; have the top-level configure script pass --enable-jemalloc
as needed.
Since we no longer have an export phase to copy header files into
dist/include/js before we build the library, we need to be able to
find nanojit.h in the nanojit directory; fix references in
jsbuiltins.h and jstracer.cpp.
Give SpiderMonkey it its own copies of many of the files from ./config
and ./build. These are all exact copies, except as follows:
. js/src/config/Makefile.in: js/src only has a subset of
js/src/config, and thus a subset of the makefile targets.
. js/src/config/autoconf.mk.in: js/src/configure.in has its own make
variables to set, not set by the top-level configure script, so it
needs a custom automake.mk template.
. js/src/config/make-system-wrappers.pl: a copy from nsprpub/config,
so that we can build without having an NSPR source tree handy.
Invoke js/src/configure from ./configure, passing the values computed
for NSPR_CFLAGS and NSPR_LIBS by the top-level configure script.
Treat js/src as a static directory of the js tier, and create a new
config/js (just a Makefile) to be the js tier's non-static directory.
Let js/src/configure generate SpiderMonkey's makefiles, not
./configure.
Generate a 'js-config' script, which clients can call to find the
CFLAGS and LIBS values necessary to compile and link against an
installed SpiderMonkey library. Don't include the js-config script in
Macintosh packages.
Teach client.mk how to rebuild js/src/configure.
Tell Mercurial to ignore files generated by autoconf in js/src.
Further work:
. Right now, callers must define JS_THREADSAFE when #including jsapi.h.
This is fixed in a subsequent patch.
. js/src/configure is a trimmed copy of ./configure. It could be
trimmed more.
--HG--
rename : build/autoconf/acoutput-fast.pl => js/src/build/autoconf/acoutput-fast.pl
rename : build/autoconf/altoptions.m4 => js/src/build/autoconf/altoptions.m4
rename : build/autoconf/config.guess => js/src/build/autoconf/config.guess
rename : build/autoconf/config.sub => js/src/build/autoconf/config.sub
rename : build/autoconf/glib.m4 => js/src/build/autoconf/glib.m4
rename : build/autoconf/install-sh => js/src/build/autoconf/install-sh
rename : build/autoconf/make-makefile => js/src/build/autoconf/make-makefile
rename : build/autoconf/match-dir.sh => js/src/build/autoconf/match-dir.sh
rename : build/autoconf/nspr.m4 => js/src/build/autoconf/nspr.m4
rename : build/autoconf/pkg.m4 => js/src/build/autoconf/pkg.m4
rename : build/autoconf/update-makefile.sh => js/src/build/autoconf/update-makefile.sh
rename : build/cygwin-wrapper => js/src/build/cygwin-wrapper
rename : build/hcc => js/src/build/hcc
rename : build/hcpp => js/src/build/hcpp
rename : build/unix/mddepend.pl => js/src/build/unix/mddepend.pl
rename : build/unix/uniq.pl => js/src/build/unix/uniq.pl
rename : config/Makefile.in => js/src/config/Makefile.in
rename : config/Moz/Milestone.pm => js/src/config/Moz/Milestone.pm
rename : config/autoconf.mk.in => js/src/config/autoconf.mk.in
rename : config/config.mk => js/src/config/config.mk
rename : config/elf-dynstr-gc.c => js/src/config/elf-dynstr-gc.c
rename : config/fastcwd.pl => js/src/config/fastcwd.pl
rename : config/gcc_hidden.h => js/src/config/gcc_hidden.h
rename : config/insure.mk => js/src/config/insure.mk
rename : nsprpub/config/make-system-wrappers.pl => js/src/config/make-system-wrappers.pl
rename : config/milestone.pl => js/src/config/milestone.pl
rename : config/milestone.txt => js/src/config/milestone.txt
rename : config/mkdepend/Makefile.in => js/src/config/mkdepend/Makefile.in
rename : config/mkdepend/cppsetup.c => js/src/config/mkdepend/cppsetup.c
rename : config/mkdepend/def.h => js/src/config/mkdepend/def.h
rename : config/mkdepend/ifparser.c => js/src/config/mkdepend/ifparser.c
rename : config/mkdepend/ifparser.h => js/src/config/mkdepend/ifparser.h
rename : config/mkdepend/imakemdep.h => js/src/config/mkdepend/imakemdep.h
rename : config/mkdepend/include.c => js/src/config/mkdepend/include.c
rename : config/mkdepend/main.c => js/src/config/mkdepend/main.c
rename : config/mkdepend/mkdepend.man => js/src/config/mkdepend/mkdepend.man
rename : config/mkdepend/parse.c => js/src/config/mkdepend/parse.c
rename : config/mkdepend/pr.c => js/src/config/mkdepend/pr.c
rename : config/nfspwd.pl => js/src/config/nfspwd.pl
rename : config/nsinstall.c => js/src/config/nsinstall.c
rename : config/nsinstall.py => js/src/config/nsinstall.py
rename : config/pathsub.c => js/src/config/pathsub.c
rename : config/pathsub.h => js/src/config/pathsub.h
rename : config/preprocessor.pl => js/src/config/preprocessor.pl
rename : config/revdepth-nt.pl => js/src/config/revdepth-nt.pl
rename : config/revdepth.pl => js/src/config/revdepth.pl
rename : config/rules.mk => js/src/config/rules.mk
rename : config/system-headers => js/src/config/system-headers
rename : config/version.mk => js/src/config/version.mk
rename : config/version_win.pl => js/src/config/version_win.pl
rename : configure.in => js/src/configure.in
2008-10-29 08:29:22 -07:00
|
|
|
js-config \
|
2007-03-22 10:30:00 -07:00
|
|
|
jscpucfg \
|
|
|
|
nsinstall \
|
|
|
|
viewer \
|
|
|
|
TestGtkEmbed \
|
|
|
|
bloaturls.txt \
|
|
|
|
codesighs* \
|
|
|
|
elf-dynstr-gc \
|
|
|
|
mangle* \
|
|
|
|
maptsv* \
|
|
|
|
mfc* \
|
|
|
|
mkdepend* \
|
|
|
|
msdump* \
|
|
|
|
msmap* \
|
|
|
|
nm2tsv* \
|
|
|
|
nsinstall* \
|
|
|
|
rebasedlls* \
|
|
|
|
res/samples \
|
|
|
|
res/throbber \
|
|
|
|
shlibsign* \
|
2008-04-21 07:32:47 -07:00
|
|
|
ssltunnel* \
|
2008-09-05 06:35:58 -07:00
|
|
|
certutil* \
|
|
|
|
pk12util* \
|
2007-03-22 10:30:00 -07:00
|
|
|
winEmbed.exe \
|
|
|
|
chrome/chrome.rdf \
|
|
|
|
chrome/app-chrome.manifest \
|
|
|
|
chrome/overlayinfo \
|
|
|
|
components/compreg.dat \
|
|
|
|
components/xpti.dat \
|
|
|
|
content_unit_tests \
|
|
|
|
necko_unit_tests \
|
2008-12-08 13:09:52 -08:00
|
|
|
*.dSYM \
|
2007-03-22 10:30:00 -07:00
|
|
|
$(NULL)
|
|
|
|
|
2008-10-01 23:49:45 -07:00
|
|
|
# browser/locales/Makefile uses this makefile for its variable defs, but
|
2007-03-22 10:30:00 -07:00
|
|
|
# doesn't want the libs:: rule.
|
|
|
|
ifndef PACKAGER_NO_LIBS
|
|
|
|
libs:: make-package
|
|
|
|
endif
|
|
|
|
|
2009-06-26 22:31:39 -07:00
|
|
|
DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -DDLL_SUFFIX=$(DLL_SUFFIX) -DBIN_SUFFIX=$(BIN_SUFFIX)
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
ifdef MOZ_PKG_REMOVALS
|
|
|
|
MOZ_PKG_REMOVALS_GEN = removed-files
|
|
|
|
|
2008-11-27 18:26:44 -08:00
|
|
|
$(MOZ_PKG_REMOVALS_GEN): $(MOZ_PKG_REMOVALS) $(GLOBAL_DEPS)
|
2008-07-06 13:30:32 -07:00
|
|
|
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(MOZ_PKG_REMOVALS) > $(MOZ_PKG_REMOVALS_GEN)
|
2008-10-20 20:17:16 -07:00
|
|
|
|
|
|
|
GARBAGE += $(MOZ_PKG_REMOVALS_GEN)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
|
|
|
|
GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE)
|
|
|
|
|
|
|
|
ifeq ($(OS_ARCH),IRIX)
|
|
|
|
STRIP_FLAGS = -f
|
|
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),BeOS)
|
|
|
|
STRIP_FLAGS = -g
|
|
|
|
PLATFORM_EXCLUDE_LIST = ! -name "*.stub" ! -name "$(MOZ_PKG_APPNAME)-bin"
|
|
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),OS2)
|
2008-07-06 13:30:32 -07:00
|
|
|
STRIP = $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/strip.cmd
|
2007-03-22 10:30:00 -07:00
|
|
|
STRIP_FLAGS =
|
2008-10-26 14:53:57 -07:00
|
|
|
PLATFORM_EXCLUDE_LIST = ! -name "*.ico" ! -name "$(MOZ_PKG_APPNAME).exe"
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
|
2009-08-10 20:50:32 -07:00
|
|
|
ifneq (,$(filter WINNT WINCE OS2,$(OS_ARCH)))
|
2007-03-22 10:30:00 -07:00
|
|
|
PKGCP_OS = dos
|
|
|
|
else
|
|
|
|
PKGCP_OS = unix
|
|
|
|
endif
|
|
|
|
|
|
|
|
# The following target stages files into three directories: one directory for
|
|
|
|
# locale-independent files, one for locale-specific files, and one for optional
|
|
|
|
# extensions based on the information in the MOZ_PKG_MANIFEST file and the
|
|
|
|
# following vars:
|
|
|
|
# MOZ_NONLOCALIZED_PKG_LIST
|
|
|
|
# MOZ_LOCALIZED_PKG_LIST
|
|
|
|
# MOZ_OPTIONAL_PKG_LIST
|
|
|
|
|
|
|
|
PKG_ARG = , "$(pkg)"
|
|
|
|
|
|
|
|
# Define packager macro to work around make 3.81 backslash issue (bug #339933)
|
|
|
|
define PACKAGER_COPY
|
2008-07-06 13:30:32 -07:00
|
|
|
$(PERL) -I$(MOZILLA_DIR)/xpinstall/packager -e 'use Packager; \
|
2007-03-22 10:30:00 -07:00
|
|
|
Packager::Copy($1,$2,$3,$4,$5,$6,$7);'
|
|
|
|
endef
|
|
|
|
|
|
|
|
installer-stage: $(MOZ_PKG_MANIFEST)
|
|
|
|
ifndef MOZ_PKG_MANIFEST
|
|
|
|
$(error MOZ_PKG_MANIFEST unspecified!)
|
|
|
|
endif
|
|
|
|
@rm -rf $(DEPTH)/installer-stage $(DIST)/xpt
|
|
|
|
@echo "Staging installer files..."
|
|
|
|
@$(NSINSTALL) -D $(DEPTH)/installer-stage/nonlocalized
|
|
|
|
@$(NSINSTALL) -D $(DEPTH)/installer-stage/localized
|
|
|
|
@$(NSINSTALL) -D $(DEPTH)/installer-stage/optional
|
|
|
|
@$(NSINSTALL) -D $(DIST)/xpt
|
|
|
|
$(call PACKAGER_COPY, "$(DIST)",\
|
|
|
|
"$(DEPTH)/installer-stage/nonlocalized", \
|
|
|
|
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
|
|
|
|
$(foreach pkg,$(MOZ_NONLOCALIZED_PKG_LIST),$(PKG_ARG)) )
|
|
|
|
$(call PACKAGER_COPY, "$(DIST)",\
|
|
|
|
"$(DEPTH)/installer-stage/localized", \
|
|
|
|
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
|
|
|
|
$(foreach pkg,$(MOZ_LOCALIZED_PKG_LIST),$(PKG_ARG)) )
|
2007-10-09 12:30:28 -07:00
|
|
|
ifdef MOZ_OPTIONAL_PKG_LIST
|
2007-03-22 10:30:00 -07:00
|
|
|
$(call PACKAGER_COPY, "$(DIST)",\
|
|
|
|
"$(DEPTH)/installer-stage/optional", \
|
|
|
|
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
|
|
|
|
$(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
|
2007-10-09 12:30:28 -07:00
|
|
|
endif
|
2008-07-06 13:30:32 -07:00
|
|
|
$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DEPTH)/installer-stage/nonlocalized/components -v -x "$(XPIDL_LINK)"
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
|
2008-12-05 09:00:33 -08:00
|
|
|
@rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
|
2007-03-22 10:30:00 -07:00
|
|
|
# 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..."
|
2008-12-05 09:00:33 -08:00
|
|
|
@mkdir $(DIST)/$(MOZ_PKG_DIR)
|
2007-03-22 10:30:00 -07:00
|
|
|
ifdef MOZ_PKG_MANIFEST
|
|
|
|
$(RM) -rf $(DIST)/xpt
|
2009-08-21 10:05:28 -07:00
|
|
|
$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
|
|
|
|
"$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
|
2007-03-22 10:30:00 -07:00
|
|
|
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
|
2009-08-26 21:03:15 -07:00
|
|
|
$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
|
2007-03-22 10:30:00 -07:00
|
|
|
else # !MOZ_PKG_MANIFEST
|
|
|
|
ifeq ($(MOZ_PKG_FORMAT),DMG)
|
|
|
|
# If UNIVERSAL_BINARY, the package will be made from an already-prepared
|
|
|
|
# STAGEPATH
|
|
|
|
ifndef UNIVERSAL_BINARY
|
2008-03-05 13:30:28 -08:00
|
|
|
ifndef STAGE_SDK
|
2008-12-05 09:00:33 -08:00
|
|
|
@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
|
2009-08-20 09:48:25 -07:00
|
|
|
@echo "Linking XPT files..."
|
|
|
|
@rm -rf $(DIST)/xpt
|
|
|
|
@$(NSINSTALL) -D $(DIST)/xpt
|
|
|
|
@($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
|
2008-03-05 13:30:28 -08:00
|
|
|
else
|
2008-12-05 09:00:33 -08:00
|
|
|
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
|
2008-03-05 13:30:28 -08:00
|
|
|
endif
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
else
|
2008-12-05 09:00:33 -08:00
|
|
|
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
|
2009-04-08 07:40:12 -07:00
|
|
|
@echo "Linking XPT files..."
|
|
|
|
@rm -rf $(DIST)/xpt
|
|
|
|
@$(NSINSTALL) -D $(DIST)/xpt
|
2009-04-23 11:23:02 -07:00
|
|
|
@($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/. Continuing...
|
2009-06-13 11:53:38 -07:00
|
|
|
endif # DMG
|
2007-03-22 10:30:00 -07:00
|
|
|
endif # MOZ_PKG_MANIFEST
|
|
|
|
ifndef PKG_SKIP_STRIP
|
|
|
|
@echo "Stripping package directory..."
|
2008-12-05 09:00:33 -08:00
|
|
|
@cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR); find . ! -type d \
|
2007-03-22 10:30:00 -07:00
|
|
|
! -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)
|
|
|
|
endif
|
|
|
|
@echo "Removing unpackaged files..."
|
|
|
|
ifdef NO_PKG_FILES
|
2008-12-05 09:00:33 -08:00
|
|
|
cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif
|
|
|
|
ifdef MOZ_PKG_REMOVALS
|
2008-12-06 20:25:08 -08:00
|
|
|
$(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
|
2007-03-22 10:30:00 -07:00
|
|
|
endif # MOZ_PKG_REMOVALS
|
|
|
|
|
2009-04-08 07:40:12 -07:00
|
|
|
make-package: stage-package $(PACKAGE_XULRUNNER)
|
2007-03-22 10:30:00 -07:00
|
|
|
@echo "Compressing..."
|
2008-09-17 13:53:09 -07:00
|
|
|
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
|
2007-08-03 07:46:17 -07:00
|
|
|
cd $(DIST) && $(MAKE_PACKAGE)
|
|
|
|
|
|
|
|
# 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,
|
|
|
|
# libraries, and IDL files as follows:
|
2009-05-18 11:15:05 -07:00
|
|
|
# dist/include -> prefix/include/appname-version
|
|
|
|
# dist/idl -> prefix/share/idl/appname-version
|
2007-08-03 07:46:17 -07:00
|
|
|
# dist/sdk/lib -> prefix/lib/appname-devel-version/lib
|
|
|
|
# prefix/lib/appname-devel-version/* symlinks to the above directories
|
|
|
|
install:: stage-package
|
2009-08-10 20:50:32 -07:00
|
|
|
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
2009-04-25 01:53:02 -07:00
|
|
|
$(error "make install" is not supported on this platform. Use "make package" instead.)
|
|
|
|
endif
|
|
|
|
ifeq (bundle,$(MOZ_FS_LAYOUT))
|
2008-04-08 22:26:00 -07:00
|
|
|
$(error "make install" is not supported on this platform. Use "make package" instead.)
|
2007-08-03 07:46:17 -07:00
|
|
|
endif
|
|
|
|
$(NSINSTALL) -D $(DESTDIR)$(installdir)
|
2008-12-05 09:00:33 -08:00
|
|
|
(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
|
2007-08-03 07:46:17 -07:00
|
|
|
(cd $(DESTDIR)$(installdir) && tar -xf -)
|
|
|
|
$(NSINSTALL) -D $(DESTDIR)$(bindir)
|
|
|
|
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
|
|
|
|
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
|
|
|
|
ifdef INSTALL_SDK # Here comes the hard part
|
2009-05-18 11:15:05 -07:00
|
|
|
$(NSINSTALL) -D $(DESTDIR)$(includedir)
|
|
|
|
(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
|
|
|
|
(cd $(DESTDIR)$(includedir) && tar -xf -)
|
|
|
|
$(NSINSTALL) -D $(DESTDIR)$(idldir)
|
2007-08-03 07:46:17 -07:00
|
|
|
(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
|
2009-05-18 11:15:05 -07:00
|
|
|
(cd $(DESTDIR)$(idldir) && tar -xf -)
|
2007-08-03 07:46:17 -07:00
|
|
|
# SDK directory is the libs + a bunch of symlinks
|
|
|
|
$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
|
2009-05-18 11:15:05 -07:00
|
|
|
if test -f $(DIST)/include/xpcom-config.h; then \
|
|
|
|
$(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
|
2007-08-03 07:46:17 -07:00
|
|
|
fi
|
|
|
|
(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
|
2009-05-18 11:15:05 -07:00
|
|
|
$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
|
2007-08-03 07:46:17 -07:00
|
|
|
ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
|
|
|
|
ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
|
2009-05-18 11:15:05 -07:00
|
|
|
ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
|
|
|
|
ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
|
2007-08-03 07:46:17 -07:00
|
|
|
endif # INSTALL_SDK
|
2007-08-09 12:53:08 -07:00
|
|
|
|
2008-03-05 13:30:28 -08:00
|
|
|
make-sdk:
|
2008-12-05 09:00:33 -08:00
|
|
|
$(MAKE) stage-package UNIVERSAL_BINARY= STAGE_SDK=1 MOZ_PKG_DIR=sdk-stage
|
2007-08-09 12:53:08 -07:00
|
|
|
@echo "Packaging SDK..."
|
|
|
|
$(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk
|
|
|
|
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin
|
2008-03-05 13:30:28 -08:00
|
|
|
(cd $(DIST)/sdk-stage && tar $(TAR_CREATE_FLAGS) - .) | \
|
2007-08-09 12:53:08 -07:00
|
|
|
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -)
|
2008-04-10 07:50:48 -07:00
|
|
|
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin
|
|
|
|
(cd $(DIST)/host/bin && tar $(TAR_CREATE_FLAGS) - .) | \
|
|
|
|
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin && tar -xf -)
|
2007-08-09 12:53:08 -07:00
|
|
|
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk
|
|
|
|
(cd $(DIST)/sdk && tar $(TAR_CREATE_FLAGS) - .) | \
|
|
|
|
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -)
|
|
|
|
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/include
|
|
|
|
(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
|
|
|
|
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/include && tar -xf -)
|
|
|
|
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/idl
|
|
|
|
(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
|
|
|
|
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/idl && tar -xf -)
|
|
|
|
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/lib
|
|
|
|
# sdk/lib is the same as sdk/sdk/lib
|
|
|
|
(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | \
|
|
|
|
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/lib && tar -xf -)
|
|
|
|
cd $(DIST) && $(MAKE_SDK)
|
2008-11-12 04:45:23 -08:00
|
|
|
|
2008-11-13 07:37:04 -08:00
|
|
|
ifeq ($(OS_TARGET), WINNT)
|
|
|
|
INSTALLER_PACKAGE = $(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
|
|
|
|
endif
|
2009-09-15 15:11:42 -07:00
|
|
|
ifeq ($(OS_TARGET), WINCE)
|
|
|
|
INSTALLER_PACKAGE = $(DIST)/$(PKG_PATH)$(PKG_BASENAME).cab
|
|
|
|
endif
|
2008-11-13 07:37:04 -08:00
|
|
|
|
2008-12-29 08:11:27 -08:00
|
|
|
# These are necessary because some of our packages/installers contain spaces
|
|
|
|
# in their filenames and GNU Make's $(wildcard) function doesn't properly
|
|
|
|
# deal with them.
|
|
|
|
empty :=
|
|
|
|
space = $(empty) $(empty)
|
|
|
|
QUOTED_WILDCARD = $(if $(wildcard $(subst $(space),?,$(1))),"$(1)")
|
|
|
|
|
2008-11-13 07:37:04 -08:00
|
|
|
upload:
|
2009-05-11 08:11:50 -07:00
|
|
|
$(PYTHON) $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
|
2009-02-02 05:53:24 -08:00
|
|
|
$(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE)) \
|
2008-12-29 08:11:27 -08:00
|
|
|
$(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE)) \
|
|
|
|
$(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \
|
2009-02-02 05:53:24 -08:00
|
|
|
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \
|
2009-02-17 06:18:50 -08:00
|
|
|
$(call QUOTED_WILDCARD,$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip) \
|
2009-03-31 06:43:31 -07:00
|
|
|
$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
|
2008-12-29 08:11:27 -08:00
|
|
|
$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
|
2008-11-13 07:37:04 -08:00
|
|
|
|
2008-11-12 04:45:23 -08:00
|
|
|
ifndef MOZ_PKG_SRCDIR
|
|
|
|
MOZ_PKG_SRCDIR = $(topsrcdir)
|
|
|
|
endif
|
|
|
|
|
|
|
|
CREATE_SOURCE_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \
|
|
|
|
--mode="go-w" --exclude=".hg*" --exclude="CVS" --exclude=".cvs*" -f
|
|
|
|
|
|
|
|
# source-package creates a source tarball from the files in MOZ_PKG_SRCDIR,
|
|
|
|
# which is either set to a clean checkout or defaults to $topsrcdir
|
|
|
|
source-package:
|
|
|
|
@echo "Packaging source tarball..."
|
|
|
|
(cd $(MOZ_PKG_SRCDIR) && $(CREATE_SOURCE_TAR) - .) | bzip2 -vf > $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_SRCPACK_BASENAME).tar.bz2
|