cxxproject 0.5.76 → 0.6.0

data/lib/tools/project_wizard.rb

@@ -1,66 +1,66 @@
-require 'rake'
-require 'erb'
-
-def choose_building_block
-  res = nil
-  choose do |menu|
-    menu.prompt = "what building block do you want to start with?"
-
-    menu.choice(:exe) { res = "exe" }
-    menu.choice(:lib) { res = "source_lib" }
-  end
-  res
-end
-
-def choose_generate_makefile
-  res = true
-  choose do |menu|
-    menu.prompt = 'generate rakefile?'
-    menu.choice(:yes) { res = true }
-    menu.choice(:no) { res = false }
-  end
-  res
-end
-
-def prepare_project(d)
-  begin
-    require 'highline/import'
-
-    if agree("This will create a new cxx-project config in dir \"#{d}\" \nAre you sure you want to continue? [yn] ")
-      bb = choose_building_block
-      generate_makefile = choose_generate_makefile
-
-      create_project(d, bb, generate_makefile)
-    else
-      say "stopped project creation"
-    end
-  rescue LoadError
-    puts "Please 'gem install highline'"
-  end
-end
-
-
-def create_project(d, bb, generate_rakefile)
-  rakefile_template = File.join(File.dirname(__FILE__),"..","tools","Rakefile.rb.template")
-  projectrb_template = File.join(File.dirname(__FILE__),"..","tools","project.rb.template")
-  s1 = IO.read(rakefile_template)
-  s2 = IO.read(projectrb_template)
-  name = "testme"
-  building_block = bb
-  mkdir_p(d, :verbose => false)
-  cd(d,:verbose => false) do
-    if ((File.exists? "Rakefile.rb") || (File.exists? "project.rb"))
-      abort "cannot create project in this directory, existing files would be overwritten!"
-    end
-    if generate_rakefile
-      write_template('Rakefile.rb', s1, binding)
-    end
-    write_template('project.rb', s2, binding)
-  end
-end
-
-def write_template(name, template_string, b)
-  File.open(name, 'w') do |f|
-    f.write ERB.new(template_string).result(b)
-  end
-end
+require 'rake'
+require 'erb'
+
+def choose_building_block
+  res = nil
+  choose do |menu|
+    menu.prompt = "what building block do you want to start with?"
+
+    menu.choice(:exe) { res = "exe" }
+    menu.choice(:lib) { res = "source_lib" }
+  end
+  res
+end
+
+def choose_generate_makefile
+  res = true
+  choose do |menu|
+    menu.prompt = 'generate rakefile?'
+    menu.choice(:yes) { res = true }
+    menu.choice(:no) { res = false }
+  end
+  res
+end
+
+def prepare_project(d)
+  begin
+    require 'highline/import'
+
+    if agree("This will create a new cxx-project config in dir \"#{d}\" \nAre you sure you want to continue? [yn] ")
+      bb = choose_building_block
+      generate_makefile = choose_generate_makefile
+
+      create_project(d, bb, generate_makefile)
+    else
+      say "stopped project creation"
+    end
+  rescue LoadError
+    puts "Please 'gem install highline'"
+  end
+end
+
+
+def create_project(d, bb, generate_rakefile)
+  rakefile_template = File.join(File.dirname(__FILE__),"..","tools","Rakefile.rb.template")
+  projectrb_template = File.join(File.dirname(__FILE__),"..","tools","project.rb.template")
+  s1 = IO.read(rakefile_template)
+  s2 = IO.read(projectrb_template)
+  name = "testme"
+  building_block = bb
+  mkdir_p(d, :verbose => false)
+  cd(d,:verbose => false) do
+    if ((File.exists? "Rakefile.rb") || (File.exists? "project.rb"))
+      abort "cannot create project in this directory, existing files would be overwritten!"
+    end
+    if generate_rakefile
+      write_template('Rakefile.rb', s1, binding)
+    end
+    write_template('project.rb', s2, binding)
+  end
+end
+
+def write_template(name, template_string, b)
+  File.open(name, 'w') do |f|
+    f.write ERB.new(template_string).result(b)
+  end
+end

data/spec/building_block_spec.rb

