From 2d585453bbf6dc437a74e760645a4405184edffc Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Thu, 23 Jun 2011 10:43:26 +0000
Subject: svn changeset:19526/svn branch:6.6

---
 build/build.xml | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/build.xml b/build/build.xml
index ad90bc083b..ffb8c19f3c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -117,6 +117,8 @@
         <property file="build/GWT-VERSION.properties" />
         <property file="build/html-style.properties" />
 
+    	<property name="snapshot.repository.url" value="http://oss.sonatype.org/content/repositories/vaadin-snapshots" />
+
         <!-- Current timestamp in different formats. -->
         <tstamp>
             <format property="build.date" pattern="yyyy-MM-dd"/>
@@ -985,6 +987,39 @@
 
         <echo>##teamcity[publishArtifacts '${result-path}/differences.txt']</echo>
     </target>
+	
+    <!-- ================================================================== -->
+    <!-- Custom build.                                                     -->
+    <!-- ================================================================== -->
+
+    <!-- Main target for the custom build. -->
+    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, build, docs, internal-package-zip">
+    </target>
+
+
+    <!-- Initialize a custom build. -->
+    <target name="custom-build-init">
+        <echo>Preparing a custom build with properties file: ${build.properties.file}</echo>
+
+    	<!-- Custom build support -->
+		<antcontrib:if>
+			<isset property="build.properties.file"/>
+			<then>
+		        <tstamp>
+		            <format property="build.date.compact" pattern="yyyyMMdd"/>
+		        </tstamp>
+		        <property file="${build.properties.file}" />
+				<property name="version" value="${vaadin.internal.version}"/>
+		        <property name="version.full" value="${version}.custom-${build.date.compact}"/>
+	   		</then>
+			<!-- Otherwise version and snapshot.repository.url come from target "init" -->
+	  	</antcontrib:if>
+	</target>
+
+    <target name="custom-build-maven-publish">
+    	<antcall target="nightly-maven-publish" />
+    </target>
+
 
     <!-- ================================================================== -->
     <!-- Nightly build.                                                     -->
@@ -1102,7 +1137,7 @@
             <sysproperty key="file" value="../${result-path}/${lib-javadoc-jar-name}" />
             <sysproperty key="pomFile" value="maven/pom.xml" />
             <sysproperty key="repositoryId" value="vaadin-snapshots" />
-            <sysproperty key="url" value="http://oss.sonatype.org/content/repositories/vaadin-snapshots" />
+            <sysproperty key="url" value="${snapshot.repository.url}" />
             <sysproperty key="classifier" value="javadoc" />
             <sysproperty key="uniqueVersion" value="false" />
             <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
@@ -1114,7 +1149,7 @@
             <sysproperty key="file" value="../${result-path}/${lib-sources-jar-name}" />
             <sysproperty key="pomFile" value="maven/pom.xml" />
             <sysproperty key="repositoryId" value="vaadin-snapshots" />
-            <sysproperty key="url" value="http://oss.sonatype.org/content/repositories/vaadin-snapshots" />
+            <sysproperty key="url" value="${snapshot.repository.url}" />
             <sysproperty key="classifier" value="sources" />
             <sysproperty key="uniqueVersion" value="false" />
             <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
@@ -1129,7 +1164,7 @@
             <sysproperty key="file" value="../${output-dir}/WebContent/${lib-jar-name}" />
             <sysproperty key="pomFile" value="maven/pom.xml" />
             <sysproperty key="repositoryId" value="vaadin-snapshots" />
-            <sysproperty key="url" value="http://oss.sonatype.org/content/repositories/vaadin-snapshots" />
+            <sysproperty key="url" value="${snapshot.repository.url}" />
             <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
         </artifact:mvn>
     </target>
-- 
cgit v1.2.3


From 2776a22823fd3150ad520aff6997e02e011dd592 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 29 Jun 2011 10:35:26 +0000
Subject: Build script updates for custom build (Maven version number)

svn changeset:19562/svn branch:6.6
---
 build/build.xml              | 8 ++++----
 build/maven/pom-template.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'build')

diff --git a/build/build.xml b/build/build.xml
index ffb8c19f3c..8715c8ff1f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -114,6 +114,8 @@
     	<antcontrib:propertyregex property="version.minor" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2"/>
     	<antcontrib:propertyregex property="version.revision" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3"/>
 
+    	<property name="vaadin.version.maven" value="${version.major}.${version.minor}-SNAPSHOT" />
+
         <property file="build/GWT-VERSION.properties" />
         <property file="build/html-style.properties" />
 
@@ -1009,7 +1011,7 @@
 		            <format property="build.date.compact" pattern="yyyyMMdd"/>
 		        </tstamp>
 		        <property file="${build.properties.file}" />
-				<property name="version" value="${vaadin.internal.version}"/>
+				<property name="version" value="${vaadin.version}"/>
 		        <property name="version.full" value="${version}.custom-${build.date.compact}"/>
 	   		</then>
 			<!-- Otherwise version and snapshot.repository.url come from target "init" -->
@@ -1113,13 +1115,11 @@
     
     <target name="nightly-maven-pom.xml">
     	<echo>Creating pom.xml for nightly build</echo>
