diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-28 14:54:41 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-28 15:24:54 -0700 |
| commit | 6074bcb88dd3f73867a70245bc5764680bee6c00 (patch) | |
| tree | 071265726a43ca8fab9186ad8b62d03265f81430 | |
| parent | 0fc5af3f29484b2f9714c1546b7973a1a7d4721e (diff) | |
| download | psych-6074bcb88dd3f73867a70245bc5764680bee6c00.tar.gz | |
put psych in the psych package
| -rw-r--r-- | Rakefile | 1 | ||||
| -rw-r--r-- | ext/java/PsychEmitter.java | 2 | ||||
| -rw-r--r-- | ext/java/PsychLibrary.java | 2 | ||||
| -rw-r--r-- | ext/java/PsychParser.java | 2 | ||||
| -rw-r--r-- | ext/java/PsychToRuby.java | 2 | ||||
| -rw-r--r-- | ext/java/PsychYamlTree.java | 2 |
6 files changed, 5 insertions, 6 deletions
@@ -40,7 +40,6 @@ $hoe = Hoe.spec 'psych' do Rake::JavaExtensionTask.new("psych", spec) do |ext| jruby_home = RbConfig::CONFIG['prefix'] ext.ext_dir = 'ext/java' - ext.lib_dir = 'lib/psych' jars = ["#{jruby_home}/lib/jruby.jar"] + FileList['lib/*.jar'] ext.classpath = jars.map { |x| File.expand_path x }.join ':' end diff --git a/ext/java/PsychEmitter.java b/ext/java/PsychEmitter.java index e775357..2a28872 100644 --- a/ext/java/PsychEmitter.java +++ b/ext/java/PsychEmitter.java @@ -25,7 +25,7 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the CPL, the GPL or the LGPL. ***** END LICENSE BLOCK *****/ -package org.jruby.ext.psych; +package psych; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/ext/java/PsychLibrary.java b/ext/java/PsychLibrary.java index dab346e..864a4f4 100644 --- a/ext/java/PsychLibrary.java +++ b/ext/java/PsychLibrary.java @@ -25,7 +25,7 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the CPL, the GPL or the LGPL. ***** END LICENSE BLOCK *****/ -package org.jruby.ext.psych; +package psych; import org.jruby.Ruby; import org.jruby.RubyArray; diff --git a/ext/java/PsychParser.java b/ext/java/PsychParser.java index 59a764e..1f7d5fb 100644 --- a/ext/java/PsychParser.java +++ b/ext/java/PsychParser.java @@ -25,7 +25,7 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the CPL, the GPL or the LGPL. ***** END LICENSE BLOCK *****/ -package org.jruby.ext.psych; +package psych; import java.io.InputStreamReader; import java.io.StringReader; diff --git a/ext/java/PsychToRuby.java b/ext/java/PsychToRuby.java index 6838f36..c60a913 100644 --- a/ext/java/PsychToRuby.java +++ b/ext/java/PsychToRuby.java @@ -25,7 +25,7 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the CPL, the GPL or the LGPL. ***** END LICENSE BLOCK *****/ -package org.jruby.ext.psych; +package psych; import org.jruby.Ruby; import org.jruby.RubyClass; diff --git a/ext/java/PsychYamlTree.java b/ext/java/PsychYamlTree.java index d53645a..d22148b 100644 --- a/ext/java/PsychYamlTree.java +++ b/ext/java/PsychYamlTree.java @@ -25,7 +25,7 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the CPL, the GPL or the LGPL. ***** END LICENSE BLOCK *****/ -package org.jruby.ext.psych; +package psych; import org.jruby.Ruby; import org.jruby.RubyClass; |