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 765294 - Fix packaging of services components; r=ted

Browse Source
This commit is contained in:
Gregory Szorc 2012-06-22 09:27:01 -07:00
parent 0190f2644c
commit 994a211bd6
7 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/build.mk
View File

@ -14,9 +14,7 @@ endif
tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
ifdef MOZ_SERVICES_SYNC
tier_app_dirs += services
endif
ifdef MOZ_WEBAPP_RUNTIME
tier_app_dirs += webapprt

2
browser/confvars.sh
View File

@ -17,6 +17,8 @@ fi
MOZ_CHROME_FILE_FORMAT=omni
MOZ_SAFE_BROWSING=1
MOZ_SERVICES_AITC=1
MOZ_SERVICES_NOTIFICATIONS=1
MOZ_SERVICES_SYNC=1
MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_EXTENSIONS_DEFAULT=" gnomevfs"

15
browser/installer/package-manifest.in
View File

@ -447,15 +447,17 @@
@BINPATH@/components/nsINIProcessor.js
@BINPATH@/components/nsPrompter.manifest
@BINPATH@/components/nsPrompter.js
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/components/SyncComponents.manifest
#ifdef MOZ_SERVICES_AITC
@BINPATH@/components/AitcComponents.manifest
@BINPATH@/components/Weave.js
@BINPATH@/components/Aitc.js
#endif
#ifdef MOZ_SERVICES_NOTIFICATIONS
@BINPATH@/components/NotificationsComponents.manifest
#endif
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/components/SyncComponents.manifest
@BINPATH@/components/Weave.js
#endif
@BINPATH@/components/TelemetryPing.js
@BINPATH@/components/TelemetryPing.manifest
@BINPATH@/components/messageWakeupService.js
@ -535,9 +537,14 @@
; All the pref files must be part of base to prevent migration bugs
@BINPATH@/@PREF_DIR@/firefox.js
@BINPATH@/@PREF_DIR@/firefox-branding.js
#ifdef MOZ_SERVICES_AITC
@BINPATH@/@PREF_DIR@/services-aitc.js
#endif
#ifdef MOZ_SERVICES_NOTIFICATIONS
@BINPATH@/@PREF_DIR@/services-notifications.js
#endif
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/@PREF_DIR@/services-sync.js
@BINPATH@/@PREF_DIR@/services-aitc.js
#endif
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js

2
config/autoconf.mk.in
View File

@ -627,6 +627,8 @@ HAVE_COMPILER_FLAG_MSSSE3 = @HAVE_COMPILER_FLAG_MSSSE3@
MOZ_THEME_FASTSTRIPE = @MOZ_THEME_FASTSTRIPE@
MOZ_SERVICES_AITC = @MOZ_SERVICES_AITC@
MOZ_SERVICES_NOTIFICATIONS = @MOZ_SERVICES_NOTIFICATIONS@
MOZ_SERVICES_SYNC = @MOZ_SERVICES_SYNC@
MOZ_WEBAPP_RUNTIME = @MOZ_WEBAPP_RUNTIME@

12
configure.in
View File

@ -8214,6 +8214,18 @@ if test "$MOZ_PLACES"; then
AC_DEFINE(MOZ_PLACES)
fi
dnl Build Apps in the Cloud (AITC) if required
AC_SUBST(MOZ_SERVICES_AITC)
if test -n "$MOZ_SERVICES_AITC"; then
AC_DEFINE(MOZ_SERVICES_AITC)
fi
dnl Build Notifications if required
AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then
AC_DEFINE(MOZ_SERVICES_NOTIFICATIONS)
fi
dnl Build Sync Services if required
AC_SUBST(MOZ_SERVICES_SYNC)
if test -n "$MOZ_SERVICES_SYNC"; then

12
services/Makefile.in
View File

@ -10,8 +10,18 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PARALLEL_DIRS += common crypto
ifdef MOZ_SERVICES_AITC
PARALLEL_DIRS += aitc
endif
ifdef MOZ_SERVICES_NOTIFICATIONS
PARALLEL_DIRS += notifications
endif
ifdef MOZ_SERVICES_SYNC
PARALLEL_DIRS += aitc common crypto notifications sync
PARALLEL_DIRS += sync
endif
include $(topsrcdir)/config/rules.mk

2
services/makefiles.sh
View File

@ -5,6 +5,7 @@
add_makefiles "
services/Makefile
services/aitc/Makefile
services/common/Makefile
services/crypto/Makefile
services/crypto/component/Makefile
@ -15,6 +16,7 @@ add_makefiles "
if [ "$ENABLE_TESTS" ]; then
add_makefiles "
services/aitc/tests/Makefile
services/common/tests/Makefile
services/crypto/tests/Makefile
services/notifications/tests/Makefile