cxx 0.1.14 → 0.1.15

data/lib/cxx.rb

@@ -149,6 +149,9 @@ module Cxx
       end
       Cxxproject::ALL_BUILDING_BLOCKS.values.inject([]) do |memo,block|
         @log.debug "creating tasks for block: #{block.name}/taskname: #{block.get_task_name} (#{block})"
+        if block.name != block.get_task_name
+          task block.name => block.get_task_name # create task with simple name of buildinblock
+        end
         memo << block.convert_to_rake()
       end
     end
@@ -183,10 +186,12 @@ module Cxx
 
     def eval_file(b, project_file)
       loadContext = EvalContext.new
+      project_text = File.read(File.basename(project_file))
       begin
-        loadContext.eval_project(File.read(File.basename(project_file)), project_file, Dir.pwd)
+        loadContext.eval_project(project_text, project_file, Dir.pwd)
       rescue Exception => e
         puts "problems with #{File.join(b, project_file)} in dir: #{Dir.pwd}"
+        puts project_text
         raise e
       end
 
@@ -194,9 +199,6 @@ module Cxx
         block.
           set_project_dir(Dir.pwd).
           set_config_files([Dir.pwd + "/" + project_file])
-        if block.respond_to?(:sources) && block.sources.instance_of?(Rake::FileList)
-          block.set_sources(block.sources.to_a)
-        end
       end
     end
 

data/lib/cxx/eval_context.rb

@@ -21,6 +21,21 @@ module Cxx
       instance_eval(project_text)
     end
 
+    def attatch_sources(hash,bblock)
+      if hash.has_key?(:sources)
+        ss = hash[:sources]
+        if ss.class == Array || ss.class == Rake::FileList
+          bblock.set_sources(ss)
+        else
+          raise "sources need to be given in an Array or FileList, not a #{ss.class}"
+        end
+      end
+    end
+
+    def attatch_includes(hash,bblock)
+      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
+    end
+
     # specify an executable
     # hash supports:
     # * :sources
@@ -31,8 +46,8 @@ module Cxx
       raise "not a hash" unless hash.is_a?(Hash)
       check_hash(hash,[:sources,:includes,:dependencies,:libpath,:output_dir])
       bblock = Cxxproject::Executable.new(name)
-      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
-      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
+      attatch_sources(hash,bblock)
+      attatch_includes(hash,bblock)
       if hash.has_key?(:dependencies)
         bblock.set_dependencies(hash[:dependencies])
         hash[:dependencies].each { |d| bblock.add_lib_element(Cxxproject::HasLibraries::DEPENDENCY, d) }
@@ -54,8 +69,8 @@ module Cxx
       check_hash(hash, [:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir, :whole_archive])
       raise ":sources need to be defined" unless hash.has_key?(:sources)
       bblock = Cxxproject::SourceLibrary.new(name, hash[:whole_archive])
-      bblock.set_sources(hash[:sources])
-      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
+      attatch_sources(hash,bblock)
+      attatch_includes(hash,bblock)
       bblock.set_tcs(hash[:toolchain]) if hash.has_key?(:toolchain)
       if hash.has_key?(:dependencies)
         bblock.set_dependencies(hash[:dependencies])
@@ -71,7 +86,7 @@ module Cxx
       check_hash(hash, [:includes, :lib_path])
 
       bblock = Cxxproject::BinaryLibrary.new(name)
-      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
+      attatch_includes(hash,bblock)
       bblock.add_lib_element(Cxxproject::HasLibraries::SEARCH_PATH, hash[:lib_path], true) if hash.has_key?(:lib_path)
       return bblock
     end
@@ -90,8 +105,8 @@ module Cxx
       raise "not a hash" unless hash.is_a?(Hash)
       check_hash(hash,[:sources,:includes])
       bblock = Cxxproject::SingleSource.new(name)
-      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
-      bblock.set_includes(hash[:includes]) if hash.has_key?(:includes)
+      attatch_sources(hash,bblock)
+      attatch_includes(hash,bblock)
       all_blocks << bblock
     end
 

data/lib/cxx/version.rb

