diff options
| author | Kenneth Russel <[email protected]> | 2009-06-17 15:45:46 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2009-06-17 15:45:46 +0000 |
| commit | ebc1ae27a0f07961fb3b9875e30a1540179bb311 (patch) | |
| tree | 592596802cc063fa32fe3c7bced0ce468f23281c | |
| parent | 894cc9e771863ef18a954d3f7e88e5e2edcfebd9 (diff) | |
Fixed problem with building of source archive when rootrel.build is
set, although inevitably this target can not know which directories to
exclude if multiple rootrel.build targets are used within the same
working copy, given that we don't want to specialize it to know
exactly which top-level files and directories are present. Improved
"clean" target to actually delete the entire build directory.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1979 232f8b59-042b-4e1e-8c03-345bb8c30851
| -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"> |