Version bump for final release.
authorJoshua Nichols <nichoj@gentoo.org>
Fri, 5 Jan 2007 05:08:21 +0000 (05:08 +0000)
committerJoshua Nichols <nichoj@gentoo.org>
Fri, 5 Jan 2007 05:08:21 +0000 (05:08 +0000)
Package-Manager: portage-2.1.2_rc4-r4

dev-java/groovy/ChangeLog
dev-java/groovy/Manifest
dev-java/groovy/files/build.xml-1.0 [new file with mode: 0644]
dev-java/groovy/files/digest-groovy-1.0 [new file with mode: 0644]
dev-java/groovy/files/groovy-1.0-compiler-exit-code.patch [new file with mode: 0644]
dev-java/groovy/groovy-1.0.ebuild [new file with mode: 0644]

index 0ee371929ecfa45fa68d872ad4f5bbd44fbb907d..b98ee778c2b35842af8e86ca01073fcd6ff023c8 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/groovy
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.18 2006/12/30 20:46:42 caster Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.19 2007/01/05 05:08:21 nichoj Exp $
+
+*groovy-1.0 (05 Jan 2007)
+
+  05 Jan 2007; Joshua Nichols <nichoj@gentoo.org> +files/build.xml-1.0,
+  +files/groovy-1.0-compiler-exit-code.patch, +groovy-1.0.ebuild:
+  Version bump for final release.
 
   30 Dec 2006; Vlastimil Babka <caster@gentoo.org> files/build.xml-1.0_rc01,
   groovy-1.0_rc01.ebuild:
index a63e7595132761f688307dacc6e6fc71a1c7ef56..166fb9658e2aadb40130e1f4f7a4a80bba5b301a 100644 (file)
@@ -1,24 +1,40 @@
+AUX build.xml-1.0 6057 RMD160 4e3d592b846554db9b36865841f788d0e5dd9106 SHA1 1c92bda7e9f6c2ae65a0fa5b051ef0d19617d136 SHA256 b622bbae573b4c9a1fb7b33e111828a20560796137a905d7989dde2f76ffe9b5
+MD5 2414cb47f9d856163a275bb15ec0cdaa files/build.xml-1.0 6057
+RMD160 4e3d592b846554db9b36865841f788d0e5dd9106 files/build.xml-1.0 6057
+SHA256 b622bbae573b4c9a1fb7b33e111828a20560796137a905d7989dde2f76ffe9b5 files/build.xml-1.0 6057
 AUX build.xml-1.0_rc01 5860 RMD160 ecabd798fc1b4ff10502fa298b3e985b2b22771c SHA1 638dee00a4e5d0466d67fd63c9d06dbbd3a5fb21 SHA256 27b2c31c174f74314d8d75accbe08acfcf5f49ebeae9831e2869ed3d9f54a44d
 MD5 e2611e683bbbbf9bc8988d7cabc54a52 files/build.xml-1.0_rc01 5860
 RMD160 ecabd798fc1b4ff10502fa298b3e985b2b22771c files/build.xml-1.0_rc01 5860
 SHA256 27b2c31c174f74314d8d75accbe08acfcf5f49ebeae9831e2869ed3d9f54a44d files/build.xml-1.0_rc01 5860
