From ec748e17c33c19a9e17e70423dc25333c7efce58 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 25 Mar 2009 07:40:58 +0000
Subject: 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
---
 build/build.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'build')

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>
 
-- 
cgit v1.2.3