cxxproject 0.2 → 0.4.6

data/spec/build_dependencies_spec.rb

@@ -0,0 +1,169 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+require 'cxxproject'
+
+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
+
+describe CxxProject2Rake do
+  def count_needed_tasks(tasks)
+    needed = 0
+    tasks.each do |tn|
+      t = tn[:task]
+      if t.needed?
+        needed = needed + 1
+      end
+    end
+    needed
+  end
+  def execute_all_tasks(tasks)
+    tasks.each do |tn|
+      t = tn[:task]
+      t.invoke
+    end
+  end
+
+  def fresh_cxx
+    ALL_BUILDING_BLOCKS.clear
+    Rake.application.clear
+    outputdir = 'output'
+    CxxProject2Rake.new(Dir.glob('**/project.rb'), outputdir, GCCChain)
+  end
+
+  it 'should rebuild only when one file was changed' do
+    require 'cxxproject/extensions/rake_listener_ext'
+    require 'cxxproject/extensions/rake_dirty_ext'
+    listener = SpecTaskListener.new
+    Rake::add_listener(listener)
+    cd("#{RSPECDIR}/testdata/onlyOneHeader", :verbose => false) do
+      # fresh build
+      listener.reset_exec_count
+      rm_r 'output' if File.directory?('output')
+      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(0.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
+      rm_r 'output' if File.directory?('output')
+    end
+    Rake::remove_listener(listener)
+  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
+
+  it 'should rebuild when any source file changes' do
+    cd("#{RSPECDIR}/testdata/basic", :verbose => false) do
+      rm_r 'output' if File.directory?('output')
+      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/lib1.a'
+      libC = 'output/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
+      rm_r 'output' if File.directory?('output')
+      ALL_BUILDING_BLOCKS.clear
+      Rake.application.clear
+    end
+  end
+
+end
+

data/spec/building_block_spec.rb

@@ -0,0 +1,12 @@
+require 'cxxproject'
+
+describe BuildingBlock do
+  it 'should build the right dependency-chain' do
+    lib1 = SourceLibrary.new('1')
+    lib2 = SourceLibrary.new('2').set_dependencies(['1'])
+    lib3 = SourceLibrary.new('3').set_dependencies(['1'])
+    lib4 = SourceLibrary.new('4').set_dependencies(['2', '3'])
+    deps = lib4.calc_transitive_dependencies
+    deps.should == ['4', '2', '3', '1']
+  end
+end

data/spec/dir_spec.rb

@@ -0,0 +1,13 @@
+require 'cxxproject'
+
+describe Dir do
+
+  it 'should deliver all paths from the current' do
+     a = []
+     Dir.ascend("/var/log") do |path|
+       a << path
+     end
+    a.should == ['/var/log', '/var', '/']
+  end
+
+end

data/spec/project_path_spec.rb

@@ -0,0 +1,73 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+require 'cxxproject'
+
+RSPECDIR = File.dirname(__FILE__)
+
+describe CxxProject2Rake do
+
+  def execute_all_tasks(tasks)
+    tasks.each do |tn|
+      t = tn[:task]
+      t.invoke
+    end
+  end
+
+  def fresh_cxx(outputdir,base)
+    ALL_BUILDING_BLOCKS.clear
+    Rake.application.clear
+    project_configs = nil
+    cd base do # have to be relative to base
+      project_configs = Dir.glob('**/project.rb')
+    end
+    CxxProject2Rake.new(project_configs, outputdir, GCCChain, base, Logger::DEBUG)
+  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 test_on_level(base, outputdir)
+    libOne = "#{outputdir}/lib1.a"
+    libTwo = "#{outputdir}/lib2.a"
+    exe = "#{outputdir}/basic.exe"
+    exe2 = "#{outputdir}/debug.exe"
+
+    rm_r outputdir if File.directory?(outputdir)
+    tasks = fresh_cxx(outputdir, base).all_tasks
+    CLOBBER.each { |fn| rm_r fn rescue nil }
+
+    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_false }
+
+    execute_all_tasks(tasks)
+
+    [libOne,libTwo,exe,exe2].all? {|f| File.exists?(f).should be_true }
+
+    # cleanup
+    rm_r outputdir if File.directory?(outputdir)
+    ALL_BUILDING_BLOCKS.clear
+    Rake.application.clear
+  end
+
+  it 'should resolve paths on different levels' do
+    outputdir = 'output'
+
+    cd("#{RSPECDIR}/testdata/multiple_levels", :verbose => false) do
+      test_on_level(".", outputdir)
+    end
+
+    cd("#{RSPECDIR}/testdata/multiple_levels/mainproject", :verbose => false) do
+      test_on_level("..", outputdir)
+    end
+
+    cd("#{RSPECDIR}/testdata", :verbose => false) do
+      test_on_level("multiple_levels/", outputdir)
+    end
+  end
+
+end
+

