RubyGems - bake-toolkit - Versions diffs - 1.7.0 → 1.8.0.1 - Mend

bake-toolkit 1.7.0 → 1.8.0.1

Files changed (13) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a490c7db651ab2f105560e8ecd219f374bdc1ea3
-  data.tar.gz: 5dcc57cb1ff99210057f5a39d5e735962a3ee428
+  metadata.gz: 9335abf32a9aa13ca68eb2985babba8ff8a02236
+  data.tar.gz: f40783c3c427e83722fb01d319c5b8deb6fe529b
 SHA512:
-  metadata.gz: a3db8a4eed4a2d21c891bbe20aecf9622ef0b00bde737f6f009ccfbf9e6f456cc3b777b8fa7190120a846ca7835d107c78a20df6f3950eb28147104c629b6b11
-  data.tar.gz: fe27f9b7f8807586e244afc439920106152e6216789559d72534e3fa7c340e28ef3dadc67ca4986b549a9df89a92e4d863196f92ab757b7d72767e78478dccbb
+  metadata.gz: 89cf35c7cb654d3a58ac1a280163f6c8d07d607697f1cb1bca838b0fe08878619a6add1440b6301033246114af61a0b8d5687aff903108cf765ef9d173b153a5
+  data.tar.gz: cf084b8ef730e2a792993f5b941c46308eef3e8c7401718cf5d0496978b25c6d88d660bcb2ec6e27e987381cd8dc812f7c2d96512f37ece7061baa1877633173

data/doc/further/change.html CHANGED

@@ -7,19 +7,25 @@
 <body>
 <h1>Changelog</h1>
+November 7, 2014 - bake-toolkit 1.8.0, Eclipse plugin 1.1.0<br>
+<ul>
+<li><b>Added: InternalIncludes and InternalDefines in DefaultToolchain, which are forwarded to the IDE.</b>
+<li><b>Changed: No default options for PC-lint in combination with GCC will be provided anymore.
+Use the official way, see co-gcc.lnt in PC-lint installation.</b>
+<li><b>Bugfix: verbose output for replacing non-existing environment variables broken.</b>
+</ul>
 November 4, 2014 - bake-toolkit 1.7.0<br>
 <ul>
 <li><b>Added: Option to define output directory relative/absolute for each project or for all projects.</b>
 <li><b>Added: --set command line option to set variables</b>
 <li><b>Added: Optional "Description" tag for projects in Project.meta</b>
 <li><b>Changed: Variables in DefaultToolchain will be substituted separately for each project.</b>
-</b>
 </ul>
 August 8, 2014 - bake-toolkit 1.6.3<br>
 <ul>
 <li><b>Fixed: possible uninitialized variable could lead to crash bake</b>
-</b>
 </ul>
 August 6, 2014 - bake-toolkit 1.6.2<br>
@@ -27,7 +33,6 @@ August 6, 2014 - bake-toolkit 1.6.2<br>
 <li><b>Fixed: clear clearn- and clobber-lists at startup</b>
 <li><b>Fixed: Variables not substituted in ArtifactName and ArtifactNameBase</b>
 <li><b>Added: Cyclic variable substitution</b>
-</b>
 </ul>
 August 5, 2014 - bake-toolkit 1.6.1<br>
@@ -39,21 +44,18 @@ August 5, 2014 - bake-toolkit 1.6.1<br>
 August 1, 2014 - bake-toolkit 1.6.0<br>
 <ul>
 <li><b>Added: The value of a variable can be the result of a command line</b>
-</b>
 </ul>
 July 18, 2014 - bake-toolkit 1.5.0<br>
 <ul>
 <li><b>Added: Dependencies can be overwritten in inherited projects</b>
 <li><b>Removed: defines cannot be filtered anymore via command line</b>
-</b>
 </ul>
 June 6, 2014 - bake-toolkit 1.4.0<br>
 <ul>
 <li><b>Bugfix: variables can be used in "Set" now</b>
 <li><b>Added: variable "MainProjectDir"
-</b>
 </ul>
 May 23, 2014 - bake-toolkit 1.3.0<br>

