- Revision
- 771
- Author
- mauro
- Date
- 2008-07-31 10:42:56 -0500 (Thu, 31 Jul 2008)
Log Message
Use jruby.home found in jruby-complete jar to avoid necessity to have JRUBY_HOME installed.
Modified Paths
Diff
Modified: trunk/BUILD.txt (770 => 771)
--- trunk/BUILD.txt 2008-07-28 08:20:38 UTC (rev 770) +++ trunk/BUILD.txt 2008-07-31 15:42:56 UTC (rev 771) @@ -2,9 +2,6 @@ JDK required: 1.5+ Maven (http://maven.apache.org) required: 2.0.9+ -JRuby (http://jruby.codehaus.org) required: 1.1.x+ -(Only for waffle-ruby module, either JRUBY_HOME env variable must be defined -or path to JRuby home must be configured in rspec-maven-plugin) Build profiles: @@ -43,4 +40,5 @@ mvn clean install -Pcodehaus - +NOTE ON RUBY SPECS: +JRuby home is extracted from the jruby-complete jar and it does not require any installation on the local filesystem.
Modified: trunk/waffle-ruby/pom.xml (770 => 771)
--- trunk/waffle-ruby/pom.xml 2008-07-28 08:20:38 UTC (rev 770) +++ trunk/waffle-ruby/pom.xml 2008-07-31 15:42:56 UTC (rev 771) @@ -9,7 +9,6 @@ <packaging>jar</packaging> <artifactId>waffle-ruby</artifactId> <name>Waffle Ruby</name> - <dependencies> <dependency> <groupId>${pom.groupId}</groupId> @@ -26,7 +25,6 @@ <artifactId>servlet-api</artifactId> </dependency> </dependencies> - <build> <resources> <resource> @@ -39,14 +37,39 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> + <artifactId>dependency-maven-plugin</artifactId> + <executions> + <execution> + <id>unpack-jruby-home</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/jruby</outputDirectory> + <includes>META-INF/jruby.home/**</includes> + <overWriteSnapshots>true</overWriteSnapshots> + <artifactItems> + <artifactItem> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + <version>1.1.2</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> <artifactId>rspec-maven-plugin</artifactId> <version>1.0-beta-3-SNAPSHOT</version> <configuration> - <jrubyHome>${env.JRUBY_HOME}</jrubyHome> + <jrubyHome>${project.build.directory}/jruby/META-INF/jruby.home</jrubyHome> <sourceDirectory>${basedir}/src/test/specs</sourceDirectory> <outputDirectory>${basedir}/target</outputDirectory> <reportFile>${basedir}/target/rspec-report.html</reportFile> - <ignoreFailure>true</ignoreFailure> <!-- TODO remove when all tests pass --> + <ignoreFailure>false</ignoreFailure> </configuration> <executions> <execution> @@ -60,5 +83,4 @@ </plugin> </plugins> </build> - -</project> +</project> \ No newline at end of file
To unsubscribe from this list please visit:
