Updated Branches: refs/heads/master b7ce587ba -> 2da6bbda2
Moved clownfish build calls over to the runtime side. Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/2da6bbda Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/2da6bbda Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/2da6bbda Branch: refs/heads/master Commit: 2da6bbda29b27236169b95efc702e015fa93eb53 Parents: b7ce587 Author: Logan Bell <[email protected]> Authored: Sat Oct 27 19:18:35 2012 -0700 Committer: Logan Bell <[email protected]> Committed: Sat Oct 27 19:18:35 2012 -0700 ---------------------------------------------------------------------- clownfish/compiler/ruby/Rakefile | 10 ---------- clownfish/runtime/ruby/Rakefile | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/2da6bbda/clownfish/compiler/ruby/Rakefile ---------------------------------------------------------------------- diff --git a/clownfish/compiler/ruby/Rakefile b/clownfish/compiler/ruby/Rakefile index 72aac98..de41f95 100644 --- a/clownfish/compiler/ruby/Rakefile +++ b/clownfish/compiler/ruby/Rakefile @@ -45,16 +45,6 @@ task :clownfish => [:parse_y_files] do end Rake::Task['cfc_ext'].invoke - require_relative 'ext/Clownfish/CFC' - hierarchy = Clownfish::CFC::Model::Hierarchy.new(:dest => "autogen") - - hierarchy.add_source_dir('../core') - #heararchy.add_source_dir('ext') - hierarchy.add_source_dir('autogen/source') - hierarchy.build - - core_binding = Clownfish::CFC::Binding::Core.new(:hierarchy => hierarchy, :header => autogen_header, :footer => '') - core_binding.write_all_modified end # Clean up compiled object files. http://git-wip-us.apache.org/repos/asf/lucy/blob/2da6bbda/clownfish/runtime/ruby/Rakefile ---------------------------------------------------------------------- diff --git a/clownfish/runtime/ruby/Rakefile b/clownfish/runtime/ruby/Rakefile index 0106cd9..780064b 100644 --- a/clownfish/runtime/ruby/Rakefile +++ b/clownfish/runtime/ruby/Rakefile @@ -43,6 +43,17 @@ task :build_clownfish => [:build_charmonizer_tests] do puts "\nFinished building Clownfish compiler.\n" end chdir(old_dir); + + require_relative '../../compiler/ruby/ext/Clownfish/CFC' + hierarchy = Clownfish::CFC::Model::Hierarchy.new(:dest => "autogen") + + hierarchy.add_source_dir('../core') + #heararchy.add_source_dir('ext') + hierarchy.add_source_dir('autogen/source') + hierarchy.build + + core_binding = Clownfish::CFC::Binding::Core.new(:hierarchy => hierarchy, :header => autogen_header, :footer => '') + core_binding.write_all_modified end desc "Building Charmonizer Tests" @@ -192,3 +203,18 @@ end def quotify(string) return '"' + string.gsub(/[\\\"]/,'\\1') + '"' end + +def autogen_header + " +/*********************************************** + + !!!! DO NOT EDIT !!!! + + This file was auto-generated by Rakefile. + + ***********************************************/ + " + +end + +