@@ -1,4 +1,4 @@
 module Cxx
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxx
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cxxproject
@@ -50,51 +50,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- Gemfile
-- Gemfile.lock
-- Rakefile.rb
 - bin/cxx
-- cxx.gemspec
-- junit.rb
-- lib/cxx.rb
-- lib/cxx/eval_context.rb
 - lib/cxx/version.rb
-- lib/cxx/wizard/Rakefile.rb.template
 - lib/cxx/wizard/project.rb.template
 - lib/cxx/wizard/project_wizard.rb
-- rake_helper/spec.rb
-- spec/cxx_spec.rb
-- spec/object_dependency_spec.rb
-- spec/project_path_spec.rb
-- spec/testdata/basic/exe12/help.cpp
-- spec/testdata/basic/exe12/help.h
-- spec/testdata/basic/exe12/main.cpp
-- spec/testdata/basic/exe12/project.rb
-- spec/testdata/basic/lib1/lib1.cpp
-- spec/testdata/basic/lib1/lib1.h
-- spec/testdata/basic/lib1/project.rb
-- spec/testdata/basic/lib2/lib2.cpp
-- spec/testdata/basic/lib2/lib2.h
-- spec/testdata/basic/lib2/project.rb
-- spec/testdata/multiple_levels/libs/lib1/lib1.cpp
-- spec/testdata/multiple_levels/libs/lib1/lib1.h
-- spec/testdata/multiple_levels/libs/lib1/project.rb
-- spec/testdata/multiple_levels/libs/lib2/lib2.cpp
-- spec/testdata/multiple_levels/libs/lib2/lib2.h
-- spec/testdata/multiple_levels/libs/lib2/project.rb
-- spec/testdata/multiple_levels/mainproject/basic/help.cpp
-- spec/testdata/multiple_levels/mainproject/basic/help.h
-- spec/testdata/multiple_levels/mainproject/basic/main.cpp
-- spec/testdata/multiple_levels/mainproject/basic/project.rb
-- spec/testdata/onlyOneHeader/.gitignore
-- spec/testdata/onlyOneHeader/Rakefile.rb
-- spec/testdata/onlyOneHeader/help.cpp
-- spec/testdata/onlyOneHeader/help.h
-- spec/testdata/onlyOneHeader/main.cpp
-- spec/testdata/onlyOneHeader/project.rb
-- spec/testdata/onlyOneHeader/testin.c
+- lib/cxx/wizard/Rakefile.rb.template
+- lib/cxx/eval_context.rb
+- lib/cxx.rb
 homepage: 
 licenses: []
 post_install_message: 

data/.gitignore

@@ -1,3 +0,0 @@
-pkg
-spec/build
-build/test_details.xml

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@cxxproject_tests --create

data/Gemfile

@@ -1,6 +0,0 @@
-source :rubygems
-gem 'rspec'
-gem 'grit'
-gem 'roodi'
-gem 'builder'
-gem 'gem-release'

data/Gemfile.lock

@@ -1,35 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.1.3)
-    diff-lcs (1.1.3)
-    gem-release (0.4.1)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    mime-types (1.19)
-    posix-spawn (0.3.6)
-    roodi (2.1.0)
-      ruby_parser
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  builder
-  gem-release
-  grit
-  roodi
-  rspec

data/Rakefile.rb

@@ -1,33 +0,0 @@
-require "bundler/gem_tasks"
-require './rake_helper/spec.rb'
-
-task :package => :build
-
-projects = ['frazzle',
-            'cxxproject',
-            'cxxproject_gcctoolchain']
-
-desc 'cleanup all built gems'
-task :clean do
-  projects.each do |p|
-    cd "../#{p}" do
-      sh 'rake clobber_package'
-    end
-  end
-end
-
-desc 'install prerequisites for build'
-task :wipe_gems do
-  sh "rvm --force gemset empty"
-end
-
-desc 'install all built gems'
-task :build_and_install_gems do
-  projects.each do |p|
-    cd "../#{p}" do
-      sh 'rm -rf pkg'
-      sh 'rake package'
-      sh 'rake install'
-    end
-  end
-end

