diff options
| author | Sven Gothel <[email protected]> | 2010-07-26 18:20:50 -0700 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-07-26 18:20:50 -0700 |
| commit | df161c9fcc1bc90d03e374e0eb8148424d4c5577 (patch) | |
| tree | eeca74874aeb808fb19b6e5e6ecd9d7b1c94ff62 /make | |
| parent | 4b1decf1fb351cf314e7031914389edab41e4d29 (diff) | |
Fix OSX 2: Newt EDT (MainThread) and I/O methods ; Build jogl.build.number
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 5 | ||||
| -rw-r--r-- | make/build.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 4234a335b..54408ab14 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -83,6 +83,11 @@ <property name="stub.includes.common" value="${stub.includes}/common" /> <property file="${build}/artifact.properties"/> + <condition property="jogl.build.number" value="manual-build"> + <not> + <isset property="jogl.build.number"/> + </not> + </condition> <condition property="setup.nodesktop"> <and> diff --git a/make/build.xml b/make/build.xml index 1244336c5..379f80c16 100644 --- a/make/build.xml +++ b/make/build.xml @@ -150,7 +150,7 @@ includes="jogl/${rootrel.build}/jogl/gensrc/classes/javax/media/opengl/**" /> </target> - <target name="tag.build"> + <target name="tag.build" depends="init"> <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/> <echo file="${build}/artifact.properties" message='jogl.build.number=${jogl.build.number}${line.separator}' append="true"/> </target> |