Bug fix in the 'lib' target.
The 'lib' target was inteded to be a target the project-specific build could override. However, the common build was using it to create dependancies on '-lib-local' and '-lib-ivy'. If a project-specific build ovverrode lib and forgot to add those dependancies it would break. The project-specific builds should not be required to know about the internal dependancies of the common build. A new target '-lib' was created, which depends on '-lib-local', 'lic-ivy', and 'lib'. 'lib' is not an empty target that is safe to be overridden.
This commit is contained in:
		| @@ -61,7 +61,9 @@ | |||||||
|     </target> |     </target> | ||||||
| 
 | 
 | ||||||
|     <!--======== LIBRARY TARGETS ========--> |     <!--======== LIBRARY TARGETS ========--> | ||||||
|     <target name="lib" depends="-lib-local,-lib-ivy"/> |     <target name="-lib" depends="-lib-local,-lib-ivy,lib"/> | ||||||
|  |      | ||||||
|  |     <target name="lib"/> | ||||||
| 
 | 
 | ||||||
|     <target name="-init-ivy"> |     <target name="-init-ivy"> | ||||||
|         <ivy:settings id="ivy.settings" file="ivysettings.xml"/> |         <ivy:settings id="ivy.settings" file="ivysettings.xml"/> | ||||||
| @@ -112,7 +114,7 @@ | |||||||
|     </target> |     </target> | ||||||
| 
 | 
 | ||||||
|     <!--======== COMPILATION TARGETS ========--> |     <!--======== COMPILATION TARGETS ========--> | ||||||
|     <target name="-compile-groovy" depends="-init,-init-groovy,lib,-lib-groovy"> |     <target name="-compile-groovy" depends="-init,-init-groovy,-lib,-lib-groovy"> | ||||||
|         <mkdir dir="${build.dir}/main/classes"/> |         <mkdir dir="${build.dir}/main/classes"/> | ||||||
|         <groovyc srcdir="${src.dir}/main" destdir="${build.dir}/main/classes" |         <groovyc srcdir="${src.dir}/main" destdir="${build.dir}/main/classes" | ||||||
|             includeAntRuntime="false"> |             includeAntRuntime="false"> | ||||||
| @@ -125,7 +127,7 @@ | |||||||
|         </groovyc> |         </groovyc> | ||||||
|     </target> |     </target> | ||||||
| 
 | 
 | ||||||
|     <target name="-compile-java" depends="-init,lib"> |     <target name="-compile-java" depends="-init,-lib"> | ||||||
|         <mkdir dir="${build.dir}/main/classes"/> |         <mkdir dir="${build.dir}/main/classes"/> | ||||||
|         <javac srcdir="${src.dir}/main" destdir="${build.dir}/main/classes" |         <javac srcdir="${src.dir}/main" destdir="${build.dir}/main/classes" | ||||||
|             includeAntRuntime="false" classpathref="compile-libs"/> |             includeAntRuntime="false" classpathref="compile-libs"/> | ||||||
		Reference in New Issue
	
	Block a user