mtbuild 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2396c6643e11dac5f4237283b8008a2197a6f836
-  data.tar.gz: 633bd1821dcaa7e207456763c2b57b648a380078
+  metadata.gz: 5d7930027ed4d42d1bebae2c9640749d41bffb95
+  data.tar.gz: a98d8091d96766f11ef77311523781df241696ec
 SHA512:
-  metadata.gz: ebf955f1536eaa5cb307ef35ae5494aceaeb7352c25f43920a23797cc03acbceac0121c0a8179d059f9c79fead2b4a340133936b994ecb436f9740bcef16f6b3
-  data.tar.gz: 1d9c4e05c3ea9ff8ba8ba60bbc2a64e3cf9186a579e72ca5ecc5b308d0c3330e0855ee336931f420ac360ed6e6c82c0f231043bf850c033eb0c9057f5e4e664d
+  metadata.gz: 25ee077f6472f68407add1fc65b835e5da0cd8e67120b57f600baf9912134ddefce4ab0f95af446fce7dee13687efc77ff6f0d692df985606c0511d026c898f3
+  data.tar.gz: 412fe0aeb34f02fd84af75086ad405d791bb4084bee2944d4703ab1c8b8d5dc491aeee7043c94d0771aff22ce32253e4c2ae4697fae53eac8c29e9cd55efcf9a

data/CHANGES.md

@@ -1,6 +1,16 @@
 # Release Notes #
 
 
+## MTBuild 0.1.1 ##
+
+### Changes ###
+
+* Removed the gpp (g++) toolchains. Upon further reflection, these made no
+  sense. We're back to simply having "gcc" toolchains, but now these will
+  automatically invoke "gcc" or "g++" on C or C++ files, respectively. And if
+  a configuration contains any C++ files, the linking is performed with "g++".
+
+
 ## MTBuild 0.1.0 ##
 
 ### Changes ###

data/README.md

@@ -595,25 +595,12 @@ On top of the base Toolchain settings, the ToolchainGcc toolchain offers the fol
 * ```:linker_script``` - A linker script file to be used when linking
 
 
-### MTBuild::ToolchainGpp ###
-Define a g++ toolchain by passing ```:gpp``` as the ```toolchain_name``` when invoking the ```toolchain()``` method.
-
-##### ToolchainGpp settings #####
-The ToolchainGpp toolchain uses the same settings as the ToolchainGcc toolchain.
-
-
 ### MTBuild::ToolchainArmNoneEabiGcc ###
 Define an arm-none-eabi-gcc toolchain by passing ```:arm_none_eabi_gcc``` as the ```toolchain_name``` when invoking the ```toolchain()``` method.
 
 ##### ToolchainArmNoneEabiGcc settings #####
 The ToolchainArmNoneEabiGcc toolchain uses the same settings as the ToolchainGcc toolchain.
 
-### MTBuild::ToolchainArmNoneEabiGpp ###
-Define an arm-none-eabi-g++ toolchain by passing ```:arm_none_eabi_gpp``` as the ```toolchain_name``` when invoking the ```toolchain()``` method.
-
-##### ToolchainArmNoneEabiGpp settings #####
-The ToolchainArmNoneEabiGpp toolchain uses the same settings as the ToolchainGcc toolchain.
-
 
 ### MTBuild::Versioner ###
 Define a Versioner with the following DSL method:

data/lib/mtbuild.rb

@@ -1,6 +1,6 @@
 module MTBuild
   # The current MTBuild version.
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 
 require 'rake'

data/lib/mtbuild/compiled_configuration.rb

@@ -39,12 +39,18 @@ module MTBuild
     # Create the actual Rake tasks that will perform the configuration's work
     def configure_tasks
       super
+      all_sources = []
       @toolchains.each do |toolchain, sources|
+        all_sources |= sources
         toolchain.output_folder = @output_folder
         toolchain.project_folder = @project_folder
         toolchain.output_decorator = "-#{@configuration_name}"
         CompiledConfiguration.add_framework_dependencies_to_toolchain(toolchain, @dependencies)
       end
