bake-toolkit 1.8.0.1 → 2.0.10

data/lib/vs/options.rb

@@ -1,6 +1,7 @@
-require "option/parser"
+require "common/options/parser"
+require "common/options/option"
 
-module Cxxproject
+module Bake
 
   class VsOptions < Parser
     attr_accessor :version, :roots, :rewriteSolution

data/license.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2012 E.S.R.Labs GmbH
+bake License:
+
+Copyright (c) 2012-2015 E.S.R.Labs AG
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -18,30 +20,27 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 
+_______________________________________________________________________________
 
--------------------------------------------------------------------------------
-
-
-This Product is based on lake that was created by Lear Corporation and that
-are governed by their lake license, which are contained hereinafter.
-
-This license applies only to (portions of) the source code file(s) in which
-the license is contained or in which it is explicitly referenced, and to
-compiled or otherwise processed forms of such source code. The licenses does not
-apply to This Product as a whole, even when it uses terms such as "product",
-"program", or any other equivalent terms/phrases. This Product as a whole is
-governed by the lake License (see above). Some parts of the lake source code have
-been modified by the authors of This Product. Unless otherwise stated, such
-modifications and additions are governed by the lake (see above). Note:
-Unless otherwise stated, graphics and files that are not part of the source
-code are governed by the lake License.
+Third-Party Licenses:
 
+This Product contains components that were created by third parties and that
+are governed by third-party licenses, which are contained hereinafter
+(separated by lines consisting of underscores). Each of the third-party
+licenses applies only to (portions of) the source code file(s) in which the
+third-party license is contained or in which it is explicitly referenced,
+and to compiled or otherwise processed forms of such source code. None of the
+third-party licenses applies to This Product as a whole, even when it uses
+terms such as "product", "program", or any other equivalent terms/phrases.
+This Product as a whole is governed by the bake License (see above). Some of
+the third-party components have been modified by the authors of This Product.
+Unless otherwise stated, such modifications and additions are governed by the
+bake License (see above). Note: Unless otherwise stated, graphics and files
+that are not part of the source code are governed by the bake License.
 
--------------------------------------------------------------------------------
-
-
-lake license:
+_______________________________________________________________________________
 
+lake License:
 
 Copyright (c) 2011 LEAR Corporation
 
@@ -61,4 +60,30 @@ FITNESS FOR A ARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+IN THE SOFTWARE.
+
+_______________________________________________________________________________
+
+cxxproject License:
+
+Copyright (c) 2010, All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+
+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
+OWNER 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.

metadata

@@ -1,88 +1,149 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 1.8.0.1
+  version: 2.0.10
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cxxproject
+  name: rtext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.76
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.76
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: rtext
+  name: rgen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rgen
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
-description: |2
-      This build tool is used to compile projects fast and easy.
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: See documentation for more details
 email: alexander.schaal@esrlabs.com
 executables:
 - bake
 - bakery
 - createVSProjects
-- bake-doc
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/alias/loader.rb
-- lib/alias/model/language.rb
-- lib/alias/model/metamodel.rb
 - lib/bake/cache.rb
-- lib/bake/loader.rb
+- lib/bake/config/loader.rb
+- lib/bake/libElement.rb
 - lib/bake/mergeConfig.rb
 - lib/bake/model/language.rb
+- lib/bake/model/loader.rb
 - lib/bake/model/metamodel.rb
 - lib/bake/model/metamodel_ext.rb
-- lib/bake/options.rb
+- lib/bake/options/options.rb
+- lib/bake/options/showConfigNames.rb
+- lib/bake/options/showDoc.rb
+- lib/bake/options/showLicense.rb
+- lib/bake/options/showToolchains.rb
+- lib/bake/options/usage.rb
+- lib/bake/process_output.rb
 - lib/bake/subst.rb
