bake-toolkit 1.8.0.1 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9335abf32a9aa13ca68eb2985babba8ff8a02236
-  data.tar.gz: f40783c3c427e83722fb01d319c5b8deb6fe529b
+  metadata.gz: b793e0fe7bd1968ec00296fba84aa608ff3c1ad9
+  data.tar.gz: 8bd30d6498a53cdb10d81be6fc8a96836731f98d
 SHA512:
-  metadata.gz: 89cf35c7cb654d3a58ac1a280163f6c8d07d607697f1cb1bca838b0fe08878619a6add1440b6301033246114af61a0b8d5687aff903108cf765ef9d173b153a5
-  data.tar.gz: cf084b8ef730e2a792993f5b941c46308eef3e8c7401718cf5d0496978b25c6d88d660bcb2ec6e27e987381cd8dc812f7c2d96512f37ece7061baa1877633173
+  metadata.gz: 82495dc61ad9c98b2dcf4c941e562ff6b0d0abf4f953d14a5e3fa7401d7aace13980bb9299433cf113b8c71e192316b23804af718720e940e530c37dad614ecf
+  data.tar.gz: fa22d24b19a3008809f3f9d2c2c956008278e3a01fdfbc15d7f344fb18d2f81273adcb7cd28eea2a71ef6a29cd7b6733b4c20ec387c6b30e9eef02d378f7c5d6

data/bin/bake

@@ -3,47 +3,32 @@
 $timeStart = Time.now
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'bake/version'
-
-$:.unshift(File.dirname(__FILE__)+"/../../cxxproject/lib")
-
-require "cxxproject/version"
+require 'common/version'
 
 STDOUT.sync = true
 STDERR.sync = true
 
-puts "-- bake #{Cxxproject::Version.bake}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
+puts "-- bake #{Bake::Version.number}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
 
 require 'tocxx'
-require 'bake/options'
+require 'common/options/option'
 require 'socket'
 
-module Cxxproject
-
-  def self.isNewer(oldVersion, newVersion)
-    oldSplitted = oldVersion.split(".")
-    newSplitted = newVersion.split(".")
-    if oldSplitted.length >= 3 and newSplitted.length >= 3
-      3.times do |i|
-        return true if newSplitted[i].to_i > oldSplitted[i].to_i
-        return false if newSplitted[i].to_i < oldSplitted[i].to_i
-      end
-    end
-    return false;
-  end
+module Bake
 
   earlyExit = nil
   begin
-    options = Options.new(ARGV)
-    options.parse_options
-
-    tocxx = Cxxproject::ToCxx.new(options)
+    if RUBY_VERSION[0..2] == "1.8"
+      Bake.formatter.printError("Error: Ruby 1.8 not supported anymore. Use Ruby 1.9 or greater.")
+      ExitHelper.exit(1)
+    end
+    
+    Bake.options = Options.new(ARGV)
+    Bake.options.parse_options
 
+    tocxx = Bake::ToCxx.new
     tocxx.connect()
-    
-    if tocxx.doit()
-      tocxx.start()
-    end
+    tocxx.doit()
     tocxx.disconnect()
     
   rescue SystemExit => e
@@ -53,34 +38,10 @@ module Cxxproject
     rescue Exception => e2
     end
   end
-  
 
   timeEnd = Time.now
   timeDiff = timeEnd - $timeStart
