Merge changes from 6.6

svn changeset:19583/svn branch:6.7

2 files changed, 44 insertions, 8 deletions

diff --git a/build/build.xml b/build/build.xml
index ad90bc083b..d6bdfa6dd1 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,40 @@
 
         <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, compile-server-side, compile-client-side, vaadin.jar, vaadin-sources.jar">
+    </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.version}"/>
+		        <property name="version.full" value="${version}.custom-${build.date.compact}"/>
+				<property name="compile.only.default-widgetset" value="1"/>
+	   		</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.                                                     -->
@@ -1078,13 +1114,12 @@
     
     <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"/>
+    	<property name="vaadin.version.maven" value="${version.major}.${version.minor}-SNAPSHOT" />
         <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"/>
@@ -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>
@@ -1138,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"/>
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>