mtbuild 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ba725a664618bcc037519e8c8181b2560427f6
-  data.tar.gz: b6414488ebf9691a4a0a523b2d116571049a1039
+  metadata.gz: 254cf6e1b63b3a9f9fa1742bd41e2e8eabfe9672
+  data.tar.gz: adb98071b8a09e4f8ffab7fac9d34a177651856a
 SHA512:
-  metadata.gz: 347ca6affd9f88b736f20e190d9d59a191f5251fe5b431ab0ffb1b062bf6c9bf26a21abfc4643e6f07378aafce2dbc6acd8c53408a77f3efcddfca031c26f8e2
-  data.tar.gz: 9abc4e0a9a2b7dd6f6d8af1029d79a37cd730b604b74fc228e85054979922ac315e0550582dd549931fafadb0af9e515765a03ea84aab4428bc53260125f8b91
+  metadata.gz: 179b5bbb78fa6592ce4d43c301b7ccd28a4cd1e7b3e0bfee7928bbca226471f6012b1bf6edd5cad4d6f9e831aa86b377890245edf9f81e5a06c4008638d94cbf
+  data.tar.gz: 0ad9a45837a25af9fe73fb460c2b30c22ac8db64e5c3bfacd6d754d561ee9d762e374c9a1fedc011d8c8d5583486496d1a0ab5796105f2ad1d5a93d3c344cd74

data/CHANGES.md

@@ -1,5 +1,20 @@
 # Release Notes #
 
+## MTBuild 0.0.5 ##
+
+### Changes ###
+
+* MTBuild now supports spaces in project paths
+* Cleaned up mtbuild sources and coverted stray tabs to spaces.
+
+
+## MTBuild 0.0.4 ##
+
+### Changes ###
+
+* This was a bad gem push. Don't use.
+
+
 ## MTBuild 0.0.3 ##
 
 ### Changes ###

data/README.md