@@ -1,56 +1,56 @@
-require 'spec_helper'
-
-require 'rspec'
-require 'cxxproject'
-require 'cxxproject/utils/cleanup'
-
-describe Cxxproject::BuildingBlock do
-
-  before(:each) do
-    Cxxproject::Utils.cleanup_rake
-  end
-  after(:each) do
-    Cxxproject::Utils.cleanup_rake
-  end
-
-  it 'should build the right dependency-chain' do
-    lib1 = Cxxproject::SourceLibrary.new('1')
-    lib2 = Cxxproject::SourceLibrary.new('2').set_dependencies(['1'])
-    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['1'])
-    lib4 = Cxxproject::SourceLibrary.new('4').set_dependencies(['2', '3'])
-    deps = lib4.all_dependencies.map { |d| d.name }
-    deps.should == ['4', '2', '3', '1']
-  end
-
-  it 'should build the right dependency-chain for custom blocks' do
-    lib1 = Cxxproject::SourceLibrary.new('1')
-    lib2 = Cxxproject::CustomBuildingBlock.new('2').set_dependencies(['1'])
-    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['1'])
-    lib4 = Cxxproject::CustomBuildingBlock.new('4').set_dependencies(['2', '3'])
-    deps = lib4.all_dependencies.map { |d| d.name }
-    deps.should == ['4', '2', '3', '1']
-  end
-
-  it 'should have the right output-directory' do
-    lib1 = Cxxproject::SourceLibrary.new('lib1').set_sources(['test.cc'])
-    lib1.set_project_dir(File.join(Dir.pwd, 'lib1'))
-
-    lib2 = Cxxproject::SourceLibrary.new('lib2').set_sources(['test.cc']).set_output_dir('build2')
-    lib2.set_project_dir(File.join(Dir.pwd, 'lib2'))
-
-    cxx = CxxProject2Rake.new([], 'build', GCCChain)
-    cxx.prepare_block(lib1)
-    cxx.prepare_block(lib2)
-
-    lib1.output_dir.should eq(File.join(Dir.pwd, 'build'))
-    lib2.output_dir.should eq(File.join(Dir.pwd, 'lib2', 'build2'))
-  end
-
-  it 'should raise exception if building block cannot be resolved' do
-    expect do
-      lib1 = Cxxproject::SourceLibrary.new('1').set_dependencies(['unresolved'])
-      cxx = CxxProject2Rake.new([], 'build', GCCChain)
-    end.to raise_exception(RuntimeError, 'Error: while reading config file for 1: dependent building block "unresolved" was specified but not found!')
-  end
-
-end
+require 'spec_helper'
+
+require 'rspec'
+require 'cxxproject'
+require 'cxxproject/utils/cleanup'
+
+describe Cxxproject::BuildingBlock do
+
+  before(:each) do
+    Cxxproject::Utils.cleanup_rake
+  end
+  after(:each) do
+    Cxxproject::Utils.cleanup_rake
+  end
+
+  it 'should build the right dependency-chain' do
+    lib1 = Cxxproject::SourceLibrary.new('1')
+    lib2 = Cxxproject::SourceLibrary.new('2').set_dependencies(['1'])
+    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['1'])
+    lib4 = Cxxproject::SourceLibrary.new('4').set_dependencies(['2', '3'])
+    deps = lib4.all_dependencies.map { |d| d.name }
+    deps.should == ['4', '2', '3', '1']
+  end
+
+  it 'should build the right dependency-chain for custom blocks' do
+    lib1 = Cxxproject::SourceLibrary.new('1')
+    lib2 = Cxxproject::CustomBuildingBlock.new('2').set_dependencies(['1'])
+    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['1'])
+    lib4 = Cxxproject::CustomBuildingBlock.new('4').set_dependencies(['2', '3'])
+    deps = lib4.all_dependencies.map { |d| d.name }
+    deps.should == ['4', '2', '3', '1']
+  end
+
+  it 'should have the right output-directory' do
+    lib1 = Cxxproject::SourceLibrary.new('lib1').set_sources(['test.cc'])
+    lib1.set_project_dir(File.join(Dir.pwd, 'lib1'))
+
+    lib2 = Cxxproject::SourceLibrary.new('lib2').set_sources(['test.cc']).set_output_dir('build2')
+    lib2.set_project_dir(File.join(Dir.pwd, 'lib2'))
+
+    cxx = CxxProject2Rake.new([], 'build', GCCChain)
+    cxx.prepare_block(lib1)
+    cxx.prepare_block(lib2)
+
+    lib1.complete_output_dir.should eq(File.join(Dir.pwd, 'build'))
+    lib2.complete_output_dir.should eq(File.join(Dir.pwd, 'lib2', 'build2'))
+  end
+
+  it 'should raise exception if building block cannot be resolved' do
+    expect do
+      lib1 = Cxxproject::SourceLibrary.new('1').set_dependencies(['unresolved'])
+      cxx = CxxProject2Rake.new([], 'build', GCCChain)
+    end.to raise_exception(RuntimeError, 'Error: while reading config file for 1: dependent building block "unresolved" was specified but not found!')
+  end
+
+end

