diff options
| author | Henri Sara <henri.sara@itmill.com> | 2009-03-25 07:40:58 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2009-03-25 07:40:58 +0000 |
| commit | ec748e17c33c19a9e17e70423dc25333c7efce58 (patch) | |
| tree | a00ae74e02fc3975e14bff3095aab8681a907c7a /build | |
| parent | a074b1f0349c7f92746ffc0fc5195482f4ad9266 (diff) | |
| download | vaadin-framework-ec748e17c33c19a9e17e70423dc25333c7efce58.tar.gz vaadin-framework-ec748e17c33c19a9e17e70423dc25333c7efce58.zip | |
Merge from 5.3 to 6.0:
[7150] Undefined-sized window now resizes if needed. Fixes #2738.
[7161] NativeSelect width updated lazily in IE6. Fixes #2742.
[7165] Fixed gwt link creation in the 'night' target (for TeamCity building).
svn changeset:7171/svn branch:6.0
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index ffd4fdfac6..1935364d6b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -1369,10 +1369,14 @@ <!-- Initialize a nightly build. --> <target name="nightly-init" depends=""> + <!-- Mandatory parameters. --> <fail unless="version.minor" message="The version.minor property must be defined."/> <fail unless="build.number" message="The build.number property must be defined."/> <fail unless="nightly.publish" message="The nightly.publish property must be defined."/> + <!-- Optional parameters. --> + <property name="build.tag" value="dev"/> + <!-- We need to create a symlink to the GWT directory, because we --> <!-- are building automatically. --> <property name="gwt.link.target" value="../../gwt-1.5"/> @@ -1380,7 +1384,9 @@ <!-- Create the link unless it already exists. --> <available file="gwt" property="gwt.link.available"/> <if> - <isset property="gwt.link.available"/> + <not> + <isset property="gwt.link.available"/> + </not> <then> <echo>${gwt.link.available}</echo> <symlink link="gwt" resource="${gwt.link.target}" failonerror="false"/> @@ -1391,7 +1397,7 @@ <tstamp> <format property="nightly.date" pattern="yyyyMMdd"/> </tstamp> - <property name="version" value="${version.minor}-nightly-${nightly.date}-b${build.number}"/> + <property name="version" value="${version.minor}-${build.tag}-${nightly.date}-b${build.number}"/> <echo>##teamcity[buildNumber '${version}']</echo> </target> |