diff --git a/libbase-1.1.3-remove-antcontrib-support.patch b/libbase-1.1.3-remove-antcontrib-support.patch new file mode 100644 index 0000000..793beb9 --- /dev/null +++ b/libbase-1.1.3-remove-antcontrib-support.patch @@ -0,0 +1,276 @@ +diff --git a/build.properties b/build.properties +index 9340c5b..557d5b0 100644 +--- a/build.properties ++++ b/build.properties +@@ -8,6 +8,6 @@ testsrc.dir=${basedir}/testcases + + java.awt.headless=true + +-antcontrib.available=true ++antcontrib.available=false + + build.cache.dir=lib +diff --git a/common_build.xml b/common_build.xml +index 3a42daa..104e1c8 100644 +--- a/common_build.xml ++++ b/common_build.xml +@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE + +- + +@@ -325,68 +322,6 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ depends="svnant.download-check"> + + + +@@ -491,58 +426,13 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ depends="ivy.download-check"> + + + +@@ -602,7 +492,7 @@ TYPICAL TARGET SEQUENCE + Verifies that there are no SNAPSHOT dependencies defined in the ivy xml. + If there are SNAPSHOTS, fail the release build. + ====================================================================--> +- ++ + + + +@@ -769,7 +659,7 @@ TYPICAL TARGET SEQUENCE + Publishes the jar file for this project to a Maven2 repository. + ====================================================================--> + ++ depends="create-pom,ivy.deliver"> + + + +@@ -1038,12 +928,11 @@ TYPICAL TARGET SEQUENCE + - compile.pre : anything needed to prep for compile + - compile.compile : the actual compilation step + - compile.src_copy : copying the source into the bin directory +- - compile.res_copy : copying the resources into the bin directory + - compile.lic_copy : copying the license information into the bin directory + - compile.post : anything needed after the compile is done + ====================================================================--> + + + +@@ -1075,36 +964,6 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + +- ++ + + + + + +- + +- ++ generate.manifest ++ ++ Creates a new manifest file if one is not specified, or updates ++ an existing manifest file if one is specified. ++ ====================================================================--> ++ + + + +@@ -1178,6 +1036,7 @@ TYPICAL TARGET SEQUENCE + + + ++ +