data/cxx.gemspec

@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-gem_name = 'cxx'
-require File.expand_path("lib/#{gem_name}/version")
-
-spec = Gem::Specification.new do |s|
-  s.name = gem_name
-  s.version = Cxx::VERSION
-
-  s.description = 'ruby-based dsl for cxxproject'
-  s.summary = 'defines the method cxx_configuration'
-  s.author = 'christian koestlin'
-  s.email = 'christian.koestlin@gmail.com'
-  s.platform = Gem::Platform::RUBY
-  s.files = `git ls-files`.split($\)
-  s.require_path = 'lib'
-
-  s.add_dependency 'cxxproject'
-  s.add_dependency 'highline'
-
-  s.executables = ['cxx']
-
-  s.has_rdoc = false
-end

data/junit.rb

@@ -1,91 +0,0 @@
-=begin
-
-Copyright (c) 2012, Nathaniel Ritmeyer
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Neither the name Nathaniel Ritmeyer nor the names of contributors to
-this software may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=end
-
-require 'time'
-require 'builder'
-require 'rspec/core/formatters/base_formatter'
-
-class JUnit < RSpec::Core::Formatters::BaseFormatter
-  def initialize output
-    super output
-    @test_results = []
-  end
-
-  def example_passed example
-    @test_results << example
-  end
-
-  def example_failed example
-    @test_results << example
-  end
-
-  def example_pending example
-    @test_results << example
-  end
-
-  def failure_details_for example
-    exception = example.metadata[:execution_result][:exception]
-    exception.nil? ? "" : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
-  end
-
-  def full_name_for example
-    test_name = ""
-    current_example_group = example.metadata[:example_group]
-    until current_example_group.nil? do
-      test_name = "#{current_example_group[:description]}." + test_name
-      current_example_group = current_example_group[:example_group]
-    end
-    test_name << example.metadata[:description]
-  end
-
-  def dump_summary duration, example_count, failure_count, pending_count
-    builder = Builder::XmlMarkup.new :indent => 2
-    builder.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
-    builder.testsuite :errors => 0, :failures => failure_count, :skipped => pending_count, :tests => example_count, :time => duration, :timestamp => Time.now.iso8601 do
-      builder.properties
-      @test_results.each do |test|
-        builder.testcase :classname => full_name_for(test), :name => test.metadata[:full_description], :time => test.metadata[:execution_result][:run_time] do
-          case test.metadata[:execution_result][:status]
-          when "failed"
-            builder.failure :message => "failed #{test.metadata[:full_description]}", :type => "failed" do
-              builder.cdata! failure_details_for test
-            end
-          when "pending" then builder.skipped
-          end
-        end
-      end
-    end
-    output.puts builder.target!
-  end
-end
-

data/rake_helper/spec.rb

@@ -1,14 +0,0 @@
-require 'rake/clean'
-
-SPEC_PATTERN ='spec/**/*_spec.rb'
-
-require 'rspec/core/rake_task'
-desc "Run examples"
-RSpec::Core::RakeTask.new() do |t|
-  t.pattern = SPEC_PATTERN
-  if ENV['BUILD_SERVER']
-    t.rspec_opts = '-r ./junit.rb -f JUnit -o build/test_details.xml'
-  end
-end
-
-task :gem => [:spec]

data/spec/cxx_spec.rb

@@ -1,166 +0,0 @@
-require 'cxx'
-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 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'
-  cxx(FileList['**/project.rb'], outputdir, 'gcc','.')
-end
-
-def cleanup
-  rm_r 'output' if File.directory?('output')
-end
-
-ONLY_ONE_HEADER = "#{RSPECDIR}/testdata/onlyOneHeader"
-describe Cxx::RubyDsl 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

data/spec/object_dependency_spec.rb