+- lib/bake/toolchain/clang.rb
+- lib/bake/toolchain/colorizing_formatter.rb
+- lib/bake/toolchain/diab.rb
+- lib/bake/toolchain/errorparser/diab_compiler_error_parser.rb
+- lib/bake/toolchain/errorparser/diab_linker_error_parser.rb
+- lib/bake/toolchain/errorparser/error_parser.rb
+- lib/bake/toolchain/errorparser/gcc_compiler_error_parser.rb
+- lib/bake/toolchain/errorparser/gcc_linker_error_parser.rb
+- lib/bake/toolchain/errorparser/greenhills_compiler_error_parser.rb
+- lib/bake/toolchain/errorparser/greenhills_linker_error_parser.rb
+- lib/bake/toolchain/errorparser/keil_compiler_error_parser.rb
+- lib/bake/toolchain/errorparser/keil_linker_error_parser.rb
+- lib/bake/toolchain/errorparser/lint_error_parser.rb
+- lib/bake/toolchain/errorparser/process_output.rb
+- lib/bake/toolchain/errorparser/ti_compiler_error_parser.rb
+- lib/bake/toolchain/errorparser/ti_linker_error_parser.rb
+- lib/bake/toolchain/gcc.rb
+- lib/bake/toolchain/gcc_param.rb
+- lib/bake/toolchain/greenhills.rb
+- lib/bake/toolchain/keil.rb
+- lib/bake/toolchain/lint.rb
+- lib/bake/toolchain/provider.rb
+- lib/bake/toolchain/ti.rb
 - lib/bake/util.rb
-- lib/bake/version.rb
 - lib/bakery/buildPattern.rb
-- lib/bakery/loader.rb
 - lib/bakery/model/language.rb
+- lib/bakery/model/loader.rb
 - lib/bakery/model/metamodel.rb
-- lib/bakery/options.rb
+- lib/bakery/options/options.rb
 - lib/bakery/toBake.rb
-- lib/option/parser.rb
+- lib/blocks/block.rb
+- lib/blocks/blockBase.rb
+- lib/blocks/commandLine.rb
+- lib/blocks/compile.rb
+- lib/blocks/docu.rb
+- lib/blocks/executable.rb
+- lib/blocks/has_execute_command.rb
+- lib/blocks/library.rb
+- lib/blocks/lint.rb
+- lib/blocks/makefile.rb
+- lib/blocks/showIncludes.rb
+- lib/common/abortException.rb
+- lib/common/cleanup.rb
+- lib/common/exit_helper.rb
+- lib/common/ext/file.rb
+- lib/common/ext/stdout.rb
+- lib/common/ide_interface.rb
+- lib/common/options/option.rb
+- lib/common/options/parser.rb
+- lib/common/process.rb
+- lib/common/utils.rb
+- lib/common/version.rb
+- lib/multithread/job.rb
 - lib/tocxx.rb
 - lib/vs/options.rb
 - Rakefile.rb
@@ -156,8 +217,7 @@ files:
 - bin/bake
 - bin/bakery
 - bin/createVSProjects
-- bin/bake-doc
-homepage: http://www.esrlabs.com
+homepage: 
 licenses:
 - MIT
 metadata: {}
@@ -171,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -179,8 +239,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.15
 signing_key: 
 specification_version: 4
-summary: Frontend for cxxproject.
+summary: Build tool to compile C/C++ projects fast and easy.
 test_files: []

data/bin/bake-doc

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-link = File.expand_path(File.dirname(__FILE__)+"/../doc/index.html")
-if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
-  system "start #{link}"
-elsif RUBY_PLATFORM =~ /darwin/
-  system "open #{link}"
-elsif RUBY_PLATFORM =~ /linux|bsd/
-  system "xdg-open #{link}"
-else
-  puts "Please open #{link} manually in your browser."
-end

data/lib/alias/loader.rb

@@ -1,56 +0,0 @@
-require 'alias/model/metamodel'
-require 'alias/model/language'
-
-require 'rgen/environment'
-require 'rgen/fragment/fragmented_model'
-
-require 'rtext/default_loader'
-
-require 'cxxproject/utils/exit_helper'
-require 'cxxproject/utils/printer'
-
-module Cxxproject
-
-class AliasLoader
-
-attr_reader :model
-
-def initialize(options)
-  @env = RGen::Environment.new
-  @options = options
-  @model = RGen::Fragment::FragmentedModel.new(:env => @env)
-end
-
-def load(filename)
-
-  sumErrors = 0
-  
-  if not File.exists?filename
-    Printer.printError "Error: #{filename} does not exist"
-    ExitHelper.exit(1) 
-  end
-
-  loader = RText::DefaultLoader.new(
-    Cxxproject::AliasLanguage,
-    @model,
-    :file_provider => proc { [filename] },
-    :cache => @DumpFileCache)
-  loader.load()
-
-  f = @model.fragments[0]
-  
-  f.data[:problems].each do |p|
-    Printer.printError "Error: "+p.file+"("+p.line.to_s+"): "+p.message
-  end
-  
-  if f.data[:problems].length > 0
-    ExitHelper.exit(1) 
-  end
-  
-  return @env
-
-end
-
-
-end
-end

