]> source.dussan.org Git - vaadin-framework.git/commitdiff
Activated DMG creation and widgetset compilation, these bugs were accidentally commit...
authorJani Laakso <jani.laakso@itmill.com>
Mon, 29 Oct 2007 13:17:03 +0000 (13:17 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Mon, 29 Oct 2007 13:17:03 +0000 (13:17 +0000)
svn changeset:2617/svn branch:trunk

build/build.xml

index f0667bb9d589927cd57c4de5148ee09f337a47fc..2865dc0c5e1052a49e983f80179086815584535e 100644 (file)
@@ -28,7 +28,6 @@
        <!-- 
        Call one of package-* targets unless you understand what you are doing 
        -->
-       <!-- TODO Should we remove depencencies: clean-all, init, build -->
        <target name="package-all" depends="clean-all, init, build, internal-package-mac, internal-package-windows, internal-package-linux" description="Build public packages for Windows, Linux and Mac platforms.">
        </target>
 
@@ -45,8 +44,6 @@
        <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
        <target name="init">
                
-               <!-- TODO The following selects mac platform even when we are building (on mac) for windows ??? -->
-               
                <!-- Find out which platform we are in -->
                <if>
                        <equals arg1="${os.name}" arg2="Windows 2000, Windows XP" />
                <mkdir dir="${output-dir}/WebContent" />
                <mkdir dir="${output-dir}/WebContent/WEB-INF" />
                <mkdir dir="${output-dir}/WebContent/WEB-INF/classes" />
-
-               <!-- TODO Selection of classpath conflicts with bin/compile-gwt-components. build.xml expects gwt/mac/...
-               and bin/compile-gwt-components expects gwt/gwt/... We should use constistent naming everywhere. I propose
-               that we use gwt/mac/... everywhere. Still this init target should use the platform we are targeting, not the
-               platform we are building on. -->
                
                <!-- Construct classpath used by java and javadoc compilation -->
                <path id="compile.classpath">
                </if>
        </target>
 
-       <!-- TODO: add docs -->
-       <!-- do not use these directly, use targets named package-* -->
        <target name="build" depends="root, demo, docs" description="Build package required files, without packing them.">
        </target>
 
                        </fileset>
                </copy>
                
-               <!-- TODO We MUST rebuild all the widgetsets explicitly in the build.xml. If not, whatever happents (or doesn't
-                        happent) to be built in WebContents dir gets included in the distribution package. So please do include
-                        dependency on build-widgetsets to this target and move compile-gwt-components to build-widgetsets -->
-
                <!-- Add WebContent -->
                <echo>Adding WebContent files, excluding ITMILL/widgetsets and few internal development libraries.</echo>
                <copy todir="${output-dir}/WebContent">
                        <fileset dir="WebContent">
                                <exclude name="**/.svn" />
                                <exclude name="openajax/**" />
-                               <exclude name="ITMILL/widgetsets" />
+                               <exclude name="ITMILL/widgetsets/**" />
                                <exclude name="ITMILL/themes/tests-*" />
                                <exclude name="WEB-INF/classes/**" />
                                <exclude name="WEB-INF/lib/commons-fileupload-1.2-javadoc.jar" />
                </jar>
        </target>
 
-       <!-- TODO: remove -->
        <target name="compile-client-side" depends="libs">
-       </target>
-
-       <target name="compile-client-side2" depends="libs">
                <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">
        </target>
 
        <!-- XEP-based FO building -->
-       <!-- TODO When building without license, we should use demo-license to get a working manual with watermarks
-                       instead of a manual with 50% of the pages left blank. Also a big warning should be given with message
-                       that Jani is the only one who can build official packages.
-                       
-                       Another alternative would be to commit official license key to svn - and allow everyone to build 
-                       working manuals. I think that we would not harsly disobey the license as only one person builds the
-                       official buils. 
-       -->
        <target name="manual-pdf">
+               <echo>PDF Manual: processing images (TBD)</echo>
+               <!-- TBD -->
                <echo>PDF Manual: converting xml to fo</echo>
                <java classname="org.apache.xalan.xslt.Process" failonerror="yes" fork="yes" maxmemory="512m">
                        <arg value="-xsl" />