-    	<fail unless="version.major" message="Major version must be defined in version.major"/>
-    	<fail unless="version.minor" message="Major version must be defined in version.minor"/>
         <copy tofile="build/maven/pom.xml">
             <filterchain>
                 <expandproperties />
                 <replacetokens begintoken="@" endtoken="@">
-                    <token key="VERSION-MAJOR.MINOR" value="${version.major}.${version.minor}" />
+                    <token key="MAVEN-VERSION" value="${vaadin.version.maven}" />
                 </replacetokens>
             </filterchain>
             <fileset file="build/maven/pom-template.xml"/>
diff --git a/build/maven/pom-template.xml b/build/maven/pom-template.xml
index 5c2cb1a727..851642dd3c 100644
--- a/build/maven/pom-template.xml
+++ b/build/maven/pom-template.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.vaadin</groupId>
   <artifactId>vaadin</artifactId>
-  <version>@VERSION-MAJOR.MINOR@-SNAPSHOT</version>
+  <version>@MAVEN-VERSION@</version>
   <name>Vaadin</name>
   <organization>
     <name>Oy IT Mill Ltd</name>
-- 
cgit v1.2.3


From b1c8a2a3eb22837dcf842c43afaf4670195bfd8e Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 29 Jun 2011 10:40:23 +0000
Subject: Do not build documentation and ZIP package for custom build

svn changeset:19564/svn branch:6.6
---
 build/build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/build.xml b/build/build.xml
index 8715c8ff1f..44ac65bbf0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -995,7 +995,7 @@
     <!-- ================================================================== -->
 
     <!-- Main target for the custom build. -->
-    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, build, docs, internal-package-zip">
+    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, build">
     </target>
 
 
@@ -1013,6 +1013,8 @@
 		        <property file="${build.properties.file}" />
 				<property name="version" value="${vaadin.version}"/>
 		        <property name="version.full" value="${version}.custom-${build.date.compact}"/>
+				<!-- Other widgetsets required as long as building demo WAR -->
+				<!-- <property name="compile.only.default-widgetset" value="1"/> -->
 	   		</then>
 			<!-- Otherwise version and snapshot.repository.url come from target "init" -->
 	  	</antcontrib:if>
-- 
cgit v1.2.3


From 8156999d9278bbc71312b490bac54b0709d188cb Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 29 Jun 2011 10:42:37 +0000
Subject: Do not build demos or other widgetsets in custom build

svn changeset:19565/svn branch:6.6
---
 build/build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/build.xml b/build/build.xml
index 44ac65bbf0..a99bd31033 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -995,7 +995,7 @@
     <!-- ================================================================== -->
 
     <!-- Main target for the custom build. -->
-    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, build">
+    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, compile-server-side, compile-client-side, vaadin.jar, vaadin-sources.jar">
     </target>
 
 
@@ -1013,8 +1013,7 @@
 		        <property file="${build.properties.file}" />
 				<property name="version" value="${vaadin.version}"/>
 		        <property name="version.full" value="${version}.custom-${build.date.compact}"/>
-				<!-- Other widgetsets required as long as building demo WAR -->
-				<!-- <property name="compile.only.default-widgetset" value="1"/> -->
+				<property name="compile.only.default-widgetset" value="1"/>
 	   		</then>
 			<!-- Otherwise version and snapshot.repository.url come from target "init" -->
 	  	</antcontrib:if>
-- 
cgit v1.2.3


From aca5cf66b46010ad4a1eb1e99be37f5708879006 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 29 Jun 2011 10:53:38 +0000
Subject: Fixes and improvements to Maven version handling

svn changeset:19566/svn branch:6.6
---
 build/build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/build.xml b/build/build.xml
index a99bd31033..d6bdfa6dd1 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -114,8 +114,6 @@
     	<antcontrib:propertyregex property="version.minor" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2"/>
     	<antcontrib:propertyregex property="version.revision" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3"/>
 
-    	<property name="vaadin.version.maven" value="${version.major}.${version.minor}-SNAPSHOT" />
-
         <property file="build/GWT-VERSION.properties" />
         <property file="build/html-style.properties" />
 
@@ -1116,6 +1114,7 @@
     
     <target name="nightly-maven-pom.xml">
     	<echo>Creating pom.xml for nightly build</echo>
+    	<property name="vaadin.version.maven" value="${version.major}.${version.minor}-SNAPSHOT" />
         <copy tofile="build/maven/pom.xml">
             <filterchain>
                 <expandproperties />
@@ -1174,11 +1173,12 @@
     	<echo>Creating pom.xml for local test build</echo>
     	<fail unless="version.major" message="Major version must be defined in version.major"/>
     	<fail unless="version.minor" message="Major version must be defined in version.minor"/>
+    	<property name="vaadin.version.maven" value="${version.major}.${version.minor}" />
         <copy tofile="build/maven/pom.xml">
             <filterchain>
                 <expandproperties />
                 <replacetokens begintoken="@" endtoken="@">
-                    <token key="VERSION-MAJOR.MINOR" value="${version.major}.${version.minor}" />
+                    <token key="MAVEN-VERSION" value="${vaadin.version.maven}" />
                 </replacetokens>
             </filterchain>
             <fileset file="build/maven/pom-template.xml"/>
-- 
cgit v1.2.3