cxxproject 0.6.28 → 0.6.29

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.0.0)
+    builder (3.1.3)
     diff-lcs (1.1.3)
     frazzle (0.1.3)
     grit (2.5.0)
@@ -17,9 +17,9 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec-mocks (2.11.2)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
     sexp_processor (3.2.0)

data/lib/cxxproject/buildingblocks/executable.rb

@@ -142,41 +142,21 @@ module Cxxproject
           cmd += linker[:LIB_POSTFIX_FLAGS].split(" ") # TODO ... is this still needed e.g. for diab
 
           mapfileStr = @mapfile ? " >#{@mapfile}" : ""
-          if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| ((c.include?(" ")) ? ("\""+c+"\"") : c )}
-
-            # TempFile used, because some compilers, e.g. diab, uses ">" for piping to map files:
-            cmdLinePrint = cmd.join(" ")
-            cmdLine = cmdLinePrint + " 2>" + get_temp_filename
-            if cmdLine.length > 8000
-              inputName = get_executable_name+".tmp"
-              File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
-              inputName = "\""+inputName+"\"" if inputName.include?(' ')
-              strCmd = "#{linker[:COMMAND] + " @" + inputName + mapfileStr + " 2>" + get_temp_filename}"
-            else
-              strCmd = "#{cmd.join(" ") + mapfileStr + " 2>" + get_temp_filename}"
-            end
-            printCmd(cmdLinePrint, "Linking #{get_executable_name}", false)
-            consoleOutput = `#{strCmd}`
-            consoleOutput.concat(read_file_or_empty_string(get_temp_filename))
-          else
-            rd, wr = IO.pipe
-            cmdLinePrint = cmd
-            printCmd(cmdLinePrint, "Linking #{get_executable_name}", false)
-            cmd << {
-             :out=> @mapfile ? "#{@mapfile}" : wr, # > xy.map
-             :err=>wr
-            }
-            sp = spawn(*cmd)
-            cmd.pop
-
-            # for console print
-            cmd << " >#{@mapfile}" if @mapfile
-            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
-          end
+          rd, wr = IO.pipe
+          cmdLinePrint = cmd
+          printCmd(cmdLinePrint, "Linking #{get_executable_name}", false)
+          cmd << {
+            :out=> @mapfile ? "#{@mapfile}" : wr, # > xy.map
+            :err=>wr
+          }
+          sp = spawn(*cmd)
+          cmd.pop
+
+          # for console print
+          cmd << " >#{@mapfile}" if @mapfile
+          consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
 
           process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil)
-
           check_config_file()
         end
       end

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -286,27 +286,14 @@ module Cxxproject
           cmd += compiler[:PREPRO_FLAGS].split(" ") if Rake::application.preproFlags
           cmd << sourceRel
 
-          if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| ((c.include?(" ")) ? ("\""+c+"\"") : c )}
-            cmdLine = cmd.join(" ")
-            if cmdLine.length > 8000
-              inputName = objectRel+".tmp"
-              File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
-              inputName = "\""+inputName+"\"" if inputName.include?(" ")
-              consoleOutput = `#{compiler[:COMMAND] + " @" + inputName}`
-            else
-              consoleOutput = `#{cmd.join(" ")} 2>&1`
-            end
-          else
-            rd, wr = IO.pipe
-            cmd << {
-             :err=>wr,
-             :out=>wr
-            }
-            sp = spawn(*cmd)
-            cmd.pop
-            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
-          end
+          rd, wr = IO.pipe
+          cmd << {
+            :err=>wr,
+            :out=>wr
+          }
+          sp = spawn(*cmd)
+          cmd.pop
+          consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
 
           process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "Compiling #{sourceRel}")
 

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -80,29 +80,16 @@ module Cxxproject
           cmd << aname # -o debug/x.exe
           cmd += objs
 
-          if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| c.include?(' ') ? "\"#{c}\"" : c }
-
-            cmdLine = cmd.join(" ")
-            if cmdLine.length > 8000
-              inputName = aname+".tmp"
-              File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
-              consoleOutput = `#{archiver[:COMMAND] + " @" + inputName}`
-            else
-              consoleOutput = `#{cmd.join(" ")} 2>&1`
-            end
-          else
-            cmd.map! {|c| c.include?(' ') ? "\"#{c}\"" : c }
-            rd, wr = IO.pipe
-            cmd << {
-             :err => wr,
-             :out => wr
-            }
-            sp = spawn(*cmd)
-            cmd.pop
-
-            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
-          end
+          cmd.map! {|c| c.include?(' ') ? "\"#{c}\"" : c }
+          rd, wr = IO.pipe
+          cmd << {
+            :err => wr,
+            :out => wr
+          }
+          sp = spawn(*cmd)
+          cmd.pop
+
+          consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
 
           process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}")
 

