Using jruby.home from the extracted directory

navaneeth · Oct 4, 2013 · e6b63fb · e6b63fb
1 parent c9154a7
commit e6b63fb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.classpath b/.classpath
@@ -4,9 +4,9 @@
 	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="deps/jruby-complete-1.7.4.jar"/>
 	<classpathentry kind="lib" path="deps/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="deps/commons-io-2.4.jar"/>
 	<classpathentry kind="lib" path="deps/xmlwise-1_2.jar"/>
+	<classpathentry kind="lib" path="deps/jruby-1.7.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.xml b/build.xml
@@ -38,7 +38,7 @@
 		<property name="scripts.dir" value="${classes.dir}/scripts" />
 		<mkdir dir="${scripts.dir}" />
 		<copy file="scripts/launcher.rb" todir="${scripts.dir}" />
-		<copy file="${gems.zip.path}" todir="${scripts.dir}/gems.zip" />
+		<copy file="${gems.zip.path}" todir="${scripts.dir}" />
 
 		<mkdir dir="${jar.dir}" />
 		<jar destfile="${jar.file}" basedir="${classes.dir}">
@@ -64,7 +64,7 @@
 		<mkdir dir="${distro.dir}" />
 		<copy file="${jar.file}" todir="${distro.dir}" />
 		<copy file="${doc.jar}" todir="${distro.dir}" />
-		<copy file="${deps.dir}/jruby-complete-1.7.4.jar" todir="${distro.dir}" />
+		<copy file="${deps.dir}/jruby-1.7.4.jar" todir="${distro.dir}" />
 		<copy file="${deps.dir}/log4j-1.2.17.jar" todir="${distro.dir}" />
 		<copy file="${deps.dir}/xmlwise-1_2.jar" todir="${distro.dir}" />
 		<copy file="LICENSE.txt" todir="${distro.dir}" />

diff --git a/deps/jruby-complete-1.7.4.jar → deps/jruby-1.7.4.jar b/deps/jruby-complete-1.7.4.jar → deps/jruby-1.7.4.jar
diff --git a/src/calabash/java/CalabashWrapper.java b/src/calabash/java/CalabashWrapper.java
@@ -671,6 +671,9 @@ public String getGemsDir() {
 	}
 
 	private final void initializeScriptingContainer() throws CalabashException {
+		// We manage JRuby home to work around a bug in JRuby (https://github.com/jruby/jruby/issues/1051)
+		container.setHomeDirectory(new File(rbScriptsDir, "jruby.home").getAbsolutePath());
+
 		HashMap<String, String> environmentVariables = new HashMap<String, String>();
 		environmentVariables.put("PROJECT_DIR", projectDir.getAbsolutePath());
 		environmentVariables.put("HOME", System.getProperty("user.home"));