data/spec/rake_listener_ext_spec.rb

@@ -0,0 +1,25 @@
+require 'cxxproject/extensions/rake_listener_ext.rb'
+
+describe Rake::Task do
+
+  it "should call a listener for prerequisites and execute" do
+    Rake.application.clear
+    t = task "test"
+
+    l = mock
+    Rake::add_listener(l)
+
+    l.should_receive(:before_prerequisites).with('test')
+    l.should_receive(:after_prerequisites).with('test')
+    l.should_receive(:before_execute).with('test')
+    l.should_receive(:after_execute).with('test')
+    t.invoke
+
+    Rake::remove_listener(l)
+
+    t.invoke
+
+    Rake.application.clear
+  end
+
+end

data/spec/string_spec.rb

@@ -0,0 +1,11 @@
+require 'cxxproject'
+
+describe String do
+  it 'should remove from start if matching' do
+    s = "abcd"
+    s.remove_from_start('abc').should == 'd'
+  end
+  it 'should not change the string if the start does not match' do
+    "abcd".remove_from_start('z').should == 'abcd'
+  end
+end

data/spec/testdata/basic/exe12/project.rb

@@ -0,0 +1,5 @@
+cxx_configuration do
+  exe "basic",
+    :sources => FileList.new('**/*.cpp'),
+    :dependencies => ['2']
+end

data/spec/testdata/basic/lib1/project.rb

@@ -0,0 +1,5 @@
+cxx_configuration do
+  source_lib "1",
+    :sources => ['lib1.cpp'],
+    :includes => ['.']
+end

data/spec/testdata/basic/lib2/project.rb

@@ -0,0 +1,8 @@
+cxx_configuration do
+  deps = ['1', BinaryLibrary.new('z')]
+  deps << BinaryLibrary.new('dl') if OS.linux?
+  source_lib "2",
+    :sources => FileList['**/*.cpp'],
+    :dependencies => deps,
+    :includes => ['.']
+end

data/spec/testdata/multiple_levels/libs/lib1/project.rb

@@ -0,0 +1,5 @@
+cxx_configuration do
+  source_lib "1",
+    :sources => FileList['lib1.cpp'],
+    :includes => ['.']
+end

data/spec/testdata/multiple_levels/libs/lib2/project.rb

@@ -0,0 +1,19 @@
+cxx_configuration do
+  deps = ['1', BinaryLibrary.new('z')]
+  deps << BinaryLibrary.new('dl') if OS.linux?
+
+  source_lib "2",
+    :sources => FileList['**/*.cpp'],
+    :dependencies => deps,
+    :includes => ['.']
+
+
+  unittest_flags = {
+    :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN="main"']
+  }
+  source_lib "2_debug",
+    :sources => FileList['**/*.cpp'],
+    :dependencies => deps,
+    :includes => ['.'],
+    :toolchain => Provider.modify_cpp_compiler("GCC", unittest_flags)
+end

data/spec/testdata/multiple_levels/mainproject/basic/project.rb

@@ -0,0 +1,8 @@
+cxx_configuration do
+  exe "basic",
+    :sources => FileList['**/*.cpp'],
+    :dependencies => ['2']
+  exe "debug",
+    :sources => FileList['**/*.cpp'],
+    :dependencies => ['2_debug']
+end

data/spec/testdata/onlyOneHeader/Rakefile.rb

