]> source.dussan.org Git - vaadin-framework.git/commitdiff
Corrected a bug in building on mac_leopard platform
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>
Sat, 28 Jun 2008 16:31:44 +0000 (16:31 +0000)
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>
Sat, 28 Jun 2008 16:31:44 +0000 (16:31 +0000)
svn changeset:4966/svn branch:trunk

build/build.xml

index 9d9a04613ac70eb05b36488c410a279483c12aee..7fed117c748b1fb631fe594a7f103eba3305e5fb 100644 (file)
@@ -46,7 +46,7 @@
 
        <target name="package-jar" depends="clean-all, init, libs" description="Create itmill-toolkit-x.y.z.jar file.">
        </target>\r
-       
+
        <target name="package-war" depends="clean-all, init, build, docs, internal-package-mac, internal-package-war">
        </target>
 
                </delete>
        </target>
 
-    <!-- Find out which platform we are in -->
+       <!-- Find out which platform we are in -->
        <target name="init-platform">
-        <if>
-            <contains string="${os.name}" substring="Windows" />
-            <then>
-                <property name="platform" value="windows" />
-            </then>
-        </if>
-        <if>
-            <equals arg1="${os.name}" arg2="Linux" />
-            <then>
-                <property name="platform" value="linux" />
-            </then>
-        </if>
-        <if>
-            <equals arg1="${os.name}" arg2="Mac OS X" />
-            <then>
-               <if>
-                       <contains string="${os.version}" substring="10.5." />
-                       <then>
-                        <property name="platform" value="mac_leopard" />
+               <if>
+                       <contains string="${os.name}" substring="Windows" />
+                       <then>
+                               <property name="platform" value="windows" />
+                       </then>
+               </if>
+               <if>
+                       <equals arg1="${os.name}" arg2="Linux" />
+                       <then>
+                               <property name="platform" value="linux" />
+                       </then>
+               </if>
+               <if>
+                       <equals arg1="${os.name}" arg2="Mac OS X" />
+                       <then>
+                               <if>
+                                       <contains string="${os.version}" substring="10.5." />
+                                       <then>
+                                               <property name="platform" value="mac_leopard" />
                                        </then>
-                       <else>
-                        <property name="platform" value="mac" />
-                       </else>
-               </if>
-            </then>
-        </if>
+                                       <else>
+                                               <property name="platform" value="mac" />
+                                       </else>
+                               </if>
+                       </then>
+               </if>
        </target>
-       
+
        <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
        <target name="init" depends="init-platform">
 
                <property file="build/html-style.properties" />
 
                <!-- Can run XEP only if license is available. -->
-        <available file="build/lib/XEP/license.xml" property="xep.license.available"/>
+               <available file="build/lib/XEP/license.xml" property="xep.license.available" />
 
                <!-- Create result dir unless already exists -->
                <mkdir dir="${result-path}" />
 
                <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
-               <property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
+               <if>
+                       <equals arg1="${platform}" arg2="mac_leopard" />
+                       <then>
+                               <property name="lib-gwt-dev" value="gwt-dev-mac.jar" />
+                       </then>
+                       <else>
+                               <property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
+                       </else>
+               </if>
 
                <echo>We are on ${platform} platform (${os.name} ${os.version}), using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
 
                                <include name="jetty/**/*" />
                        </fileset>
                </copy>
-        <copy todir="${output-dir}/WebContent/demo/lib">
-            <fileset dir="lib">
-                <include name="portlet/**/*" />
-            </fileset>
-        </copy>
+               <copy todir="${output-dir}/WebContent/demo/lib">
+                       <fileset dir="lib">
+                               <include name="portlet/**/*" />
+                       </fileset>
+               </copy>
 
                <!-- Add demo sources -->
                <echo>Adding demo sources to WebContent/WEB-INF/src</echo>
                        </fileset>
                </copy>
                <java classname="com.itmill.toolkit.buildhelpers.PortletConfigurationGenerator" failonerror="yes" fork="yes" maxmemory="512m">
-                   <arg value="${output-dir}/WebContent/WEB-INF" />
-                   <arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
-                   <classpath>
-                       <pathelement location="build/buildhelpers/" />
-                   </classpath>
+                       <arg value="${output-dir}/WebContent/WEB-INF" />
+                       <arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
+                       <classpath>
+                               <pathelement location="build/buildhelpers/" />
+                       </classpath>
                </java>
        </target>
 
                <javac source="1.4" target="1.4" classpathref="compile.classpath" srcdir="${result-path}/src" destdir="${result-path}/classes" includes="${toolkit-package}/**" debug="true">
                </javac>
        </target>
