rpms/jruby/F-9 jruby-add-classpath-for-tests.patch, NONE, 1.1 jruby-dont-include-dependencies-in-jar.patch, NONE, 1.1 jruby-fix-jruby-start-script.patch, NONE, 1.1 jruby-remove-retroweaver-task.patch, NONE, 1.1 jruby.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Conrad Meyer (konradm) fedora-extras-commits at redhat.com
Fri Apr 25 02:39:02 UTC 2008


Author: konradm

Update of /cvs/pkgs/rpms/jruby/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29077/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	jruby-add-classpath-for-tests.patch 
	jruby-dont-include-dependencies-in-jar.patch 
	jruby-fix-jruby-start-script.patch 
	jruby-remove-retroweaver-task.patch jruby.spec 
Log Message:
Initial import


jruby-add-classpath-for-tests.patch:

--- NEW FILE jruby-add-classpath-for-tests.patch ---
--- build.xml.orig	2008-04-23 17:07:21.000000000 -0700
+++ build.xml	2008-04-23 17:12:21.000000000 -0700
@@ -484,10 +484,11 @@
       <echo message="compile=@{compile.mode}, jit.threshold=@{jit.threshold}, jit.max=@{jit.max}, objectspace=@{objectspace.enabled} threadpool=@{thread.pooling} reflection=@{reflection} version=@{jruby.version}"/>
       <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" classpath="${build.lib.dir}/junit.jar"/>
 
       <junit jvm="${jruby.test.jvm}" fork="yes" forkMode="once" haltonfailure="true" dir="${basedir}" maxmemory="${jruby.test.memory}" showoutput="true" timeout="1200000">
 	<classpath refid="test.class.path"/>
+	<classpath refid="build.classpath"/>
       
 	<sysproperty key="java.awt.headless" value="true"/>
 	<sysproperty key="jruby.home" value="${basedir}"/>
 	<sysproperty key="jruby.lib" value="${lib.dir}"/>
 	<sysproperty key="jruby.compile.mode" value="@{compile.mode}"/>

jruby-dont-include-dependencies-in-jar.patch:

--- NEW FILE jruby-dont-include-dependencies-in-jar.patch ---
--- build.xml.orig	2008-04-22 17:22:58.000000000 -0700
+++ build.xml	2008-04-22 17:27:32.000000000 -0700
@@ -168,34 +168,18 @@
        <patternset refid="java.src.pattern"/>
     </javac>
   </target>
 
   <target name="jar-jruby" unless="jar-up-to-date">
-      <antcall target="generate-method-classes" inheritall="true"/>
-      <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0rc7.jar"/>
-      <jarjar destfile="${lib.dir}/jruby.jar">
-        <fileset dir="${jruby.classes.dir}">
-          <exclude name="org/jruby/util/ant/**/*.class"/>
-        </fileset>
-        <zipfileset src="${build.lib.dir}/asm-3.0.jar"/>
-        <zipfileset src="${build.lib.dir}/asm-commons-3.0.jar"/>
-        <zipfileset src="${build.lib.dir}/asm-util-3.0.jar"/>
-        <zipfileset src="${build.lib.dir}/asm-analysis-3.0.jar"/>
-        <zipfileset src="${build.lib.dir}/asm-tree-3.0.jar"/>
-        <zipfileset src="${build.lib.dir}/bytelist-0.1.jar"/>
-        <zipfileset src="${build.lib.dir}/jvyamlb-0.1.jar"/>
-        <zipfileset src="${build.lib.dir}/jline-0.9.93.jar"/>
-        <zipfileset src="${build.lib.dir}/joni.jar"/>
-        <zipfileset src="${build.lib.dir}/jna-posix.jar"/>
-        <zipfileset src="${build.lib.dir}/jna.jar"/>
-        <zipfileset src="${build.lib.dir}/joda-time-1.5.1.jar"/>
-        <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm. at 1"/>
-        <manifest>
-          <attribute name="Built-By" value="${user.name}"/>
-          <attribute name="Main-Class" value="org.jruby.Main"/>
-        </manifest>
-      </jarjar>
+    <antcall target="generate-method-classes" inheritall="true"/>
+    <jar destfile="${lib.dir}/jruby.jar">
+      <fileset dir="${jruby.classes.dir}" />
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Main-Class" value="org.jruby.Main"/>
+      </manifest>
+    </jar>
   </target>
 
   <path id="lib.classpath">
     <pathelement location="${build.lib.dir}/retroweaver-rt-2.0.5.jar"/>
     <pathelement location="${build.lib.dir}/backport-util-concurrent.jar"/>

