Author: [email protected]
Date: Tue Jun 16 08:28:58 2009
New Revision: 5563

Modified:
     
trunk/build-tools/ant-gwt/src/com/google/gwt/ant/taskdefs/LatestTimeJar.java
    trunk/build.xml
    trunk/samples/common.ant.xml
    trunk/tools/api-checker/build.xml
    trunk/tools/soyc-vis/build.xml

Log:
Ant fixes for platform independence, for dist-dev not needing tools, and
for FD release in LatestTimeJar.

Review by: bobv


Modified:  
trunk/build-tools/ant-gwt/src/com/google/gwt/ant/taskdefs/LatestTimeJar.java
==============================================================================
---  
trunk/build-tools/ant-gwt/src/com/google/gwt/ant/taskdefs/LatestTimeJar.java    
 
(original)
+++  
trunk/build-tools/ant-gwt/src/com/google/gwt/ant/taskdefs/LatestTimeJar.java    
 
Tue Jun 16 08:28:58 2009
@@ -116,8 +116,12 @@
      @Override
      public void addToZip(ZipOutputStream out, String path) throws  
IOException {
        FileInputStream inStream = new FileInputStream(tmpFile);
-      doZipFile(inStream, out, path, timestamp, archive, mode);
-      tmpFile.delete();
+      try {
+        doZipFile(inStream, out, path, timestamp, archive, mode);
+        tmpFile.delete();
+      } finally {
+        inStream.close();
+      }
      }
    }


Modified: trunk/build.xml
==============================================================================
--- trunk/build.xml     (original)
+++ trunk/build.xml     Tue Jun 16 08:28:58 2009
@@ -35,7 +35,7 @@
      <gwt.ant dir="distro-source" target="${build.host.platform}" />
    </target>

-  <target name="dist-dev" depends="buildonly, tools" description="Make  
this platform's distribution, minus doc and samples">
+  <target name="dist-dev" depends="buildonly" description="Make this  
platform's distribution, minus doc and samples">
      <gwt.ant dir="distro-source" target="${build.host.platform}" />
    </target>

@@ -93,7 +93,7 @@
      <call-subproject subproject="samples" subtarget="checkstyle" />
    </target>

-  <target name="test" depends="dist-one" description="Runs all the GWT  
tests">
+  <target name="test" depends="dist-dev" description="Runs all the GWT  
tests">
      <call-subproject subproject="buildtools" subtarget="test" />
      <call-subproject subproject="dev" subtarget="test" />
      <call-subproject subproject="user" subtarget="test" />

Modified: trunk/samples/common.ant.xml
==============================================================================
--- trunk/samples/common.ant.xml        (original)
+++ trunk/samples/common.ant.xml        Tue Jun 16 08:28:58 2009
@@ -16,7 +16,7 @@

    <property.ensure name="gwt.user.jar"  
location="${gwt.build.lib}/gwt-user.jar" />
    <!-- Platform shouldn't matter here, just picking one -->
-  <property.ensure name="gwt.dev.jar"  
location="${gwt.build.lib}/gwt-dev-linux.jar" />
+  <property.ensure name="gwt.dev.jar"  
location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" />

    <!-- Mirror directory for scripts; makes building distro easier -->
    <property name="samples.scripts"  
value="${gwt.build.out}/samples-scripts" />

Modified: trunk/tools/api-checker/build.xml
==============================================================================
--- trunk/tools/api-checker/build.xml   (original)
+++ trunk/tools/api-checker/build.xml   Tue Jun 16 08:28:58 2009
@@ -7,7 +7,7 @@
          <property name="tools.build"  
value="${gwt.build.out}/${project.tail}" />

    <!-- Platform shouldn't matter here, just picking one -->
-  <property.ensure name="gwt.dev.jar"  
location="${gwt.build.lib}/gwt-dev-linux.jar" />
+  <property.ensure name="gwt.dev.jar"  
location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" />
    <property.ensure name="gwt.user.jar"  
location="${gwt.build.lib}/gwt-user.jar" />

    <target name="compile" description="Compile all class files">

Modified: trunk/tools/soyc-vis/build.xml
==============================================================================
--- trunk/tools/soyc-vis/build.xml      (original)
+++ trunk/tools/soyc-vis/build.xml      Tue Jun 16 08:28:58 2009
@@ -7,7 +7,7 @@
    <import file="${gwt.root}/common.ant.xml" />

    <!-- Platform shouldn't matter here, just picking one -->
-  <property.ensure name="gwt.dev.jar"  
location="${gwt.build.lib}/gwt-dev-linux.jar" />
+  <property.ensure name="gwt.dev.jar"  
location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" />

    <target name="clean">
      <delete dir="build"/>
@@ -41,4 +41,4 @@

    <target name="checkstyle"/>

-</project>
\ No newline at end of file
+</project>

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

Reply via email to