[gwt-contrib] Include json-1.5.jar in gwt-dev.jar. JSON is needed by the Closure (issue1732804)

[skybrian]

Reviewers: cromwellian,

Description:
Include json-1.5.jar in gwt-dev.jar. JSON is needed by the Closure
compiler and also to generate source maps.
Fixes issue 7397


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

Affected files:
  M dev/build.xml
  M dev/codeserver/build.xml


Index: dev/build.xml
===================================================================
--- dev/build.xml       (revision 11054)
+++ dev/build.xml       (working copy)
@@ -40,7 +40,6 @@
         <pathelement  
location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
         <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
         <pathelement  
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
-        <pathelement  
location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
         <pathelement  
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"  
/>
         <pathelement  
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
         <pathelement  
location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" />
@@ -113,6 +112,9 @@
           <include name="sun/swingworker/swing-worker-1.1.jar" />
           <include name="guava/guava-10.0.1/guava-10.0.1-rebased.jar" />
           <include name="jscomp/r1649/compiler-rebased.jar" />
+        </fileset>
+        <fileset dir="${gwt.tools.redist}">
+          <include name="json/r2_20080312/json-1.5.jar" />
         </fileset>
         <fileset file="build.xml"/>
       </sourcefiles>
@@ -179,6 +181,7 @@
           <zipfileset  
src="${gwt.tools.lib}/sun/swingworker/swing-worker-1.1.jar" />
           <zipfileset  
src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" />
           <zipfileset  
src="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" />
+          <zipfileset  
src="${gwt.tools.redist}/json/r2_20080312/json-1.5.jar" />
         </gwt.jar>
       </sequential>
     </outofdate>
Index: dev/codeserver/build.xml
===================================================================
--- dev/codeserver/build.xml    (revision 11054)
+++ dev/codeserver/build.xml    (working copy)
@@ -57,11 +57,6 @@

   <target name="demo" depends="build" description="starts the code server  
with a sample app">

-    <!-- hack to make sourcemaps generation work in the compiler -->
-    <!-- See:  
http://code.google.com/p/google-web-toolkit/issues/detail?id=7397 -->
-    <property.ensure name="json.jar"
-                      
location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
-
     <property.ensure name="gwt.user.jar"  
location="${gwt.build.lib}/gwt-user.jar" />
     <property.ensure name="sample-src"  
location="${gwt.root}/samples/hello/src" />

@@ -69,7 +64,6 @@
       <classpath>
         <pathelement location="${project.lib}"/>
         <pathelement location="${gwt.dev.jar}"/>
-        <pathelement location="${json.jar}" />
         <pathelement location="${gwt.user.jar}"/>
       </classpath>
       <arg value="-src"/>


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