Merge branch '2.1.x'

build.xml

@@ -39,6 +39,7 @@
     -->
 
     <property name="version" value="HEAD" override="true" />
+	<property name="package.version" value="HEAD" />
     <property name="build-directory" value="build" override="true" />
     <property name="package-directory" value="${build-directory}/package/${vendor-name}/${extension-name}" />
     <property name="phpbb-root" value="${build-directory}/../../../../../" />
@@ -110,6 +111,17 @@
 				<exec dir="${build-directory}/../phpbb/phpBB/ext/board3/portal" command="rm phploc.phar" passthru="true" />
 			</else>
 		</if>
+		<if>
+			<equals arg1="$BUILD_NUMBER" arg2="" />
+			<then>
+				<echo msg="BUILD_NUMBER is not available" />
+			</then>
+			<else>
+				<property environment="env" />
+				<echo>Build number is ${env.BUILD_NUMBER}</echo>
+				<property name="package.version" value="${env.BUILD_NUMBER}" override="true" />
+			</else>
+		</if>
 	</target>
 
     <target name="test" depends="clean,composer,prepare-tests">
@@ -195,7 +207,7 @@
         </phingcall>
 
         <phingcall target="wrap-package">
-            <property name="destination-filename" value="${build-directory}/upload/${vendor-name}_${extension-name}-${version}" />
+            <property name="destination-filename" value="${build-directory}/upload/${vendor-name}_${extension-name}_${package.version}" />
         </phingcall>
     </target>