+      # Give the default toolchain an opportunity to scan all source files for
+      # any special needs. For example, a toolchain might look for .cpp files
+      # to determine that it should link a project with the "g++" vs "gcc".
+      @default_toolchain.scan_sources(all_sources)
     end
 
     private

data/lib/mtbuild/toolchain.rb

@@ -63,6 +63,10 @@ module MTBuild
       @library_paths |= library_paths
     end
 
+    # Scan source files for any special processing needs
+    def scan_sources(source_files)
+    end
+
     # Create Rake tasks for compilation
     def create_compile_tasks(source_files)
       fail "Toolchain didn't provide create_compile_tasks"

data/lib/mtbuild/toolchains/arm_none_eabi_gcc.rb

@@ -53,18 +53,30 @@ module MTBuild
       return "\"#{objcopy}\"#{objcopyflags} \"#{input_name}\" \"#{output_name}\""
     end
 
-    def compiler
+    def assembler
       return 'arm-none-eabi-gcc'
     end
 
+    def compiler_c
+      return 'arm-none-eabi-gcc'
+    end
+
+    def compiler_cpp
+      return 'arm-none-eabi-g++'
+    end
+
     def archiver
       return 'arm-none-eabi-ar'
     end
 
-    def linker
+    def linker_c
       return 'arm-none-eabi-gcc'
     end
 
+    def linker_cpp
+      return 'arm-none-eabi-g++'
+    end
+
     def objcopy
       return 'arm-none-eabi-objcopy'
     end

data/lib/mtbuild/toolchains/gcc.rb

@@ -17,14 +17,15 @@ module MTBuild
       @tracked_folders = []
 
       begin