data/spec/cxxproject_2_rake_spec.rb

@@ -1,186 +1,186 @@
-require 'spec_helper'
-require 'cxxproject'
-require 'cxxproject/utils/cleanup'
-
-RSPECDIR = File.dirname(__FILE__)
-puts RSPECDIR
-
-class SpecTaskListener
-  def initialize
-    @task_execution_count = 0
-  end
-  def before_prerequisites(name)
-  end
-
-  def after_prerequisites(name)
-  end
-
-  def before_execute(name)
-    @task_execution_count += 1
-  end
-
-  def after_execute(name)
-  end
-  def reset_exec_count()
-    @task_execution_count = 0
-  end
-  def get_exec_count()
-    @task_execution_count
-  end
-end
-
-def rebuild
-  tasks = fresh_cxx.all_tasks
-  execute_all_tasks(tasks)
-end
-
-#def is_older? fileA, fileB
-#  File.mtime(fileA) < File.mtime(fileB)
-#end
-#
-#def is_newer? fileA, fileB
-#  File.mtime(fileA) > File.mtime(fileB)
-#end
-
-def check_rebuilding (end_product, prereq_file, should_rebuild = true)
-  sleep(2)
-  FileUtils.touch prereq_file
-  # prereq_file should be newer
-  File.mtime(prereq_file).should > File.mtime(end_product)
-  rebuild
-  if should_rebuild
-    # prereq_file should NOT be newer
-    File.mtime(prereq_file).should <= File.mtime(end_product)
-  else
-    # prereq_file should still be newer
-    File.mtime(prereq_file).should > File.mtime(end_product)
-  end
-end
-
-def execute_all_tasks(tasks)
-  tasks.each do |t|
-    t.invoke
-  end
-end
-
-def fresh_cxx
-  Cxxproject::Utils.cleanup_rake
-  outputdir = 'output'
-  CxxProject2Rake.new(Dir.glob('**/project.rb'), outputdir, GCCChain)
-end
-
-def cleanup
-  rm_r 'output' if File.directory?('output')
-end
-
-#def count_needed_tasks(tasks)
-#  needed = 0
-#  tasks.each do |tn|
-#    t = tn[:task]
-#    if t.needed?
-#      needed = needed + 1
-#    end
-#  end
-#  needed
-#end
-
-ONLY_ONE_HEADER = "#{RSPECDIR}/testdata/onlyOneHeader"
-describe CxxProject2Rake do
-  before(:all) do
-    Rake::application.options.silent = true
-  end
-
-  it 'should provide runtask for executables' do
-    cd ONLY_ONE_HEADER, :verbose => false do
-      cleanup
-      tasks = fresh_cxx.all_tasks
-      Rake::Task['run:basic'].invoke
-      cleanup
-    end
-  end
-
-  it 'should rebuild only when one file was changed' do
-    require 'cxxproject/ext/rake_listener'
-    require 'cxxproject/ext/rake_dirty'
-
-    listener = SpecTaskListener.new
-    Rake::add_listener(listener)
-    cd(ONLY_ONE_HEADER, :verbose => false) do
-      # fresh build
-      listener.reset_exec_count
-      cleanup
-
-      tasks = fresh_cxx.all_tasks
-      CLOBBER.each { |fn| rm_r fn rescue nil }
-      execute_all_tasks(tasks)
-      fresh_build_steps = listener.get_exec_count
-
-      # rebuild, nothing changed
-      listener.reset_exec_count
-      execute_all_tasks(tasks)
-      rebuild_build_steps = listener.get_exec_count
-
-      # rebuild, nothing changed
-      listener.reset_exec_count
-      execute_all_tasks(tasks)
-      listener.get_exec_count.should == rebuild_build_steps
-
-      # rebuild after header changed
-      listener.reset_exec_count
-      sleep(1)
-      files2touch = Dir.glob('help.h')
-      FileUtils.touch files2touch
-      execute_all_tasks(fresh_cxx.all_tasks)
-      rebuild_after_touch_steps = listener.get_exec_count
-      rebuild_after_touch_steps.should > rebuild_build_steps
-
-      # rebuild, nothing changed
-      listener.reset_exec_count
-      execute_all_tasks(tasks)
-      listener.get_exec_count.should == rebuild_build_steps
-
-      cleanup
-    end
-    Rake::remove_listener(listener)
-  end
-
-  it 'should rebuild when any source file changes' do
-    cd("#{RSPECDIR}/testdata/basic", :verbose => false) do
-      cleanup
-
-      tasks = fresh_cxx.all_tasks
-      CLOBBER.each { |fn| rm_r fn rescue nil }
-      execute_all_tasks(tasks)
-
-      # dependencies: exe -> libC -> libB
-
-      headerA = 'exe12/help.h'
-      sourceA = 'exe12/main.cpp'
-      projectA = 'exe12/project.rb'
-      headerB = 'lib1/lib1.h'
-      sourceB = 'lib1/lib1.cpp'
-      projectB = 'lib1/project.rb'
-      headerC = 'lib2/lib2.h'
-      sourceC = 'lib2/lib2.cpp'
-      projectC = 'lib2/project.rb'
-      exe = 'output/basic.exe'
-      libB = 'output/libs/lib1.a'
-      libC = 'output/libs/lib2.a'
-
-      check_rebuilding exe, headerA
-      check_rebuilding exe, sourceA
-      check_rebuilding exe, projectA
-      check_rebuilding exe, headerB
-      check_rebuilding exe, headerC
-      check_rebuilding libB, sourceA, false
-      check_rebuilding libB, sourceB
-
-      check_rebuilding libB, sourceC, false
-      check_rebuilding libC, sourceB
-
-      cleanup
-      Cxxproject::Utils.cleanup_rake
-    end
-  end
-
-end
+require 'spec_helper'
+require 'cxxproject'
+require 'cxxproject/utils/cleanup'
+
+RSPECDIR = File.dirname(__FILE__)
+puts RSPECDIR
+
+class SpecTaskListener
+  def initialize
+    @task_execution_count = 0
+  end
+  def before_prerequisites(name)
+  end
+
+  def after_prerequisites(name)
+  end
+
+  def before_execute(name)
+    @task_execution_count += 1
+  end
+
+  def after_execute(name)
+  end
+  def reset_exec_count()
+    @task_execution_count = 0
+  end
+  def get_exec_count()
+    @task_execution_count
+  end
+end
+
+def rebuild
+  tasks = fresh_cxx.all_tasks
+  execute_all_tasks(tasks)
+end
+
+#def is_older? fileA, fileB
+#  File.mtime(fileA) < File.mtime(fileB)
+#end
+#
+#def is_newer? fileA, fileB
+#  File.mtime(fileA) > File.mtime(fileB)
+#end
+
+def check_rebuilding (end_product, prereq_file, should_rebuild = true)
+  sleep(1)
+  FileUtils.touch prereq_file
+  # prereq_file should be newer
+  File.mtime(prereq_file).should > File.mtime(end_product)
+  rebuild
+  if should_rebuild
+    # prereq_file should NOT be newer
+    File.mtime(prereq_file).should <= File.mtime(end_product)
+  else
+    # prereq_file should still be newer
+    File.mtime(prereq_file).should > File.mtime(end_product)
+  end
+end
+
+def execute_all_tasks(tasks)
+  tasks.each do |t|
+    t.invoke
+  end
+end
+
+def fresh_cxx
+  Cxxproject::Utils.cleanup_rake
+  outputdir = 'output'
+  CxxProject2Rake.new(Dir.glob('**/project.rb'), outputdir, GCCChain)
+end
+
+def cleanup
+  rm_r 'output' if File.directory?('output')
+end
+
+#def count_needed_tasks(tasks)
+#  needed = 0
+#  tasks.each do |tn|
+#    t = tn[:task]
+#    if t.needed?
+#      needed = needed + 1
+#    end
+#  end
+#  needed
+#end
+
+ONLY_ONE_HEADER = "#{RSPECDIR}/testdata/onlyOneHeader"
+describe CxxProject2Rake do
+  before(:all) do
+    Rake::application.options.silent = true
+  end
+
+  it 'should provide runtask for executables' do
+    cd ONLY_ONE_HEADER, :verbose => false do
+      cleanup
+      tasks = fresh_cxx.all_tasks
+      Rake::Task['run:basic'].invoke
+      cleanup
+    end
+  end
+
+  it 'should rebuild only when one file was changed' do
+    require 'cxxproject/ext/rake_listener'
+    require 'cxxproject/ext/rake_dirty'
+
+    listener = SpecTaskListener.new
+    Rake::add_listener(listener)
+    cd(ONLY_ONE_HEADER, :verbose => false) do
+      # fresh build
+      listener.reset_exec_count
+      cleanup
+
+      tasks = fresh_cxx.all_tasks
+      CLOBBER.each { |fn| rm_r fn rescue nil }
+      execute_all_tasks(tasks)
+      fresh_build_steps = listener.get_exec_count
+
+      # rebuild, nothing changed
+      listener.reset_exec_count
+      execute_all_tasks(tasks)
+      rebuild_build_steps = listener.get_exec_count
+
+      # rebuild, nothing changed
+      listener.reset_exec_count
+      execute_all_tasks(tasks)
+      listener.get_exec_count.should == rebuild_build_steps
+
+      # rebuild after header changed
+      listener.reset_exec_count
+      sleep(1)
+      files2touch = Dir.glob('help.h')
+      FileUtils.touch files2touch
+      execute_all_tasks(fresh_cxx.all_tasks)
+      rebuild_after_touch_steps = listener.get_exec_count
+      rebuild_after_touch_steps.should > rebuild_build_steps
+
+      # rebuild, nothing changed
+      listener.reset_exec_count
+      execute_all_tasks(tasks)
+      listener.get_exec_count.should == rebuild_build_steps
+
+      cleanup
+    end
+    Rake::remove_listener(listener)
+  end
+
+  it 'should rebuild when any source file changes' do
+    cd("#{RSPECDIR}/testdata/basic", :verbose => false) do
+      cleanup
+
+      tasks = fresh_cxx.all_tasks
+      CLOBBER.each { |fn| rm_r fn rescue nil }
+      execute_all_tasks(tasks)
+
+      # dependencies: exe -> libC -> libB
+
+      headerA = 'exe12/help.h'
+      sourceA = 'exe12/main.cpp'
+      projectA = 'exe12/project.rb'
+      headerB = 'lib1/lib1.h'
+      sourceB = 'lib1/lib1.cpp'
+      projectB = 'lib1/project.rb'
+      headerC = 'lib2/lib2.h'
+      sourceC = 'lib2/lib2.cpp'
+      projectC = 'lib2/project.rb'
+      exe = 'output/basic.exe'
+      libB = 'output/libs/lib1.a'
+      libC = 'output/libs/lib2.a'
+
+      check_rebuilding exe, headerA
+      check_rebuilding exe, sourceA
+      check_rebuilding exe, projectA
+      check_rebuilding exe, headerB
+      check_rebuilding exe, headerC
+      check_rebuilding libB, sourceA, false
+      check_rebuilding libB, sourceB
+
+      check_rebuilding libB, sourceC, false
+      check_rebuilding libC, sourceB
+
+      cleanup
+      Cxxproject::Utils.cleanup_rake
+    end
+  end
+
+end