Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #631 from marc1706/ticket/628

Browse Source 
[ticket/628] Properly parse build number
This commit is contained in:
Marc Alexander
2015-06-22 10:25:51 +02:00
parent b3adcbe97d 5be701a09a
commit 0ea94ae9c8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.xml
View File

@@ -39,6 +39,7 @@
--> -->
<property name="version" value="HEAD" override="true" /> <property name="version" value="HEAD" override="true" />
<property name="package.version" value="HEAD" />
<property name="build-directory" value="build" override="true" /> <property name="build-directory" value="build" override="true" />
<property name="package-directory" value="${build-directory}/package/${vendor-name}/${extension-name}" /> <property name="package-directory" value="${build-directory}/package/${vendor-name}/${extension-name}" />
<property name="phpbb-root" value="${build-directory}/../../../../../" /> <property name="phpbb-root" value="${build-directory}/../../../../../" />
@@ -115,8 +116,9 @@
<echo msg="BUILD_NUMBER is not available" /> <echo msg="BUILD_NUMBER is not available" />
</then> </then>
<else> <else>
<exec dir="${build-directory}" command="echo $BUILD_NUMBER" outputProperty="version.override" passthru="true" /> <property environment="env" />
<property name="version" value="${version.override}" override="true" /> <echo>Build number is ${env.BUILD_NUMBER}</echo>
<property name="package.version" value="${env.BUILD_NUMBER}" override="true" />
</else> </else>
</if> </if>
</target> </target>
@@ -204,7 +206,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}_${package.version}" />
</phingcall> </phingcall>
</target> </target>