diff options
| author | Sven Gothel <[email protected]> | 2019-08-18 01:46:58 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-08-18 01:46:58 +0200 |
| commit | f12fde9dbfc79aa37303c724f094b3cef8a3f989 (patch) | |
| tree | bb52f6e43b51aba6d74b9e582c8578798e508374 | |
| parent | 15549c5c038e4ef009b9b487e460c29da16c956b (diff) | |
build.xml: Explicitly issue 'clean-temp' at start and in the end of default 'all*' targets.
This shall ensure that build-temp gets deleted before and after build,
removing the transitionary previous build state.
| -rw-r--r-- | make/build.xml | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/make/build.xml b/make/build.xml index 73616fa..2bd077e 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1222,23 +1222,36 @@ </target> <target name="base.compile" description="Base compile ensuring valid build results w/o tampering the artifacts.properties" - depends="init, android-launcher.build, gluegen.build.java, gluegen.build.native, gluegen.build.shasum, gluegen.package.java, gluegen.package.native, android-launcher.package" /> + depends="clean-temp, android-launcher.build, gluegen.build.java, gluegen.build.native, gluegen.build.shasum, gluegen.package.java, gluegen.package.native, android-launcher.package" /> - <target name="all.no_junit" description="Release build" depends="init, base.compile, tag.build, android.package, developer-zip-archive" /> - <target name="all" description="Release build" depends="init, base.compile, tag.build, junit.compile, android.package, developer-zip-archive" /> + <target name="all.no_junit" description="Release build" depends="base.compile, tag.build, android.package, developer-zip-archive" > + <antcall target="clean-temp" inheritAll="true" inheritRefs="true" /> + </target> + <target name="all" description="Release build" depends="base.compile, tag.build, junit.compile, android.package, developer-zip-archive" > + <antcall target="clean-temp" inheritAll="true" inheritRefs="true" /> + </target> - <target name="all.debug" description="Debug build" depends="init.debug, base.compile, tag.build, junit.compile, developer-zip-archive" /> + <target name="all.debug" description="Debug build" depends="init.debug, base.compile, tag.build, junit.compile, developer-zip-archive" > + <antcall target="clean-temp" inheritAll="true" inheritRefs="true" /> + </target> - <target name="all.ide" description="Debug IDE build including all junit tests, but don't tag the build or create archives" depends="init.debug, base.compile, tag.build, junit.compile" /> + <target name="all.ide" description="Debug IDE build including all junit tests, but don't tag the build or create archives" depends="init.debug, base.compile, tag.build, junit.compile" > + <antcall target="clean-temp" inheritAll="true" inheritRefs="true" /> + </target> - <target name="clean" depends="init"> + <target name="clean-temp" depends="init"> <delete includeEmptyDirs="true" failonerror="false"> - <fileset dir="${build}" /> <fileset dir="${project.root}/build-temp" /> <fileset dir="${project.root}" includes="make/GnuCTreeParserTokenTypes.txt make/STDCTokenTypes.txt" /> </delete> </target> + <target name="clean" depends="clean-temp"> + <delete includeEmptyDirs="true" failonerror="false"> + <fileset dir="${build}" /> + </delete> + </target> + <target name="tag.build" depends="init"> <echo message='gluegen.build.version=${jogamp.version}${line.separator}' file="${build}/artifact.properties"/> <echo message='gluegen.build.number=${gluegen.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/> |