-       
-       <target name="defaulttheme" >
+
+       <target name="defaulttheme">
                <echo>Combining default themes css files</echo>
                <!-- ensure buildhelpers are compiled -->
-               <javac source="1.4" target="1.4" srcdir="build/buildhelpers"/>
+               <javac source="1.4" target="1.4" srcdir="build/buildhelpers" />
                <java classname="com.itmill.toolkit.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes">
                        <classpath>
                                <pathelement location="build/buildhelpers" />
                <echo>TEST TARGET CALLED</echo>
        </target>
 
-    <target name="compile-widgetset-default">
-        <echo>Compiling src (client-side)</echo>
-        <echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
-        <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
-            <arg value="-out" />
-            <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-            <arg value="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" />
-            <arg value="-style" />
-            <arg value="OBF" />
-            <classpath>
-                <pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
-                <pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
-                <pathelement location="${result-path}/src" />
-            </classpath>
-        </java>
-        <echo>Compiled DefaultWidgetSet</echo>
-    </target>
-
-    <target name="compile-widgetset-reserver">
-        <condition property="googlemaps-jar" value="${output-dir}/WebContent/demo/lib/reservr/googlemaps_gwt.jar">
-             <available file="${output-dir}/WebContent/demo/lib/reservr/googlemaps_gwt.jar"/>
-        </condition>
-        <condition property="googlemaps-jar" value="lib/reservr/googlemaps_gwt.jar">
-            <available file="lib/reservr/googlemaps_gwt.jar"/>
-        </condition>
-        <echo>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</echo>
-        <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
-            <arg value="-out" />
-            <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-            <arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
-            <arg value="-style" />
-            <arg value="OBF" />
-            <classpath>
-                <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="${googlemaps-jar}" />
-                <!-- demo widgetset sources -->
-                <pathelement path="${output-dir}/WebContent/WEB-INF/src" />
-            </classpath>
-        </java>
-        <echo>Compiled ReservationWidgetSet</echo>
-    </target>
-
-    <target name="compile-widgetset-colorpicker">
-        <echo>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
-        <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
-            <arg value="-out" />
-            <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-            <arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
-            <arg value="-style" />
-            <arg value="OBF" />
-            <classpath>
-                <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" />
-            </classpath>
-        </java>
-       <echo>Compiled ColorPickerWidgetSet</echo>
-    </target>
+       <target name="compile-widgetset-default">
+               <echo>Compiling src (client-side)</echo>
+               <echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
+               <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
+                       <arg value="-out" />
+                       <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+                       <arg value="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" />
+                       <arg value="-style" />
+                       <arg value="OBF" />
+                       <classpath>
+                               <pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
+                               <pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
+                               <pathelement location="${result-path}/src" />
+                       </classpath>
+               </java>
+               <echo>Compiled DefaultWidgetSet</echo>
+       </target>
+
+       <target name="compile-widgetset-reserver">
+               <condition property="googlemaps-jar" value="${output-dir}/WebContent/demo/lib/reservr/googlemaps_gwt.jar">
+                       <available file="${output-dir}/WebContent/demo/lib/reservr/googlemaps_gwt.jar" />
+               </condition>
+               <condition property="googlemaps-jar" value="lib/reservr/googlemaps_gwt.jar">
+                       <available file="lib/reservr/googlemaps_gwt.jar" />
+               </condition>
+               <echo>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</echo>
+               <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
+                       <arg value="-out" />
+                       <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+                       <arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
+                       <arg value="-style" />
+                       <arg value="OBF" />
+                       <classpath>
+                               <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="${googlemaps-jar}" />
+                               <!-- demo widgetset sources -->
+                               <pathelement path="${output-dir}/WebContent/WEB-INF/src" />
+                       </classpath>
+               </java>
+               <echo>Compiled ReservationWidgetSet</echo>
+       </target>
+
+       <target name="compile-widgetset-colorpicker">
+               <echo>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
+               <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
+                       <arg value="-out" />
+                       <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+                       <arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
+                       <arg value="-style" />
+                       <arg value="OBF" />
+                       <classpath>
+                               <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" />
+                       </classpath>
+               </java>
+               <echo>Compiled ColorPickerWidgetSet</echo>
+       </target>
 
        <!-- Builds the client-side engine, i.e., the widgetsets in parallel. -->
        <target name="compile-client-side">
                <echo>Compiling widget sets in parallel.</echo>
                <parallel threadsperprocessor="1">