jruby-fix-jruby-start-script.patch:

--- NEW FILE jruby-fix-jruby-start-script.patch ---
--- bin/jruby.orig	2008-04-05 17:59:31.000000000 -0700
+++ bin/jruby	2008-04-05 19:01:29.000000000 -0700
@@ -9,10 +9,14 @@
 #
 #   JAVA_HOME     Must point at your Java Development Kit installation.
 #
 # -----------------------------------------------------------------------------
 
+CLASSPATH=$(build-classpath objectweb-asm/asm objectweb-asm/asm-util \
+            objectweb-asm/asm-analysis objectweb-asm/asm-tree joni \
+            joda-time jline bytelist jna-posix jvyamlb)
+
 cygwin=false
 
 # ----- Identify OS we are running under --------------------------------------
 case "`uname`" in
 CYGWIN*) cygwin=true

jruby-remove-retroweaver-task.patch:

--- NEW FILE jruby-remove-retroweaver-task.patch ---
--- build.xml	2008-02-10 04:57:50.000000000 -0800
+++ build.xml.patched	2008-03-02 02:27:42.000000000 -0800
@@ -39,12 +39,10 @@
   
   <patternset id="other.src.pattern">
     <include name="**/*.properties"/>
   </patternset>
   
-  <taskdef name="retro" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask" classpathref="build.classpath"/>
-  
   <import file="netbeans-ant.xml" optional="true"/>
 
   <!-- Initializes the build -->
   <target name="init">
     <xmlproperty file="build-config.xml" keepRoot="false" collapseAttributes="true"/>


--- NEW FILE jruby.spec ---
Name:           jruby
Version:        1.1.1
Release:        4%{?dist}
Summary:        Pure Java implementation of the Ruby interpreter

Group:          Development/Languages
License:        (CPL or GPLv2+ or LGPLv2+) and ASL 1.1 and MIT and Ruby
URL:            http://jruby.codehaus.org/
Source0:        http://dist.codehaus.org/jruby/jruby-src-1.1.1.tar.gz
# This patch is Fedora specific; we set up classpath using build-classpath.
Patch1:         jruby-fix-jruby-start-script.patch
# Temporary until upstream realizes they don't support 1.4 and scraps
# retroweaver.
Patch2:         jruby-remove-retroweaver-task.patch
# Disagreements with upstream. They want to bundle binary dependencies
# into jruby's jar; we don't.
Patch3:         jruby-dont-include-dependencies-in-jar.patch
# Assuming we want to run the tests.
Patch5:         jruby-add-classpath-for-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  ant >= 1.6
BuildRequires:  ant-junit >= 1.6
BuildRequires:  bsf
BuildRequires:  bytelist
BuildRequires:  java-devel >= 1.5
BuildRequires:  jline
BuildRequires:  jna
BuildRequires:  jna-posix
BuildRequires:  joda-time
BuildRequires:  joni
BuildRequires:  jpackage-utils >= 1.5
BuildRequires:  junit
BuildRequires:  jvyamlb
BuildRequires:  objectweb-asm

Requires:       bcel
Requires:       bsf
Requires:       bytelist
Requires:       java >= 1.5
Requires:       jna
Requires:       jna-posix
Requires:       jpackage-utils >= 1.5
Requires:       jvyamlb
Requires:       objectweb-asm

%description
JRuby is an 100% pure-Java implementation of the Ruby programming
language.

Features:
  * A 1.8.5 compatible Ruby interpreter
  * Most builtin Ruby classes provided
  * Support for interacting with and defining Java classes from within
    Ruby
  * Bean Scripting Framework (BSF) support


%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    javadoc
Javadoc for %{name}.


%prep
%setup -q
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch5 -p0

cp build.xml build.xml.orig