@@ -0,0 +1,4 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","..","lib")
+require 'cxxproject'
+BuildDir='output'
+CxxProject2Rake.new(['project.rb'], BuildDir, GCCChain)

data/spec/testdata/onlyOneHeader/project.rb

@@ -0,0 +1,4 @@
+cxx_configuration do
+  exe "basic",
+    :sources => FileList.new('**/*.cpp')
+end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cxxproject
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 4
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - ""
@@ -13,29 +15,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
+date: 2011-05-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
+        version: 1.6.0
+  type: :runtime
+  version_requirements: *id001
 description: "    Some more high level building blocks for cpp projects.\n"
-email: ""
-executables: []
-
+email: oliver.mueller@gmail.com
+executables: 
+- cxx
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- lib/cxxproject/compiler.rb
-- lib/cxxproject/dependencies.rb
-- lib/cxxproject/gcccompiler.rb
-- lib/cxxproject/osxcompiler.rb
-- lib/cxxproject/utils.rb
+- lib/cxxproject/buildingblocks/binary_library.rb
+- lib/cxxproject/buildingblocks/building_block.rb
+- lib/cxxproject/buildingblocks/command_line.rb
+- lib/cxxproject/buildingblocks/custom_building_block.rb
+- lib/cxxproject/buildingblocks/executable.rb
+- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
+- lib/cxxproject/buildingblocks/has_libraries_mixin.rb
+- lib/cxxproject/buildingblocks/has_sources_mixin.rb
+- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/module.rb
+- lib/cxxproject/buildingblocks/single_source.rb
+- lib/cxxproject/buildingblocks/source_library.rb
+- lib/cxxproject/extensions/file_ext.rb
+- lib/cxxproject/extensions/rake_dirty_ext.rb
+- lib/cxxproject/extensions/rake_ext.rb
+- lib/cxxproject/extensions/rake_listener_ext.rb
+- lib/cxxproject/extensions/stdout_ext.rb
+- lib/cxxproject/extensions/string_ext.rb
+- lib/cxxproject/task_maker.rb
+- lib/cxxproject/testinstanceeval.rb
+- lib/cxxproject/toolchain/base.rb
+- lib/cxxproject/toolchain/diab.rb
+- lib/cxxproject/toolchain/gcc.rb
+- lib/cxxproject/toolchain/provider.rb
+- lib/cxxproject/torake/compiler.rb
+- lib/cxxproject/torake/gcccompiler.rb
+- lib/cxxproject/torake/osxcompiler.rb
+- lib/cxxproject/torake.rb
+- lib/cxxproject/utils/dot/building_block_graph_writer.rb
+- lib/cxxproject/utils/dot/graph_writer.rb
+- lib/cxxproject/utils/dot/task_graph_writer.rb
+- lib/cxxproject/utils/ubigraph.rb
+- lib/cxxproject/utils/utils.rb
 - lib/cxxproject.rb
+- lib/tools/projectWizard.rb
+- lib/tools/project.rb.template
+- lib/tools/Rakefile.rb.template
 - Rakefile.rb
-- spec/dependencies_spec.rb
-has_rdoc: true
-homepage: ""
+- spec/build_dependencies_spec.rb
+- spec/building_block_spec.rb
+- spec/dir_spec.rb
+- spec/project_path_spec.rb
+- spec/rake_listener_ext_spec.rb
+- spec/string_spec.rb
+- spec/testdata/basic/exe12/project.rb
+- spec/testdata/basic/lib1/project.rb
+- spec/testdata/basic/lib2/project.rb
+- spec/testdata/multiple_levels/libs/lib1/project.rb
+- spec/testdata/multiple_levels/libs/lib2/project.rb
+- spec/testdata/multiple_levels/mainproject/basic/project.rb
+- spec/testdata/onlyOneHeader/project.rb
+- spec/testdata/onlyOneHeader/Rakefile.rb
+- bin/cxx
+homepage: https://github.com/marcmo/cxxproject
 licenses: []
 
 post_install_message: 
@@ -44,23 +104,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Cpp Support for Rake.

data/lib/cxxproject/compiler.rb

