packaging platform specific issues

svn changeset:2978/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index e2327969dfce6bce2a172fa704eed7dc00ae8116..f90e12416cff15f05efd1894980c37a39bade28a 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -563,8 +563,9 @@
                <jar jarfile="${output-dir}/lib/${lib-jar-name}" compress="true">
                        <fileset dir="${result-path}/classes">
                                <patternset>
-                                       <exclude name="${toolkit-package}/demo/**/*" />
-                                       <exclude name="${toolkit-package}/launcher/**/*" />
+                                       <exclude name="${toolkit-package}/demo/**" />
+                                       <exclude name="${toolkit-package}/tests/**" />
+                                       <exclude name="${toolkit-package}/launcher/**" />
                                </patternset>
                        </fileset>
                        <!-- fileupload, see build/external/fileupload/build.xml -->
@@ -575,6 +576,7 @@
                        <fileset dir="${result-path}/src">
                                <patternset>
                                        <exclude name="${toolkit-package}/demo/**" />
+                                       <exclude name="${toolkit-package}/tests/**" />
                                        <exclude name="${toolkit-package}/launcher/**" />
                                </patternset>
                        </fileset>
@@ -584,18 +586,6 @@
                                </patternset>
                        </fileset>
                </jar>
-               <!-- Create Toolkit source JAR -->
-               <!-- Now included within lib-jar-name
-               <jar jarfile="${output-dir}/lib/${lib-src-jar-name}" compress="true">
-                       <fileset dir="${result-path}/src">
-                               <patternset>
-                                       <exclude name="${toolkit-package}/demo/**" />
-                                       <exclude name="${toolkit-package}/tests/**" />
-                                       <exclude name="${toolkit-package}/launcher/**" />
-                               </patternset>
-                       </fileset>
-               </jar>
-               -->
        </target>
 
        <!-- Demo  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

diff --git a/build/package/build-widgetsets.xml b/build/package/build-widgetsets.xml
index 41d0118c58558274be77812da3311e4ddf4cf3a9..f854c075f4c1e8c801cd4337296091ad8b194319 100644 (file)
--- a/build/package/build-widgetsets.xml
+++ b/build/package/build-widgetsets.xml
@@ -27,7 +27,7 @@ See configure target to adjust this buildfile.
        -->
        <target name="configure">
                <!-- which platform we are in, possible values are windows, linux and mac -->
-               <property name="platform" value="<platform></platform>" />
+               <property name="gwt-platform" value="<platform></platform>" />
                
                <!-- where platform specific GWT distribution is located -->
                <property name="gwt-location" value="gwt" />
@@ -45,9 +45,9 @@ See configure target to adjust this buildfile.
        
        <target name="init" depends="configure">
 
-               <echo>Configured for ${platform} platform.</echo>
+               <echo>Configured for ${gwt-platform} platform.</echo>
                <echo>Requirements for classpath:</echo>
-               <echo>  ${gwt-location}/gwt-dev-${platform}.jar</echo>
+               <echo>  ${gwt-location}/gwt-dev-${gwt-platform}.jar</echo>
                <echo>  ${gwt-location}/gwt-user.jar</echo>
                <echo>  ${toolkit-jar-location}</echo>
                <echo>  ${client-side-src-location}</echo>
@@ -59,7 +59,7 @@ See configure target to adjust this buildfile.
                        <pathelement path="${client-side-src-location}" />
                        <pathelement path="${toolkit-jar-location}" />
                        <pathelement path="${gwt-location}/gwt-user.jar" />
-                       <pathelement path="${gwt-location}/gwt-dev-${platform}.jar" />
+                       <pathelement path="${gwt-location}/gwt-dev-${gwt-platform}.jar" />
                </path>
 
        </target>