Tweak compilation config for JS client (gwt)
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/1f7c66a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/1f7c66a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/1f7c66a2 Branch: refs/heads/swellrt Commit: 1f7c66a25876c0abd039a52a18347461338dec16 Parents: b81c31f Author: Pablo Ojanguren <pablo...@gmail.com> Authored: Tue Oct 18 16:52:53 2016 +0200 Committer: Pablo Ojanguren <pablo...@gmail.com> Committed: Tue Oct 18 16:52:53 2016 +0200 ---------------------------------------------------------------------- wave/build.gradle | 15 ++-- .../resources/org/swellrt/api/SwellRT.gwt.xml | 73 ++++++-------------- .../org/swellrt/api/SwellRTDev.gwt.xml | 47 +++++++++++++ .../org/swellrt/api/SwellRTProd.gwt.xml | 33 +++++++++ 4 files changed, 110 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1f7c66a2/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index e86814c..cf8fbe2 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -355,7 +355,7 @@ task compileJsWeb { "-noincremental", "-optimize", "9", "-localWorkers", "4", - "org.swellrt.api.SwellRT" + "org.swellrt.api.SwellRTProd" ] } } @@ -383,18 +383,19 @@ task compileJsWebDev { "-logLevel", "INFO", "-saveSource", "-draftCompile", - "org.swellrt.api.SwellRT" + "org.swellrt.api.SwellRTDev" ] } } } +// compileJsWebDev.mustRunAfter compileJava +// run.dependsOn compileJsWebDev + +compileJsWeb.mustRunAfter compileJava compileJsWebDev.mustRunAfter compileJava run.dependsOn compileJsWebDev -// compileJsWeb.mustRunAfter compileJava -// run.dependsOn compileJsWeb - compileJava.dependsOn = [generateMessages, generateGXP] @@ -705,8 +706,8 @@ task createDistBinTar(type: Tar) { } -createDistBinZip.dependsOn jar, compileJsWebDev, createPropertiesFile -createDistBinTar.dependsOn jar, compileJsWebDev, createPropertiesFile +createDistBinZip.dependsOn jar, compileJsWeb, createPropertiesFile +createDistBinTar.dependsOn jar, compileJsWeb, createPropertiesFile //============================================================================= // Distribution's http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1f7c66a2/wave/src/main/resources/org/swellrt/api/SwellRT.gwt.xml ---------------------------------------------------------------------- diff --git a/wave/src/main/resources/org/swellrt/api/SwellRT.gwt.xml b/wave/src/main/resources/org/swellrt/api/SwellRT.gwt.xml index a7f8900..f9ff31d 100644 --- a/wave/src/main/resources/org/swellrt/api/SwellRT.gwt.xml +++ b/wave/src/main/resources/org/swellrt/api/SwellRT.gwt.xml @@ -2,56 +2,27 @@ <!-- - It provides a collection of JSNI classes wrapping the GWT implementation of the - generic API. - - It basically mimics WebClient basics.. - - --> + SwellRT JavaSctript Client for Web + Common module + +--> <module rename-to="swellrt"> - <inherits name="com.google.gwt.http.HTTP"/> - <inherits name="org.waveprotocol.box.webclient.WebClient" /> - - <!-- Wave Mod --> - <inherits name='org.swellrt.model.SwellRTModel'/> - <inherits name='org.swellrt.client.SwellRTClient'/> - - <!-- Kune.cc Initials avatars --> - <inherits name='cc.kune.initials.InitialsAvatars'/> - - <!-- Specify the app entry point class. --> - <entry-point class='org.swellrt.api.SwellRT'/> - - <!-- Specification of permutation restrictions suitable for production. - In general, this should support as many permutations as possible --> - - <!-- Stack emulation is too slow to use in production. --> - <!-- - <set-property name="compiler.emulatedStack" value="false"/> - --> - - <!-- Only build supported clients. --> - <set-property name="user.agent" value="safari, gecko1_8, ie8"/> - <set-property name="mobile.user.agent" value="android, iphone, not_mobile" /> - - <!-- Turn off logging, because it's really slow. --> - <set-property name="loglevel" value="debug" /> - - - <extend-property name="locale" values="en"/> - <set-property-fallback name="locale" value="en"/> - - <!-- Allow super-dev debug in custom host name --> - <set-configuration-property name="devModeUrlWhitelistRegexp" value="http://(localhost|127\.0\.0\.1|showcase\.net)(:\d+)?/.*" /> - <!-- Work around for source map offset problem https://code.google.com/p/google-web-toolkit/issues/detail?id=7862 --> - <set-property name="compiler.useSymbolMaps" value="true"/> - - <add-linker name="xsiframe"/> - - <source path="" /> - <source path="js" /> - <source path="js/adt" /> - <source path="js/generic" /> - <source path="js/editor" /> - + <inherits name="com.google.gwt.http.HTTP" /> + <inherits name="org.waveprotocol.box.webclient.WebClient" /> + + <!-- Wave Mod --> + <inherits name='org.swellrt.model.SwellRTModel' /> + <inherits name='org.swellrt.client.SwellRTClient' /> + + <!-- Kune.cc Initials avatars --> + <inherits name='cc.kune.initials.InitialsAvatars' /> + + <add-linker name="xsiframe" /> + + <source path="" /> + <source path="js" /> + <source path="js/adt" /> + <source path="js/generic" /> + <source path="js/editor" /> + </module> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1f7c66a2/wave/src/main/resources/org/swellrt/api/SwellRTDev.gwt.xml ---------------------------------------------------------------------- diff --git a/wave/src/main/resources/org/swellrt/api/SwellRTDev.gwt.xml b/wave/src/main/resources/org/swellrt/api/SwellRTDev.gwt.xml new file mode 100644 index 0000000..9f42442 --- /dev/null +++ b/wave/src/main/resources/org/swellrt/api/SwellRTDev.gwt.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + + SwellRT JavaSctript Client for Web + Development version module + +--> +<module rename-to="swellrt"> + + <inherits name='org.swellrt.api.SwellRT' /> + + <!-- Specify the app entry point class. --> + <entry-point class='org.swellrt.api.SwellRT' /> + + <!-- Specification of permutation restrictions suitable for production. + In general, this should support as many permutations as possible --> + + <!-- Stack emulation is too slow to use in production. --> + <set-property name="compiler.emulatedStack" value="true" /> + <set-configuration-property name="compiler.emulatedStack.recordFileNames" + value="true" /> + <set-configuration-property name="compiler.emulatedStack.recordLineNumbers" + value="true" /> + + <set-property name="loglevel" value="debug" /> + + <!-- Only build supported clients. --> + <!-- --> + <set-property name="user.agent" value="safari, gecko1_8, ie8" /> + <set-property name="mobile.user.agent" value="android, iphone, not_mobile" /> + + + <extend-property name="locale" values="en" /> + <set-property-fallback name="locale" value="en" /> + + <!-- Allow super-dev debug in custom host name --> + <set-configuration-property name="devModeUrlWhitelistRegexp" + value="http://(localhost|127\.0\.0\.1|showcase\.net)(:\d+)?/.*" /> + + <!-- Work around for source map offset problem https://code.google.com/p/google-web-toolkit/issues/detail?id=7862 --> + <set-property name="compiler.useSymbolMaps" value="true" /> + + <set-property name="compiler.useSourceMaps" value="true" /> + + +</module> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1f7c66a2/wave/src/main/resources/org/swellrt/api/SwellRTProd.gwt.xml ---------------------------------------------------------------------- diff --git a/wave/src/main/resources/org/swellrt/api/SwellRTProd.gwt.xml b/wave/src/main/resources/org/swellrt/api/SwellRTProd.gwt.xml new file mode 100644 index 0000000..9eb7399 --- /dev/null +++ b/wave/src/main/resources/org/swellrt/api/SwellRTProd.gwt.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + + SwellRT JavaSctript Client for Web + Production version module + +--> +<module rename-to="swellrt"> + + <inherits name='org.swellrt.api.SwellRT' /> + + <!-- Specify the app entry point class. --> + <entry-point class='org.swellrt.api.SwellRT' /> + + + <!-- Stack emulation is too slow to use in production. --> + <set-property name="compiler.emulatedStack" value="false"/> + + <!-- Specification of permutation restrictions suitable for production. + In general, this should support as many permutations as possible --> + + <!-- Only build supported clients. --> + <set-property name="user.agent" value="safari, gecko1_8, ie8" /> + <set-property name="mobile.user.agent" value="android, iphone, not_mobile" /> + + <!-- Turn off logging, because it's really slow. --> + <set-property name="loglevel" value="none" /> + + <extend-property name="locale" values="en" /> + <set-property-fallback name="locale" value="en" /> + +</module> \ No newline at end of file
