magica 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62577788a3e691eb9721f30c543c72bc877a6440
-  data.tar.gz: 474ddaa3cf884e948884cd488ea5a7746bf4bfe6
+  metadata.gz: eb7b82405cd742dc627d9f13a6d6d06320ef3444
+  data.tar.gz: be7f31fc4323449921753243b9540e773dbfa014
 SHA512:
-  metadata.gz: f528514384ed8c0c1a54c7dd453acf3ba8d5e700820ad8278071d26a1055f7a94db01cb3805e65cee4adfcbb54457b17cc83b61a7306f180dcfcf4d578209268
-  data.tar.gz: c87a4697ed722311df9e4a398e07e4d4cead6bf139aa24beea95007ce7d3ba2c38c29652d1d8625280570596ae687b2a614c97aa1189c34d725d84d21e9e2f11
+  metadata.gz: bb478c78a41dc0153535736dc3996c24ac217df35937488a12fae4c142c4198e45bc5ff9a409ce5e5133c6ebd503f5e2e4a56a2fca0abe265244ddeed14753ff
+  data.tar.gz: 7a0546aadf8c8852845f61bae792a9ce7ea7da7a78e2772bb8d936284f6645aa4ea84c3f2b395a46e93d3e347bbc496f712afed8ff12c1e7f654d97a9d8a902d

data/lib/magica/build.rb

@@ -15,7 +15,7 @@ module Magica
     COMPILERS = %w(cc cxx)
     COMMANDS = COMPILERS + %w(linker git)
 
-    attr_reader :options
+    attr_reader :options, :defines, :include_paths, :flags
     attr_block COMMANDS
 
     Exts = Struct.new(:object, :executable, :library)
@@ -71,7 +71,7 @@ module Magica
         name.flatten.map { |n| define(n, value) }
       else
         _define = name.to_s.upcase
-        value = '\"%{value}\"' % {value: value} unless value.is_a?(Fixnum)
+        value = '\"%{value}\"' % {value: value} unless value.is_a?(Numeric)
         _define << "=#{value}" unless value.nil?
         @defines << _define
       end
@@ -205,17 +205,19 @@ module Magica
     end
 
     def compile(source)
+      return if Rake::Task.task_defined?(objfile(source))
       file objfile(source) => source do |t|
-        Build.current = Magica.builds[@name]
-        @compiler.run t.name, t.prerequisites.first, @defines, @include_paths, @flags
+        @compiler.run t.name, t.prerequisites.first, Build.current.defines, Build.current.include_paths, Build.current.flags
       end
     end
 
     def link(exec, objects)
       desc "Build #{@name}'s executable file"
-      task "#{@name}" => @dependencies + objects  do
+      task "#{@name}" do
         Build.current = Magica.builds[@name]
-        @linker.run "#{exec}", objects + @static_libraries, @libraries, @library_paths, @flags
+        task "#{@name}:build" => @dependencies + objects do
+          @linker.run "#{exec}", objects + @static_libraries, @libraries, @library_paths, @flags
+        end.invoke
       end
     end
 

data/lib/magica/tasks/framework.rake

@@ -9,3 +9,9 @@ task :_all do |t|
     end
   end
 end
+
+task :environment do |t|
+  p "ENV ===>"
+  p Magica::Build.current
+  t.reenable
+end

data/lib/magica/version.rb

@@ -1,3 +1,3 @@
 module Magica
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magica
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A tool to build C++ project