summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-07-26 16:12:08 -0700
committerSven Gothel <[email protected]>2010-07-26 16:12:08 -0700
commit4b1decf1fb351cf314e7031914389edab41e4d29 (patch)
tree04cedd04cefe8514905b888eac121aa4746486a4
parent87b2c3a6752cebf2f65cb02e258d6ce7a7bc0451 (diff)
Fix build.number -> jogl.build.number; Read artifact.properties
-rw-r--r--make/build-common.xml2
-rw-r--r--make/build.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index fc53e951b..4234a335b 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -82,6 +82,8 @@
<property name="stub.includes" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet -->
<property name="stub.includes.common" value="${stub.includes}/common" />
+ <property file="${build}/artifact.properties"/>
+
<condition property="setup.nodesktop">
<and>
<isfalse value="${isWindows}" />
diff --git a/make/build.xml b/make/build.xml
index 892ae0a4d..1244336c5 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -152,7 +152,7 @@
<target name="tag.build">
<copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
- <echo file="${build}/artifact.properties" message='jogl.build.number="${build.number}"${line.separator}' append="true"/>
+ <echo file="${build}/artifact.properties" message='jogl.build.number=${jogl.build.number}${line.separator}' append="true"/>
</target>
<!-- ================================================================== -->