-  Printer.printInfo "\nTime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60]
-  
-  # update check
-  #begin
-  #  versionWarningString = ""
-  #  require 'net/http'
-  #  vtext = Net::HTTP.get('10.40.38.84', '/bake/versions.txt')
-  #  vtextSplitted = vtext.split(" ")
-  #  if vtextSplitted.length > 0
-  #    if isNewer(Cxxproject::Version.bake, vtextSplitted[0])
-  #      versionWarningString = versionWarningString + "\nNewer version of bake gem available: #{vtextSplitted[0]} - please update!"
-  #    end 
-  #  end
-  #  if vtextSplitted.length > 1
-  #    if isNewer(options.eclipse_version, vtextSplitted[1])
-  #      versionWarningString = versionWarningString + "\nNewer version of bake Eclipse plugin available: #{vtextSplitted[1]} - please update!"
-  #    end 
-  #  end
-  #  if versionWarningString != ""
-  #    Printer.printWarning versionWarningString
-  #  end
-  #rescue Exception => e
-  #end  
-
+  Bake.formatter.printInfo("\nTime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60])
   
   raise earlyExit if earlyExit
 end

data/bin/bakery

@@ -3,44 +3,44 @@
 $timeStart = Time.now
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
-require 'bake/version'
+require 'common/version'
 
-$:.unshift(File.dirname(__FILE__)+"/../../cxxproject/lib")
+require 'common/utils'
 
-require "cxxproject/version"
-require 'cxxproject/utils/utils'
-
-puts "-- bakery #{Cxxproject::Version.bake}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
+puts "-- bakery #{Bake::Version.number}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
 
 STDOUT.sync = true
 STDERR.sync = true
 
-require 'cxxproject/utils/printer'
+require 'bake/toolchain/colorizing_formatter'
 require 'tocxx'
-require "bakery/loader"
-require "bakery/options"
+require "bakery/model/loader"
+require "bakery/options/options"
 require "bakery/toBake"
 require "bakery/buildPattern"
-require 'cxxproject/ext/stdout'
-require 'cxxproject/utils/cleanup'
-
-module Cxxproject
+require 'common/ext/stdout'
+require 'common/cleanup'
 
+module Bake
  
   @options = BakeryOptions.new(ARGV)
   @options.parse_options
 
   env = nil
   begin
-    loader = BakeryLoader.new(@options) 
+    loader = BakeryLoader.new 
     env = loader.load(@options.collection_dir+"/Collection.meta")
+  rescue SystemExit => e
+    raise e
   rescue Exception => e
+    puts e
+    puts e.backtrace
     ExitHelper.exit(1)
   end 
 
   
   if @options.collection_name.empty? 
-    puts "Please specify a collection name (with -b). Possible values are:"      
+    puts "Please specify a collection name. Possible values are:"      
     env.find(:class => BakeryModel::Collection).each { |e|
       puts "* " + e.name
     }
@@ -71,8 +71,9 @@ module Cxxproject
   
   passedParams = []
   excludeParam = false
+  wasMinus = false
   ARGV.each do |x|
-    if (x=="-b" or x=="-m" or x=="-p" or x=="-e" or x=="--socket")
+    if (x=="-b" or x=="-m" or x=="--socket")
       excludeParam = true
       next
     end
@@ -80,44 +81,51 @@ module Cxxproject
       excludeParam = false
       next
     end
+    if x.length > 0
+      if x[0] == "-"
+        wasMinus = true
+      else
+        next if not wasMinus
+        wasMinus = false
+      end
+    end
     passedParams << x
   end  
   
   if @options.socket != 0
-    Rake.application.idei.connect(@options.socket)
+    Bake::IDEInterface.instance.connect(@options.socket)
   end
 
   msg1 = "* bakery "
 
-  ExitHelper.enable_exit_test
-  
   exitValue = 0
   abort = false
   @toBuild.each do |bp|
     currentRun += 1
     p = File.dirname(bp.proj)
-    cmd = (["-m", p, "-b", bp.conf] + passedParams)
+    pRel = File.rel_from_to_project(Dir.pwd, p, false)
+    pRel = "." if pRel.empty?
+    cmd = (["-m", pRel, "-b", bp.conf] + passedParams)
     cmdWithNum = "* bakery #{currentRun} of #{maxRuns}: bake " + cmd.join(" ") + " *"
-    print "\n"; cmdWithNum.length.times { print "*" }; print "\n";
-    Printer.printInfo cmdWithNum
-    cmdWithNum.length.times { print "*" }; print "\n";
+    puts "\n************************************************";
+    Bake.formatter.printInfo(cmdWithNum)
+    puts "************************************************";
+   
     
-    runOk = true
+    runOk = false
     begin
-      bakeOptions = Options.new(cmd)
-      bakeOptions.parse_options
-      tocxx = ToCxx.new(bakeOptions)
-      if tocxx.doit()
-        runOk = tocxx.start()
-      else
-        runOk = false
-      end
+      Bake.options = Options.new(cmd)
+      Bake.options.parse_options
+      tocxx = ToCxx.new
+      tocxx.doit()
+      runOk = (ExitHelper.exit_code == 0)
+    rescue SystemExit
+      runOk = (ExitHelper.exit_code == 0)
     rescue Exception => e
-      puts e.message if e.message != "Cxxproject::ExitHelperException"
-      runOk = false
+      puts e.message
     end
     
-    Utils.cleanup_rake
+    Bake::cleanup
     ExitHelper.reset_exit_code
       
     if runOk == false
@@ -150,18 +158,17 @@ module Cxxproject
   msg1.length.times { stars << "*" }
 
   if failedRuns == 0
-    Printer.printSuccess stars
-    Printer.printSuccess msg1
-    Printer.printSuccess stars
+    Bake.formatter.printSuccess(stars)
+    Bake.formatter.printSuccess(msg1)
+    Bake.formatter.printSuccess(stars)
   else
-    Printer.printError stars
-    Printer.printError msg1
-    Printer.printError stars
+    Bake.formatter.printError(stars)
+    Bake.formatter.printError(msg1)
+    Bake.formatter.printError(stars)
   end
   
-  Rake.application.idei.disconnect()
+  Bake::IDEInterface.instance.disconnect()
 
-  ExitHelper.disable_exit_test
   ExitHelper.exit(exitValue)
 end
 

data/bin/createVSProjects

@@ -3,11 +3,11 @@ $:.unshift(File.dirname(__FILE__)+"/../lib")
 
 require "securerandom"
 require "vs/options"
-require 'bake/version'
+require 'common/version'
 
-puts "-- bake #{Cxxproject::Version.bake}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
+puts "-- bake #{Bake::Version.number}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
 
-module Cxxproject
+module Bake
 
 PATH = 0
 UUID = 1

data/doc/cmd/install.html

@@ -15,7 +15,7 @@
 <body>
 <h1>How to install bake command line tool</h1>
 
-bake is a ruby gem. It runs with ruby 1.8.6 and above. However, it is <b>highly recommended</b>, that you use <b>ruby 1.9.x</b>, because of a <b>significant speed improvement</b>.
+bake is a ruby gem. It runs with ruby 1.9 and above.
 <p>
 bake and its depedencies can be found on rubygems, which is configured as ruby source per default. Type "gem sources" if you wish to check that.<br>
 Installing bake is very easy:
@@ -29,14 +29,12 @@ This is how the installation could look like:
 Fetching: highline-1.6.15.gem (100%)
 Fetching: colored-1.2.gem (100%)
 Fetching: progressbar-0.11.0.gem (100%)
-Fetching: cxxproject-0.5.59.gem (100%)
 Fetching: rgen-0.6.0.gem (100%)
 Fetching: rtext-0.2.0.gem (100%)
 Fetching: bake-toolkit-1.0.2.gem (100%)
 Successfully installed highline-1.6.15
 Successfully installed colored-1.2
 Successfully installed progressbar-0.11.0
-Successfully installed cxxproject-0.5.59
 Successfully installed rgen-0.6.0
 Successfully installed rtext-0.2.0
 Successfully installed bake-toolkit-1.0.2
@@ -44,14 +42,12 @@ Successfully installed bake-toolkit-1.0.2
 Installing ri documentation for highline-1.6.15...
 Installing ri documentation for colored-1.2...
 Installing ri documentation for progressbar-0.11.0...
-Installing ri documentation for cxxproject-0.5.59...
 Installing ri documentation for rgen-0.6.0...
 Installing ri documentation for rtext-0.2.0...
 Installing ri documentation for bake-toolkit-1.0.2...
 Installing RDoc documentation for highline-1.6.15...
 Installing RDoc documentation for colored-1.2...
 Installing RDoc documentation for progressbar-0.11.0...
-Installing RDoc documentation for cxxproject-0.5.59...
 Installing RDoc documentation for rgen-0.6.0...
 Installing RDoc documentation for rtext-0.2.0...
 Installing RDoc documentation for bake-toolkit-1.0.2...</code></pre>

data/doc/cmd/usecmd.html

@@ -20,7 +20,8 @@ The most important options are:
 <ul>
 <li><b>-b</b> the build configuration name
 <li><b>-m</b> the main project directory (default is current directory)
-<li><b>-p</b> the project to build (if not specified, the main project will be built with all dependencies)
+<li><b>-p</b> the project to build (if not specified, the main project will be built with all dependencies) - note, that ALL configs of the project will be built,
+which is usually just one config, but if you have more than one config of the project in the workspace, use a comma separator. 
 </ul>
 
 <h2>Examples</h2>
@@ -29,22 +30,45 @@ If you want to build your application, switch to the directory of the main proje
 
 <pre id="rundrum"><code>bake -b Debug</code></pre>
 
+It is possible to omit "-b":
+
+<pre id="rundrum"><code>bake Debug</code></pre>
+
+It Debug is the default configuration, it's just:
+
+<pre id="rundrum"><code>bake</code></pre>
+
 If you are not in the directory of the main project you want to build:
 
-<pre id="rundrum"><code>bake -b Debug -m w:/root/mainProj</code></pre>
+<pre id="rundrum"><code>bake Debug -m w:/root/mainProj</code></pre>
+
+Building just mainProj project:
+
+<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -p myProj</code></pre>
+
+Assuming mainProj has several configs really included in the build (which is uncommon), you can choose one of the configs like this:
+
+<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -p myProj,abc</code></pre>
 
 Code has been checked out into two roots, the console supports ansi colors, you want to stop on first error and build only the project bspAbc:
 
-<pre id="rundrum"><code>bake -b Debug -m w:/root1/myProj -w w:/root1 -w w:/root2 -r -a black -p bspAbc</code></pre>
+<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -w w:/root1 -w w:/root2 -r -a black -p bspAbc</code></pre>
+
+To clean the project(s), just add "-c": 
+
+<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -w w:/root1 -w w:/root2 -r -a black -p bspAbc -c</code></pre>
+
+To build single file(s), use "-f". All files matching this pattern will be compiled (no wildcards allowed):
 
-To clean the project(s), just add "-c". 
+<pre id="rundrum"><code>bake Debug -p bspAbc -f main.cpp
+bake Debug -f .asm</code></pre>
 
 <h2>roots.bake</h2>
 
 Workspace roots can be defined in a file called "roots.bake", which will be searched from main project directory to root folder. Example:
 
 <pre id="rundrum"><code>../..
-C:/another/root
+C:/another/root # comments written like this
 something/else</code></pre>
 
 If -w and roots.bake are not specified, the default workspace root is the parent directory of the main project.

data/doc/dyk/lint.html

@@ -25,7 +25,7 @@ Example:
 <pre id="rundrum"><code>bake Debug -p MyLibraryProject --lint</code></pre>
 
 <h3>How does it work</h3>
-You can lint LibraryConfigs, ExecutableConfigs and single files, but not the complete workspace. The CPP Toolchain settings
+You can lint LibraryConfigs, ExecutableConfigs, single files and the complete workspace (in this case the projects are linted separately). The CPP Toolchain settings
 of the project are used regardless of the file type and file specific options.
 
 It is possible to specify lnt-files with LintPolicy, but you can add every other lint command line option as well.<br>
@@ -36,15 +36,32 @@ A possible approach is to add global Lint policies in the DefaultToolchain like
   LintPolicy "$(ProjectDir)/lint/suppressions.lnt"
 }</code></pre>
 