data/lib/cxxproject/ext/file.rb

@@ -5,61 +5,47 @@ class File
   SLASH = '/'
 
   def self.is_absolute?(filename)
-    if Cxxproject::Utils.old_ruby?
-      filename[0] == 47 or filename[1] == 58 # 47 = /, 58 = :
-    else
-      filename[0] == SLASH or filename[1] == ':'
-    end
+    filename[0] == SLASH or filename[1] == ':'
   end
 
   def self.rel_from_to_project(from,to,endWithSlash = true)
     return nil if from.nil? or to.nil?
-    
-	toSplitted = to.split('/')
-	fromSplitted = from.split('/')
-	
-	max = [toSplitted.length, fromSplitted.length].min
-	
-	return nil if max < 1
-	
-	i = 0
 
-	# path letter in windows may be case different
-	if toSplitted[0].length > 1 and fromSplitted[0].length > 1
-      if Cxxproject::Utils.old_ruby?
-        i = 1 if toSplitted[0][1] == 58 and fromSplitted[0][1] == 58 and toSplitted[0].swapcase[0] == fromSplitted[0][0] 
-      else
-        i = 1  if toSplitted[0][1] == ':' and fromSplitted[0][1] == ':' and toSplitted[0].swapcase[0] == fromSplitted[0][0]
-      end	
-	end
-	
-	while i < max
-      break if toSplitted[i] != fromSplitted[i] 
-	  i += 1
-	end
-	j = i
-	
-	res = []
-	while i < fromSplitted.length
-	  res << ".."
-	  i += 1
-	end
-	
-	while j < toSplitted.length
-	  res << toSplitted[j]
-	  j += 1
-	end
-	
-	if res.length == 0
-	  return ""
-	end
-	
-	res = res.join('/')
-	res += "/" if endWithSlash 
-	res
+    toSplitted = to.split('/')
+    fromSplitted = from.split('/')
+    max = [toSplitted.length, fromSplitted.length].min
+    return nil if max < 1
+
+    i = 0
+    # path letter in windows may be case different
+    if toSplitted[0].length > 1 and fromSplitted[0].length > 1
+      i = 1  if toSplitted[0][1] == ':' and fromSplitted[0][1] == ':' and toSplitted[0].swapcase[0] == fromSplitted[0][0]
+    end
+    while i < max
+      break if toSplitted[i] != fromSplitted[i]
+      i += 1
+    end
+    j = i
+    res = []
+    while i < fromSplitted.length
+      res << ".."
+      i += 1
+    end
+
+    while j < toSplitted.length
+      res << toSplitted[j]
+      j += 1
+    end
+
+    if res.length == 0
+      return ""
+    end
+
+    res = res.join('/')
+    res += "/" if endWithSlash
+    res
   end
 
-  
   def self.add_prefix(prefix, file)
     if not prefix or is_absolute?(file)
       file

data/lib/cxxproject/toolchain/colorizing_formatter.rb

@@ -18,7 +18,7 @@ module Cxxproject
     # simple class to colorize compiler output
     # the class depends on the rainbow gem
     class ColorizingFormatter
-    
+
       # colors are not instance vars due to caching the building blocks
       def self.setColorScheme(scheme)
         if scheme == :black
@@ -76,7 +76,7 @@ module Cxxproject
             else
               res << l
             end
-            res << "\n" 
+            res << "\n"
           end
         rescue Exception => e
           puts "Error while parsing compiler output: #{e}"

data/lib/cxxproject/utils/process.rb

@@ -5,14 +5,14 @@ module Cxxproject
 
     def self.readOutput(sp, rd, wr)
       wr.close
-        
+
       consoleOutput = ""
       begin
-        while not rd.eof? 
+        while not rd.eof?
            tmp = rd.read(1000)
            if (tmp != nil)
              consoleOutput << tmp
-           end  
+           end
         end
       rescue Exception=>e
         # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
@@ -20,24 +20,22 @@ module Cxxproject
         # how to "break" the loop.
         # This problem occurs on Windows command shell and Cygwin.
       end