-               <subant antfile="build.xml" target="compile-widgetset-default" inheritall="true" buildpath="build"/>
-            <subant antfile="build.xml" target="compile-widgetset-reserver" inheritall="true" buildpath="build"/> 
-            <subant antfile="build.xml" target="compile-widgetset-colorpicker" inheritall="true" buildpath="build"/>
+                       <subant antfile="build.xml" target="compile-widgetset-default" inheritall="true" buildpath="build" />
+                       <subant antfile="build.xml" target="compile-widgetset-reserver" inheritall="true" buildpath="build" />
+                       <subant antfile="build.xml" target="compile-widgetset-colorpicker" inheritall="true" buildpath="build" />
                </parallel>
        </target>
 
        <!-- Definitions for building local components, i.e., not for an installation package. -->
        <target name="init-nonpackage" depends="init-platform">
-        <property file="build/VERSION.properties" />
+               <property file="build/VERSION.properties" />
 
-        <!-- Definitions for building the client-side. -->
-        <property name="output-dir" value="."/>
-        
-        <!-- The "result-path" simply contains the sources. -->
-        <property name="result-path" value="."/>
+               <!-- Definitions for building the client-side. -->
+               <property name="output-dir" value="." />
 
-        <!-- Path to GWT directory. TODO: This should be read from build.properties file. -->
-        <property name="gwt-dir" value="build/gwt"/>
+               <!-- The "result-path" simply contains the sources. -->
+               <property name="result-path" value="." />
 
-        <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
-        <property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
+               <!-- Path to GWT directory. TODO: This should be read from build.properties file. -->
+               <property name="gwt-dir" value="build/gwt" />
 
-        <echo>We are on ${platform} platform, using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
-        <echo>GWT dir:    ${gwt-dir}</echo>
-        <echo>Output dir: ${output-dir}</echo>
+               <!-- 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 ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
+               <echo>GWT dir:    ${gwt-dir}</echo>
+               <echo>Output dir: ${output-dir}</echo>
        </target>
-       
+
        <!-- Builds all widgetsets locally, i.e., not for an installation package. -->
        <target name="widgetsets" depends="init-nonpackage, compile-client-side">
        </target>
 
-    <!-- Builds the default widgetset locally, i.e., not for an installation package. -->
-    <target name="widgetset-default" depends="init-nonpackage, compile-widgetset-default">
-    </target>
+       <!-- Builds the default widgetset locally, i.e., not for an installation package. -->
+       <target name="widgetset-default" depends="init-nonpackage, compile-widgetset-default">
+       </target>
 
-    <!-- Builds the reservation widgetset locally, i.e., not for an installation package. -->
-    <target name="widgetset-reserver" depends="init-nonpackage, compile-widgetset-reserver">
-    </target>
+       <!-- Builds the reservation widgetset locally, i.e., not for an installation package. -->
+       <target name="widgetset-reserver" depends="init-nonpackage, compile-widgetset-reserver">
+       </target>
 
-    <!-- Builds the colorpicker widgetset locally, i.e., not for an installation package. -->
-    <target name="widgetset-colorpicker" depends="init-nonpackage, compile-widgetset-colorpicker">
-    </target>
+       <!-- Builds the colorpicker widgetset locally, i.e., not for an installation package. -->
+       <target name="widgetset-colorpicker" depends="init-nonpackage, compile-widgetset-colorpicker">
+       </target>
 
        <target name="libs" depends="compile-java, webcontent, compile-client-side">
                <echo>Creating libs (server-side) ${lib-jar-name}</echo>
                        </fileset>
                </copy>
        </target>
-       
+
        <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   Documentation 
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
        </target>
 
        <!-- Build PDF manual from sources or just copy it. -->
-    <target name="manual-pdf" depends="build-manual-pdf, copy-manual-pdf">
-    </target>
-       
+       <target name="manual-pdf" depends="build-manual-pdf, copy-manual-pdf">
+       </target>
+
        <!-- Just copy a prebuilt PDF manual. -->
-    <target name="copy-manual-pdf" unless="xep.license.available">
-        <echo>PDF Manual: No XEP license available, just copy a prebuilt PDF.</echo>
-        <copy file="doc/manual/book.pdf" tofile="${output-dir}/WebContent/doc/manual.pdf" />
-    </target>
+       <target name="copy-manual-pdf" unless="xep.license.available">
+               <echo>PDF Manual: No XEP license available, just copy a prebuilt PDF.</echo>
+               <copy file="doc/manual/book.pdf" tofile="${output-dir}/WebContent/doc/manual.pdf" />
+       </target>
 
        <!-- XEP-based FO building -->
        <target name="build-manual-pdf" if="xep.license.available">