diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2009-11-06 16:33:32 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2009-11-06 16:33:32 -0400 |
| commit | 02c06c7d09a4e1f3db3c3d4ccc00307054e72c0e (patch) | |
| tree | 876ce7ea0b858fc72af26fce3821dfb82160e08b | |
| parent | dce67b651683c0809eed59aa5a685f67dc16e4de (diff) | |
| download | candlepin-02c06c7d09a4e1f3db3c3d4ccc00307054e72c0e.tar.gz candlepin-02c06c7d09a4e1f3db3c3d4ccc00307054e72c0e.tar.xz candlepin-02c06c7d09a4e1f3db3c3d4ccc00307054e72c0e.zip | |
Cleanup some dead ant build.xml code.
There could be a LOT more. We currently have 750 lines of build XML. :(
| -rw-r--r-- | proxy/build.xml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/proxy/build.xml b/proxy/build.xml index 6f0a6f4..7a78c43 100644 --- a/proxy/build.xml +++ b/proxy/build.xml @@ -131,7 +131,7 @@ </target> <target name="init" - depends="resolve,link-jars,init-taskdefs, set-default-config-dir"> + depends="resolve,link-jars,init-taskdefs"> <tstamp /> </target> @@ -142,10 +142,6 @@ <property name="ccbuild" value="true" /> </target> - <target name="init-install" depends="set-default-config-dir"> - <property name="installbuild" value="true" /> - </target> - <target name="cctarget" depends="init-cc,all,cc-test,test-report,coverage-report,apidoc-jsp,javadoc" description="Target called by cruisecontrol process"> @@ -153,10 +149,6 @@ <target name="cc-test" depends ="set-cc-config-dir, test"/> - <target name="set-default-config-dir"> - <property name="rhn.config.dir" value="/etc/rhn" /> - </target> - <target name="set-cc-config-dir"> <property name="rhn.config.dir" value="${candlepin.home}/buildconf/builder/config/satellite" /> @@ -175,7 +167,7 @@ <target name="dotest" description="Run the tests (use -Dtestsubsystem=<subsystem> or -Dtestcase=<testcase>)" - depends="set-default-config-dir,compile-main,init-tests,invoke-tests-testcase,invoke-tests-subsystem,invoke-tests-all" > + depends="compile-main,init-tests,invoke-tests-testcase,invoke-tests-subsystem,invoke-tests-all" > <fail if="junit_test_failure" message="One or more tests failed" /> </target> @@ -471,7 +463,9 @@ </target> <target name="invoke-tests-all" unless="testcaseorsubsystem"> + <!-- <antcall target="checkstyle" /> + --> <run-junit include="**/test/*Test.class" banner="all tests" testbuilddir="${build.dir}/classes" |