From d7c5961f02b7d8488333b41adcee334d540fb2cb Mon Sep 17 00:00:00 2001 From: adammurdoch Date: Sun, 7 Apr 2002 06:56:00 +0000 Subject: [PATCH] * Moved a bunch of Jars around in CVS. * Moved a bunch of Jars around in dist image: excalibur-cli-*.jar -> dist/bin/lib excalibur-bzip2-*.jar -> dist/ext excalibur-tar-*.jar -> dist/ext excalibur-zip-*.jar -> dist/ext * Added dependency on 'excalibur-bzip2' to archive 'antlib'. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272266 13f79535-47bb-0310-9956-ffa450edef68 --- proposal/myrmidon/antlib.xml | 5 +-- proposal/myrmidon/build.xml | 38 +++++++++--------- .../lib/{ => bin/lib}/excalibur-cli-1.0.jar | Bin .../lib/{ => ext}/excalibur-bzip2-1.0a.jar | Bin .../lib/{ => ext}/excalibur-tar-1.0a.jar | Bin .../lib/{ => ext}/excalibur-zip-1.0a.jar | Bin .../myrmidon/src/manifest/archive-manifest.mf | 3 ++ .../{ => tools}/lib/LICENSE.jdepend.txt | 0 8 files changed, 23 insertions(+), 23 deletions(-) rename proposal/myrmidon/lib/{ => bin/lib}/excalibur-cli-1.0.jar (100%) rename proposal/myrmidon/lib/{ => ext}/excalibur-bzip2-1.0a.jar (100%) rename proposal/myrmidon/lib/{ => ext}/excalibur-tar-1.0a.jar (100%) rename proposal/myrmidon/lib/{ => ext}/excalibur-zip-1.0a.jar (100%) create mode 100644 proposal/myrmidon/src/manifest/archive-manifest.mf rename proposal/myrmidon/{ => tools}/lib/LICENSE.jdepend.txt (100%) diff --git a/proposal/myrmidon/antlib.xml b/proposal/myrmidon/antlib.xml index 0f9daa369..77ed966da 100644 --- a/proposal/myrmidon/antlib.xml +++ b/proposal/myrmidon/antlib.xml @@ -37,9 +37,8 @@ Legal: - - - + + diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml index 297d3c998..bf9b62bb9 100644 --- a/proposal/myrmidon/build.xml +++ b/proposal/myrmidon/build.xml @@ -71,16 +71,17 @@ Legal: + + + + - - - - - + + @@ -205,7 +206,7 @@ Legal: - + @@ -220,7 +221,7 @@ Legal: classname="org.apache.myrmidon.build.AntlibDescriptorTask"> - + @@ -558,6 +559,7 @@ Legal: + @@ -659,8 +661,9 @@ Legal: + destdir="${gen.dir}"> + + @@ -716,7 +719,7 @@ Legal: - + - + @@ -824,25 +827,20 @@ Legal: + + + + - - - - - - - - - diff --git a/proposal/myrmidon/lib/excalibur-cli-1.0.jar b/proposal/myrmidon/lib/bin/lib/excalibur-cli-1.0.jar similarity index 100% rename from proposal/myrmidon/lib/excalibur-cli-1.0.jar rename to proposal/myrmidon/lib/bin/lib/excalibur-cli-1.0.jar diff --git a/proposal/myrmidon/lib/excalibur-bzip2-1.0a.jar b/proposal/myrmidon/lib/ext/excalibur-bzip2-1.0a.jar similarity index 100% rename from proposal/myrmidon/lib/excalibur-bzip2-1.0a.jar rename to proposal/myrmidon/lib/ext/excalibur-bzip2-1.0a.jar diff --git a/proposal/myrmidon/lib/excalibur-tar-1.0a.jar b/proposal/myrmidon/lib/ext/excalibur-tar-1.0a.jar similarity index 100% rename from proposal/myrmidon/lib/excalibur-tar-1.0a.jar rename to proposal/myrmidon/lib/ext/excalibur-tar-1.0a.jar diff --git a/proposal/myrmidon/lib/excalibur-zip-1.0a.jar b/proposal/myrmidon/lib/ext/excalibur-zip-1.0a.jar similarity index 100% rename from proposal/myrmidon/lib/excalibur-zip-1.0a.jar rename to proposal/myrmidon/lib/ext/excalibur-zip-1.0a.jar diff --git a/proposal/myrmidon/src/manifest/archive-manifest.mf b/proposal/myrmidon/src/manifest/archive-manifest.mf new file mode 100644 index 000000000..ab4c36bb3 --- /dev/null +++ b/proposal/myrmidon/src/manifest/archive-manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Extension-List: bzip2 +bzip2-Extension-Name: excalibur-bzip2 diff --git a/proposal/myrmidon/lib/LICENSE.jdepend.txt b/proposal/myrmidon/tools/lib/LICENSE.jdepend.txt similarity index 100% rename from proposal/myrmidon/lib/LICENSE.jdepend.txt rename to proposal/myrmidon/tools/lib/LICENSE.jdepend.txt