diff options
| author | Sven Gothel <[email protected]> | 2014-08-28 06:48:11 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-08-28 06:48:11 +0200 |
| commit | be0f9da108aaad99d91d43e59d30bed9b8b79574 (patch) | |
| tree | ef71c3550fb9ccae1921292f9b3e837dc5f0bc5a | |
| parent | fcde400cccd352cc13ff1f21945f330fcd94fbb7 (diff) | |
| parent | 1bf89ec4fde4227f8935f8c91b7ee22d160da581 (diff) | |
Merge remote-tracking branch 'hharrison/master'
| -rw-r--r-- | make/build.xml | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/make/build.xml b/make/build.xml index 534f122..9c96481 100644 --- a/make/build.xml +++ b/make/build.xml @@ -66,27 +66,33 @@ <property name="gluegen.build.number" value="manual"/> <property name="gluegen.build.id" value="${version.timestamp}"/> - <mkdir dir="${build}" /> - <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false" - output="${build}/localbranch.raw"> - <arg line="branch --no-color"/> - </exec> - <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false" - outputproperty="gluegen.build.branch"> - <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' '${build}/localbranch.raw'"/> + + <exec dir="${project.root}" executable="git" logError="false" failonerror="false" failifexecutionfails="false" + outputproperty="gluegen.build.branch.raw" resultproperty="gluegen.build.branch.ret"> + <arg value="symbolic-ref"/> + <arg value="-q"/> + <arg value="--short"/> + <arg value="HEAD"/> </exec> - <property name="gluegen.build.branch" value="manual"/> <!-- fallback --> - <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false" - outputproperty="gluegen.build.commit"> - <arg line="rev-parse HEAD"/> + <condition property="gluegen.build.branch" value="${gluegen.build.branch.raw}" else="manual"> + <not> <isfailure code="${gluegen.build.branch.ret}"/> </not> + </condition> + + <exec dir="${project.root}" executable="git" logError="false" failonerror="false" failifexecutionfails="false" + outputproperty="gluegen.build.commit.raw" resultproperty="gluegen.build.commit.ret"> + <arg value="rev-parse"/> + <arg value="HEAD"/> </exec> - <property name="gluegen.build.commit" value="manual"/> <!-- fallback --> + <condition property="gluegen.build.commit" value="${gluegen.build.commit.raw}" else="manual"> + <not> <isfailure code="${gluegen.build.commit.ret}"/> </not> + </condition> <property name="gluegen.version" value="${jogamp.version.base}-b${gluegen.build.number}-${version.timestamp}" /> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> <!-- The generated source directories. --> + <mkdir dir="${build}" /> <property name="src.generated" value="${build}/gensrc" /> <property name="src.generated.java" value="${src.generated}/java" /> <property name="src.generated.c" value="${src.generated}/native" /> |