wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 604266. (Cv1) Remove MOZ_INSTALLER support. r=ted.mielczarek.

Browse Source
This commit is contained in:
Serge Gautherie 2012-03-24 01:27:35 +01:00
parent 946e2bcc4e
commit 3967275108
6 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/Makefile.in
View File

@ -57,16 +57,12 @@ DIRS = \
$(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::
@ -75,4 +71,3 @@ ifdef MOZ_MAINTENANCE_SERVICE
$(MAKE) -C installer/windows maintenanceservice_installer
endif
endif
endif

2
browser/makefiles.sh
View File

@ -103,12 +103,10 @@ if [ "$MOZ_SAFE_BROWSING" ]; then
fi
if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
if [ "$MOZ_INSTALLER" ]; then
add_makefiles "
browser/installer/windows/Makefile
"
fi
fi
if [ "$MOZ_WIDGET_TOOLKIT" = "gtk2" -o "$MOZ_WIDGET_TOOLKIT" = "qt" ]; then
add_makefiles "

1
config/autoconf.mk.in
View File

@ -141,7 +141,6 @@ 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@

5
configure.in
View File

@ -4527,7 +4527,6 @@ MOZ_BRANDING_DIRECTORY=
MOZ_OFFICIAL_BRANDING=
MOZ_FEEDS=1
MOZ_FLEXBOX=
MOZ_INSTALLER=1
MOZ_JSDEBUGGER=1
MOZ_AUTH_EXTENSION=1
MOZ_OGG=1
@ -4610,7 +4609,6 @@ case "${target}" in
fi
NSS_DISABLE_DBM=1
MOZ_INSTALLER=
NECKO_WIFI=
MOZ_THEME_FASTSTRIPE=1
MOZ_TREE_FREETYPE=1
@ -6291,7 +6289,7 @@ 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)
@ -8355,7 +8353,6 @@ 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)

2
xulrunner/Makefile.in
View File

@ -51,10 +51,8 @@ PARALLEL_DIRS = \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
ifdef MOZ_INSTALLER
DIRS += installer/windows
endif
endif
ifeq ($(OS_ARCH),WINNT)
PARALLEL_DIRS += tools/redit

2
xulrunner/makefiles.sh
View File

@ -52,7 +52,7 @@ 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
"