diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-21 09:18:33 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-21 09:18:33 -0700 |
commit | 7fe5b4de0f836ad48173c0afdab64c16ed80ecaa (patch) | |
tree | 928af8ac9ee816503a9032e6d67b3c9d0c5e3c69 | |
parent | 940896aaf62630f6b25520c64cfeb8d565f73885 (diff) | |
parent | 371ace9a60f2a5dc34e9b4af8cd04778cb5d3dbf (diff) | |
download | psych-7fe5b4de0f836ad48173c0afdab64c16ed80ecaa.zip |
Merge branch 'jruby' of github.com:tenderlove/psych into jruby
* 'jruby' of github.com:tenderlove/psych:
no need to supply jruby itself to the classpath
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Mavenfile | 2 | ||||
-rw-r--r-- | Rakefile | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -2,5 +2,6 @@ *.bundle *.jar *.class +.mvn /pkg /tmp @@ -1,7 +1,5 @@ #-*- mode: ruby -*- -pom 'org.jruby:jruby:${jruby.version}', :scope => :provided - jar 'org.yaml:snakeyaml:${snakeyaml.version}' plugin :dependency, '2.8', :outputFile => 'pkg/classpath' @@ -50,7 +50,9 @@ $hoe = Hoe.spec 'psych' do require 'maven/ruby/maven' # uses Mavenfile to write classpath into pkg/classpath # and tell maven via system properties the snakeyaml version - Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Djruby.version=#{JRUBY_VERSION}", "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}")#, '--quiet' ) + # this is basically the same as running from the commandline: + # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here' + Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')#, '--quiet' ) ext.source_version = '1.7' ext.target_version = '1.7' ext.classpath = File.read('pkg/classpath') |