cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53bee10b3a
openbsd-ports/lang/jruby/patches/patch-build_xml

54 lines
2.3 KiB
Plaintext
Raw Normal View History

Make regress tests work. Set JAVA_HOME and PATH and disable forking so java doesn't crash when running the test and spec tasks. Don't install the jruby-launcher gem when running the test and spec tasks, as it fails. Regress depend on git when running the specs, as it needs to download current rubyspecs for the spec task. Delete the jruby-complete.jar file and just use the jruby.jar file when running the specs, as otherwise you get additional test failures and warnings. Switch to SUBST_CMD while here now that has been fixed. Also, bump the memory limits by 50M as 384M doesn't seem to be enough in all cases.
2011-11-14 06:38:16 -05:00
$OpenBSD: patch-build_xml,v 1.4 2011/11/14 11:38:16 jeremy Exp $
Update to JRuby 1.6.5. Make jruby binary not segfault if PATH isn't set correctly. Remove rubygems hacks, since they are no longer necessary now that the versions of rubygems for the other ruby interpreters are > 1.3.7. No longer ship the ri documentation files with JRuby. JRuby ships with a broken ri binary anyway (requires the rdoc gem to work), and almost all users of JRuby have MRI ruby installed and can use its ri binary.
2011-11-08 18:58:08 -05:00
Make regress tests work. Set JAVA_HOME and PATH and disable forking so java doesn't crash when running the test and spec tasks. Don't install the jruby-launcher gem when running the test and spec tasks, as it fails. Regress depend on git when running the specs, as it needs to download current rubyspecs for the spec task. Delete the jruby-complete.jar file and just use the jruby.jar file when running the specs, as otherwise you get additional test failures and warnings. Switch to SUBST_CMD while here now that has been fixed. Also, bump the memory limits by 50M as 384M doesn't seem to be enough in all cases.
2011-11-14 06:38:16 -05:00
Fix build by removing ri cache generation, backported from git
commit a760b4aea4b5aa9b38da4bd3334d8355a83f60fa.
Update to JRuby 1.6.5. Make jruby binary not segfault if PATH isn't set correctly. Remove rubygems hacks, since they are no longer necessary now that the versions of rubygems for the other ruby interpreters are > 1.3.7. No longer ship the ri documentation files with JRuby. JRuby ships with a broken ri binary anyway (requires the rdoc gem to work), and almost all users of JRuby have MRI ruby installed and can use its ri binary.
2011-11-08 18:58:08 -05:00
Make regress tests work. Set JAVA_HOME and PATH and disable forking so java doesn't crash when running the test and spec tasks. Don't install the jruby-launcher gem when running the test and spec tasks, as it fails. Regress depend on git when running the specs, as it needs to download current rubyspecs for the spec task. Delete the jruby-complete.jar file and just use the jruby.jar file when running the specs, as otherwise you get additional test failures and warnings. Switch to SUBST_CMD while here now that has been fixed. Also, bump the memory limits by 50M as 384M doesn't seem to be enough in all cases.
2011-11-14 06:38:16 -05:00
Don't install the jruby launcher when running the regress specs,
as it fails due to a make error and it isn't necessary for the
regress tests.
Also, don't fork for the regress tests, as otherwise the JVM
exits abnormally.
--- build.xml.orig Tue Oct 25 16:54:51 2011
+++ build.xml Sun Nov 13 23:49:50 2011
Update to JRuby 1.6.5. Make jruby binary not segfault if PATH isn't set correctly. Remove rubygems hacks, since they are no longer necessary now that the versions of rubygems for the other ruby interpreters are > 1.3.7. No longer ship the ri documentation files with JRuby. JRuby ships with a broken ri binary anyway (requires the rdoc gem to work), and almost all users of JRuby have MRI ruby installed and can use its ri binary.
2011-11-08 18:58:08 -05:00
@@ -379,7 +379,6 @@
</jar>
<antcall target="add-emma-jars"/>
- <antcall target="generate-ri-cache"/>
<property name="jar-jruby.hasrun" value="true"/>
</target>
@@ -484,7 +483,6 @@
<param name="bar.wrap" value="${lib.dir}/jruby.bar" />
</antcall>
- <antcall target="generate-ri-cache"/>
</target>
<target name="jarjar" depends="jar-jruby-dist"/>
Make regress tests work. Set JAVA_HOME and PATH and disable forking so java doesn't crash when running the test and spec tasks. Don't install the jruby-launcher gem when running the test and spec tasks, as it fails. Regress depend on git when running the specs, as it needs to download current rubyspecs for the spec task. Delete the jruby-complete.jar file and just use the jruby.jar file when running the specs, as otherwise you get additional test failures and warnings. Switch to SUBST_CMD while here now that has been fixed. Also, bump the memory limits by 50M as 384M doesn't seem to be enough in all cases.
2011-11-14 06:38:16 -05:00
@@ -806,13 +804,6 @@
<env key="GEM_PATH" value=""/> <!-- to ignore any gems installed in ~/.gem -->
<arg line="-S gem uninstall --all jruby-launcher"/>
</java>
- <java classname="org.jruby.Main" fork="true" maxmemory="${jruby.launch.memory}" failonerror="true">
- <classpath refid="build.classpath"/>
- <classpath path="${jruby.classes.dir}"/>
- <sysproperty key="jruby.home" value="${basedir}"/>
- <env key="GEM_PATH" value=""/> <!-- to ignore any gems installed in ~/.gem -->
- <arg line="-S gem install ${jruby.launcher.gem}"/>
- </java>
</target>
<target name="test" depends="
@@ -967,7 +958,7 @@
<echo message="compile=@{compile.mode}, jit.threshold=@{jit.threshold}, jit.maxsize=@{jit.maxsize}, 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="1800000">
+ <junit jvm="${jruby.test.jvm}" haltonfailure="false" dir="${basedir}" maxmemory="${jruby.test.memory}" showoutput="true" timeout="1800000">
<classpath refid="test.class.path"/>
<sysproperty key="java.awt.headless" value="true"/>
Reference in New Issue Copy Permalink