@@ -1,63 +0,0 @@
-require 'cxx'
-require 'cxxproject/ext/rake_listener.rb'
-require 'cxxproject/utils/cleanup'
-
-OUT_DIR='cxxbuild'
-
-describe Rake::Task do
-  compiler = 'gcc'
-
-  before(:each) do
-    Rake::application.options.silent = true
-    Cxxproject::Utils.cleanup_rake
-  end
-
-  after(:each) do
-    Cxxproject::Utils.cleanup_rake
-  end
-
-  it 'should fail if source of object is missing' do
-    file 'test.cc' => 'compiler'
-    File.delete('test.cc') if File.exists?('test.cc')
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    cxx = cxx([], OUT_DIR, compiler, '.')
-
-    task = Rake::application['lib:testlib']
-    task.invoke
-    task.failure.should eq(true)
-
-    FileUtils.rm_rf(OUT_DIR)
-  end
-
-  it 'should not fail if include-dependency of object is missing' do
-    File.open('test.cc', 'w') do |io|
-      io.puts('#include "test.h"')
-    end
-
-    File.open('test.h', 'w') do |io|
-    end
-
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    cxx([], OUT_DIR, compiler, '.')
-
-    task = Rake::application['lib:testlib']
-    task.invoke
-    task.failure.should == false
-
-    Cxxproject::Utils.cleanup_rake
-
-    FileUtils.rm_rf('test.h')
-    File.open('test.cc', 'w') do |io|
-    end
-
-    sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    cxx([], OUT_DIR, compiler, '.')
-
-    task = Rake::application[File.join(OUT_DIR, 'libs', 'libtestlib.a')]
-    task.invoke
-    task.failure.should == false
-
-    FileUtils.rm_rf('test.cc')
-  end
-
-end

data/spec/project_path_spec.rb

@@ -1,69 +0,0 @@
-require 'cxx'
-require 'cxxproject/utils/cleanup'
-
-RSPECDIR = File.dirname(__FILE__)
-
-describe Cxx::RubyDsl do
-
-  def execute_all_tasks(tasks)
-    tasks.each do |t|
-      t.invoke
-    end
-  end
-
-  def fresh_cxx(outputdir,base)
-    Cxxproject::Utils.cleanup_rake
-    project_configs = nil
-    cd base do # have to be relative to base
-      project_configs = Dir.glob('**/project.rb')
-    end
-    cxx(project_configs, outputdir, 'gcc', base)
-  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}/libs/lib1.a"
-    libTwo = "#{outputdir}/libs/lib2.a"
-    exe = "#{outputdir}/basic.exe"
-    exe2 = "#{outputdir}/debug.exe"
-    files = [libOne,libTwo,exe,exe2]
-    rm_r outputdir if File.directory?(outputdir)
-    tasks = fresh_cxx(outputdir, base).all_tasks
-    CLOBBER.each { |fn| rm_r fn rescue nil }
-
-    files.all? {|f| File.exists?(f).should be_false }
-
-    execute_all_tasks(tasks)
-
-    files.all? {|f| File.exists?(f).should be_true }
-
-    # cleanup
-    rm_r outputdir if File.directory?(outputdir)
-    Cxxproject::Utils.cleanup_rake
-  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/testdata/basic/exe12/help.cpp

@@ -1,5 +0,0 @@
-#include "help.h"
-#include <iostream>
-void helpMe() {
-  std::cout << "help me" << std::endl;
-}

data/spec/testdata/basic/exe12/help.h

@@ -1,6 +0,0 @@
-#ifndef help_h_
-#define help_h_
-
-void helpMe();
-
-#endif

data/spec/testdata/basic/exe12/main.cpp

@@ -1,10 +0,0 @@
-// #include "lib2.h"
-#include <iostream>
-#include "help.h"
-
-int main(int argc, char** args) {
-  helpMe();
-  // lib2();
-  std::cout << "hello world" << std::endl;
-  return 0;
-}

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

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

data/spec/testdata/basic/lib1/lib1.cpp

@@ -1,7 +0,0 @@
-#include "lib1.h"
-
-#include <iostream>
-
-void lib1() {
-  std::cout << "lib1" << std::endl;
-}

data/spec/testdata/basic/lib1/lib1.h

@@ -1,8 +0,0 @@
-#ifndef lib1_h_
-#define lib1_h_
-
-void lib1();
-
-
-#endif
-

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

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