@@ -1,80 +0,0 @@
-class Compiler
-  def initialize(output_path)
-    @output_path = output_path
-  end
-
-  def include(name)
-    CLEAN.include(name)
-#    ALL.include(name)
-  end
-
-  def transitive_includes(lib)
-    res = Dependencies.transitive_dependencies([lib.name]).map do |i|
-      i.includes.map { |include| File.join(i.base, include) }
-    end
-    return res.flatten
-  end
-  def transitive_libs(from)
-    res = Dependencies.transitive_dependencies([from.name]).delete_if{|i|i.instance_of?(Exe)}.map do |i|
-      "#{@output_path}/lib#{i.name}.a"
-    end
-    return res
-  end
-
-  def create_object_file(lib, relative_source)
-    source = File.join(lib.base, relative_source)
-    out = File.join(@output_path, "#{source}.o")
-    outputdir = File.dirname(out)
-    directory outputdir
-    include(out)
-    desc "compiling #{source}"
-    res = file out => [source, outputdir] do |t|
-      includes = transitive_includes(lib)
-      include_string = includes.inject('') { | res, i | "#{res} -I#{i} " }
-      sh "g++ -c #{source} #{include_string} -o #{t.name}"
-    end
-    return res
-  end
-
-  def static_lib_path(name)
-    libname = "lib#{name}.a"
-    fullpath = File.join(@output_path, libname)
-    return fullpath
-  end
-
-  def create_source_lib(lib, objects)
-    fullpath = static_lib_path(lib.name)
-    command = objects.inject("ar -r #{fullpath}") do |command, o|
-      "#{command} #{o}"
-    end
-    include(fullpath)
-    deps = objects.dup
-    deps += lib.dependencies.map {|dep|static_lib_path(dep)}
-    desc "link lib #{lib.name}"
-    res = file fullpath => deps do
-      sh command
-    end
-    return res
-  end
-
-  def create_exe(exe, objects)
-    exename = "#{exe.name}.exe"
-    fullpath = File.join(@output_path, exename)
-    command = objects.inject("g++ -o #{fullpath}") do |command, o|
-      "#{command} #{o}"
-    end
-
-    dep_paths = exe.dependencies.map {|dep|static_lib_path(dep)}
-    include(fullpath)
-    deps = objects.dup
-    deps += dep_paths
-    desc "link exe #{exe.name}"
-    res = file fullpath => deps do
-      libs = transitive_libs(exe)
-      command = libs.inject(command) { |command, l| "#{command} #{l}" }
-      sh command
-    end
-    return res
-  end
-end
-

data/lib/cxxproject/dependencies.rb

@@ -1,41 +0,0 @@
-class Dependencies
-
-  attr_reader :all_libs
-
-  def initialize(lib_strings)
-    @all_libs = []
-    lib_strings.each do |lib_string|
-      add(lib_string)
-    end
-  end
-
-  def self.transitive_dependencies(lib)
-    return Dependencies.new(lib).all_libs
-  end
-
-
-
-  def self.tr_libs(libs)
-    return LibHelper.new(libs).all_libs
-  end
-
-  def add_unique(lib)
-    @all_libs.delete(lib)
-    @all_libs.push(lib)
-  end
-
-  def add(lib)
-    bb = ALL_BUILDING_BLOCKS[lib]
-    if !bb
-      raise "dependency not found #{lib}"
-    end
-    add_unique(bb)
-    bb.dependencies.each do |dep|
-      add(dep)
-    end
-  end
-
-
-
-
-end

data/spec/dependencies_spec.rb

@@ -1,19 +0,0 @@
-require 'cxxproject'
-
-describe Dependencies do
-  it 'should build the right dependency-chain' do
-    lib1 = SourceLibrary.new('1')
-    lib2 = SourceLibrary.new('2')
-    lib2.dependencies = ['1']
-    lib3 = SourceLibrary.new('3')
-    lib3.dependencies = ['1']
-    lib4 = SourceLibrary.new('4')
-    lib4.dependencies = ['2', '3']
-    deps = Dependencies.transitive_dependencies(['4'])
-    deps.map {|d|d.name}.should == ['4', '2', '3', '1']
-  end
-  it 'should create .d files' do
-    pending
-    1.should == 0
-  end
-end