diff options
author | Michael Bien <[email protected]> | 2010-07-09 03:46:36 +0200 |
---|---|---|
committer | Michael Bien <[email protected]> | 2010-07-09 03:46:36 +0200 |
commit | b2558379ed0b2ae7a0ab6bfdb0a8f2c05afa1663 (patch) | |
tree | 4d65598f5a1607f149b132deb576326b3f2a2e5a /make | |
parent | d02a2933f7e7a2b27be6dc1cfe0ebfa09f9b5100 (diff) |
fixed tests, build + cleanup.
- removed junit.jar, using now gluegen's lib
- fixed paths, joal.jar contains now classes :)
- converted junit test to junit 4.x
- replaced tabs with spaces...
Diffstat (limited to 'make')
-rwxr-xr-x | make/build.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/make/build.xml b/make/build.xml index f14f7ad..70c42c6 100755 --- a/make/build.xml +++ b/make/build.xml @@ -369,7 +369,7 @@ <!-- Now check for the presence of one well-known file --> <uptodate property="java.generate.skip" - targetfile="${src.generated.java}/net/java/games/joal/AL.java"> + targetfile="${src.generated.java}/com/jogamp/openal/AL.java"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> @@ -549,8 +549,7 @@ <!-- Build the jar excluding any build specific classes. --> <jar manifest="tempversion" destfile="${joal.jar}"> <fileset dir="${classes}"> - <include name="net/java/games/**" /> - <include name="com/sun/gluegen/runtime/**" /> + <include name="com/jogamp/openal/**" /> </fileset> </jar> <delete file="tempversion"/> @@ -612,7 +611,7 @@ <delete file="../${rootrel.build}/joal-${version-string}-src.zip" /> <zip destfile="../${rootrel.build}/joal-${version-string}-src.zip" basedir="../.." - includes="gluegen/LICENSE.txt,gluegen/doc/**,gluegen/make/**,gluegen/src/**,joal/README.txt,joal/LICENSE.txt,joal/make/**,joal/src/**,joal/${rootrel.build}/gensrc/classes/net/java/games/joal/AL.java,joal/${rootrel.build}/gensrc/classes/net/java/games/joal/ALC.java,joal/${rootrel.build}/gensrc/classes/net/java/games/joal/ALCConstants.java,joal/${rootrel.build}/gensrc/classes/net/java/games/joal/ALCcontext.java,joal/${rootrel.build}/gensrc/classes/net/java/games/joal/ALCdevice.java,joal/${rootrel.build}/gensrc/classes/net/java/games/joal/ALConstants.java" + includes="gluegen/LICENSE.txt,gluegen/doc/**,gluegen/make/**,gluegen/src/**,joal/README.txt,joal/LICENSE.txt,joal/make/**,joal/src/**,joal/${rootrel.build}/gensrc/classes/com/jogamp/openal/**" excludes="**/*.class,**/*~" /> </target> @@ -709,9 +708,7 @@ --> <target name="test" depends="all"> - <ant dir="../test" target="compile"/> - <ant dir="../test" target="runOpenALTest"/> - <ant dir="../test" target="runSound3DTest"/> + <ant dir="../test" target="test"/> </target> </project> |