# delete binary .jars.
rm -f build_lib/*.jar
# there are non-binaries in lib/ as well; leave them alone
rm -f lib/bsf.jar
rm -f lib/profile.{jar,properties}

# and replace them with symlinks
build-jar-repository -s -p build_lib objectweb-asm/asm \
  objectweb-asm/asm-analysis objectweb-asm/asm-commons \
  objectweb-asm/asm-tree objectweb-asm/asm-util jline jna \
  joda-time joni junit bsf jna-posix jvyamlb bytelist

# remove hidden .document files
find lib/ruby/ -name '*.document' -exec rm -f '{}' \;

# change included stdlib to use jruby rather than some arcane ruby install
find lib/ruby/ -name '*.rb' -exec sed --in-place "s|^#!/usr/local/bin/ruby|#!/usr/bin/env jruby|" '{}' \;

# remove some random empty files
rm -f lib/ruby/gems/1.8/gems/rspec-*/spec/spec/runner/{empty_file.txt,resources/a_{foo,bar}.rb}

# archdir on jruby
mkdir lib/ruby/site_ruby/1.8/java


%build
ant jar
ant create-apidocs


%install
rm -rf %{buildroot}

# prefix install
install -p -d -m 755 %{buildroot}%{_libdir}/%{name}
cp -ar samples/ %{buildroot}%{_libdir}/%{name}/ # samples
cp -ar lib/     %{buildroot}%{_libdir}/%{name}/ # stdlib + jruby.jar
cp -ar bin/     %{buildroot}%{_libdir}/%{name}/ # startup scripts

# jar - link to prefix'd jar so that java stuff knows where to look
install -d -m 755 %{buildroot}%{_javadir}
ln -s %{_libdir}/%{name}/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar

# /usr prefix startup scripts
install -d -m 755 %{buildroot}%{_bindir}
ln -s %{_libdir}/%{name}/bin/jruby %{buildroot}%{_bindir}/jruby
ln -s %{_libdir}/%{name}/bin/jirb  %{buildroot}%{_bindir}/jirb

# javadoc
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}


%check
# Skip tests as they fail now for some weird reason -- the last test
# in test/test_backquote.rb fails.
#ant test-all


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING COPYING.CPL COPYING.GPL COPYING.LGPL
%doc docs/BeanScriptingFramework docs/CodeConventions.txt
%doc docs/Glossary.txt docs/Javasupport-highlevel.txt
%doc docs/Javasupport-lowlevel.txt docs/Javasupport-overview.txt
%doc docs/README.test docs/release-checklist.txt

%attr(0755,root,root) %{_bindir}/%{name}
%attr(0755,root,root) %{_bindir}/jirb
%{_javadir}/%{name}.jar
%{_libdir}/%{name}


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Tue Apr 22 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.1-4
- Add check section.
- Removed patches 0 and 4 because they got incorporated in upstream.

* Mon Apr 7 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-3
- Install all jruby to the prefix libdir/jruby, linking from /usr
  where needed.

* Sun Apr 6 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-2
- Add a few missing Requires.
- Add some things that were missing from CP in the start script.

* Sun Mar 30 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-1
- Bump to 1.1.
- Remove binary .jars.
- Minor cleanups in the specfile.
- Don't include jruby stdlib (for now).

* Sun Feb 24 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-0.4.20080216svn
- Bump for 1.1rc2.

* Tue Jan 8 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-0.3.20080108svn
- Bump for 1.1rc1.

* Sun Dec 9 2007 Conrad Meyer <konrad at tylerc.org> - 1.1-0.2.20071209svn
- SVN version bump.

* Mon Dec 3 2007 Conrad Meyer <konrad at tylerc.org> - 1.1-0.1.20071203svn
- Initial package created from ancient jpackage package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2008 01:54:43 -0000	1.1
+++ .cvsignore	25 Apr 2008 02:38:28 -0000	1.2
@@ -0,0 +1 @@
+jruby-src-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2008 01:54:43 -0000	1.1
+++ sources	25 Apr 2008 02:38:28 -0000	1.2
@@ -0,0 +1 @@
+94ce5370ada712d2190666bacc6fae21  jruby-src-1.1.1.tar.gz




More information about the fedora-extras-commits mailing list