diff options
| author | Marko Grönroos <magi@iki.fi> | 2009-05-14 14:31:22 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2009-05-14 14:31:22 +0000 |
| commit | e4e7bcd25cd15027f786798604f286a503c0b0e9 (patch) | |
| tree | e4e1555b066a852b6ab478474897b8be94ffeb31 | |
| parent | 8edeee183f4d3fa7244e142ad0918c7e1d60a3e2 (diff) | |
| download | vaadin-framework-e4e7bcd25cd15027f786798604f286a503c0b0e9.tar.gz vaadin-framework-e4e7bcd25cd15027f786798604f286a503c0b0e9.zip | |
Some renamings for Vaadin 6.0 package.
svn changeset:7818/svn branch:6.0
| -rw-r--r-- | build/build.xml | 16 | ||||
| -rw-r--r-- | build/html-style.properties | 2 | ||||
| -rw-r--r-- | build/package/eclipse-Vaadin Hosted Mode-launch (renamed from build/package/eclipse-IT Mill Toolkit Hosted Mode-launch) | 0 | ||||
| -rw-r--r-- | build/package/eclipse-Vaadin Web Mode-launch (renamed from build/package/eclipse-IT Mill Toolkit Web Mode-launch) | 0 | ||||
| -rw-r--r-- | build/readme.txt | 10 |
5 files changed, 16 insertions, 12 deletions
diff --git a/build/build.xml b/build/build.xml index 2a276dc83b..5f8878c6af 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ <project xmlns:antcontrib="antlib:net.sf.antcontrib" - name="IT Mill Toolkit" + name="Vaadin" basedir="../" default="package-all"> <!-- Package creation - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21,6 +21,10 @@ * vaadin-mac-<version>.tar.gz * vaadin-mac-<version>.dmg + In addition, the OOPHM package has the following target for building: + package-oophm + * vaadin-oophm-<version>.zip + NOTE: This build script requires directories named ${gwt-dir}/(linux|windows|mac) . See build.properties to define path where your gwt installation is located. You must unpack platform specific binaries under linux, windows and mac directories. @@ -153,7 +157,7 @@ <isset property="ignoreversion"/> </or> </condition> - <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but IT Mill Toolkit must be compiled with genuine Java 1.5 compiler. Use -Dignoreversion=1 for ant to ignore the version check."/> + <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java 1.5 compiler. Use -Dignoreversion=1 for ant to ignore the version check."/> <echo>Java version is ${ant.java.version} as required.</echo> </target> @@ -165,7 +169,7 @@ <echo>Java Servlet API is available.</echo> <available classpathref="compile.classpath" classname="javax.servlet.ServletRequestListener" property="servlet.version.is-2.4"/> - <fail if="servlet.version.is-2.4" message="Java Servlet API 2.4 or later detected. IT Mill Toolkit must be compiled exactly with Servlet API 2.3."/> + <fail if="servlet.version.is-2.4" message="Java Servlet API 2.4 or later detected. Vaadin must be compiled exactly with Servlet API 2.3."/> <echo>Java Servlet API specification 2.3 used.</echo> </target> @@ -493,8 +497,8 @@ <move file="${output-dir}/build-widgetset.xml" tofile="${output-dir}/WebContent/doc/example-source/build-widgetset.xml" /> <move file="${output-dir}/eclipse-classpath" tofile="${output-dir}/.classpath" /> <move file="${output-dir}/eclipse-project" tofile="${output-dir}/.project" /> - <move file="${output-dir}/eclipse-IT Mill Toolkit Hosted Mode-launch" tofile="${output-dir}/IT Mill Toolkit Hosted Mode.launch" /> - <move file="${output-dir}/eclipse-IT Mill Toolkit Web Mode-launch" tofile="${output-dir}/IT Mill Toolkit Web Mode.launch" /> + <move file="${output-dir}/eclipse-Vaadin Hosted Mode-launch" tofile="${output-dir}/Vaadin Hosted Mode.launch" /> + <move file="${output-dir}/eclipse-Vaadin Web Mode-launch" tofile="${output-dir}/Vaadin Web Mode.launch" /> <mkdir dir="${output-dir}/.settings" /> <move file="${output-dir}/eclipse-org.eclipse.core.resources.prefs" tofile="${output-dir}/.settings/org.eclipse.core.resources.prefs" /> <move file="${output-dir}/eclipse-org.eclipse.jdt.core.prefs" tofile="${output-dir}/.settings/org.eclipse.jdt.core.prefs" /> @@ -998,7 +1002,7 @@ <exec executable="svn" dir="${checkout-path}"> <arg value="checkout"/> - <arg value="http://dev.itmill.com/svn/doc/trunk"/> + <arg value="http://dev.vaadin.com/svn/doc/trunk"/> <arg value="doc"/> </exec> diff --git a/build/html-style.properties b/build/html-style.properties index c2b8cf9111..aa0c2c2944 100644 --- a/build/html-style.properties +++ b/build/html-style.properties @@ -7,7 +7,7 @@ html.body.end=<div id="footer"><span>Version: ${version}</span>© Oy IT Mil html.head.tag=<head> html.head.endtag=</head> html.head.style=<link rel="stylesheet" type="text/css" href="styles/demos.css" /> -javadoc.doctitle=<h1>IT Mill Toolkit</h1> +javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright © 2000-2009 IT Mill Ltd. All Rights Reserved.</i> www.manual.body.start1=<div id="container"><div id="header"><h1> www.manual.body.start2=</h1></div><div id="itmilllogo"></div> diff --git a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch b/build/package/eclipse-Vaadin Hosted Mode-launch index 7479aeb801..7479aeb801 100644 --- a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch +++ b/build/package/eclipse-Vaadin Hosted Mode-launch diff --git a/build/package/eclipse-IT Mill Toolkit Web Mode-launch b/build/package/eclipse-Vaadin Web Mode-launch index 30439e501f..30439e501f 100644 --- a/build/package/eclipse-IT Mill Toolkit Web Mode-launch +++ b/build/package/eclipse-Vaadin Web Mode-launch diff --git a/build/readme.txt b/build/readme.txt index 51e01e9bad..6310236fc7 100644 --- a/build/readme.txt +++ b/build/readme.txt @@ -6,7 +6,7 @@ How to build packages 1. See build/GWT-VERSION.properties file - states the GWT version used within this project -2. Checkout correct GWT distribution version for your platform from http://dev.itmill.com/svn/gwt/ +2. Checkout correct GWT distribution version for your platform from http://dev.vaadin.com/svn/gwt/ - 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 @@ -21,10 +21,10 @@ How to build packages Complete example for building from scratch ========================================== This is run in an empty directory on Ubuntu 8.10 to checkout sources from svn and -to build a complete IT Mill Toolkit package. +to build a complete Vaadin package. -svn co http://dev.itmill.com/svn/trunk/ -svn co http://dev.itmill.com/svn/gwt/ +svn co http://dev.vaadin.com/svn/trunk/ +svn co http://dev.vaadin.com/svn/gwt/ cd gwt tar xfj gwt-linux-1.5.3.tar.bz2 cd ../trunk/build @@ -32,4 +32,4 @@ mkdir gwt cd gwt ln -sf ../../../gwt/gwt-linux-1.5.3 linux cd .. -ant package-linux
\ No newline at end of file +ant package-linux |