data/doc/further/issues.html CHANGED

@@ -11,7 +11,6 @@
 <b>Workaround 1</b>: Clean the project.<br>
 <b>Workaround 2</b>: Delete the archive/executable manually.<br>
 <b>Workaround 3</b>: Touch, edit, create another source file.<br>
-<li>Pathes given to lint may be unit pathes, must be converted (will be fixed soon).
 </ul>

data/doc/further/wish.html CHANGED

@@ -30,7 +30,6 @@ Reason: require statements take round about two seconds before the build can be
 <li>Better annotations undefined symbol errors (if e.g. filename is given in error message)
 <li>Doxygen parameter to generate Doxygen, maybe with AutoOpen from Eclipse?
 <li>Even shorter command line options
-<li>Export defines to Eclipse
 <li>Better error log in Eclipse if plugin does not work
 <li>Doxygen support or even better generic docu support
 </ul>

data/doc/index.html CHANGED

@@ -72,7 +72,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
 <p>
 <hr>
-<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.7.0</td><td align="right">November 4, 2014</td></tr></table>
+<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.8.0</td><td align="right">November 7, 2014</td></tr></table>
 </body>

data/doc/syntax/syntax.html CHANGED

@@ -109,6 +109,7 @@ z-index: 100;
                                           <span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: &#60;cmd&#62; {</i><br>
 &nbsp; &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showDefaultFlags()" onMouseout="notip()">Flags</span> &#60;flags&#62;<br>
 &nbsp; &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showDefaultDefine()" onMouseout="notip()">Define</span> &#60;define&#62;<br>
+&nbsp; &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showInternalDefines()" onMouseout="notip()">InternalDefines</span> &#60;file&#62;<br>
 &nbsp; &nbsp; &nbsp; }<br>
 &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showDefaultArchiver()" onMouseout="notip()">Archiver</span>
                                           <span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: &#60;cmd&#62; {</i><br>
@@ -120,6 +121,7 @@ z-index: 100;
 &nbsp; &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showLibPrefixFlags()" onMouseout="notip()">LibPrefixFlags</span> &#60;flags&#62;<br>
 &nbsp; &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showLibPostfixFlags()" onMouseout="notip()">LibPostfixFlags</span> &#60;flags&#62;<br>
 &nbsp; &nbsp; &nbsp; }<br>
+&nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showInternalIncludes()" onMouseout="notip()">InternalIncludes</span> &#60;file&#62;<br>
 &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showDefaultLintPolicy()" onMouseout="notip()">LintPolicy</span> &#60;policy&#62;<br>
 &nbsp; &nbsp; }<br></span><br></span>
@@ -525,6 +527,14 @@ function showDefaultDefine() {
   ddrivetip("Define", "No","0..n","-","Defines which are valid for all files.")
 }
+function showInternalDefines() {
+  ddrivetip("InternalDefines", "No","0..1","-","File with list of compiler internal defines.<br>One define per line.<br>Empty lines and comments with # are allowed.")
+}
+function showInternalIncludes() {
+  ddrivetip("InternalIncludes", "No","0..1","-","File with list of compiler internal include folders.<br>One folder per line.<br>Empty lines and comments with # are allowed.")
+}
 function showDefaultCompiler() {
   ddrivetip("Compiler", "No","0..3 (for each compiler type: ASM, CPP, C)","-","Default compiler settings.")
 }

data/lib/bake/model/metamodel.rb CHANGED

@@ -46,7 +46,14 @@ module Cxxproject
       has_attr 'str', String, :defaultValueLiteral => ""
     end
+      class InternalIncludes < ModelElement
+        has_attr 'name', String, :defaultValueLiteral => ""
+      end
+      class InternalDefines < ModelElement
+        has_attr 'name', String, :defaultValueLiteral => ""
+      end
       class Archiver < ModelElement
         has_attr 'command', String, :defaultValueLiteral => ""
         contains_many 'flags', Flags, 'parent'
@@ -64,6 +71,7 @@ module Cxxproject
         has_attr 'command', String, :defaultValueLiteral => ""
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'
+        contains_one 'internalDefines', InternalDefines, 'parent'
       end
       class LintPolicy < ModelElement