+AUX groovy-1.0-compiler-exit-code.patch 581 RMD160 738498ac3883d1dabf0ad8f75d30bd8a23a82cf9 SHA1 a193ea0b6875e9c7a266b9c4e5ec3d568f4a4bcd SHA256 0a5fb73cbfd4913903000c7632fb931f8611cb7d7ff04c6004ad5659d312484b
+MD5 507b823cf983a5244e4050ddd795c7af files/groovy-1.0-compiler-exit-code.patch 581
+RMD160 738498ac3883d1dabf0ad8f75d30bd8a23a82cf9 files/groovy-1.0-compiler-exit-code.patch 581
+SHA256 0a5fb73cbfd4913903000c7632fb931f8611cb7d7ff04c6004ad5659d312484b files/groovy-1.0-compiler-exit-code.patch 581
 AUX groovy-1.0_rc01-compiler-exit-code.patch 1298 RMD160 b03e55173ea0ff4e1ccece169d172b82d65af727 SHA1 ef45228ad25a704c4a9f08b43f7f4c519551a692 SHA256 1e95765f7b0919314049ab955eeb3e38b0cd17c2e5655f4bc1958f1fda6543d3
 MD5 5f0b3b8d5848efe47815055e507ae196 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
 RMD160 b03e55173ea0ff4e1ccece169d172b82d65af727 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
 SHA256 1e95765f7b0919314049ab955eeb3e38b0cd17c2e5655f4bc1958f1fda6543d3 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
 DIST groovy-1.0-RC-01-src.tar.gz 985880 RMD160 eed0f9259ad9775779c1c58b0128befe88fe90da SHA1 9ecce175ccac2dae784eed26f0eda796f34a78d0 SHA256 b788d1f8e43779cb518a21a92d1b9808f363b491d7d7084cfd177ed71fff84aa
+DIST groovy-1.0-src.tar.gz 966931 RMD160 dad940d5bbe10a16686dc619a094c2cbdc0d52f1 SHA1 010a21f5694a8a35756f7c491ce0518ff954812c SHA256 63d1e47d80a31567792b65dfe19653ab98ce74a6876fb05b9423b83ecc960599
+EBUILD groovy-1.0.ebuild 3174 RMD160 2179eedd053d625e185a7e2b9b61b4c3505ad522 SHA1 2a211b0761bd0583fe9c9e06fe231449412c7f1b SHA256 fdfa520b4e539031a596530a2d19a75c7801691883c790fb55c14b26ac2fab23
+MD5 b706417ef1f83c9ff55e4b7d0a74e441 groovy-1.0.ebuild 3174
+RMD160 2179eedd053d625e185a7e2b9b61b4c3505ad522 groovy-1.0.ebuild 3174
+SHA256 fdfa520b4e539031a596530a2d19a75c7801691883c790fb55c14b26ac2fab23 groovy-1.0.ebuild 3174
 EBUILD groovy-1.0_rc01.ebuild 3065 RMD160 8421ade851a442ebffb691150384d68292e26b7a SHA1 47fb4010d5d2239a70b1c1c586a1fd86a16d1710 SHA256 733c0ac8d9298a675bf63cef85e72cb35dd8efffa1b58a9a1fc6390b0718dfc7
 MD5 5a017e712e234c3baf1c169304259188 groovy-1.0_rc01.ebuild 3065
 RMD160 8421ade851a442ebffb691150384d68292e26b7a groovy-1.0_rc01.ebuild 3065
 SHA256 733c0ac8d9298a675bf63cef85e72cb35dd8efffa1b58a9a1fc6390b0718dfc7 groovy-1.0_rc01.ebuild 3065
