Changeset 148

Timestamp:

06/04/2007 23:57:42 (18 months ago)

Author:

why

Message:

• Rakefile: install the shared lib into a platform-specific directory. (an old one: see #15)
  

Files:

• trunk/Rakefile (modified) (9 diffs)

trunk/Rakefile

@@ -12 +12 @@
 PKG = "#{NAME}-#{VERS}"
 BIN = "*.{bundle,jar,so,obj,pdb,lib,def,exp}"
-CLEAN.include ["ext/hpricot_scan/#{BIN}", "lib/#{BIN}", 'ext/hpricot_scan/Makefile', 
+ARCHLIB = "lib/#{::Config::CONFIG['arch']}"
+CLEAN.include ["ext/hpricot_scan/#{BIN}", "lib/**/#{BIN}", 'ext/hpricot_scan/Makefile', 
                '**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', 'The Hpricot Reference', '--main', 'README', '--inline-source']
@@ -33 +34 @@
     s.homepage = 'http://code.whytheluckystiff.net/hpricot/'
     s.files = PKG_FILES
-    s.require_path = "lib"
+    s.require_paths = [ARCHLIB, "lib"] 
     s.extensions = FileList["ext/**/extconf.rb"].to_a
     s.bindir = "bin"
@@ -49 +50 @@
 desc "Run all the tests"
 Rake::TestTask.new do |t|
-    t.libs << "test"
+    t.libs << "test" << ARCHLIB
     t.test_files = FileList['test/test_*.rb']
     t.verbose = true
@@ -84 +85 @@
 desc "Compiles the Ruby extension"
 task :compile => [:hpricot_scan] do
-  if Dir.glob(File.join("lib","hpricot_scan.*")).length == 0
+  if Dir.glob(File.join(ARCHLIB,"hpricot_scan.*")).length == 0
     STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
     STDERR.puts "Gem actually failed to build.  Your system is"
@@ -105 +106 @@
     sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
   end
-  cp ext_so, "lib"
+  mkdir_p ARCHLIB
+  cp ext_so, ARCHLIB
 end
 
@@ -127 +129 @@
 Win32Spec = SPEC.dup
 Win32Spec.platform = Gem::Platform::WIN32
-Win32Spec.files = PKG_FILES + ['lib/hpricot_scan.so']
+Win32Spec.files = PKG_FILES + ["#{ARCHLIB}/hpricot_scan.so"]
 Win32Spec.extensions = []
   
@@ -142 +144 @@
   cp "extras/mingw-rbconfig.rb", "#{WIN32_PKG_DIR}/ext/hpricot_scan/rbconfig.rb"
   sh "cd #{WIN32_PKG_DIR}/ext/hpricot_scan/ && ruby -I. extconf.rb && make"
-  mv "#{WIN32_PKG_DIR}/ext/hpricot_scan/hpricot_scan.so", "#{WIN32_PKG_DIR}/lib"
+  mv "#{WIN32_PKG_DIR}/ext/hpricot_scan/hpricot_scan.so", "#{WIN32_PKG_DIR}/#{ARCHLIB}"
 end
 
@@ -171 +173 @@
 JRubySpec = SPEC.dup
 JRubySpec.platform = 'jruby'
-JRubySpec.files = PKG_FILES + ['lib/hpricot_scan.jar']
+JRubySpec.files = PKG_FILES + ["#{ARCHLIB}/hpricot_scan.jar"]
 JRubySpec.extensions = []
 
@@ -185 +187 @@
 file "hpricot_scan_jruby" => [JRUBY_PKG_DIR] do
   Dir.chdir("#{JRUBY_PKG_DIR}/ext/hpricot_scan", &compile_java)
-  mv "#{JRUBY_PKG_DIR}/ext/hpricot_scan/hpricot_scan.jar", "#{JRUBY_PKG_DIR}/lib"
+  mv "#{JRUBY_PKG_DIR}/ext/hpricot_scan/hpricot_scan.jar", "#{JRUBY_PKG_DIR}/#{ARCHLIB}"
 end