data/lib/alias/model/language.rb

@@ -1,22 +0,0 @@
-require 'bake/model/metamodel'
-require 'rtext/language'
-
-module Cxxproject
-
-  AliasLanguage =
-  RText::Language.new(AliasModel.ecore,
-    :feature_provider => proc {|c|
-      RGen::Serializer::OppositeReferenceFilter.call(c.eAllStructuralFeatures).reject {|f|
-        f.eAnnotations.any? {|a|
-          a.details.any? {|d| d.key == 'internal' && d.value == 'true'}
-        }
-      }
-    },
-    :unlabled_arguments => proc {|c|
-      ["hdd_name", "logical_name"]
-    },
-    :line_number_attribute => "line_number",
-    :file_name_attribute => "file_name"
-  )
-
-end

data/lib/alias/model/metamodel.rb

@@ -1,29 +0,0 @@
-require 'rgen/metamodel_builder'
-require 'rgen/metamodel_builder/data_types'
-
-module Cxxproject
-
-  module AliasModel
-    extend RGen::MetamodelBuilder::ModuleExtension
-
-    class ModelElement < RGen::MetamodelBuilder::MMBase
-      abstract
-      has_attr 'line_number', Integer do
-        annotation :details => {'internal' => 'true'}
-      end
-      has_attr 'file_name', String do
-        annotation :details => {'internal' => 'true'}
-      end
-    end
-
-    class Alias < ModelElement
-      has_attr 'hdd_name', String, :defaultValueLiteral => ""
-      has_attr 'logical_name', String, :defaultValueLiteral => ""
-    end
-    class Aliases < ModelElement
-      contains_many 'alias', Alias, 'aliases'
-    end
-
-  end
-
-end

data/lib/bake/loader.rb

@@ -1,92 +0,0 @@
-require 'bake/model/metamodel'
-require 'bake/model/language'
-require 'bake/version'
-
-require 'rgen/environment'
-require 'rgen/fragment/dump_file_cache'
-require 'rgen/fragment/fragmented_model'
-require 'rgen/util/file_cache_map'
-
-require 'rtext/default_loader'
-
-require 'cxxproject/utils/exit_helper'
-require 'cxxproject/utils/printer'
-require 'bake/options'
-
-module Cxxproject
-
-class Loader
-
-attr_reader :model
-
-def initialize(options)
-  @env = RGen::Environment.new
-  @options = options
-
-  fcm = RGen::Util::FileCacheMap.new(".bake", ".cache")
-  fcm.version_info = Version.bake
-  @DumpFileCache = RGen::Fragment::DumpFileCache.new(fcm)
-  if @options.nocache
-    def @DumpFileCache.load(fragment)
-      :invalid
-    end
-  end
-  
-  @model = RGen::Fragment::FragmentedModel.new(:env => @env)
-  @mainProjectName = File::basename(@options.main_dir)
-end
-
-def load(filename)
-
-  sumErrors = 0
-  
-  if not File.exists?filename
-    Printer.printError "Error: #{filename} does not exist"
-    ExitHelper.exit(1) 
-  end
-
-  loader = RText::DefaultLoader.new(
-    Cxxproject::Language,
-    @model,
-    :file_provider => proc { [filename] },
-    :cache => @DumpFileCache)
-  loader.load(:before_load => proc {|fragment, kind|
-    case kind
-    when :load_update_cache
-      if @options.verbose
-        puts "Loading and caching #{fragment.location}"
-      else
-        puts "Loading #{fragment.location}"
-      end
-    when :load_cached
-      if @options.verbose
-        puts "Loading cached #{fragment.location}"
-      else
-        puts "Loading #{fragment.location}"
-      end
-    when :load
-      puts "Loading #{fragment.location}"
-    else
-      Printer.printError "Error: Could not load #{fragment.location}"
-      ExitHelper.exit(1)     
-    end
-  })
-
-  f = @model.fragments[0]
-  @model.remove_fragment(f)
-
-  f.data[:problems].each do |p|
-    Printer.printError "Error: "+p.file+"("+p.line.to_s+"): "+p.message
-  end
-  
-  if f.data[:problems].length > 0
-    ExitHelper.exit(1) 
-  end
-  
-  return f
-
-end
-
-
-end
-end