Fix #2229 build-widgetsets.xml should give error of invalid toolkit path, #2353 Replace build-widgetsets.xml with build-widgetset.xml

svn changeset:6235/svn branch:trunk

5 files changed, 95 insertions, 131 deletions

diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
new file mode 100644
index 0000000000..e8516b4d30
--- /dev/null
+++ b/build/package/build-widgetset.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+
+<!-- 
+
+Client-side code is compiled by using GWTCompiler which compiles client-side Java code into
+JavaScript. Generated files are located under WebContent/ITMILL/widgetsets/*.
+
+Client-side compilation is required if you create new or modify existing widgets.
+You may use either this script or IT Mill Toolkit Hosted Mode.launch (in Eclipse)
+to compile your client-side java code. 
+
+By default IT Mill Toolkit first tries to serve widgetset resources from the file system, if that
+fails then files are streamed from itmill-toolkit-<version>.jar. 
+
+See configure target to adjust this buildfile.
+
+-->
+
+<project name="Widgetset compile example" basedir="." default="compile-widgetset">
+
+	<!-- 
+		Update based on your project structure, by default this buildfile assumes that you 
+		1. use WebContent under your project's root directory
+		2. WebContent/WEB-INF/lib/itmill-toolkit-<version>.jar exists
+		3. WebContent/WEB-INF/src contains your project source files
+		4. gwt directory contains extracted GWT distribution for your platform (windows, linux or mac)
+	-->
+	<target name="configure">
+		
+		<!-- Path from this file to the root of the toolkit distribution package -->
+		<property name="base" value="../../../" />
+		
+		<!-- which platform we are in, possible values are windows, linux and mac -->
+		<property name="gwt-platform" value="<platform></platform>" />
+		
+		<!-- where platform specific GWT distribution is located -->
+		<property name="gwt-location" value="${base}gwt" />
+		
+		<!-- where Toolkit jar is located -->
+		<property name="toolkit-jar-location" value="${base}WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" />
+		
+		<!-- where project client-side widgetset source files are located -->
+		<property name="client-side-src-location" value="${base}WebContent/WEB-INF/src" />
+			
+		<!-- where to generate compiled javascript and theme files -->
+		<property name="client-side-destination" value="${base}WebContent/ITMILL/widgetsets" />
+	</target>
+		
+	<target name="init" depends="configure">
+
+		<echo>Configured for ${gwt-platform} platform.</echo>
+		<echo>Requirements for classpath:</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>
+		<echo>Output will be written into ${client-side-destination}</echo>
+
+		<!-- Check that files exist -->
+		<fail message="Some of the required files (listed above) are missing.">
+			<condition><not><resourcecount count="3">
+				<filelist files="${gwt-location}/gwt-dev-${gwt-platform}.jar,${gwt-location}/gwt-user.jar,${toolkit-jar-location}"/>
+			</resourcecount></not></condition>
+		</fail>
+
+		<!-- Construct and check classpath -->
+		<path id="compile.classpath">
+			<pathelement path="${client-side-src-location}" />
+			<pathelement path="${toolkit-jar-location}" />
+			<pathelement path="${gwt-location}/gwt-user.jar" />
+			<pathelement path="${gwt-location}/gwt-dev-${gwt-platform}.jar" />
+		</path>
+	</target>
+	
+	<!-- NOTE: Modify this example to compile your own widgetset  -->
+	<target name="compile-widgetset" depends="init">
+		<echo>Compiling com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet.</echo>
+		<echo>Modify this example ant-script to compile your own widgetsets.</echo>
+		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="256m">
+			<arg value="-out" />
+			<arg value="${client-side-destination}" />
+			<arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
+			<classpath>
+				<path refid="compile.classpath"/>
+			</classpath>
+		</java>
+	</target>
+
+</project>
diff --git a/build/package/build-widgetsets.xml b/build/package/build-widgetsets.xml
deleted file mode 100644
index 1e24a949e3..0000000000
--- a/build/package/build-widgetsets.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- 
-
-Client-side code is compiled by using GWTCompiler which compiles client-side Java code into
-JavaScript. Generated files are located under WebContent/ITMILL/widgetsets/*.
-
-Client-side compilation is required if you create new or modify existing widgets.
-You may use either this script or IT Mill Toolkit Hosted Mode.launch (in Eclipse)
-to compile your client-side java code. 
-
-By default IT Mill Toolkit first tries to serve widgetset resources from the file system, if that
-fails then files are streamed from itmill-toolkit-<version>.jar. 
-
-See configure target to adjust this buildfile.
-
--->
-
-<project name="IT Mill Toolkit Widgetset" basedir="." default="compile-all-widgetsets">
-
-	<!-- 
-		Update based on your project structure, by default this buildfile assumes that you 
-		1. use WebContent under your project's root directory
-		2. WebContent/WEB-INF/lib/itmill-toolkit-<version>.jar exists
-		3. WebContent/WEB-INF/src contains your project source files
-		4. gwt directory contains extracted GWT distribution for your platform (windows, linux or mac)
-	-->
-	<target name="configure">
-		<!-- which platform we are in, possible values are windows, linux and mac -->
-		<property name="gwt-platform" value="<platform></platform>" />
-		
-		<!-- where platform specific GWT distribution is located -->
-		<property name="gwt-location" value="gwt" />
-		
-		<!-- where Toolkit jar is located -->
-		<property name="toolkit-jar-location" value="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" />
-		
-		<!-- where project client-side widgetset source files are located -->
-		<property name="client-side-src-location" value="WebContent/WEB-INF/src" />
-			
-		<!-- where to generate compiled javascript and theme files -->
-		<property name="client-side-destination" value="WebContent/ITMILL/widgetsets" />
-	</target>
-
-	
-	<target name="init" depends="configure">
-
-		<echo>Configured for ${gwt-platform} platform.</echo>
-		<echo>Requirements for classpath:</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>
-		<echo>Output will be written into ${client-side-destination}</echo>
-		<echo>Note, if you have created your own widgetset, please modify target compile-my-widgetset first.</echo>
-
-		<!-- Construct classpath -->
-		<path id="compile.classpath">
-			<pathelement path="${client-side-src-location}" />
-			<pathelement path="${toolkit-jar-location}" />
-			<pathelement path="${gwt-location}/gwt-user.jar" />
-			<pathelement path="${gwt-location}/gwt-dev-${gwt-platform}.jar" />
-		</path>
-
-	</target>
-	
-	
-	<!-- NOTE: use this template to compile your own widgetset -->
-	<target name="compile-my-widgetset" depends="init">
-		<fail message="Please open build-widgetset.xml and update your widgetset's package name to enable this target" />
-		<!-- remove upper fail message -->
-		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="256m">
-			<arg value="-out" />
-			<arg value="${client-side-destination}" />
-			<!-- NOTE: Update line below and tell package name to your own widgetset -->
-			<arg value="com.myexample.gwt.MyWidgetSet" />
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</java>
-	</target>
-	
-	<!-- NOTE: used only in demos, execute after changes to colorpicker demo's client-side source code  -->
-	<target name="compile-colorpicker_demo-widgetset" depends="init">
-		<echo>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
-		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="256m">
-			<arg value="-out" />
-			<arg value="${client-side-destination}" />
-			<arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</java>
-	</target>
-	
-	<!-- NOTE: used only in demos, execute changes to reservation demo's client-side source code -->
-	<target name="compile-reservation_demo-widgetset" depends="init">
-		<echo>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</echo>
-		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="256m">
-			<arg value="-out" />
-			<arg value="${client-side-destination}" />
-			<arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
-			<classpath>
-				<path refid="compile.classpath"/>
-				<pathelement location="WebContent/demo/lib/reservr/gwt-maps.jar" />
-			</classpath>
-		</java>
-	</target>
-	
-	<!-- NOTE: only required if you extract Toolkit sources and change default widgetset -->
-	<target name="compile-default-widgetset" depends="init">
-		<echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
-		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="256m">
-			<arg value="-out" />
-			<arg value="${client-side-destination}" />
-			<arg value="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" />
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</java>
-	</target>
-	
-	<target name="compile-all-widgetsets" depends="compile-default-widgetset, compile-colorpicker_demo-widgetset, compile-reservation_demo-widgetset" />
-	
-</project>
diff --git a/build/package/linux-readme.txt b/build/package/linux-readme.txt
index be4db9f1fa..151af52774 100644
--- a/build/package/linux-readme.txt
+++ b/build/package/linux-readme.txt
@@ -58,8 +58,8 @@ IT Mill Toolkit Hosted Mode.launch
 IT Mill Toolkit Web Mode.launch

 - launch configurations for Eclipse workspace

 

-build-widgetsets.xml

-- builds GWT widget sets for IT Mill Toolkit applications

+WebContent/doc/example-source/build-widgetset.xml

+- example on how to build GWT widget sets for IT Mill Toolkit application

 

 WebContent/ITMILL

 - widget sets and themes

diff --git a/build/package/mac-readme.txt b/build/package/mac-readme.txt
index 3252ab577c..881c076072 100644
--- a/build/package/mac-readme.txt
+++ b/build/package/mac-readme.txt
@@ -59,8 +59,8 @@ IT Mill Toolkit Hosted Mode.launch
 IT Mill Toolkit Web Mode.launch

 - launch configurations for Eclipse workspace

 

-build-widgetsets.xml

-- builds GWT widget sets for IT Mill Toolkit applications

+WebContent/doc/example-source/build-widgetset.xml

+- example on how to build GWT widget sets for IT Mill Toolkit application

 

 WebContent/ITMILL

 - widget sets and themes

diff --git a/build/package/windows-readme.txt b/build/package/windows-readme.txt
index e5e7d0413b..f7d72eecdc 100644
--- a/build/package/windows-readme.txt
+++ b/build/package/windows-readme.txt
@@ -58,8 +58,8 @@ IT Mill Toolkit Hosted Mode.launch
 IT Mill Toolkit Web Mode.launch

 - launch configurations for Eclipse workspace

 

-build-widgetsets.xml

-- builds GWT widget sets for IT Mill Toolkit applications

+WebContent/doc/example-source/build-widgetset.xml

+- example on how to build GWT widget sets for IT Mill Toolkit application

 

 WebContent/ITMILL

 - widget sets and themes