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 779984 - replace --enable-marionette with ENABLE_MARIONETTE and make it consistent, r=ted

Browse Source
This commit is contained in:
Jonathan Griffin 2012-08-22 11:17:22 -07:00
parent c5f9c8f75f
commit 74cd5acc2e
15 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/app/Makefile.in
View File

@ -11,6 +11,10 @@ include $(DEPTH)/config/autoconf.mk
PREF_JS_EXPORTS = $(srcdir)/b2g.js
ifdef ENABLE_MARIONETTE
DEFINES += -DENABLE_MARIONETTE=1
endif
ifndef LIBXUL_SDK
PROGRAM=$(MOZ_APP_NAME)$(BIN_SUFFIX)

2
b2g/app/b2g.js
View File

@ -432,9 +432,11 @@ pref("full-screen-api.ignore-widgets", true);
pref("media.volume.steps", 10);
#ifdef ENABLE_MARIONETTE
//Enable/disable marionette server, set listening port
pref("marionette.defaultPrefs.enabled", true);
pref("marionette.defaultPrefs.port", 2828);
#endif
#ifdef MOZ_UPDATER
pref("app.update.enabled", true);

2
b2g/config/mozconfigs/gb_armv7a_gecko/debug
View File

@ -11,7 +11,7 @@ ac_add_options --disable-elf-hack
ac_add_options --enable-debug-symbols
ac_add_options --enable-debug
ac_add_options --with-ccache
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
# Enable dump() from JS.
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

2
b2g/config/mozconfigs/gb_armv7a_gecko/nightly
View File

@ -11,7 +11,7 @@ ac_add_options --disable-elf-hack
ac_add_options --enable-debug-symbols
ac_add_options --enable-profiling
ac_add_options --with-ccache
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
# Enable dump() from JS.
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

2
b2g/config/mozconfigs/ics_armv7a_gecko/debug
View File

@ -14,7 +14,7 @@ ac_add_options --disable-elf-hack
ac_add_options --enable-debug-symbols
ac_add_options --enable-debug
#ac_add_options --with-ccache
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
# Enable dump() from JS.
export CXXFLAGS="-DMOZ_ENABLE_JS_DUMP -include $topsrcdir/gonk-toolchain/gonk-misc/Unicode.h -include $topsrcdir/gonk-toolchain/system/vold/ResponseCode.h"

2
b2g/config/mozconfigs/ics_armv7a_gecko/nightly
View File

@ -14,7 +14,7 @@ ac_add_options --disable-elf-hack
ac_add_options --enable-debug-symbols
ac_add_options --enable-profiling
#ac_add_options --with-ccache
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
# Enable dump() from JS.
export CXXFLAGS="-DMOZ_ENABLE_JS_DUMP -include $topsrcdir/gonk-toolchain/gonk-misc/Unicode.h -include $topsrcdir/gonk-toolchain/system/vold/ResponseCode.h"

2
b2g/config/mozconfigs/linux32_gecko/nightly
View File

@ -33,6 +33,6 @@ ac_add_options --with-ccache=/usr/bin/ccache
#B2G options
ac_add_options --enable-application=b2g
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
ac_add_options --disable-elf-hack
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

2
b2g/config/mozconfigs/linux64_gecko/nightly
View File

@ -35,6 +35,6 @@ ac_add_options --with-ccache=/usr/bin/ccache
#B2G options
ac_add_options --enable-application=b2g
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
ac_add_options --disable-elf-hack
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

2
b2g/config/mozconfigs/macosx64_gecko/nightly
View File

@ -23,6 +23,6 @@ ac_add_options --enable-warnings-as-errors
ac_add_options --enable-application=b2g
ac_add_options --enable-debug-symbols
ac_add_options --with-ccache
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

2
b2g/config/mozconfigs/win32_gecko/nightly
View File

@ -24,6 +24,6 @@ fi
# B2G Options
ac_add_options --enable-application=b2g
ac_add_options --enable-marionette
ENABLE_MARIONETTE=1
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

1
b2g/confvars.sh
View File

@ -38,6 +38,5 @@ fi
MOZ_APP_ID={3c2e2abc-06d4-11e1-ac3b-374f68613e61}
MOZ_EXTENSION_MANAGER=1
ENABLE_MARIONETTE=1
MOZ_SYS_MSG=1

4
b2g/installer/Makefile.in
View File

@ -38,6 +38,10 @@ DEFINES += -DJAREXT=$(JAREXT)
include $(topsrcdir)/ipc/app/defs.mk
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
ifdef ENABLE_MARIONETTE
DEFINES += -DENABLE_MARIONETTE=1
endif
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest
endif

2
b2g/installer/package-manifest.in
View File

@ -675,10 +675,12 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
@BINPATH@/components/B2GComponents.xpt
@BINPATH@/components/CameraContent.js
@BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
#ifdef ENABLE_MARIONETTE
@BINPATH@/chrome/marionette@JAREXT@
@BINPATH@/chrome/marionette.manifest
@BINPATH@/components/MarionetteComponents.manifest
@BINPATH@/components/marionettecomponent.js
#endif
@BINPATH@/components/AlertsService.js
@BINPATH@/components/ContentPermissionPrompt.js
#ifdef MOZ_UPDATER

4
browser/app/Makefile.in
View File

@ -12,6 +12,10 @@ include $(DEPTH)/config/autoconf.mk
DIRS = profile/extensions
dist_dest = $(DIST)/$(MOZ_MACBUNDLE_NAME)
ifdef ENABLE_MARIONETTE
DEFINES += -DENABLE_MARIONETTE=1
endif
PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
$(NULL)

6
browser/app/profile/firefox.js
View File

@ -1164,6 +1164,12 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
//Enable/disable marionette server, set listening port
#ifdef ENABLE_MARIONETTE
pref("marionette.defaultPrefs.enabled", true);
pref("marionette.defaultPrefs.port", 2828);
#endif
// Example social provider
pref("social.manifest.motown", "{\"origin\":\"https://motown-dev.mozillalabs.com\",\"name\":\"MoTown\",\"workerURL\":\"https://motown-dev.mozillalabs.com/social/worker.js\",\"iconURL\":\"https://motown-dev.mozillalabs.com/images/motown-icon.png\",\"sidebarURL\":\"https://motown-dev.mozillalabs.com/social/sidebar\"}");
// Comma-separated list of nsIURI::prePaths that are allowed to activate