mtbuild 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e4d1cccbe7c5456ef353cb5fd432eeccf0d06b
-  data.tar.gz: c0c996673e3682024d8514d67d51f93e204fdca7
+  metadata.gz: a217788ed422994acb0e8b158ddb179f84298f9f
+  data.tar.gz: 5c385e802f9c2fd223f993a93b0009cfb7d984ce
 SHA512:
-  metadata.gz: c38f7fc92990df74599b2e7fbd4ab3a91a11e97582246afc2d891383ebeb1c713799a16ca363968021f6bf257857903577eb1d56ba72440ae4256ed5fa82c9f3
-  data.tar.gz: 34bea4ad42b155151ffb6324c6f2cf17a1308b9721c78b7fcf4d659f392faf594efc2857ea4871081843b6a11c931a664f69f1d948f8c6168aeeda3d58deff2a
+  metadata.gz: 0e02b69f8cf243376deaf87e298b5855adbbc0885003ee3e6a9a73adcf5124c011aa4efd4b013db361fcbb092ccd1ba1e68362829f83f0af7cdc7a8f40352df6
+  data.tar.gz: f8f2ff9949627b0216253280b44ccfa7ed9625f5f22e7a921678c09a1c9fb86616902eae46f34f0f33fd03428fc879cdd74ec0c8cf260cf30ad1b9832bcee481

data/CHANGES.md

@@ -1,6 +1,19 @@
 # Release Notes #
 
 
+## MTBuild 0.1.3 ##
+
+### Changes ###
+
+* Changed 'default' task to 'all' task to be more compatible with 'make'
+  conventions.  
+* Fixed bug where source files couldn't be excluded with 'excludes'
+  configuration property.
+* Renamed the 'excludes' property to 'source_excludes' and documented it.
+  (Source file exclusion was previously undocumented--probably because it
+  didn't work.)  
+
+
 ## MTBuild 0.1.2 ##
 
 ### Changes ###

data/README.md

@@ -461,7 +461,9 @@ Application Project configurations offer the following optional settings:
 
 * ```:dependencies``` - The Rake task names of one or more dependencies. For example, ```'MyLibrary:Debug'``` or ```['MyLibrary1:Debug', 'MyLibrary2:Debug']```
 
-* ```:sources``` - One or more source file names or source file glob patterns. For example, ```'main.c'``` or ```['main.c', 'startup.c']``` or ```['src/main.c', 'src/*.cpp']```. Note that the source file paths should be relative to the project folder.
+* ```:sources``` - Source files to build in this configuration. Specified as one or more source file names or source file glob patterns. For example, ```'main.c'``` or ```['main.c', 'startup.c']``` or ```['src/main.c', 'src/*.cpp']```. Note that the source file paths should be relative to the project folder.
+
+* ```:excluded_sources``` - Source files to exclude from the configuration. Specified as one or more source file names or source file glob patterns. For example, ```'badmain.c'``` or ```['badmain.c', 'badstartup.c']``` or ```['src/badmain.c', 'src/bad*.cpp']```. Note that the source file paths should be relative to the project folder.
 
 * ```:tests``` - The Rake task names of one or more unit test applications. For example, ```'MyLibraryTest:Test'``` or ```['MyLibraryTest1:Test', 'MyLibraryTest2:Test']```
 

data/lib/mtbuild.rb

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

data/lib/mtbuild/application.rb

@@ -34,6 +34,7 @@ module MTBuild
       standard_exception_handling do
         init
         load_rakefile
+        create_default_task_if_none_exists
         top_level
       end
     end
@@ -74,6 +75,20 @@ module MTBuild
       sort_options(options)
     end
 
+    def create_default_task_if_none_exists
+      if lookup(default_task_name).nil?
+        task default_task_name do
+          puts 'Nothing to do because no projects specified default tasks.'
+          puts 'Use the -T flag to see the list of tasks you can build.'
+        end
+      end
+    end
+
+    def default_task_name
+      'all'
+    end
+
+    include Rake::DSL
   end
 
 end

data/lib/mtbuild/compiled_configuration.rb

@@ -22,7 +22,7 @@ module MTBuild
       @default_toolchain_config = configuration[:toolchain]
       @default_toolchain = Toolchain.create_toolchain(self, @default_toolchain_config)
 
-      @source_files = Utils.expand_file_list(configuration.fetch(:sources, []), configuration.fetch(:excludes, []), @project_folder)
+      @source_files = Utils.expand_file_list(configuration.fetch(:sources, []), configuration.fetch(:excluded_sources, []), @project_folder)
       @toolchains = {@default_toolchain => @source_files}
 
       @tests = namespace_tasks(Utils.ensure_array(configuration.fetch(:tests, [])))

data/lib/mtbuild/project.rb

@@ -40,13 +40,6 @@ module MTBuild
         Cleaner.generate_clean_task_for_project(@project_name, @clean_list)
       end
 
-      #TODO: This is a strange way to do this. Should probably be moved to "application" functionality.
-      if @parent_workspace.nil? and Rake.application.lookup(:default).nil?
-        task :default do
-          puts 'Nothing to do. Use the -T flag to see the list of tasks you can build.'
-        end
-      end
-
       MTBuild::BuildRegistry.exit_project
     end
 

data/lib/mtbuild/utils.rb

@@ -21,7 +21,7 @@ module MTBuild
       file_list.include(included_files)
 
       excluded_files = Utils.ensure_array(excluded_files).flatten.collect{|e| base_folder ? File.join(base_folder, e) : e}
-      file_list.exclude(excluded_files)
+      file_list.exclude(*excluded_files)
 
       return file_list.to_ary.collect{|f| File.expand_path(f)}
     end

data/lib/mtbuild/workspace.rb

@@ -70,7 +70,7 @@ module MTBuild
 
       # Only register default tasks and generate global clean if we're the top-level workspace.
       if @parent_workspace.nil?
-        task :default => @default_tasks
+        task Rake.application.default_task_name => @default_tasks
         Cleaner.generate_global_clean_task
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtbuild
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jerry Ryle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake