From 6ba26218ee376e86d93a61777bfc3b64912cc04a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sun, 21 Jan 2007 20:32:33 +0000 Subject: [PATCH] Run the unit test in src_test so we don't need to depend on full dev-java/ant for just building this. Package-Manager: portage-2.1.2-r1 --- dev-java/jline/ChangeLog | 8 +- dev-java/jline/Manifest | 34 +++- dev-java/jline/files/maven-build.properties | 13 ++ dev-java/jline/files/maven-build.xml | 199 ++++++++++++++++++++ dev-java/jline/jline-0.9.9-r1.ebuild | 26 ++- 5 files changed, 261 insertions(+), 19 deletions(-) create mode 100644 dev-java/jline/files/maven-build.properties create mode 100644 dev-java/jline/files/maven-build.xml diff --git a/dev-java/jline/ChangeLog b/dev-java/jline/ChangeLog index 159085d22412..96003a444623 100644 --- a/dev-java/jline/ChangeLog +++ b/dev-java/jline/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jline # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.5 2007/01/21 14:11:56 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.6 2007/01/21 20:32:33 betelgeuse Exp $ + + 21 Jan 2007; Petteri Räty + +files/maven-build.properties, +files/maven-build.xml, + jline-0.9.9-r1.ebuild: + Run the unit test in src_test so we don't need to depend on full + dev-java/ant for just building this. 21 Jan 2007; Vlastimil Babka jline-0.9.9-r1.ebuild: Depend on full ant for junit, fixes bug #163049. diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest index d8a58c5a4312..c7f96e7a4c4f 100644 --- a/dev-java/jline/Manifest +++ b/dev-java/jline/Manifest @@ -1,16 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX build-0.9.9.xml 3483 RMD160 31693eabfa651af418938f22175aaf8be3608112 SHA1 d9a1a8ba7a9709c1e873d30cc1b2fd8bb8067a6f SHA256 36ee2d8d6770f8c6fe0a13a94b8cc86682139f902b911b308528ba04b9c08bb2 MD5 fea58a669e91ad7cb8adc6e47484c153 files/build-0.9.9.xml 3483 RMD160 31693eabfa651af418938f22175aaf8be3608112 files/build-0.9.9.xml 3483 SHA256 36ee2d8d6770f8c6fe0a13a94b8cc86682139f902b911b308528ba04b9c08bb2 files/build-0.9.9.xml 3483 +AUX maven-build.properties 529 RMD160 848710f8ecbb55fe2b5b5a8b383ef6b720d095cb SHA1 fad287b1dc9ead53425755e4e1ada1454b6ef381 SHA256 724fa4a3c9268861f5556df8f03c38bf797b090db7fcaecdd04aab5ac3fa0d55 +MD5 a9eaa4290f58a9ea305de33ebfe3a45a files/maven-build.properties 529 +RMD160 848710f8ecbb55fe2b5b5a8b383ef6b720d095cb files/maven-build.properties 529 +SHA256 724fa4a3c9268861f5556df8f03c38bf797b090db7fcaecdd04aab5ac3fa0d55 files/maven-build.properties 529 +AUX maven-build.xml 8690 RMD160 f0df801eefb80fa60d5892155a24824c1b8a154d SHA1 a66e2d7cdd19fbfb88da3b4dcceb03951f37c2a0 SHA256 927859305f93e7a07cb2b2b6a5e54f11b9d2f0cf47bd424ad89b35fa65660bd7 +MD5 63c08a4586fde5a3295fb6e437e61977 files/maven-build.xml 8690 +RMD160 f0df801eefb80fa60d5892155a24824c1b8a154d files/maven-build.xml 8690 +SHA256 927859305f93e7a07cb2b2b6a5e54f11b9d2f0cf47bd424ad89b35fa65660bd7 files/maven-build.xml 8690 DIST jline-0.9.9.zip 692022 RMD160 62e45ddadf1eb175cf0271df5f8f8d6075f62f07 SHA1 f87ec1bc97bfefcc25d7186f2e94510c57bd9e65 SHA256 f1ac3b06fbb9b81c03555874ab748c3e674644736f0003ac3ed81d6201332e9b -EBUILD jline-0.9.9-r1.ebuild 1161 RMD160 e2ce4978e6c542f02669303316751e75700e855c SHA1 e9926b86ec316dd93dfaa165c6859be3c282029d SHA256 994e9b0736b864306b130e70ea0551926fafb60089a2f149c8ca0d8c92c40bef -MD5 eca699cf40ec97bdd5ba61794f7f180a jline-0.9.9-r1.ebuild 1161 -RMD160 e2ce4978e6c542f02669303316751e75700e855c jline-0.9.9-r1.ebuild 1161 -SHA256 994e9b0736b864306b130e70ea0551926fafb60089a2f149c8ca0d8c92c40bef jline-0.9.9-r1.ebuild 1161 -MISC ChangeLog 909 RMD160 8b59affccb2b82c1e7246a7860f692df17ca0ca6 SHA1 811a4d0b28ee875131536b3d7a1299b27aaaecaa SHA256 64c925b743e4296bee7857521a1d6b3557e845e9d8d56f06c9f9f0ed4872712a -MD5 c173274ee0bf6367c6639269ecd73660 ChangeLog 909 -RMD160 8b59affccb2b82c1e7246a7860f692df17ca0ca6 ChangeLog 909 -SHA256 64c925b743e4296bee7857521a1d6b3557e845e9d8d56f06c9f9f0ed4872712a ChangeLog 909 +EBUILD jline-0.9.9-r1.ebuild 1319 RMD160 5c29d8035228d91deface7b5c42e9b19ada8e21b SHA1 81e56ecf7eab90332aca736816593590aed2925a SHA256 a2c5c0682b3b9053a95644c77000e421e5b695f597a92a0c19e17fc4fbbaa0bc +MD5 e651190099c827c4c8e9cede6060c254 jline-0.9.9-r1.ebuild 1319 +RMD160 5c29d8035228d91deface7b5c42e9b19ada8e21b jline-0.9.9-r1.ebuild 1319 +SHA256 a2c5c0682b3b9053a95644c77000e421e5b695f597a92a0c19e17fc4fbbaa0bc jline-0.9.9-r1.ebuild 1319 +MISC ChangeLog 1155 RMD160 1b8bc5ee8ad16dd4e4592ad56369899ce2e4e1d3 SHA1 805953bb999865e8ba4e1d7685e28966c9fea844 SHA256 945de61150d5635ceb694b088b8ec81f206c7f0cd501a11e8c34654035a3bc4f +MD5 c33316ab51d058eba906964383c921c0 ChangeLog 1155 +RMD160 1b8bc5ee8ad16dd4e4592ad56369899ce2e4e1d3 ChangeLog 1155 +SHA256 945de61150d5635ceb694b088b8ec81f206c7f0cd501a11e8c34654035a3bc4f ChangeLog 1155 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252 @@ -18,3 +29,10 @@ SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a metadata MD5 1f96274dc29bbf19598105039e7106a1 files/digest-jline-0.9.9-r1 226 RMD160 e0e738a6995c1c505e6bf84b08555c4948d8f65d files/digest-jline-0.9.9-r1 226 SHA256 b598c193b8fc7f5aba1c3ba65d0427912ce24ece03d5cb1b7588517b00532cd9 files/digest-jline-0.9.9-r1 226 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFs83ocxLzpIGCsLQRAv7lAJ9KXRehg9sQeuODt6t8vCA93lf/gQCgk3+l +ueKbHVqco3b7wUmpcc1ODlA= +=nEYo +-----END PGP SIGNATURE----- diff --git a/dev-java/jline/files/maven-build.properties b/dev-java/jline/files/maven-build.properties new file mode 100644 index 000000000000..bebd460b3286 --- /dev/null +++ b/dev-java/jline/files/maven-build.properties @@ -0,0 +1,13 @@ +#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE! +#Sun Jan 21 15:31:06 EET 2007 +maven.build.finalName=jline-0.9.9 +maven.build.outputDir=${maven.build.dir}/classes +maven.build.resourceDir.0=src/main/resources +maven.build.testResourceDir.0=src/test/resources +maven.build.testOutputDir=${maven.build.dir}/test-classes +maven.repo.local=/home/betelgeuse/.m2/repository +maven.settings.offline=false +maven.build.dir=target +maven.settings.interactiveMode=true +maven.build.srcDir.0=src/main/java +maven.build.testDir.0=src/test/java diff --git a/dev-java/jline/files/maven-build.xml b/dev-java/jline/files/maven-build.xml new file mode 100644 index 000000000000..ef1947b88a9f --- /dev/null +++ b/dev-java/jline/files/maven-build.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =================================== WARNING =================================== + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + =============================================================================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev-java/jline/jline-0.9.9-r1.ebuild b/dev-java/jline/jline-0.9.9-r1.ebuild index 2ed623e10e18..199aeb867e58 100644 --- a/dev-java/jline/jline-0.9.9-r1.ebuild +++ b/dev-java/jline/jline-0.9.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.9-r1.ebuild,v 1.4 2007/01/21 14:11:56 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.9-r1.ebuild,v 1.5 2007/01/21 20:32:33 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -11,14 +11,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="source" +IUSE="source test" -# TODO: use maven to create a build.xml that does not always -# run tests DEPEND=">=virtual/jdk-1.4 - dev-java/ant + dev-java/ant-core app-arch/unzip - dev-java/junit + test? ( dev-java/junit dev-java/ant-tasks ) source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.4" @@ -30,16 +28,24 @@ src_unpack() { cd "${S}" # we don't support maven for building yet. this build.xml was generated by: # - mvn ant:ant - # - tweak build.xml to use