@@ -112,7 +112,7 @@ Workspace Folder
           └ *.h/*.c/*.cpp
 ```
 
-In this case, we have a top-level workspace folder that contains projects in sub-folders. The project folders have public headers and source files neatly separated. Unit Test files are either located in their own folders, or separated by language--for example, if our project is written in C, but our unit tests are C++, we might put the unit test files alongside the project sources for convenience.
+We have a top-level workspace folder that contains projects in sub-folders. The project folders have public headers and source files neatly separated. Unit Test files are either located in their own folders, or separated by language--for example, if our project is written in C, but our unit tests are C++, we might put the unit test files alongside the project sources for convenience.
 
 Here is an example of a simpler application that is self-contained:
 
@@ -125,7 +125,7 @@ Application Project Folder
       └ *.h/*.c/*.cpp
 ```
 
-In this case, the project and (optional) workspace are defined in a single Rakefile. There are no public headers, so everything goes into the "src" folder, but tests might still be separated into a "test" folder.
+The project and (optional) workspace are defined in a single Rakefile. There are no public headers, so everything goes into the "src" folder, but tests might still be separated into a "test" folder.
 
 #### Rakefiles ####
 
@@ -171,7 +171,7 @@ A framework project wraps up a static library and its headers for use by applica
 
 #### Configurations ####
 
-A configuration containa build settings for a project. This includes source files, toolchain, dependencies, etc. By defining multiple configurations, a project can be built for different processors (ARM, x86, etc.), different platforms, or simply different settings (debug vs. release). Configurations generate the actual Rake tasks that begin doing work. They are named with a fixed convention that allows you to refer to them in other Rake tasks. The naming scheme is "Project:Configuration". For example, if you declare a project called "MyLibrary" with configuration "Debug", you could list "MyLibrary:Debug" as a dependency in any Rake task and "MyLibrary:Debug" would be built before that task.
+A configuration contains build settings for a project. This includes source files, toolchain, dependencies, etc. By defining multiple configurations, a project can be built for different processors (ARM, x86, etc.), different platforms, or simply different settings (debug vs. release). Configurations generate the actual Rake tasks that begin doing work. They are named with a fixed convention that allows you to refer to them in other Rake tasks. The naming scheme is "Project:Configuration". For example, if you declare a project called "MyLibrary" with configuration "Debug", you could list "MyLibrary:Debug" as a dependency in any Rake task and "MyLibrary:Debug" would be built before that task.
 
 #### Workspaces ####
 

data/lib/mtbuild/application_configuration.rb

@@ -5,7 +5,7 @@ module MTBuild
   # Use this class to create application configurations. You won't typically
   # instantiate this directly. Instead, the ApplicationProject.add_configuration
   # method will create this for you.
-	class ApplicationConfiguration < CompiledConfiguration
+  class ApplicationConfiguration < CompiledConfiguration
 
     # Create the actual Rake tasks that will perform the configuration's work
     def configure_tasks
@@ -43,6 +43,6 @@ module MTBuild
 
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/application_project.rb

@@ -4,7 +4,7 @@ module MTBuild
 
   # This class is used to build applications. An application has compilation
   # and link phases that produce a binary executable.
-	class ApplicationProject < Project
+  class ApplicationProject < Project
 
     # Adds a named ApplicationConfiguration to the project.
     def add_configuration(configuration_name, configuration)
@@ -16,6 +16,6 @@ module MTBuild
       return cfg
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/compiled_configuration.rb

@@ -4,7 +4,7 @@ module MTBuild
 
   # This is the base class for configurations representing compiled objects
   # (libraries, applications, etc.)
-	class CompiledConfiguration < Configuration
+  class CompiledConfiguration < Configuration
 
     # A list of Rake tasks that this configuration depends upon
     attr_reader :dependencies
@@ -15,7 +15,7 @@ module MTBuild
     # A list of Rake test tasks that will execute after this configuration builds
     attr_reader :tests
 
-		def initialize(project_name, project_folder, output_folder, configuration_name, configuration)
+    def initialize(project_name, project_folder, output_folder, configuration_name, configuration)
       super
       check_configuration(configuration)
 
@@ -27,7 +27,7 @@ module MTBuild
       @toolchains = {@default_toolchain => source_files}
 
       @tests = Utils.ensure_array(configuration.fetch(:tests, []))
-		end
+    end
 
     # This method adds source files with their own toolchains. Use this method
     # to add any source files that need special toolchain settings.
@@ -69,6 +69,6 @@ module MTBuild
     end
 
     include Rake::DSL
-	end
+  end
 
 end

data/lib/mtbuild/configuration.rb

@@ -3,7 +3,7 @@ module MTBuild
   require 'mtbuild/versioner'
 
   # This is the base class for all configuration types.
-	class Configuration
+  class Configuration
 
     # The configuration's name
     attr_reader :configuration_name
@@ -18,7 +18,7 @@ module MTBuild
     # The project's output folder. Project output goes here.
     attr_reader :output_folder
 
-		def initialize(project_name, project_folder, output_folder, configuration_name, configuration)
+    def initialize(project_name, project_folder, output_folder, configuration_name, configuration)
       check_configuration(configuration)
       @project_name = project_name
       @project_folder = File.expand_path(project_folder)
@@ -28,7 +28,7 @@ module MTBuild
       @versioner = nil
       @versioner_config = configuration.fetch(:versioner, nil)
       @versioner = Versioner.create_versioner(@project_name, @project_folder, @output_folder, @configuration_name, @versioner_config) unless @versioner_config.nil?
-		end
+    end
 
     # Create the actual Rake tasks that will perform the configuration's work
     def configure_tasks
@@ -41,6 +41,6 @@ module MTBuild
     end
 
     include Rake::DSL
-	end
+  end
 
 end

data/lib/mtbuild/project.rb

@@ -1,7 +1,7 @@
 module MTBuild
 
   # This is the base class for all project types.
-	class Project
+  class Project
 
     # The project's name
     attr_reader :project_name
@@ -15,13 +15,13 @@ module MTBuild
 
     # If supplied, the configuration_block will be passed the
     # newly-constructed Project object.
-		def initialize(project_name, project_folder, &configuration_block)
+    def initialize(project_name, project_folder, &configuration_block)
       @configurations = []
       @default_tasks = []
       @project_name = project_name
       @project_folder = File.expand_path(project_folder)
       @output_folder = File.expand_path(File.join(@project_folder, MTBuild.default_output_folder))
-			configuration_block.call(self) if configuration_block
+      configuration_block.call(self) if configuration_block
 
       namespace @project_name do
         @configurations.each do |configuration|
@@ -31,7 +31,7 @@ module MTBuild
 
       # If there is no active workspace, set up any registered default project tasks
       task :default => @default_tasks unless Workspace.have_workspace?
-		end
+    end
 
     # Add tasks to be built by default if MTBuild is invoked with no arguments
     def add_default_tasks(default_tasks)
@@ -62,6 +62,6 @@ module MTBuild
     end
 
     include Rake::DSL
-	end
+  end
 
 end

data/lib/mtbuild/staticlibrary_configuration.rb

@@ -4,7 +4,7 @@ module MTBuild
   # Use this class to create static library configurations. You won't typically
   # instantiate this directly. Instead, the StaticLibraryProject.add_configuration
   # method will create this for you.
-	class StaticLibraryConfiguration < CompiledConfiguration
+  class StaticLibraryConfiguration < CompiledConfiguration
 
     def initialize(project_name, project_folder, output_folder, configuration_name, configuration, api_headers)
       @api_headers = api_headers
@@ -43,6 +43,6 @@ module MTBuild
       new_task.library_files = library_files
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/staticlibrary_project.rb

@@ -5,7 +5,7 @@ module MTBuild
 
   # This class is used to build static libraries. A static library has
   # compilation and archival phases that produce a binary library package.
-	class StaticLibraryProject < Project
+  class StaticLibraryProject < Project
 
     def initialize(project_name, project_folder, &configuration_block)
       @framework_configurations = []
@@ -81,6 +81,6 @@ module MTBuild
       end
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/test_application_configuration.rb

@@ -4,7 +4,7 @@ module MTBuild
   # Use this class to create test application configurations. You won't typically
   # instantiate this directly. Instead, the TestApplicationProject.add_configuration
   # method will create this for you.
-	class TestApplicationConfiguration < CompiledConfiguration
+  class TestApplicationConfiguration < CompiledConfiguration
 
     # Create the actual Rake tasks that will perform the configuration's work
     def configure_tasks
@@ -28,6 +28,6 @@ module MTBuild
       end
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/test_application_project.rb

@@ -5,7 +5,7 @@ module MTBuild
   # This class is used to build test applications. A test application has
   # compilation and link phases that produce a binary test executable. The test
   # executable is invoked after building successfully.
-	class TestApplicationProject < Project
+  class TestApplicationProject < Project
 
     # Adds a named test application configuration to the project.
     def add_configuration(configuration_name, configuration)
@@ -17,6 +17,6 @@ module MTBuild
       return cfg
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/toolchain.rb

@@ -1,7 +1,7 @@
 module MTBuild
 
   # This is the base class for all toolchain types.
-	class Toolchain
+  class Toolchain
 
     # The toolchain's output folder
     attr_accessor :output_folder
@@ -13,7 +13,7 @@ module MTBuild
     # Text to append to the name of output files
     attr_accessor :output_decorator
 
-		def initialize(configuration)
+    def initialize(configuration)
       @output_folder = ''
       @project_folder = ''
       @output_decorator = ''
@@ -24,7 +24,7 @@ module MTBuild
       add_include_paths(expand_project_relative_paths(configuration.fetch(:include_paths, [])))
       add_include_objects(expand_project_relative_paths(configuration.fetch(:include_objects, [])))
       add_library_paths(expand_project_relative_paths(configuration.fetch(:library_paths, [])))
-		end
+    end
 
     # Retrieve a list of additional objects to link with
     def get_include_objects
@@ -104,6 +104,6 @@ module MTBuild
     end
 
     include Rake::DSL
-	end
+  end
 
 end

data/lib/mtbuild/toolchains/arm_none_eabi_gcc.rb

@@ -4,11 +4,11 @@ module MTBuild
   Toolchain.register_toolchain(:arm_none_eabi_gcc, 'MTBuild::ToolchainArmNoneEabiGcc')
 
   # This ToolchainGcc subclass can build using arm-non-eabi-gcc
-	class ToolchainArmNoneEabiGcc < ToolchainGcc
+  class ToolchainArmNoneEabiGcc < ToolchainGcc
 
-		def initialize(configuration)
+    def initialize(configuration)
       super
-		end
+    end
 
     # Create Rake tasks for linking
     def create_application_tasks(objects, executable_name)
@@ -45,7 +45,7 @@ module MTBuild
     private
 
     def construct_objcopy_command(input_name, output_name, objcopyflags)
-      return "#{objcopy}#{objcopyflags} #{input_name} #{output_name}"
+      return "\"#{objcopy}\"#{objcopyflags} \"#{input_name}\" \"#{output_name}\""
     end
 
     def compiler
@@ -64,6 +64,6 @@ module MTBuild
       return 'arm-none-eabi-objcopy'
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/toolchains/gcc.rb

@@ -7,11 +7,11 @@ module MTBuild
   Toolchain.register_toolchain(:gcc, 'MTBuild::ToolchainGcc')
 
   # This Toolchain subclass can build using GCC
-	class ToolchainGcc < Toolchain
+  class ToolchainGcc < Toolchain
 
     attr_accessor :cppflags, :cflags, :cxxflags, :asflags, :ldflags, :linker_script
 
-		def initialize(configuration)
+    def initialize(configuration)
       super
 
       begin
@@ -29,7 +29,7 @@ module MTBuild
       @asflags = configuration.fetch(:asflags, '')
       @ldflags = configuration.fetch(:ldflags, '')
       @linker_script = configuration.fetch(:linker_script, '')
-		end
+    end
 
     # Create Rake tasks for compilation
     def create_compile_tasks(source_files)
@@ -111,36 +111,36 @@ module MTBuild
     end
 
     def construct_compile_command(file_type, prerequisites, include_paths, output_name)
-      prerequisites_s = prerequisites.empty? ? '' : " #{prerequisites.join(' ')}"
-      include_paths_s = include_paths.empty? ? '' : " -I#{include_paths.join(' -I')}"
+      prerequisites_s = prerequisites.empty? ? '' : " \"#{prerequisites.join('" "')}\""
+      include_paths_s = include_paths.empty? ? '' : " -I\"#{include_paths.join('" -I"')}\""
       cppflags_s = @cppflags.empty? ? '' : " #{@cppflags}"
       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}\"#{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
     end
 
     def construct_archive_command(prerequisites, output_name)
-      prerequisites_s = prerequisites.empty? ? '' : " #{prerequisites.join(' ')}"
-      return "#{archiver} rcs #{output_name} #{prerequisites_s}"
+      prerequisites_s = prerequisites.empty? ? '' : " \"#{prerequisites.join('" "')}\""
+      return "\"#{archiver}\" rcs \"#{output_name}\" #{prerequisites_s}"
     end
 
     def construct_link_command(prerequisites, output_name, include_paths, library_paths, map_name)
-      prerequisites_s = prerequisites.empty? ? '' : " #{prerequisites.join(' ')}"
-      include_paths_s = include_paths.empty? ? '' : " -I#{include_paths.join(' -I')}"
-      library_paths_s = library_paths.empty? ? '' : " -L#{library_paths.join(' -L')}"
+      prerequisites_s = prerequisites.empty? ? '' : " \"#{prerequisites.join('" "')}\""
+      include_paths_s = include_paths.empty? ? '' : " -I\"#{include_paths.join('" -I"')}\""
+      library_paths_s = library_paths.empty? ? '' : " -L\"#{library_paths.join('" -L"')}\""
       cppflags_s = @cppflags.empty? ? '' : " #{@cppflags}"
       cflags_s = @cflags.empty? ? '' : " #{@cflags}"
       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}#{linker_script_s}#{prerequisites_s}#{include_paths_s} #{map_flag(map_name)} -o #{output_name}"
+      linker_script_s = @linker_script.empty? ? '' : " -Wl,-T\"#{File.join(@project_folder,@linker_script)}\""
+      return "\"#{compiler}\"#{cppflags_s}#{cflags_s}#{ldflags_s}#{linker_script_s}#{prerequisites_s}#{include_paths_s} #{map_flag(map_name)} -o \"#{output_name}\""
     end
 
     def map_flag(map_file)
-      return "-Wl,-map,#{map_file}" if @compiler_is_LLVM_gcc
-      return "-Wl,-Map=#{map_file},--cref"
+      return "-Wl,-map,\"#{map_file}\"" if @compiler_is_LLVM_gcc
+      return "-Wl,-Map=\"#{map_file}\",--cref"
     end
 
     def compiler
@@ -155,6 +155,6 @@ module MTBuild
       return 'gcc'
     end
 
-	end
+  end
 
 end

data/lib/mtbuild/version.rb

@@ -1,4 +1,4 @@
 module MTBuild
   # The current MTBuild version.
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/mtbuild/workspace.rb

@@ -1,7 +1,7 @@
 module MTBuild
 
   # Use this class to create a workspace
-	class Workspace
+  class Workspace
     require 'mtbuild/utils'
     require 'rake/clean'
 
@@ -15,7 +15,7 @@ module MTBuild
     # The workspace's output folder
     attr_reader :output_folder
 
-		def initialize(workspace_name, workspace_folder, &configuration_block)
+    def initialize(workspace_name, workspace_folder, &configuration_block)
       @workspace_name = workspace_name
       @workspace_folder = File.expand_path(workspace_folder)
       @output_folder = File.expand_path(File.join(@workspace_folder, MTBuild.default_output_folder))
@@ -41,7 +41,7 @@ module MTBuild
 
         task :default => @default_tasks+[:workspace]
       end
-		end
+    end
 
     # Adds a project subfolder
     def add_project(project_location)
@@ -107,6 +107,6 @@ module MTBuild
 
     include Rake::DSL
 
-	end
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtbuild
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Jerry Ryle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake