magica 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae08a14f9afd492220909acfd962936e1641855
-  data.tar.gz: 56213a62811fa8ba8a92a4348b8a6016eb7bf978
+  metadata.gz: 593737f9dbab87cd2a745fbd7a962a8a94fd9a6f
+  data.tar.gz: 767d92965831f71b0cb5463490b960a364f4e0de
 SHA512:
-  metadata.gz: 993f0eabf1aadd5242157ded0d659dfb73a4c9ac9e86de8e0457d174c9b465fd7225faa2555134ccbfe43730f1201c85d08555b4f840ba1e768d601429da2afe
-  data.tar.gz: 89f1a0d336136b312ad3c450fb13fcb814aa6bd69ffa0059972342b6463412e8ddc8eec10711f9d979a02f75acf7b918ea4f728381adeb902724e5bbf17d5a7d
+  metadata.gz: dd8fd24617cea40b2bda1336d243cd023a83b4e0a5570bd41b41bc4d8257b87097c089881da347338e49ac92dbe39db6e76509c18fd22c6887994b08c37cfbd9
+  data.tar.gz: 9eaf19db454b3642663a115667d1211b16209b332ce5bae16257f76d726aa4314b10639b4339f81dddbbb55c407507df651538d3b02f617c66a24bd3e6d2981b

data/lib/magica/application.rb

@@ -38,13 +38,13 @@ module Magica
     end
 
     def sort_options(options)
-      not_applicable_to_capistrano = %w(verbose execute execute-continue libdir no-search rakefile rakelibdir require system no-system where no-deprecation-warnings)
+      not_applicable_to_magica = %w(verbose execute execute-continue libdir no-search rakefile rakelibdir require system no-system where no-deprecation-warnings)
 
       options.reject! do |(switch, *)|
-        switch =~ /--#{Regexp.union(not_applicable_to_capistrano)}/
+        switch =~ /--#{Regexp.union(not_applicable_to_magica)}/
       end
 
-      super.push(version, clean, clean_all)
+      super.push(version, clean, clean_all, target)
     end
 
     def top_level_tasks
@@ -95,5 +95,13 @@ module Magica
          options.clean_all = true
        end]
     end
+
+    def target
+      ["--target", '-t TARGET',
+       "Specify the build to use",
+       lambda do |_value|
+         options.target = _value
+       end]
+    end
   end
 end

data/lib/magica/build.rb

@@ -25,6 +25,9 @@ module Magica
       @dest = (options[:dest] || 'build').to_s
       @sources = FileList["src/**/*.cpp"]
       @options = OpenStruct.new(options.merge(Rake.application.options.to_h))
+      @default_target = nil
+      @config_block = block
+      @targets = {}
 
       @exe_name = @name
       @exe_path = "bin"
@@ -48,13 +51,21 @@ module Magica
       @dependencies = []
       @static_libraries = []
 
-      Magica.targets[@name] = self
-      Magica.targets[@name].instance_eval(&block) unless block.nil?
-      Magica.targets[@name].instance_exec(@options, &Magica.default_compile_task)
+      Magica.builds[@name] = self
+      Magica.builds[@name].instance_eval(&block) unless block.nil?
+      Magica.builds[@name].instance_exec(@options, &Magica.default_compile_task)
 
       Magica.default_toolchain.setup(self, Magica.toolchain_params) if Magica.default_toolchain
     end
 
+    def target(name, **options, &block)
+      return if block.nil?
+      name = name.to_sym
+      @targets[name] = block
+      @default_target = name if options[:default]
+      Target.new("#{@name}:#{name}", @options.to_h.merge({target: name}), &@config_block) if Magica.const_defined?("Target")
+    end
+
     def define(name, value = nil)
       if name.is_a?(Array)
         name.flatten.map { |n| define(n, value) }
@@ -113,6 +124,10 @@ module Magica
       @sources = @sources.exclude(*patterns)
     end
 
+    def include(*patterns)
+      @sources = @sources.include(*patterns)
+    end
+
     def dest(path)
       @dest = path.to_s
     end
@@ -191,21 +206,30 @@ module Magica
 
     def compile(source)
       file objfile(source) => source do |t|