data/spec/testdata/basic/lib2/lib2.cpp

@@ -1,17 +0,0 @@
-#include "lib2.h"
-
-#include <iostream>
-#include <math.h>
-#include "lib1.h"
-#include <dlfcn.h>
-#include <zlib.h>
-
-void lib2() {
-  std::cout << "lib2" << std::endl;
-  lib1();
-  std::cout << sin(5) << std::endl;
-  void* help = dlopen("test", RTLD_LAZY);
-  std::cout << (long)help << std::endl;
-  Bytef b = 0;
-  uLong res = crc32(0, &b, 1);
-}

data/spec/testdata/basic/lib2/lib2.h

@@ -1,6 +0,0 @@
-#ifndef lib2_h_
-#define lib2_h_
-
-void lib2();
-
-#endif

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

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

data/spec/testdata/multiple_levels/libs/lib1/lib1.cpp

@@ -1,7 +0,0 @@
-#include "lib1.h"
-
-#include <iostream>
-
-void lib1() {
-  std::cout << "lib1" << std::endl;
-}

data/spec/testdata/multiple_levels/libs/lib1/lib1.h

@@ -1,8 +0,0 @@
-#ifndef lib1_h_
-#define lib1_h_
-
-void lib1();
-
-
-#endif
-

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

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

data/spec/testdata/multiple_levels/libs/lib2/lib2.cpp

@@ -1,21 +0,0 @@
-#include "lib2.h"
-
-#include <iostream>
-#include <math.h>
-#include "lib1.h"
-#include <dlfcn.h>
-#include <zlib.h>
-
-void lib2() {
-#ifdef UNIT_TEST
-  std::cout << "lib2 for UNIT_TEST defined" << std::endl;
-#else
-  std::cout << "lib2" << std::endl;
-#endif
-  lib1();
-  std::cout << sin(5) << std::endl;
-  void* help = dlopen("test", RTLD_LAZY);
-  std::cout << (long)help << std::endl;
-  Bytef b = 0;
-  uLong res = crc32(0, &b, 1);
-}

data/spec/testdata/multiple_levels/libs/lib2/lib2.h

@@ -1,6 +0,0 @@
-#ifndef lib2_h_
-#define lib2_h_
-
-void lib2();
-
-#endif

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

@@ -1,19 +0,0 @@
-cxx_configuration do
-  deps = ['1', BinaryLibrary.new('z')]
-  deps << BinaryLibrary.new('dl') if Utils::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/help.cpp

@@ -1,5 +0,0 @@
-#include "help.h"
-#include <iostream>
-void helpMe() {
-  std::cout << "help me" << std::endl;
-}

data/spec/testdata/multiple_levels/mainproject/basic/help.h

@@ -1,6 +0,0 @@
-#ifndef help_h_
-#define help_h_
-
-void helpMe();
-
-#endif

data/spec/testdata/multiple_levels/mainproject/basic/main.cpp

@@ -1,10 +0,0 @@
-#include "lib2.h"
-#include <iostream>
-#include "help.h"
-
-int main(int argc, char** args) {
-  helpMe();
-  lib2();
-  std::cout << "hello world" << std::endl;
-  return 0;
-}

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

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

data/spec/testdata/onlyOneHeader/.gitignore

@@ -1 +0,0 @@
-output

data/spec/testdata/onlyOneHeader/Rakefile.rb

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

data/spec/testdata/onlyOneHeader/help.cpp

@@ -1,5 +0,0 @@
-#include "help.h"
-#include <iostream>
-void helpMe() {
-  std::cout << "help me" << std::endl;
-}

data/spec/testdata/onlyOneHeader/help.h

@@ -1,7 +0,0 @@
-#ifndef help_h_
-#define help_h_
-
-
-void helpMe();
-
-#endif

data/spec/testdata/onlyOneHeader/main.cpp

@@ -1,8 +0,0 @@
-#include <iostream>
-#include "help.h"
-
-int main(int argc, char** args) {
-  helpMe();
-  std::cout << "hello world" << std::endl;
-  return 0;
-}

data/spec/testdata/onlyOneHeader/project.rb

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