-MISC ChangeLog 3455 RMD160 6b01d530a094c845cc3b67a32ba20d89a1346368 SHA1 6dc4753e880004845f5df5d8af2b7ba0c505af7f SHA256 37a2199cd61f97b28a19bf35e075379f63d84ad7cf81cd7ef2a55fff1db23376
-MD5 d2df87dc71eff5b9890898b3fac72166 ChangeLog 3455
-RMD160 6b01d530a094c845cc3b67a32ba20d89a1346368 ChangeLog 3455
-SHA256 37a2199cd61f97b28a19bf35e075379f63d84ad7cf81cd7ef2a55fff1db23376 ChangeLog 3455
+MISC ChangeLog 3655 RMD160 82cf152a53c93f94978b3ff9aa5cdf87231b3306 SHA1 4ef79a5cea4da92dfe7c4a69c19dc2d469450cf0 SHA256 6a24e377d457d2b779ab7dc18df4ecbf64e984c74becbb6eb35a9b225dabd3d4
+MD5 073051be6579547aa223a013ab214527 ChangeLog 3655
+RMD160 82cf152a53c93f94978b3ff9aa5cdf87231b3306 ChangeLog 3655
+SHA256 6a24e377d457d2b779ab7dc18df4ecbf64e984c74becbb6eb35a9b225dabd3d4 ChangeLog 3655
 MISC metadata.xml 830 RMD160 e44201b843377223db467fe70be144015cab7b59 SHA1 37a0746d1e2a77a17c787679a9999eb51dad7988 SHA256 4b3a3459adb24e4c0b26ce6393047369f82ab7d6075c19c2926cf9cd256794ab
 MD5 fa732ae92a71e90035cc94ba31d28449 metadata.xml 830
 RMD160 e44201b843377223db467fe70be144015cab7b59 metadata.xml 830
 SHA256 4b3a3459adb24e4c0b26ce6393047369f82ab7d6075c19c2926cf9cd256794ab metadata.xml 830
+MD5 dae7d800484aece65ea06c5433a4a519 files/digest-groovy-1.0 244
+RMD160 dcce0e075b49e04314fa12775a00066907750490 files/digest-groovy-1.0 244
+SHA256 86adb88603d4ef7218667268db25c73d92e569fd957c8789c1939949351d10ad files/digest-groovy-1.0 244
 MD5 afaff3addd3c6831ceddc75a5bf063a3 files/digest-groovy-1.0_rc01 262
 RMD160 b134a8ee07418d937e851a7cf7e9a2625fc71e99 files/digest-groovy-1.0_rc01 262
 SHA256 8cc01f453647a7f0be77bcaebf8366fdb24384d330a2b0e790545fd6ad112b86 files/digest-groovy-1.0_rc01 262
