Permalink
Browse files

Update to latest fixme

  • Loading branch information...
1 parent 93a7b50 commit b90c643214910b3c6d68235fe688d3676d400e1d @copiousfreetime committed Feb 9, 2013
Showing with 14 additions and 16 deletions.
  1. +1 −3 tasks/default.rake
  2. +12 −1 tasks/extension.rake
  3. +1 −12 tasks/this.rb
View
@@ -56,8 +56,6 @@ begin
t.libs = %w[ lib spec ]
t.pattern = "spec/**/*_spec.rb"
end
- task :test_requirements
- task :test => :test_requirements
task :default => :test
rescue LoadError
This.task_warning( 'test' )
@@ -225,7 +223,7 @@ task :gemspec do
end
# the gemspec is also a dev artifact and should not be kept around.
-CLOBBER << This.gemspec_file.to_s
+CLOBBER << This.gemspec_file
# The standard gem packaging task, everyone has it.
require 'rubygems/package_task'
View
@@ -1,21 +1,32 @@
+# To be used if the gem has extensions.
+# If this task set is inclueded then you will need to also have
+#
+# spec.add_development_dependency( 'rake-compiler', '~> 0.8.1' )
+#
+# in your top level rakefile
require 'rake/extensiontask'
require 'rake/javaextensiontask'
if RUBY_PLATFORM == "java" then
+
Rake::JavaExtensionTask.new( This.name) do |ext|
ext.ext_dir = File.join( 'ext', This.name, "java" )
ext.lib_dir = File.join( 'lib', This.name )
ext.gem_spec = This.java_gemspec
end
+
else
+
Rake::ExtensionTask.new( This.name ) do |ext|
ext.ext_dir = File.join( 'ext', This.name, "c" )
ext.lib_dir = File.join( 'lib', This.name )
ext.gem_spec = This.ruby_gemspec
- ext.cross_compile = true # enable cross compilation (requires cross compile toolchain)
+ ext.cross_compile = true # enable cross compilation (requires cross compile toolchain)
ext.cross_platform = 'i386-mswin32' # forces the Windows platform instead of the default one
# configure options only for cross compile
end
+
end
+
task :test_requirements => :compile
View
@@ -25,7 +25,7 @@ class ThisProject
#
# Yields self
def initialize(&block)
- @exclude_from_manifest = %r/tmp$|\.(git|DS_Store)|^(doc|coverage|pkg)|Gemfile*|\.gemspec$|\.swp$|\.jar|\.rvmrc$|~$/
+ @exclude_from_manifest = %r/tmp$|\.(git|DS_Store)|^(doc|coverage|pkg|tmp)|Gemfile*|\.gemspec$|\.swp$|\.jar|\.rvmrc$|~$/
@gemspecs = Hash.new
yield self if block_given?
end
@@ -110,17 +110,6 @@ def manifest
manifest_file.readlines.map { |l| l.strip }
end
- # Internal: Returns the list of files that are extension source files
- #
- # Returns an Array
- def extension_c_source
- manifest.grep( /\.c\Z/ )
- end
-
- def extension_java_source
- manifest.grep( /\.java\Z/ )
- end
-
# Internal: Return the files that define the extensions
#
# Returns an Array

0 comments on commit b90c643

Please sign in to comment.