@@ -77,6 +85,7 @@ module Cxxproject
         contains_one 'archiver', Archiver, 'parent'
         contains_one 'linker', Linker, 'parent'
         contains_many 'lintPolicy', LintPolicy, 'parent'
+        contains_one 'internalIncludes', InternalIncludes, 'parent'
       end
       class Toolchain < ModelElement

data/lib/bake/options.rb CHANGED

@@ -8,7 +8,7 @@ module Cxxproject
   class Options < Parser
     attr_reader :build_config, :main_dir, :project, :filename, :eclipse_version, :alias_filename # String
     attr_reader :roots, :include_filter, :exclude_filter # String List
-    attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :linkOnly, :check_uninc, :printLess, :no_autodir, :clobber, :lint, :debug, :cmake # Boolean
+    attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :show_includes_and_defines, :linkOnly, :check_uninc, :printLess, :no_autodir, :clobber, :lint, :debug, :cmake # Boolean
     attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
     attr_reader :vars # map
@@ -31,6 +31,7 @@ module Cxxproject
       @check_uninc = false
       @color = false
       @show_includes = false
+      @show_includes_and_defines = false
       @linkOnly = false
       @printLess = false
       @no_autodir = false
@@ -85,6 +86,7 @@ module Cxxproject
       add_option(Option.new("-h",false)                    {     usage; ExitHelper.exit(0)  })
       add_option(Option.new("--help",false)                {     usage; ExitHelper.exit(0)  })
       add_option(Option.new("--show_include_paths",false)  {     set_show_inc               })
+      add_option(Option.new("--show_incs_and_defs",false)  {     set_show_inc_def           })
       add_option(Option.new("--eclipse_version",true)      { |x| set_eclipse_version(x)     })
       add_option(Option.new("--show_license",false)        {     show_license               })
       add_option(Option.new("--version",false)             {     ExitHelper.exit(0)         })
@@ -282,14 +284,19 @@ module Cxxproject
     end
     def set_color(x)
-      if (x != "black" and x != "white")
+      if (x != "black" and x != "white" and x != "none")
         Printer.printError "Error: color scheme must be 'black' or 'white'"
         ExitHelper.exit(1)
       end
-      begin
-        ColorizingFormatter::setColorScheme(x.to_sym)
-        @color = true
-        ColorizingFormatter.enabled = true
+      begin
+        if (x == "none")
+          @color = false
+          ColorizingFormatter.enabled = false
+        else
+          ColorizingFormatter::setColorScheme(x.to_sym)
+          @color = true
+          ColorizingFormatter.enabled = true
+        end
       rescue Exception => e
         Printer.printError "Error: colored gem not installed (#{e.message})"
         puts e.backtrace if @verbose
@@ -308,7 +315,11 @@ module Cxxproject
     def set_show_inc
       @show_includes = true
     end
+    def set_show_inc_def
+      @show_includes_and_defines = true
+    end
     def set_show_fullnames
       Rake::application.consoleOutput_fullnames = true
     end

data/lib/bake/subst.rb CHANGED

@@ -10,6 +10,7 @@ module Cxxproject
       @@options = options
       @@mainProjectName = File::basename(options.main_dir)
       @@resolvedVars = 0
+      @@configFilename = config.file_name
       @@artifactName = ""
       if Metamodel::ExecutableConfig === config
@@ -42,7 +43,7 @@ module Cxxproject
           cmd_result = false
           begin
             rd, wr = IO.pipe
