From: Jani Laakso <jani.laakso@itmill.com>
Date: Mon, 26 Nov 2007 08:10:26 +0000 (+0000)
Subject: Fixed fridays build.xml mixups (machine crash), transfered GWT out from project svn... 
X-Git-Tag: 6.7.0.beta1~5491
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5eebc288c708003f969b1d6528b981ba9bd48f12;p=vaadin-framework.git

Fixed fridays build.xml mixups (machine crash), transfered GWT out from project svn into root svn

svn changeset:2925/svn branch:trunk
---

diff --git a/build/GWT-VERSION.properties b/build/GWT-VERSION.properties
new file mode 100644
index 0000000000..9195b1ec3b
--- /dev/null
+++ b/build/GWT-VERSION.properties
@@ -0,0 +1 @@
+gwt-version=1.4.60
diff --git a/build/VERSION b/build/VERSION
deleted file mode 100644
index 8b88ec3041..0000000000
--- a/build/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-version=5.0.0-alpha-2
\ No newline at end of file
diff --git a/build/VERSION.properties b/build/VERSION.properties
new file mode 100644
index 0000000000..7f3ea9fcc2
--- /dev/null
+++ b/build/VERSION.properties
@@ -0,0 +1 @@
+version=5.0.0-alpha-2
diff --git a/build/build.xml b/build/build.xml
index 1eb8da93cd..8fe23e1d06 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -56,13 +56,13 @@
 		<antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
 		<exec executable="ln" failonerror="false">
 			<arg line="-s" />
-			<arg line="${basedir}/${output-dir}" />
+			<arg line="${output-dir}" />
 			<arg line="${result-path}/eclipse-test" />
 		</exec>
 		<exec executable="ln" failonerror="false">
 			<arg line="-s" />
 			<arg line="${basedir}/build/gwt/gwt" />
-			<arg line="${basedir}/${output-dir}/gwt" />
+			<arg line="${output-dir}/gwt" />
 		</exec>
 	</target>
 
@@ -75,7 +75,11 @@
 
 	<!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
 	<target name="init">
-
+	
+		<property file="build/build.properties" />
+		<property file="build/VERSION" />
+		<property file="build/html-style.properties" />
+		
 		<!-- Find out which platform we are in -->
 		<if>
 			<equals arg1="${os.name}" arg2="Windows 2000, Windows XP" />
@@ -103,10 +107,6 @@
 		<!-- Create result dir unless already exists -->
 		<mkdir dir="${result-path}" />
 
-		<property file="build/build.properties" />
-		<property file="build/VERSION" />
-		<property file="build/html-style.properties" />
-		
 		<!-- Destination files -->
 		<property name="lib-jar-name" value="${product-file}-${version}.jar" />
 		<property name="demo-war-name" value="${product-file}-demo-${version}.war" />
@@ -479,7 +479,8 @@
 				<exclude name="WEB-INF/web.xml" />
 				<exclude name="ITMILL/widgetsets/**" />
 				<exclude name="WEB-INF/lib/commons-fileupload-custom.jar" />
-				<exclude name="ITMILL/themes/tests-*" />
+				<!-- TODO check that tests* are not added -->
+				<exclude name="ITMILL/themes/test*/**" />
 				<exclude name="WEB-INF/classes/**" />
 			</fileset>
 		</copy>
diff --git a/build/package/webcontent-index.html b/build/package/webcontent-index.html
index 1cfa67984a..f3da503143 100644
--- a/build/package/webcontent-index.html
+++ b/build/package/webcontent-index.html
@@ -22,16 +22,6 @@
 	<br />Source code:
 	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/reservation">browse source</a></span>
   </div>
- 
-   <div class="feature-browser">
-	<h4><a href="FeaturesApplication/">Feature Browser</a></h4>
-	<div class="option">
-	 <span class="link"><a href="FeaturesApplication/">FeatureBrowser</a></span>
-	 <span class="desc">Test bench application for trying out different components and features of the IT Mill Toolkit</span>
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/features">browse features folder</a></span>
-  </div>
   
     <div class="feature-browser">
 	<h3><a href="NotificationDemo/">Notification Demo</a></h3>
diff --git a/build/readme.txt b/build/readme.txt
new file mode 100644
index 0000000000..43fcd20a12
--- /dev/null
+++ b/build/readme.txt
@@ -0,0 +1,17 @@
+See documentation on build.xml how product is build.
+
+
+1. See build/GWT-VERSION.properties file
+- states the GWT version used within this project
+
+2. Checkout correct GWT distribution version for your platform
+- note, you have to checkout GWT for all platforms when doing release builds
+
+3. Extract or link GWT distribution under build/gwt/<platform> directory / directories
+- <platform> = linux|windows|mac
+
+4. Update Eclipse project classpath build/gwt/<platform>/gwt-user.jav and gwt-dev-<platform>.jar
+
+Note: All GWT distributions have been moved to 
+https://svn.itmill.com/svn/itmill-toolkit/gwt
+