-        toolchain_test_output=%x{#{compiler} --version 2>&1}
+        toolchain_test_output=%x{#{compiler_c} --version 2>&1}
         toolchain_test_passed=$?.success?
       rescue
         toolchain_test_passed = false
       end
-      fail "Toolchain component #{compiler} not found." unless toolchain_test_passed
+      fail "Toolchain component #{compiler_c} not found." unless toolchain_test_passed
 
       @compiler_is_LLVM_gcc = toolchain_test_output.include?'LLVM'
+      @link_as_cpp = false
       @cppflags = Utils.ensure_array(toolchain_configuration.fetch(:cppflags, '')).to_a.flatten.join(' ')
       @cflags = Utils.ensure_array(toolchain_configuration.fetch(:cflags, '')).to_a.flatten.join(' ')
       @cxxflags = Utils.ensure_array(toolchain_configuration.fetch(:cxxflags, '')).to_a.flatten.join(' ')
@@ -33,6 +34,10 @@ module MTBuild
       @linker_script = toolchain_configuration.fetch(:linker_script, '')
     end
 
+    def scan_sources(source_files)
+      @link_as_cpp = source_files.any? { |s| get_file_type(s)==:cplusplus }
+    end
+
     # Create Rake tasks for compilation
     def create_compile_tasks(source_files)
       object_files = []
@@ -134,9 +139,9 @@ module MTBuild
       cflags_s = @cflags.empty? ? '' : " #{@cflags}"
       cxxflags_s = @cxxflags.empty? ? '' : " #{@cxxflags}"
       asflags_s = @asflags.empty? ? '' : " #{@asflags}"
-      return "\"#{compiler}\"#{cppflags_s}#{cflags_s}#{prerequisites_s}#{include_paths_s} -MMD -c -o \"#{output_name}\"" if file_type == :c
-      return "\"#{compiler}\"#{cppflags_s}#{cxxflags_s}#{prerequisites_s}#{include_paths_s} -MMD -c -o \"#{output_name}\"" if file_type == :cplusplus
-      return "\"#{compiler}\"#{cppflags_s}#{asflags_s}#{prerequisites_s}#{include_paths_s} -MMD -c -o \"#{output_name}\"" if file_type == :asm
+      return "\"#{compiler_c}\"#{cppflags_s}#{cflags_s}#{prerequisites_s}#{include_paths_s} -MMD -c -o \"#{output_name}\"" if file_type == :c
+      return "\"#{compiler_cpp}\"#{cppflags_s}#{cxxflags_s}#{prerequisites_s}#{include_paths_s} -MMD -c -o \"#{output_name}\"" if file_type == :cplusplus
+      return "\"#{assembler}\"#{cppflags_s}#{asflags_s}#{prerequisites_s}#{include_paths_s} -MMD -c -o \"#{output_name}\"" if file_type == :asm
     end
 
     def construct_archive_command(prerequisites, output_name)
@@ -150,9 +155,11 @@ module MTBuild
       library_paths_s = library_paths.empty? ? '' : " -L\"#{library_paths.join('" -L"')}\""
       cppflags_s = @cppflags.empty? ? '' : " #{@cppflags}"
       cflags_s = @cflags.empty? ? '' : " #{@cflags}"
+      cxxflags_s = @cxxflags.empty? ? '' : " #{@cxxflags}"
       ldflags_s = @ldflags.empty? ? '' : " #{@ldflags}"
       linker_script_s = @linker_script.empty? ? '' : " -Wl,-T\"#{File.join(@project_folder,@linker_script)}\""
-      return "\"#{compiler}\"#{cppflags_s}#{cflags_s}#{ldflags_s}#{include_paths_s}#{library_paths_s}#{linker_script_s}#{prerequisites_s} #{map_flag(map_name)} -o \"#{output_name}\""
+      return "\"#{compiler_cpp}\"#{cppflags_s}#{cxxflags_s}#{ldflags_s}#{include_paths_s}#{library_paths_s}#{linker_script_s}#{prerequisites_s} #{map_flag(map_name)} -o \"#{output_name}\"" if @link_as_cpp
+      return "\"#{compiler_c}\"#{cppflags_s}#{cflags_s}#{ldflags_s}#{include_paths_s}#{library_paths_s}#{linker_script_s}#{prerequisites_s} #{map_flag(map_name)} -o \"#{output_name}\""
     end
 
     def map_flag(map_file)
@@ -160,18 +167,30 @@ module MTBuild
       return "-Wl,-Map=\"#{map_file}\",--cref"
     end
 
-    def compiler
+    def assembler
+      return 'gcc'
+    end
+
+    def compiler_c
       return 'gcc'
     end
 
+    def compiler_cpp
+      return 'g++'
+    end
+
     def archiver
       return 'ar'
     end
 
-    def linker
+    def linker_c
       return 'gcc'
     end
 
+    def linker_cpp
+      return 'g++'
+    end
+
     include MTBuild::DSL
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtbuild
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jerry Ryle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,9 +125,7 @@ files:
 - lib/mtbuild/test_application_task.rb
 - lib/mtbuild/toolchain.rb
 - lib/mtbuild/toolchains/arm_none_eabi_gcc.rb
-- lib/mtbuild/toolchains/arm_none_eabi_gpp.rb
 - lib/mtbuild/toolchains/gcc.rb
-- lib/mtbuild/toolchains/gpp.rb
 - lib/mtbuild/utils.rb
 - lib/mtbuild/version.rb
 - lib/mtbuild/versioner.rb

data/lib/mtbuild/toolchains/arm_none_eabi_gpp.rb

@@ -1,21 +0,0 @@
-module MTBuild
-  require 'mtbuild/toolchains/arm_none_eabi_gcc'
-
-  Toolchain.register_toolchain(:arm_none_eabi_gpp, 'MTBuild::ToolchainArmNoneEabiGpp')
-
-  # This ToolchainGcc subclass can build using arm-non-eabi-g++
-  class ToolchainArmNoneEabiGpp < ToolchainArmNoneEabiGcc
-
-    private
-
-    def compiler
-      return 'arm-none-eabi-g++'
-    end
-
-    def linker
-      return 'arm-none-eabi-g++'
-    end
-
-  end
-
-end

data/lib/mtbuild/toolchains/gpp.rb

@@ -1,21 +0,0 @@
-module MTBuild
-  require 'mtbuild/toolchains/gcc'
-
-  Toolchain.register_toolchain(:gpp, 'MTBuild::ToolchainGpp')
-
-  # This ToolchainGcc subclass can build using g++
-  class ToolchainGpp < ToolchainGcc
-
-    private
-
-    def compiler
-      return 'g++'
-    end
-
-    def linker
-      return 'g++'
-    end
-
-  end
-
-end