-            cmd = [s.cmd]
+            cmd = [substString(s.cmd)]
             cmd << {
              :err=>wr,
              :out=>wr
@@ -138,7 +139,7 @@ module Cxxproject
           substStr << ENV[var]
         else
           if @@options.verbose
-            Printer.printInfo "Info: #{elem.file_name}(#{elem.line_number}): substitute variable '$(#{var})' with empty string"
+            Printer.printInfo "Info: #{@@configFilename}: substitute variable '$(#{var})' with empty string"
           end
           substStr << ""
         end
@@ -177,4 +178,5 @@ module Cxxproject
   end
-end
+end

data/lib/bake/util.rb CHANGED

@@ -130,3 +130,8 @@ def calc_def_roots(dir)
   end
   def_roots
 end
+def add_line_if_no_comment(array, str)
+  s = str.split("#")[0].strip
+  array << s unless s.empty?
+end

data/lib/bake/version.rb CHANGED

@@ -1,11 +1,11 @@
 module Cxxproject
   class Version
     def self.bake
-      "1.7.0"
+      "1.8.0.1"
     end
   end
-  expectedCxx = "0.5.75"
+  expectedCxx = "0.5.76"
   expectedRGen = "0.6.0"
   expectedRText = "0.2.0"

data/lib/tocxx.rb CHANGED

@@ -346,6 +346,15 @@ module Cxxproject
           end
         end
+        if config.respond_to?("toolchain") and config.toolchain
+          config.toolchain.compiler.each do |c|
+            if not c.internalDefines.nil? and c.internalDefines != ""
+              Printer.printError "Error: #{c.file_name}(#{c.internalDefines.line_number}): InternalDefines only allowed in DefaultToolchain'"
+              ExitHelper.exit(1)
+            end
+          end
+        end
         config.dependency.each do |d|
           pname = d.name
           cname = d.config
@@ -807,17 +816,77 @@ module Cxxproject
         @num_modules = calc_needed_bbs(startBBName, @bbs)
       end
-      if @options.show_includes
-        @bbs.each do |bb|
-          if HasIncludes === bb
-            print bb.name
-            li = bb.local_includes
-            li.each { |i| print "##{i}" }
-            print "\n"
+      begin # show incs and stuff
+        if @options.show_includes
+          @bbs.each do |bb|
+            if HasIncludes === bb
+              print bb.name
+              li = bb.local_includes
+              li.each { |i| print "##{i}" }
+              print "\n"
+            end
           end
+          ExitHelper.exit(0)
         end
-        exit(0)
-      end
+        if @options.show_includes_and_defines
+          intIncs = []
+          intDefs = {:CPP => [], :C => [], :ASM => []}
+          Dir.chdir(@options.main_dir) do
+            if (@mainConfig.defaultToolchain.internalIncludes)
+              iname = convPath(@mainConfig.defaultToolchain.internalIncludes.name, @mainConfig)
+              if iname != ""
+                if not File.exists?(iname)
+                  Printer.printError "Error: InternalIncludes file #{iname} does not exist"
+                  ExitHelper.exit(1)
+                end
+                IO.foreach(iname) {|x| add_line_if_no_comment(intIncs,x) }
+              end
+            end
+            @mainConfig.defaultToolchain.compiler.each do |c|
+              if (c.internalDefines)
+                dname = convPath(c.internalDefines.name, @mainConfig)
+                if dname != ""
+                  if not File.exists?(dname)
+                    Printer.printError "Error: InternalDefines file #{dname} does not exist"
+                    ExitHelper.exit(1)
+                  end
+                  IO.foreach(dname) {|x| add_line_if_no_comment(intDefs[c.ctype],x)  }
+                end
+              end
+            end
+          end
+          @bbs.each do |bb|
+            if HasIncludes === bb
+              puts bb.name
+              puts " includes"
+              (bb.local_includes + intIncs).each { |i| puts "  #{i}" }
+              [:CPP, :C, :ASM].each do |type|
+                puts " #{type} defines"
+                (bb.tcs[:COMPILER][type][:DEFINES] + intDefs[type]).each { |d| puts "  #{d}" }
+              end
+              puts " done"
+            end
+          end
+          ExitHelper.exit(0)
+        end
+      rescue Exception => e
+        if (not SystemExit === e)
+          puts e
+          puts e.backtrace
+          ExitHelper.exit(1)
+        else
+          raise e
+        end
+      end
       theExeBB = nil
       @bbs.each do |bb|

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cxxproject
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.75
+        version: 0.5.76
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.75
+        version: 0.5.76
 - !ruby/object:Gem::Dependency
   name: rtext
   requirement: !ruby/object:Gem::Requirement