diff options
| -rw-r--r-- | make/build.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 0bf0d97a7..91d9a97c4 100644 --- a/make/build.xml +++ b/make/build.xml @@ -136,15 +136,20 @@ --> <target name="source-archive" depends="setup-version-RI,setup-version-non-RI"> + <!-- NOTE that if you are using multiple rootrel.build directories within the same + repository, the exclude lists here won't work well enough and you will wind up + archiving binary bits from other rootrel.build settings in the source archive. + This is inevitable given that we don't want to specialize this target to + explicitly include top level files and directories, to make it future-proof. --> <zip destfile="${build}/jogl-${tmp.version}-src.zip" basedir="${project.root}/.." - excludes="gluegen/build/**,gluegen/build-temp/**,jogl/build/**,jogl/build-temp/**" + excludes="gluegen/${rootrel.build}/**,gluegen/build/**gluegen/build-temp/**,jogl/${rootrel.build}/**,jogl/build/**,jogl/build-temp/**,jogl/www/**" includes="gluegen/**, jogl/**" /> <!-- Now add in certain portions of the generated source code for developers --> <zip update="true" destfile="${build}/jogl-${tmp.version}-src.zip" basedir="${project.root}/.." - includes="jogl/build/jogl/gensrc/classes/javax/media/opengl/**" /> + includes="jogl/${rootrel.build}/jogl/gensrc/classes/javax/media/opengl/**" /> </target> <!-- ================================================================== --> @@ -158,6 +163,9 @@ <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make.dir}" target="clean" inheritAll="false"/> <ant antfile="${jogl.build.xml}" dir="${jogl.make.dir}" target="clean" inheritAll="false"/> <ant antfile="${newt.build.xml}" dir="${newt.make.dir}" target="clean" inheritAll="false"/> + <delete includeEmptyDirs="true" quiet="true"> + <fileset dir="${build}" /> + </delete> </target> <target name="javadoc" depends="init"> |