Reviewers: codefu,

Description:
In the chrome.manifest, list binary components in ascending version
order so that the right choice wins. Unbreaks <=FF4 from my previous
change.

Don't conflate debug with debuglevel (really, loglevel). Default to
build binaries without debugging information for the space savings but
keep the INFO logging.


Please review this at http://gwt-code-reviews.appspot.com/1465806/

Affected files:
  M plugins/config.mk
  M plugins/xpcom/prebuilt/extension/chrome.manifest


Index: plugins/config.mk
===================================================================
--- plugins/config.mk   (revision 10389)
+++ plugins/config.mk   (working copy)
@@ -71,10 +71,12 @@
 MARCH=i386
 endif

+# Default to Debug off
+DEBUG ?=
 ifeq ($(DEBUG),TRUE)
 DEBUGCFLAGS= -g
 else
-DEBUGCFLAGS= -DGWT_DEBUGDISABLE
+DEBUGCFLAGS=
 endif

 # Set OS as well as CFLAGS, CXX, and other common make variables
Index: plugins/xpcom/prebuilt/extension/chrome.manifest
===================================================================
--- plugins/xpcom/prebuilt/extension/chrome.manifest    (revision 10389)
+++ plugins/xpcom/prebuilt/extension/chrome.manifest    (working copy)
@@ -1,14 +1,18 @@
 content gwt-dev-plugin content/
 skin gwt-dev-plugin classic/1.0 skin/

-binary-component lib/Linux_x86_64-gcc3/ff50/libgwt_dev_ff50.so ABI=Linux_x86_64-gcc3 appversion<=5.0.* -binary-component lib/Linux_x86-gcc3/ff50/libgwt_dev_ff50.so ABI=Linux_x86-gcc3 appversion<=5.0.*
+# This file is parsed top to bottom. List the lowest versions first

+# Firefox 4
binary-component lib/Linux_x86_64-gcc3/ff40/libgwt_dev_ff40.so ABI=Linux_x86_64-gcc3 appversion<=4.0.* binary-component lib/Linux_x86-gcc3/ff40/libgwt_dev_ff40.so ABI=Linux_x86-gcc3 appversion<=4.0.* binary-component lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib ABI=Darwin_x86_64-gcc3 appversion<=4.0.* binary-component lib/Darwin-gcc3/ff40/libgwt_dev_ff40.dylib ABI=Darwin_x86-gcc3 appversion<=4.0.* binary-component lib/WINNT_x86-msvc/ff40/xpGwtDevPlugin.dll ABI=WINNT_x86-msvc appversion<=4.0.*

+# Firefox 5
+binary-component lib/Linux_x86_64-gcc3/ff50/libgwt_dev_ff50.so ABI=Linux_x86_64-gcc3 appversion<=5.0.* +binary-component lib/Linux_x86-gcc3/ff50/libgwt_dev_ff50.so ABI=Linux_x86-gcc3 appversion<=5.0.*
+
 interfaces components/IOOPHM.xpt
contract @gwt.google.com/ExternalWrapper;1 {028DD88B-6D65-401D-AAFD-17E497D15D09}


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to