cxxproject 0.6.2 → 0.6.4

data/Rakefile.rb

@@ -47,7 +47,7 @@ begin
       end
     end
     RoodiTask.new('roodi', spec.files)
-    task :gem => [:roodi]
+    task :agem => [:roodi]
   rescue LoadError # don't bail out when people do not have roodi installed!
       puts 'please gem install roodi'
   end

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      "0.6.2"
+      "0.6.4"
     end
   end
 end

data/lib/tools/Rakefile.rb.template

@@ -5,6 +5,6 @@ unittest_flags = {
   :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN=main'],
   :FLAGS => "-O0 -g3 -Wall"
 }
-toolchain = Provider.modify_cpp_compiler("GCC", unittest_flags)
+toolchain = Provider.modify_cpp_compiler("<%= toolchain_name %>", unittest_flags)
 dependent_projects =  ['./project.rb']
 CxxProject2Rake.new(dependent_projects, BuildDir, toolchain, './')

data/lib/tools/project_wizard.rb

@@ -1,5 +1,27 @@
 require 'rake'
 require 'erb'
+require 'rubygems'
+
+def choose_toolchain
+  res = nil
+  toolchains = []
+  prefix = "cxxproject_"
+  toolchain_gems = Gem::Specification.find_all do |gem|
+    gem.name.start_with?(prefix)
+  end
+  if toolchain_gems.length > 0
+    choose do |menu|
+      menu.prompt = "choose a toolchain:"
+      toolchain_gems.each do |gem|
+        name = gem.name[prefix.length..-1]
+        menu.choice(name.to_sym) { res = name }
+      end
+    end
+  else
+    say "no toolchains found...you need to install toolchain-gems in order to use cxxproject"
+  end
+  res
+end
 
 def choose_building_block
   res = nil
@@ -27,10 +49,12 @@ def prepare_project(d)
     require 'highline/import'
 
     if agree("This will create a new cxx-project config in dir \"#{d}\" \nAre you sure you want to continue? [yn] ")
+      tc = choose_toolchain
+      return unless tc
       bb = choose_building_block
       generate_makefile = choose_generate_makefile
 
-      create_project(d, bb, generate_makefile)
+      create_project(d, bb, tc, generate_makefile)
     else
       say "stopped project creation"
     end
@@ -40,13 +64,14 @@ def prepare_project(d)
 end
 
 
-def create_project(d, bb, generate_rakefile)
+def create_project(d, bb, tc, 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
+  toolchain_name = tc[/(.*?)toolchain/,1] 
   mkdir_p(d, :verbose => false)
   cd(d,:verbose => false) do
     if ((File.exists? "Rakefile.rb") || (File.exists? "project.rb"))

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors: 
 - oliver mueller
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3389425425970571321
+      hash: 1495580368314725504
       segments: 
       - 0
       version: "0"