author | Serge Gautherie <sgautherie.bz@free.fr> |
Sat, 24 Mar 2012 01:27:35 +0100 | |
changeset 93445 | df1f94b2bdee149285c9f30ec7e62ff27110fe97 |
parent 93444 | 1699897f0c0527f9052280e4ebb133a31b2e2432 |
child 93446 | f1c738169b20a03dbd49263043f574f2634df2b9 |
push id | 886 |
push user | lsblakk@mozilla.com |
push date | Mon, 04 Jun 2012 19:57:52 +0000 |
treeherder | mozilla-beta@bbd8d5efd6d1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted.mielczarek |
bugs | 604266 |
milestone | 14.0a1 |
first release with | nightly linux32
df1f94b2bdee
/
14.0a1
/
20120324031100
/
files
nightly linux64
df1f94b2bdee
/
14.0a1
/
20120324031100
/
files
nightly mac
df1f94b2bdee
/
14.0a1
/
20120324031100
/
files
nightly win32
df1f94b2bdee
/
14.0a1
/
20120324031100
/
files
nightly win64
df1f94b2bdee
/
14.0a1
/
20120324031100
/
files
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
14.0a1
/
20120324031100
/
pushlog to previous
nightly linux64
14.0a1
/
20120324031100
/
pushlog to previous
nightly mac
14.0a1
/
20120324031100
/
pushlog to previous
nightly win32
14.0a1
/
20120324031100
/
pushlog to previous
nightly win64
14.0a1
/
20120324031100
/
pushlog to previous
|
browser/Makefile.in | file | annotate | diff | comparison | revisions | |
browser/makefiles.sh | file | annotate | diff | comparison | revisions | |
config/autoconf.mk.in | file | annotate | diff | comparison | revisions | |
configure.in | file | annotate | diff | comparison | revisions | |
xulrunner/Makefile.in | file | annotate | diff | comparison | revisions | |
xulrunner/makefiles.sh | file | annotate | diff | comparison | revisions |
--- a/browser/Makefile.in +++ b/browser/Makefile.in @@ -52,27 +52,22 @@ PARALLEL_DIRS = \ $(NULL) DIRS = \ devtools \ app \ $(NULL) ifeq ($(OS_ARCH),WINNT) -ifdef MOZ_INSTALLER DIRS += installer/windows endif -endif include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) -ifdef MOZ_INSTALLER - # For Windows build the uninstaller during the application build since the # uninstaller is included with the application for mar file generation. libs:: $(MAKE) -C installer/windows uninstaller ifdef MOZ_MAINTENANCE_SERVICE $(MAKE) -C installer/windows maintenanceservice_installer endif endif -endif
--- a/browser/makefiles.sh +++ b/browser/makefiles.sh @@ -98,21 +98,19 @@ security/manager/locales/Makefile if [ "$MOZ_SAFE_BROWSING" ]; then add_makefiles " browser/components/safebrowsing/Makefile " fi if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then - if [ "$MOZ_INSTALLER" ]; then - add_makefiles " - browser/installer/windows/Makefile - " - fi + add_makefiles " + browser/installer/windows/Makefile + " fi if [ "$MOZ_WIDGET_TOOLKIT" = "gtk2" -o "$MOZ_WIDGET_TOOLKIT" = "qt" ]; then add_makefiles " browser/themes/gnomestripe/Makefile browser/themes/gnomestripe/communicator/Makefile " elif [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
--- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -136,17 +136,16 @@ INCREMENTAL_LINKER = @INCREMENTAL_LINKER MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@ ENABLE_TESTS = @ENABLE_TESTS@ ENABLE_MARIONETTE = @ENABLE_MARIONETTE@ IBMBIDI = @IBMBIDI@ MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@ ACCESSIBILITY = @ACCESSIBILITY@ MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@ XPCOM_USE_LEA = @XPCOM_USE_LEA@ -MOZ_INSTALLER = @MOZ_INSTALLER@ MOZ_MAINTENANCE_SERVICE = @MOZ_MAINTENANCE_SERVICE@ MOZ_VERIFY_MAR_SIGNATURE = @MOZ_VERIFY_MAR_SIGNATURE@ MOZ_ENABLE_SIGNMAR = @MOZ_ENABLE_SIGNMAR@ MOZ_UPDATER = @MOZ_UPDATER@ MOZ_UPDATE_CHANNEL = @MOZ_UPDATE_CHANNEL@ MOZ_UPDATE_PACKAGING = @MOZ_UPDATE_PACKAGING@ MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@ NS_ENABLE_TSF = @NS_ENABLE_TSF@
--- a/configure.in +++ b/configure.in @@ -4522,17 +4522,16 @@ dnl ==================================== MOZ_ARG_HEADER(Application) ENABLE_TESTS=1 ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= MOZ_FEEDS=1 MOZ_FLEXBOX= -MOZ_INSTALLER=1 MOZ_JSDEBUGGER=1 MOZ_AUTH_EXTENSION=1 MOZ_OGG=1 MOZ_RAW= MOZ_SYDNEYAUDIO= MOZ_CUBEB= MOZ_VORBIS= MOZ_TREMOR= @@ -4605,17 +4604,16 @@ esac case "${target}" in *-android*|*-linuxandroid*) if test "$CPU_ARCH" = "arm" ; then USE_ARM_KUSER=1 fi NSS_DISABLE_DBM=1 - MOZ_INSTALLER= NECKO_WIFI= MOZ_THEME_FASTSTRIPE=1 MOZ_TREE_FREETYPE=1 MOZ_MEMORY=1 MOZ_RAW=1 ;; esac @@ -6286,17 +6284,17 @@ if test -n "$MOZ_TREE_FREETYPE"; then AC_SUBST(CAIRO_FT_CFLAGS) fi dnl ======================================================== dnl Installer dnl ======================================================== dnl Abort Windows build if the required major version and dnl minimum minor version of Unicode NSIS isn't in the path. -if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then +if test "$OS_ARCH" = "WINNT"; then REQ_NSIS_MAJOR_VER=2 MIN_NSIS_MINOR_VER=33 MOZ_PATH_PROGS(MAKENSISU, $MAKENSISU makensisu-2.46 makensisu makensis) if test -z "$MAKENSISU" -o "$MAKENSISU" = ":"; then AC_MSG_ERROR([To build the installer you must have the latest MozillaBuild or Unicode NSIS with a major version of $REQ_NSIS_MAJOR_VER and a minimum minor version of $MIN_NSIS_MINOR_VER in your path.]) fi changequote(,) MAKENSISU_VER=`"$MAKENSISU" -version 2>/dev/null | sed -e '/-Unicode/!s/.*//g' -e 's/^v\([0-9]\+\.[0-9]\+\)\-Unicode$/\1/g'` @@ -8350,17 +8348,16 @@ AC_SUBST(MOZ_PSM) AC_SUBST(MOZ_DEBUG) AC_SUBST(MOZ_DEBUG_SYMBOLS) AC_SUBST(MOZ_DEBUG_ENABLE_DEFS) AC_SUBST(MOZ_DEBUG_DISABLE_DEFS) AC_SUBST(MOZ_DEBUG_FLAGS) AC_SUBST(MOZ_DEBUG_LDFLAGS) AC_SUBST(WARNINGS_AS_ERRORS) AC_SUBST(MOZ_EXTENSIONS) -AC_SUBST(MOZ_INSTALLER) AC_SUBST(MOZ_JSDEBUGGER) AC_SUBST(MOZ_LOG_REFCNT) AC_SUBST(MOZ_LEAKY) AC_SUBST(MOZ_ENABLE_PROFILER_SPS) AC_SUBST(MOZ_JPROF) AC_SUBST(MOZ_SHARK) AC_SUBST(MOZ_CALLGRIND) AC_SUBST(MOZ_VTUNE)
--- a/xulrunner/Makefile.in +++ b/xulrunner/Makefile.in @@ -46,18 +46,16 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = \ app \ setup \ stub \ examples \ $(NULL) ifeq ($(OS_ARCH),WINNT) -ifdef MOZ_INSTALLER DIRS += installer/windows endif -endif ifeq ($(OS_ARCH),WINNT) PARALLEL_DIRS += tools/redit endif include $(topsrcdir)/config/rules.mk
--- a/xulrunner/makefiles.sh +++ b/xulrunner/makefiles.sh @@ -47,17 +47,17 @@ xulrunner/examples/simple/Makefile xulrunner/examples/simple/components/Makefile xulrunner/examples/simple/components/public/Makefile xulrunner/examples/simple/components/src/Makefile xulrunner/setup/Makefile xulrunner/stub/Makefile xulrunner/installer/Makefile " -if [ "$OS_ARCH" = "WINNT" -a "$MOZ_INSTALLER" ]; then +if [ "$OS_ARCH" = "WINNT" ]; then add_makefiles " xulrunner/installer/windows/Makefile " fi if [ "$OS_ARCH" = "Darwin" ]; then add_makefiles " xulrunner/installer/mac/Makefile