diff --git a/dev-java/groovy/files/build.xml-1.0 b/dev-java/groovy/files/build.xml-1.0
new file mode 100644 (file)
index 0000000..1111b90
--- /dev/null
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--build.xml generated by maven from project.xml version 1.0
+  on date January 4 2007, time 2343-->
+<project default="jar" name="groovy" basedir=".">
+  <!--Load local and user build preferences-->
+  <property file="build.properties"></property>
+  <property file="${user.home}/build.properties"></property>
+  <!--Build properties-->
+  <property name="defaulttargetdir" value="${basedir}/target"></property>
+  <property name="libdir" value="${user.home}/.maven/repository"></property>
+  <property name="classesdir" value="${basedir}/target/classes"></property>
+  <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
+  <property name="testreportdir" value="${basedir}/target/test-reports"></property>
+  <property name="distdir" value="${basedir}/dist"></property>
+  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
+  <property name="final.name" value="groovy-1.0"></property>
+  <property name="proxy.host" value=""></property>
+  <property name="proxy.port" value=""></property>
+  <property name="proxy.username" value=""></property>
+  <property name="proxy.password" value=""></property>
+  <path id="build.classpath">
+       <fileset dir="${libdir}" includes="**/*.jar"/>
+  </path>
+  <target name="init" description="o Initializes some properties">
+    <mkdir dir="${libdir}"></mkdir>
+    <condition property="noget">
+      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
+    </condition>
+    <!--Test if JUNIT is present in ANT classpath-->
+    <available property="Junit.present" classname="junit.framework.Test"></available>
+    <!--Test if user defined a proxy-->
+    <condition property="useProxy">
+      <and>
+        <isset property="proxy.host"></isset>
+        <not>
+          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
+        </not>
+      </and>
+    </condition>
+  </target>
+  <target name="compile" description="o Compile the code" depends="">
+    <mkdir dir="${classesdir}"></mkdir>
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="${basedir}/src/main"></pathelement>
+      </src>
+      <classpath refid="build.classpath"></classpath>
+    </javac>
+    <copy todir="${classesdir}">
+      <fileset dir="${basedir}/src/main">
+        <include name="**/*.properties"></include>
+        <include name="**/*.xml"></include>
+      </fileset>
+    </copy>
+  </target>
+  <target name="jar" description="o Create the jar" depends="compile">
+    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
+  </target>
+  <target name="clean" description="o Clean up the generated directories">
+    <delete dir="${defaulttargetdir}"></delete>
+    <delete dir="${distdir}"></delete>
+  </target>
+  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+    <mkdir dir="dist"></mkdir>
+    <copy todir="dist">
+      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
+      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
+    </copy>
+  </target>
+  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+    <fail message="There were test failures."></fail>
+  </target>
+  <target name="internal-test" depends="compile-tests">
+    <mkdir dir="${testreportdir}"></mkdir>
+    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+      <sysproperty key="basedir" value="."></sysproperty>
+      <formatter type="xml"></formatter>
+      <formatter usefile="false" type="plain"></formatter>
+      <classpath>
+        <path refid="build.classpath"></path>
+        <pathelement path="${testclassesdir}"></pathelement>
+        <pathelement path="${classesdir}"></pathelement>
+      </classpath>
+      <batchtest todir="${testreportdir}">
+        <fileset dir="${basedir}/src/test">
+          <include name="**/Uber*.*"></include>
+          <exclude name="**/SignedJarTest.*"></exclude>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="junit-present" unless="Junit.present" depends="init">
+    <echo>================================= WARNING ================================</echo>
+    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="compile-tests" depends="compile">
+    <mkdir dir="${testclassesdir}"></mkdir>
+    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="${basedir}/src/test"></pathelement>
+      </src>
+      <classpath>
+        <path refid="build.classpath"></path>
+        <pathelement path="${classesdir}"></pathelement>
+      </classpath>
+    </javac>
+    <copy todir="${testclassesdir}">
+      <fileset dir="${basedir}/src/test">
+        <include name="**/*.properties"></include>
+        <include name="**/*.xml"></include>
+        <include name="**/*.xsd"></include>
+      </fileset>
+    </copy>
+    <copy todir="${testclassesdir}">
+      <fileset dir="${basedir}/src/test">
+        <include name="**/*.*"></include>
+        <include name="**/groovy*"></include>
+      </fileset>
+    </copy>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="">
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="2003-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  The Codehaus. All Rights Reserved."></property>
+    <property name="title" value="groovy 1.0 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/main" packagenames=".*">
+      <classpath>
+        <path refid="build.classpath"></path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>
diff --git a/dev-java/groovy/files/digest-groovy-1.0 b/dev-java/groovy/files/digest-groovy-1.0
new file mode 100644 (file)
index 0000000..36011df
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 14d39578832e3c7a02a4d5972e5d573f groovy-1.0-src.tar.gz 966931
+RMD160 dad940d5bbe10a16686dc619a094c2cbdc0d52f1 groovy-1.0-src.tar.gz 966931
+SHA256 63d1e47d80a31567792b65dfe19653ab98ce74a6876fb05b9423b83ecc960599 groovy-1.0-src.tar.gz 966931
diff --git a/dev-java/groovy/files/groovy-1.0-compiler-exit-code.patch b/dev-java/groovy/files/groovy-1.0-compiler-exit-code.patch
new file mode 100644 (file)
index 0000000..18c5bb5
--- /dev/null
@@ -0,0 +1,11 @@
+diff -ru groovy-1.0/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java groovy-1.0-patched/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
+--- groovy-1.0/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java      2007-01-02 19:17:30.000000000 -0500
++++ groovy-1.0-patched/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java      2007-01-05 00:02:45.000000000 -0500
+@@ -223,6 +223,7 @@
+         catch( Throwable e ) \r
+         {\r
+             new ErrorReporter( e, displayStackTraceOnError ).write( System.err );\r
++                      System.exit(1);\r
+         }\r
+     }\r
+     \r
diff --git a/dev-java/groovy/groovy-1.0.ebuild b/dev-java/groovy/groovy-1.0.ebuild
new file mode 100644 (file)
index 0000000..2dcd827
--- /dev/null
@@ -0,0 +1,104 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0.ebuild,v 1.1 2007/01/05 05:08:21 nichoj Exp $
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV/_rc/-RC-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
+HOMEPAGE="http://groovy.codehaus.org/"
+SRC_URI="http://dist.codehaus.org/groovy/distributions/${MY_P/JSR/jsr}-src.tar.gz"
+LICENSE="codehaus-groovy"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="source"
+
+COMMON_DEPS="
+       =dev-java/asm-2.2*
+       >=dev-java/antlr-2.7.5
+       >=dev-java/xerces-2.7
+       >=dev-java/ant-core-1.6.5
+       >=dev-java/xstream-1.1.1
+       >=dev-java/junit-3.8.1
+       dev-java/qdox
+       >=dev-java/commons-cli-1.0
+       >=dev-java/bsf-2.3.0_rc1
+       >=dev-java/mockobjects-0.09
+       ~dev-java/servletapi-2.4
+       dev-java/sun-jmx"
+RDEPEND=">=virtual/jre-1.4
+       ${COMMON_DEPS}"
+# FIXME doesn't compile with 1.6 due to JDBC api change
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+       ${COMMON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+       unpack ${A}
+
+       cd ${S}
+#      epatch ${FILESDIR}/${P}-compiler-exit-code.patch
+
+       mkdir -p ${S}/target/lib
+
+       cd ${S}/target/lib
+       java-pkg_jar-from commons-cli-1
+       java-pkg_jar-from xerces-2
+       java-pkg_jar-from ant-core ant.jar
+       java-pkg_jar-from antlr
+       java-pkg_jar-from asm-2.2
+       java-pkg_jar-from qdox-1.6
+       java-pkg_jar-from xstream
+       java-pkg_jar-from mockobjects
+       java-pkg_jar-from junit
+       java-pkg_jar-from servletapi-2.4
+       java-pkg_jar-from bsf-2.3
+       java-pkg_jar-from sun-jmx
+
+       cd ${S}
+
+       # We use ant NOT maven. This build.xml is generated using 'maven ant', and
+       # then the following tweaks:
+       #  - change build.classpath to use <fileset dir="${libdir}" includes="**/*.jar"/>
+       #     instead of using each individual jar
+       #  - remove get-deps from the depends of all targets. you should be able to
+       #  define -Dnoget=true, but that doesn't really work
+       #  - remove all the get-* targets (otherwise, the file is a bit oversized to
+       #  be in files/
+       #  - remove all the junit-present stuff
+       #  - remove test dependency from jar target
+       cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml"
+
+       cd src/main
+       # This won't compile without an incestuous relationship with radeox.
+       rm -rf org/codehaus/groovy/wiki
+}
+
+src_compile() {
+       eant jar
+
+       # need to compile .groovy files to .class files
+       cd src/main
+       java -classpath ../../target/${MY_P}.jar:$(java-pkg_getjars commons-cli-1,asm-2.2,antlr,junit,qdox-1.6) \
+               org.codehaus.groovy.tools.FileSystemCompiler \
+               $(find -name *.groovy) || die "Failed to invoke groovyc"
+
+       # add the now compiled .class files to our jar
+       jar uf ../../target/${MY_P}.jar  $(find -name *.class) || die "Failed to backpatch Console*.class"
+}
+
+src_install() {
+       java-pkg_newjar target/${MY_P}.jar
+       java-pkg_dolauncher "grok" --main org.codehaus.groovy.tools.Grok
+       java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+       java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+       java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+       java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+}
+
+src_test() {
+       eant test
+}