Merge pull request #630 from marc1706/ticket/628

[ticket/628] Correctly pass version.override [ci skip]
This commit is contained in:
Marc Alexander
2015-06-21 23:44:00 +02:00

View File

@@ -116,7 +116,7 @@
</then> </then>
<else> <else>
<exec dir="${build-directory}" command="echo $BUILD_NUMBER" outputProperty="version.override" passthru="true" /> <exec dir="${build-directory}" command="echo $BUILD_NUMBER" outputProperty="version.override" passthru="true" />
<property name="version" value="${BUILD_NUMBER}" override="true" /> <property name="version" value="${version.override}" override="true" />
</else> </else>
</if> </if>
</target> </target>
@@ -204,7 +204,7 @@
</phingcall> </phingcall>
<phingcall target="wrap-package"> <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}_${version}" />
</phingcall> </phingcall>
</target> </target>