+<h3>How to start for GCC</h3>
+Lint will fail if compiler internal includes and defines are missing. Therefore lint comes with some helper files.
+For GCC, follow the steps below.<br>
+First extract the compiler includes and defines:
+<pre id="rundrum"><code>make -f .../PcLint/../lnt/co-gcc.mak</code></pre>
+You will get some lnt files: gcc-include-path.lnt, lint_cmac.h, lint_cppmac.h and size-options.lnt.<br>
+Write a lnt file with the following content:
+<pre id="rundrum"><code>-i".../PcLint/.../lnt"
+-i"...pathToTheLntFilesExtractedAbove"
+gcc-include-path.lnt
+.../PcLint/.../lnt/co-gcc.lnt</code></pre>
+Afterwards you can test lint directly without bake like this:
+<pre id="rundrum"><code>lint-nt your.lnt test.cpp</code></pre>
+To use in bake, add a LintPolicy in Project.meta:
+<pre id="rundrum"><code>LintPolicy ".../your.lnt"</code></pre>
+
+
 <h3>Notes</h3>
 In rare cases lint has problems if it has to open too many (include) files. If that is the case, use --lint_min and --lint_max command line option of bake. Example:
 <pre id="rundrum"><code>bake Debug -p MyLibraryProject --lint --lint_max 50                (lints the first 51 files)
 bake Debug -p MyLibraryProject --lint --lint_min 51 --lint_max 100 (lints the next 50 files)
 bake Debug -p MyLibraryProject --lint --lint_min 101               (lints the rest of the files)</code></pre>
 <p>
-Lint in bake uses GCC includes to check system include stuff. Therefore it is required to have a working GCC installation.<br>
-But you don't have to use a config with GCC toolchain. Every other toolchain is also valid.
-
+Currently the lint output is buffered and not shown before lint has finished a project. The reason is the implementation of the error parser. This will change in future.
+<p>
+If you have another lint command than lint-nt.exe, use an alias.
 </body>
 
 </html>

data/doc/dyk/tipps.html

@@ -40,12 +40,6 @@ It is possible to use symlinks (Linux) or junctions (Windows) when working with
     <li>To sync/commit from/to svn, use the original directories created by git.
 </ul>
 
-<h3>Single file</h3>
-If you want to build a single file, you have to specify it like that:
-<pre id="rundrum"><code>bake -b Debug -f src/abc/MyFile.cpp</pre></code>
-No need to type so much! If it's not ambiguous, it's enough to specify parts of the filename like this:
-<pre id="rundrum"><code>bake -b Debug -f abc/MyFile.cpp
-bake -b Debug -f MyFile.cpp</code></pre>
 </body>
 
 </html>