зеркало из https://github.com/mozilla/gecko-dev.git
Bug 329686: tools/update-packaging needs its own build target. r=darin
This commit is contained in:
Родитель
4f1506ea51
Коммит
405b2fe9b0
26
Makefile.in
26
Makefile.in
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/build/unix/modules.mk
|
||||
|
||||
ifeq (,$(filter-out all,$(BUILD_MODULES))$(MOZ_XSLT_STANDALONE))
|
||||
ifneq ($(MOZ_STANDALONE_BUILD),1) # {
|
||||
#
|
||||
# And now for something completely different...
|
||||
# Divide the default build into tiers.
|
||||
|
@ -453,11 +453,11 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
else # BUILD_MODULES
|
||||
else # } { MOZ_STANDALONE_BUILD
|
||||
|
||||
# Standalone build
|
||||
|
||||
ifdef MOZ_XSLT_STANDALONE
|
||||
ifeq ($(MOZ_BUILD_APP),content/xslt) # {
|
||||
DIRS = \
|
||||
xpcom/typelib \
|
||||
xpcom \
|
||||
|
@ -466,7 +466,21 @@ DIRS = \
|
|||
$(NULL)
|
||||
|
||||
SUBMAKEFILES = xpcom/typelib/Makefile
|
||||
else
|
||||
|
||||
endif # } MOZ_BUILD_APP == content/xslt
|
||||
|
||||
ifeq ($(MOZ_BUILD_APP),tools/update-packaging) # {
|
||||
DIRS = \
|
||||
config \
|
||||
build \
|
||||
modules/libbz2 \
|
||||
modules/libmar \
|
||||
other-licenses/bsdiff \
|
||||
$(NULL)
|
||||
|
||||
endif # } MOZ_BUILD_APP == tools/update-packaging
|
||||
|
||||
ifeq ($(MOZ_BUILD_APP),standalone) # {
|
||||
DIRS = $(BUILD_MODULE_DIRS)
|
||||
|
||||
# Hack to generate xpidl Makefile
|
||||
|
@ -476,13 +490,13 @@ DIRS := xpcom/typelib $(DIRS)
|
|||
SUBMAKEFILES := xpcom/typelib/Makefile
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif # } MOZ_BUILD_APP == standalone
|
||||
|
||||
default:: $(SUBMAKEFILES)
|
||||
$(MAKE) export
|
||||
$(MAKE) libs
|
||||
|
||||
endif # BUILD_MODULES == all or MOZ_XSLT_STANDALONE
|
||||
endif # } BUILD_MODULES == all or MOZ_STANDALONE
|
||||
|
||||
STATIC_MAKEFILES := nsprpub directory/c-sdk security/nss
|
||||
|
||||
|
|
|
@ -214,6 +214,7 @@ MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@
|
|||
MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@
|
||||
MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
|
||||
MOZ_XSLT_STANDALONE = @MOZ_XSLT_STANDALONE@
|
||||
MOZ_STANDALONE_BUILD = @MOZ_STANDALONE_BUILD@
|
||||
|
||||
MOZ_PREF_EXTENSIONS = @MOZ_PREF_EXTENSIONS@
|
||||
|
||||
|
|
13
configure.in
13
configure.in
|
@ -4306,6 +4306,7 @@ MOZ_XMLEXTRAS=1
|
|||
MOZ_XPFE_COMPONENTS=1
|
||||
MOZ_XPINSTALL=1
|
||||
MOZ_XSLT_STANDALONE=
|
||||
MOZ_STANDALONE_BUILD=
|
||||
MOZ_XTF=1
|
||||
MOZ_XUL=1
|
||||
NS_PRINTING=1
|
||||
|
@ -4339,6 +4340,7 @@ MOZ_ARG_ENABLE_STRING(application,
|
|||
xulrunner
|
||||
macbrowser (Camino)
|
||||
content/xslt (Standalone Transformiix XSLT)
|
||||
tools/update-packaging (AUS-related packaging tools)
|
||||
standalone (use this for standalone
|
||||
xpcom/xpconnect or to manually drive a build)],
|
||||
[ MOZ_BUILD_APP=$enableval ] )
|
||||
|
@ -4497,6 +4499,7 @@ content/xslt)
|
|||
MOZ_EXTENSIONS_DEFAULT=""
|
||||
AC_DEFINE(TX_EXE)
|
||||
MOZ_XSLT_STANDALONE=1
|
||||
MOZ_STANDALONE_BUILD=1
|
||||
MOZ_APP_VERSION=$MOZILLA_VERSION
|
||||
;;
|
||||
|
||||
|
@ -4506,6 +4509,15 @@ standalone)
|
|||
MOZ_APP_VERSION=$MOZILLA_VERSION
|
||||
;;
|
||||
|
||||
tools/update-packaging)
|
||||
MOZ_APP_NAME=mozilla
|
||||
MOZ_APP_DISPLAYNAME=Mozilla
|
||||
MOZ_APP_VERSION=$MOZILLA_VERSION
|
||||
MOZ_UPDATE_PACKAGING=1
|
||||
MOZ_UPDATER=1
|
||||
MOZ_STANDALONE_BUILD=1
|
||||
;;
|
||||
|
||||
*)
|
||||
if test -z "$MOZ_BUILD_APP"; then
|
||||
AC_MSG_ERROR([--enable-application=APP is required.])
|
||||
|
@ -7186,6 +7198,7 @@ AC_SUBST(MOZ_SVG_RENDERER_GDIPLUS)
|
|||
AC_SUBST(MOZ_SVG_RENDERER_LIBART)
|
||||
AC_SUBST(MOZ_SVG_RENDERER_CAIRO)
|
||||
AC_SUBST(MOZ_XSLT_STANDALONE)
|
||||
AC_SUBST(MOZ_STANDALONE_BUILD)
|
||||
AC_SUBST(MOZ_JS_LIBS)
|
||||
AC_SUBST(MOZ_PSM)
|
||||
AC_SUBST(BUILD_MODULES)
|
||||
|
|
Загрузка…
Ссылка в новой задаче