diff options
| author | Michael Bien <[email protected]> | 2010-05-19 05:18:55 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-05-19 05:18:55 +0200 |
| commit | 5d0f56a70bcc1f971a9d330d8012b8b97778453a (patch) | |
| tree | e84cc5f92570aea45430a244657f9bc5d4727460 /make | |
| parent | 6842d41aff963d323c6047e30d06257f524be571 (diff) | |
| parent | 8e078b5902ed7615fd976499af7100f6f84cb2db (diff) | |
Merge branch 'master' of github.com:sgothel/jogl
Conflicts:
doc/HowToBuild.html
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-junit.xml | 2 | ||||
| -rw-r--r-- | make/build.xml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index eae2ea4c7..749e73dbd 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -24,7 +24,7 @@ <property name="java.dir.test" value="com/jogamp/test"/> <property name="java.part.test" value="${java.dir.test}/**"/> - <property name="batchtest.timeout" value="30000"/> + <property name="batchtest.timeout" value="60000"/> </target> diff --git a/make/build.xml b/make/build.xml index a79d2d5fc..51dac3fa7 100644 --- a/make/build.xml +++ b/make/build.xml @@ -10,7 +10,7 @@ <property name="javadoc.overview" value="doc/jogl/spec-overview.html" /> <property name="javadoc.nw.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" /> - <property name="javadoc.nw.spec" value="${project.root}/javadoc_nativewindow_spec" /> + <property name="javadoc.nw.spec" value="${build}/javadoc_nativewindow_spec" /> <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${nativewindow_base_version} Specification" /> <property name="javadoc.nw.spec.packagenames" value="javax.media.nativewindow.*" /> @@ -249,6 +249,9 @@ <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/> <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> </javadoc> + <zip destfile="${build}/javadoc_nativewindow_spec.zip" + basedir="${build}" + includes="javadoc_nativewindow_spec/**" /> </target> <target name="javadoc.spec" description="Build Specifications JOGL and Nativewindow" depends="init,javadoc.jogl.spec" /> |