Added gwt dir definition.

svn changeset:3056/svn branch:trunk

diff --git a/build/build.properties b/build/build.properties
index 38e06b8971723afcea39a2761b3aebcbb2d115b0..24892fae27580f56500b91307dc38d6f1c0e6787 100644 (file)
--- a/build/build.properties
+++ b/build/build.properties
@@ -1,7 +1,7 @@
-result-path=build/result
+result-path=/result
 product-file=itmill-toolkit
 product-name=IT Mill Toolkit
 toolkit-package=com/itmill/toolkit
 eclipse-workspace-name=itmill-toolkit-examples
 eclipse-launch-vmargs=-Xms256M -Xmx512M
-
+gwt-dir=build/gwt

diff --git a/build/build.xml b/build/build.xml
index 5f92c4c555df6dbf9c881e28aa10fe48ac0863a9..2081e735077f6e52816e08a49f098dc6a25141dc 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -18,9 +18,10 @@
         * itmill-toolkit-mac-<version>.tar.gz
         * itmill-toolkit-mac-<version>.dmg
 
-       NOTE: This build script requires directories named build/gwt/(linux|windows|mac) .
+       NOTE: This build script requires directories named ${gwt-dir}/(linux|windows|mac) .
+       See build.properties to define path where your gwt installation is located.
        You must unpack platform specific binaries under linux, windows and mac directories.
-       build/gwt/(linux|windows|mac) are used for
+       ${gwt-dir}/${platform} (linux|windows|mac) are used for
        a) compile WebContent/ITMILL/widgetsets
        b) creating platform specific release ZIP/TGZ packages.
        -->
@@ -61,7 +62,7 @@
                </exec>
                <exec executable="ln" failonerror="false">
                        <arg line="-s" />
-                       <arg line="${basedir}/build/gwt/${package-platform}" />
+                       <arg line="${gwt-dir}/${package-platform}" />
                        <arg line="${output-dir}/gwt" />
                </exec>
        </target>
@@ -105,7 +106,7 @@
                <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
                <property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
 
-               <echo>We are on ${platform} platform, using build/gwt/${platform}/${lib-gwt-dev}.</echo>
+               <echo>We are on ${platform} platform, using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
 
 
 
@@ -131,8 +132,8 @@
 
                <!-- Construct classpath used by java and javadoc compilation -->
                <path id="compile.classpath">
-                       <pathelement path="build/gwt/${platform}/gwt-user.jar" />
-                       <pathelement path="build/gwt/${platform}/${lib-gwt-dev}" />
+                       <pathelement path="${gwt-dir}/${platform}/gwt-user.jar" />
+                       <pathelement path="${gwt-dir}/${platform}/${lib-gwt-dev}" />
                        <pathelement path="build/external/fileupload/classes" />
                        <pathelement path="lib/reservr/googlemaps_gwt.jar" />
                        <pathelement path="lib/jetty/jetty-6.1.5.jar" />
@@ -153,7 +154,7 @@
                                        <include name="**/*" />
                                </patternset>
                        </zipfileset>
-                       <zipfileset prefix="${product-file}-${package-platform}-${version}/gwt" dir="build/gwt/windows">
+                       <zipfileset prefix="${product-file}-${package-platform}-${version}/gwt" dir="${gwt-dir}/windows">
                                <patternset>
                                        <include name="**/*" />
                                </patternset>
@@ -175,7 +176,7 @@
                                        <include name="**/*" />
                                </patternset>
                        </tarfileset>
-                       <tarfileset prefix="${product-file}-${package-platform}-${version}/gwt" dir="build/gwt/linux">
+                       <tarfileset prefix="${product-file}-${package-platform}-${version}/gwt" dir="${gwt-dir}/linux">
                                <patternset>
                                        <include name="**/*" />
                                </patternset>
@@ -194,15 +195,14 @@
                                        <include name="**/*" />
                                </patternset>
                        </tarfileset>
-                       <tarfileset prefix="${product-file}-${package-platform}-${version}/gwt" dir="build/gwt/mac">
+                       <tarfileset prefix="${product-file}-${package-platform}-${version}/gwt" dir="${gwt-dir}/mac">
                                <patternset>
                                        <include name="**/*" />
                                </patternset>
                        </tarfileset>
                </tar>
-               <!-- TODO: remove me: DISABLED for speed
+               <!-- TODO: remove me: DISABLE for speed -->
         <antcall target="create-mac-diskimage" inheritAll="true" inheritRefs="true" />
-        -->
        </target>
 
        <target name="create-mac-diskimage">
@@ -535,8 +535,8 @@
                        <arg value="-style" />
                        <arg value="OBF" />
                        <classpath>
-                               <pathelement location="build/gwt/${platform}/gwt-user.jar" />
-                               <pathelement location="build/gwt/${platform}/${lib-gwt-dev}" />
+                               <pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
+                               <pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
                                <pathelement location="${result-path}/src" />
                        </classpath>
                </java>
@@ -549,8 +549,8 @@
                        <arg value="-style" />
                        <arg value="OBF" />
                        <classpath>
-                               <pathelement location="build/gwt/${platform}/gwt-user.jar" />
-                               <pathelement location="build/gwt/${platform}/${lib-gwt-dev}" />
+                               <pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
+                               <pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
                                <pathelement location="${result-path}/src" />
                                <!-- demo jars -->
                                <pathelement location="${output-dir}/lib/demo/reservr/googlemaps_gwt.jar" />
@@ -567,8 +567,8 @@
                        <arg value="-style" />
                        <arg value="OBF" />
                        <classpath>
-                               <pathelement location="build/gwt/${platform}/gwt-user.jar" />
-                               <pathelement location="build/gwt/${platform}/${lib-gwt-dev}" />
+                               <pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
+                               <pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
                                <pathelement location="${result-path}/src" />
                                <!-- demo widgetset sources -->
                                <pathelement path="${output-dir}/WebContent/WEB-INF/src" />