Updated build scripts to build only one platform-independent package (#3811). Updated sample widgetset build script for GWT 2.0 (#3972). Also removed obsolete Mac DMG target.

svn changeset:10679/svn branch:6.3

7 files changed, 33 insertions, 26 deletions

diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 27a371b3a3..7fd7bd073d 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -23,17 +23,14 @@ See configure target to adjust this buildfile.
 		1. use WebContent under your project's root directory
 		2. WebContent/WEB-INF/lib/vaadin-@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)
+		4. gwt directory contains extracted GWT distribution
 	-->
 	<target name="configure">
 		
 		<!-- Path from this file to the root of the Vaadin distribution package -->
 		<property name="base" value="../../../" />
 		
-		<!-- which platform we are in, possible values are windows, linux and mac -->
-		<property name="gwt-platform" value="@platform@" />
-		
-		<!-- where platform specific GWT distribution is located -->
+		<!-- where GWT distribution is located -->
 		<property name="gwt-location" value="${base}gwt" />
 		
 		<!-- where Vaadin jar is located -->
@@ -86,9 +83,8 @@ See configure target to adjust this buildfile.
 	
 	<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-dev.jar</echo>
 		<echo>  ${gwt-location}/gwt-user.jar</echo>
 		<echo>  ${toolkit-jar-location}</echo>
 		<echo>  ${src-location}</echo>
@@ -97,7 +93,7 @@ See configure target to adjust this buildfile.
 		<!-- 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}"/>
+				<filelist files="${gwt-location}/gwt-dev.jar,${gwt-location}/gwt-user.jar,${toolkit-jar-location}"/>
 			</resourcecount></not></condition>
 		</fail>
 
@@ -109,7 +105,7 @@ See configure target to adjust this buildfile.
 			<pathelement path="${server-side-destination}" />
 			<pathelement path="${toolkit-jar-location}" />
 			<pathelement path="${gwt-location}/gwt-user.jar" />
-			<pathelement path="${gwt-location}/gwt-dev-${gwt-platform}.jar" />
+			<pathelement path="${gwt-location}/gwt-dev.jar" />
 		    <fileset dir="${base}WebContent/WEB-INF/lib/">
 		    	<include name="*.jar"/>
 		     </fileset>
diff --git a/build/package/eclipse-Vaadin Hosted Mode Browser-launch b/build/package/eclipse-Vaadin Hosted Mode Browser-launch
index 0578393797..9f3820fad2 100644
--- a/build/package/eclipse-Vaadin Hosted Mode Browser-launch
+++ b/build/package/eclipse-Vaadin Hosted Mode Browser-launch
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/Vaadin Hosted Mode.launch"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-@platform@.jar"/>
+<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev.jar"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
diff --git a/build/package/mac-DS_Store b/build/package/mac-DS_Store
deleted file mode 100644
index b2de4bf44f..0000000000
--- a/build/package/mac-DS_Store
+++ /dev/null
diff --git a/build/package/mac-Start IT Mill Toolkit.zip b/build/package/mac-Start IT Mill Toolkit.zip
deleted file mode 100644
index 23df10e3a1..0000000000
--- a/build/package/mac-Start IT Mill Toolkit.zip
+++ /dev/null
diff --git a/build/package/mac-Start-icon_script.zip b/build/package/mac-Start-icon_script.zip
deleted file mode 100644
index 9de5a208d4..0000000000
--- a/build/package/mac-Start-icon_script.zip
+++ /dev/null
diff --git a/build/package/mac-VolumeIcon.icns b/build/package/mac-VolumeIcon.icns
deleted file mode 100644
index a11c092378..0000000000
--- a/build/package/mac-VolumeIcon.icns
+++ /dev/null
diff --git a/build/package/linux-readme.txt b/build/package/readme.txt
index 7ac0f10f15..d8c3d8ca77 100644
--- a/build/package/linux-readme.txt
+++ b/build/package/readme.txt
@@ -1,18 +1,32 @@
 ==============================================================================

-Vaadin <version></version> Readme

+Vaadin @version@ Readme

 ==============================================================================

 

 -------------

 How to Start?

 -------------

 

-Open a shell window, change to the installation directory, and execute "sh start.sh". It

-will start a web application at port 8888 on the local host and opens a web browser window

-to display the start page of Vaadin Content Browser.

+In Windows:

+  Just double-click start.bat icon. It will start a web application at

+  port 8888 on the local host and opens a web browser window to display

+  the start page of Vaadin Content Browser.

 

-The installation directory is a web application as itself and is directly importable to

-Eclipse IDE by selecting "File / Import / Existing Projects into Workspace" from Eclipse

-main menu. See the manual for detailed instructions.

+In Linux:

+  Open a shell window, change to the installation directory, and execute

+  "sh start.sh". It will start a web application at port 8888 on the local

+  host and opens a web browser window to display the start page of Vaadin

+  Content Browser.

+

+In Mac:

+  Start Terminal.app and run the start.sh script in the installation

+  directory. It will start a web application at port 8888 on the local

+  host and opens a web browser window to display the start page of Vaadin

+  Content Browser.

+

+The installation directory is a web application as itself and can be directly

+imported to the Eclipse IDE by selecting

+"File / Import / Existing Projects into Workspace" from Eclipse main menu.

+See the manual for detailed instructions.

 

 ---------------------------------

 What's Inside the Vaadin Package?

@@ -21,9 +35,9 @@ What's Inside the Vaadin Package?
 You should start exploring Vaadin through the provided Content Browser web

 application within this package; see 'How to Start?' above.

 

-The WebContent directory contains the content available through the Content Browser: the

-Vaadin Library, demos, documentation, and other useful information to get started

-with Vaadin.

+The WebContent directory contains the content available through the Content

+Browser: the Vaadin Library, demos, documentation, and other useful

+information to get started with Vaadin.

 

 Below is a list of most important locations and files:

 

@@ -33,14 +47,11 @@ Start Vaadin
 COPYING

 - license file

 

-WebContent/vaadin-<version></version>.jar

+WebContent/vaadin-@version@.jar

 - Vaadin Library containing Java source and compiled files

 

-WebContent/doc/manual.pdf

-- Vaadin Reference Manual in PDF format

-

-WebContent/doc/manual/index.html

-- Vaadin Reference Manual in HTML format

+WebContent/doc/book-of-vaadin.pdf

+- Book of Vaadin in PDF format

 

 WebContent/doc/api/index.html

 - Vaadin API Documentation as JavaDoc reference