Rakefile in json_pure-1.2.4 vs Rakefile in json_pure-1.4.0

- old
+ new

@@ -7,34 +7,33 @@ require 'rake/extensiontask' rescue LoadError puts "WARNING: rake-compiler is not installed. You will not be able to build the json gem until you install it." end -require 'rake/clean' -CLOBBER.include Dir['benchmarks/data/*.{dat,log}'] - require 'rbconfig' include Config +require 'rake/clean' +CLOBBER.include Dir['benchmarks/data/*.{dat,log}'], FileList['**/*.rbc'] +CLEAN.include FileList['diagrams/*.*'], 'doc', 'coverage', 'tmp', + FileList["ext/**/{Makefile,mkmf.log}"], + FileList["{ext,lib}/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"] + MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') } PKG_NAME = 'json' +PKG_TITLE = 'JSON Implementation for Ruby' PKG_VERSION = File.read('VERSION').chomp PKG_FILES = FileList["**/*"].exclude(/CVS|pkg|tmp|coverage|Makefile|\.nfs\./).exclude(/\.(so|bundle|o|#{CONFIG['DLEXT']})$/) EXT_ROOT_DIR = 'ext/json/ext' -EXT_PARSER_DIR = "#{EXT_ROOT_DIR}/parser" EXT_PARSER_DL = "#{EXT_ROOT_DIR}/parser.#{CONFIG['DLEXT']}" -EXT_PARSER_SRC = "#{EXT_PARSER_DIR}/parser.c" +EXT_PARSER_SRC = "#{EXT_ROOT_DIR}/parser.c" PKG_FILES << EXT_PARSER_SRC -EXT_GENERATOR_DIR = "#{EXT_ROOT_DIR}/generator" EXT_GENERATOR_DL = "#{EXT_ROOT_DIR}/generator.#{CONFIG['DLEXT']}" -EXT_GENERATOR_SRC = "#{EXT_GENERATOR_DIR}/generator.c" +EXT_GENERATOR_SRC = "#{EXT_ROOT_DIR}/generator.c" RAGEL_CODEGEN = %w[rlcodegen rlgen-cd ragel].find { |c| system(c, '-v') } RAGEL_DOTGEN = %w[rlgen-dot rlgen-cd ragel].find { |c| system(c, '-v') } -RAGEL_PATH = "#{EXT_PARSER_DIR}/parser.rl" -CLEAN.include FileList['diagrams/*.*'], 'doc', 'coverage', 'tmp', - FileList["ext/**/{Makefile,mkmf.log}"], - FileList["{ext,lib}/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"] +RAGEL_PATH = "#{EXT_ROOT_DIR}/parser.rl" def myruby(*args, &block) @myruby ||= File.join(CONFIG['bindir'], CONFIG['ruby_install_name']) options = (Hash === args.last) ? args.pop : {} if args.length > 1 then @@ -72,34 +71,32 @@ desc "Compiling extension" task :compile_ext => [ EXT_PARSER_DL, EXT_GENERATOR_DL ] file EXT_PARSER_DL => EXT_PARSER_SRC do - cd EXT_PARSER_DIR do - myruby 'extconf.rb' + cd EXT_ROOT_DIR do + myruby 'extconf_parser.rb' sh MAKE end - cp "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}", EXT_ROOT_DIR end file EXT_GENERATOR_DL => EXT_GENERATOR_SRC do - cd EXT_GENERATOR_DIR do - myruby 'extconf.rb' + cd EXT_ROOT_DIR do + myruby 'extconf_generator.rb' sh MAKE end - cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR end desc "Generate parser with ragel" task :ragel => EXT_PARSER_SRC task :ragel_clean do rm_rf EXT_PARSER_SRC end file EXT_PARSER_SRC => RAGEL_PATH do - cd EXT_PARSER_DIR do + cd EXT_ROOT_DIR do if RAGEL_CODEGEN == 'ragel' sh "ragel parser.rl -G2 -o parser.c" else sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2" end @@ -156,31 +153,33 @@ desc "Benchmarking parser" task :benchmark_parser do ENV['RUBYOPT'] = "-Ilib:ext #{ENV['RUBYOPT']}" myruby 'benchmarks/parser_benchmark.rb' + myruby 'benchmarks/parser2_benchmark.rb' end desc "Benchmarking generator" task :benchmark_generator do ENV['RUBYOPT'] = "-Ilib:ext #{ENV['RUBYOPT']}" myruby 'benchmarks/generator_benchmark.rb' + myruby 'benchmarks/generator2_benchmark.rb' end desc "Benchmarking library" task :benchmark => [ :benchmark_parser, :benchmark_generator ] desc "Create RDOC documentation" task :doc => [ :version, EXT_PARSER_SRC ] do - sh "rdoc -o doc -m README README lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}" + sh "rdoc -o doc -t '#{PKG_TITLE}' -m README README lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}" end if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::ExtensionTask) spec_pure = Gem::Specification.new do |s| s.name = 'json_pure' s.version = PKG_VERSION - s.summary = "A JSON implementation in Ruby" + s.summary = PKG_TITLE s.description = "This is a JSON implementation in pure Ruby." s.files = PKG_FILES s.require_path = 'lib' @@ -190,11 +189,11 @@ s.default_executable = "edit_json.rb" s.has_rdoc = true s.extra_rdoc_files << 'README' s.rdoc_options << - '--title' << 'JSON -- A JSON implemention' << '--main' << 'README' + '--title' << 'JSON implemention for ruby' << '--main' << 'README' s.test_files.concat Dir['tests/*.rb'] s.author = "Florian Frank" s.email = "flori@ping.de" s.homepage = "http://flori.github.com/#{PKG_NAME}" @@ -207,16 +206,16 @@ end spec_ext = Gem::Specification.new do |s| s.name = 'json' s.version = PKG_VERSION - s.summary = "A JSON implementation as a Ruby extension" + s.summary = PKG_TITLE s.description = "This is a JSON implementation as a Ruby extension in C." s.files = PKG_FILES - s.extensions = FileList['ext/**/extconf.rb'] + s.extensions = FileList['ext/**/extconf_*.rb'] s.require_path = EXT_ROOT_DIR s.require_paths << 'ext' s.require_paths << 'lib' @@ -225,11 +224,11 @@ s.default_executable = "edit_json.rb" s.has_rdoc = true s.extra_rdoc_files << 'README' s.rdoc_options << - '--title' << 'JSON -- A JSON implemention' << '--main' << 'README' + '--title' << 'JSON implemention for Ruby' << '--main' << 'README' s.test_files.concat Dir['tests/*.rb'] s.author = "Florian Frank" s.email = "flori@ping.de" s.homepage = "http://flori.github.com/#{PKG_NAME}" @@ -241,22 +240,24 @@ pkg.package_files = PKG_FILES end Rake::ExtensionTask.new do |ext| ext.name = 'parser' + ext.config_script = 'extconf_parser.rb' ext.gem_spec = spec_ext ext.cross_compile = true ext.cross_platform = %w[i386-mswin32 i386-mingw32] - ext.ext_dir = 'ext/json/ext/parser' + ext.ext_dir = 'ext/json/ext' ext.lib_dir = 'lib/json/ext' end Rake::ExtensionTask.new do |ext| ext.name = 'generator' + ext.config_script = 'extconf_generator.rb' ext.gem_spec = spec_ext ext.cross_compile = true ext.cross_platform = %w[i386-mswin32 i386-mingw32] - ext.ext_dir = 'ext/json/ext/generator' + ext.ext_dir = 'ext/json/ext' ext.lib_dir = 'lib/json/ext' end end desc m = "Writing version information for #{PKG_VERSION}"