-        
+
       Process.wait(sp)
       rd.close
-      
-      # seems that pipe cannot handle non-ascii characters right on windows (even with correct encoding)  
+
+      # seems that pipe cannot handle non-ascii characters right on windows (even with correct encoding)
       consoleOutput.gsub!(/\xE2\x80\x98/,"`") # ���
       consoleOutput.gsub!(/\xE2\x80\x99/,"'") # ���
-      
+
       consoleOutput
     end
 
     def self.spawnProcess(cmdLine)
-      return system(cmdLine) if Cxxproject::Utils.old_ruby?
-      
       @@pid = spawn(cmdLine)
       pid, status = Process.wait2(@@pid)
       @@pid = nil
-      status.success? 
+      status.success?
     end
 
     def self.killProcess
@@ -47,7 +45,7 @@ module Cxxproject
       end
       @@pid = nil
     end
-    
+
   end
 
-end
+end

data/lib/cxxproject/version.rb

@@ -1,5 +1,5 @@
 module Cxxproject
-  VERSION = '0.6.28'
+  VERSION = '0.6.29'
 
   class Version
     def self.cxxproject

data/rake_helper/spec.rb

@@ -44,7 +44,9 @@ def new_rspec
   desc "Run examples"
   RSpec::Core::RakeTask.new() do |t|
     t.pattern = SPEC_PATTERN
-    t.rspec_opts = '-r ./junit.rb -f JUnit -o build/test_details.xml'    
+    if ENV['BUILD_SERVER']
+      t.rspec_opts = '-r ./junit.rb -f JUnit -o build/test_details.xml'
+    end
   end
 
   desc 'Run examples with coverage'
@@ -52,30 +54,12 @@ def new_rspec
   CLOBBER.include('coverage')
 end
 
-def old_rspec
-  require 'spec/rake/spectask'
-  desc "Run examples"
-  Spec::Rake::SpecTask.new() do |t|
-    t.spec_files = SPEC_PATTERN
-  end
-end
-
 namespace :spec do
-  begin
-    new_rspec
-  rescue LoadError
-    begin
-      old_rspec
-    rescue LoadError
-      desc "Run examples"
-      task 'spec' do
-        puts 'rspec not installed...! please install with "gem install rspec"'
-      end
-    end
-  end
+  new_rspec
 end
+
 task :spec do
   puts 'Please use spec:spec or spec:coverage'
 end
-task :gem => [:spec]
 
+task :gem => [:spec]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxxproject
 version: !ruby/object:Gem::Version
-  version: 0.6.28
+  version: 0.6.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -168,12 +168,9 @@ files:
 - rake_helper/spec.rb
 - roodi.yml
 - spec/building_block_spec.rb
-- spec/cxxproject_2_rake_spe.rb
 - spec/file_ext_spec.rb
 - spec/ide_interface_spec.rb
-- spec/object_dependency_spe.rb
 - spec/plugin_context_spec.rb
-- spec/project_path_spe.rb
 - spec/provider_spec.rb
 - spec/rake_listener_ext_spec.rb
 - spec/spec_helper.rb
@@ -220,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1684714182921890965
+      hash: 4389251987030978626
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/cxxproject_2_rake_spe.rb

@@ -1,167 +0,0 @@
-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 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, 'gcc')
-end
-
-def cleanup
-  rm_r 'output' if File.directory?('output')
-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

data/spec/object_dependency_spe.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-require 'cxxproject'
-require 'cxxproject/ext/rake_listener.rb'
-require 'cxxproject/utils/cleanup'
-
-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 = CxxProject2Rake.new([], 'build', compiler)
-
-    task = Rake::application['lib:testlib']
-    task.invoke
-    task.failure.should eq(true)
-
-    FileUtils.rm_rf('build')
-  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(".")
-    CxxProject2Rake.new([], 'build', 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(".")
-    CxxProject2Rake.new([], 'build', compiler)
-
-    task = Rake::application['build/libs/libtestlib.a']
-    task.invoke
-    task.failure.should == false
-
-    FileUtils.rm_rf('test.cc')
-  end
-
-end

data/spec/project_path_spe.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-require 'cxxproject'
-require 'cxxproject/utils/cleanup'
-
-RSPECDIR = File.dirname(__FILE__)
-
-describe CxxProject2Rake 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
-    CxxProject2Rake.new(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
-