-        Build.current = Magica.targets[@name]
+        Build.current = Magica.builds[@name]
         @compiler.run t.name, t.prerequisites.first, @defines, @include_paths, @flags
       end
     end
 
     def link(exec, objects)
-      desc "Build target #{@name}'s executable file"
-      task "build:#{@name}" => @dependencies + objects  do
-        Build.current = Magica.targets[@name]
+      desc "Build #{@name}'s executable file"
+      task "#{@name}" => @dependencies + objects  do
+        Build.current = Magica.builds[@name]
         @linker.run "#{exec}", objects + @static_libraries, @libraries, @library_paths, @flags
       end
     end
 
+    def do_target(name = nil)
+      name ||= @default_target
+      return if name.nil?
+      target = @targets[name.to_sym]
+      @sources.clear_exclude # Reset exclude files
+      @exe_name = name.to_s.capitalize
+      Magica.builds[@name].instance_eval(&target) unless target.nil?
+    end
+
     def build_task(&block)
-      Magica.targets[@name].instance_eval(@options, &block)
+      Magica.builds[@name].instance_eval(@options, &block)
     end
   end
 end

data/lib/magica/magica.rb

@@ -2,14 +2,14 @@ module Magica
   class << self
     attr_accessor :default_toolchain, :toolchain_params
 
-    def targets
-      @targets ||= {}
+    def builds
+      @builds ||= {}
     end
 
-    def each_target(&block)
-      return to_enum(:each_target) if block.nil?
-      @targets.each do |key, target|
-        target.instance_eval(&block)
+    def each_build(&block)
+      return to_enum(:each_build) if block.nil?
+      @builds.each do |key, build|
+        build.instance_eval(&block)
       end
     end
 
@@ -21,6 +21,8 @@ module Magica
       proc { |options|
         clean if options[:clean]
 
+        do_target(options[:target])
+
         objects = objfile(@sources)
         @sources.each { |source| compile source }
 

data/lib/magica/target.rb

@@ -0,0 +1,23 @@
+include Magica::DSL
+
+require "magica/framework"
+
+module Magica
+  class Target < Build
+    def target(name, **options, &block)
+      return if block.nil?
+      name = name.to_sym
+      @targets[name] = block
+      @default_target = name if options[:default]
+    end
+
+    def dependency(name, options = {}, &block)
+      Dependency.new(name, options, &block)
+      task "#{@name}:dependency:#{name}" do |t|
+        Dependency[name].build(self)
+      end
+      @dependencies << "#{@name}:dependency:#{name}"
+      @static_libraries.push(*Dependency[name].static_libraries)
+    end
+  end
+end

data/lib/magica/tasks/framework.rake

@@ -4,8 +4,8 @@ task :_all do |t|
   if Rake::Task.task_defined?(:all)
     Rake::Task[:all].invoke
   else
-    Magica.each_target do
-      Rake::Task["build:#{@name}"].invoke
+    Magica.each_build do
+      Rake::Task["#{@name}"].invoke
     end
   end
 end

data/lib/magica/templates/Magicafile

@@ -1,4 +1,5 @@
 require "magica/build"
+require "magica/target"
 
 # Define default toolchain
 # toolchain :gcc
@@ -8,6 +9,18 @@ require "magica/build"
 build :main, {clean: true} do
   # define :debug
   # dynamic_library "sdl2"
+
+  # dependency :mruby do
+  #   source "git@github.com:mruby/mruby.git"
+  #   version "1.2.0"
+  #   command "./minirake -quiet"
+  #
+  #   static_library "libmruby.a"
+  # end
+
+  # target :test do
+  #   exclude('src/Main.cpp')
+  # end
 end
 
 task :run => "build:main" do

data/lib/magica/version.rb

@@ -1,3 +1,3 @@
 module Magica
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magica
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - 蒼時弦也
@@ -99,6 +99,7 @@ files:
 - lib/magica/initialize.rb
 - lib/magica/magica.rb
 - lib/magica/package_config.rb
+- lib/magica/target.rb
 - lib/magica/tasks/build.rake
 - lib/magica/tasks/framework.rake
 - lib/magica/tasks/initialize.rake