magica 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2da1bed863df770f3cda733a7fd15f2ebbd2e14
-  data.tar.gz: b5753f85c89bedf34cc8f277f8adc9445e3389e6
+  metadata.gz: 75b6c620691aaf5e3ae2ed6322042efdbac359d8
+  data.tar.gz: 3f3b4950ec4ace3c13794d018337f7a1d26df8c6
 SHA512:
-  metadata.gz: c0c39a627e37f94cf9c0c321967964f836ad3d3e4add99df62bd2ab245752453a7cbf123f0deb2547b2c89beceb52d631a7de3966a2440a71e6deb5790b4f84d
-  data.tar.gz: f710c1b786149e677b4c2440d96c2003f797ce1808d4e94b9e197472dd8576bb02ec0e1d74f0c08162f0c0ed5d5abf5c8be21add03b9d861d0137461ac54c214
+  metadata.gz: 41ccaa64898ac96fd5fb769afe53187db32afa579aaedd572fd243d13dd379f49f6ca82d5115af15313a485433ddf463a37752a6a20f21c3f273167fab5512a1
+  data.tar.gz: 9b3a47b548bb0ba211fa7851837954fba5cf95856d5aee8f82cd7b4a30bed136a48171022447f17c2fb14648b60d6f47f82969f1edaa3302b6a9b0714ee96195

data/lib/magica/all.rb

@@ -6,10 +6,12 @@ require "magica/extension"
 require "magica/i18n"
 require "magica/dsl"
 require "magica/toolchain"
+require "magica/dependency"
 require "magica/application"
 
 require "magica/command"
 require "magica/commands/compiler"
 require "magica/commands/linker"
+require "magica/commands/git"
 
 require "magica/magica"

data/lib/magica/application.rb

@@ -44,7 +44,7 @@ module Magica
         switch =~ /--#{Regexp.union(not_applicable_to_capistrano)}/
       end
 
-      super.push(version, clean)
+      super.push(version, clean, clean_all)
     end
 
     def top_level_tasks
@@ -80,11 +80,20 @@ module Magica
     end
 
     def clean
-      ["--clean", nil,
+      ["--clean", "-c",
        "Clean all files before build",
        lambda do |_value|
          options.clean = true
        end]
     end
+
+    def clean_all
+      ["--clean-all", '-C',
+       "Clean all files before build include dependency",
+       lambda do |_value|
+         options.clean = true
+         options.clean_all = true
+       end]
+    end
   end
 end

data/lib/magica/build.rb

@@ -12,11 +12,14 @@ module Magica
 
     include Rake::DSL
 
-    COMPILERS = %w(cxx)
-    COMMANDS = COMPILERS + %w(linker)
+    COMPILERS = %w(cc cxx)
+    COMMANDS = COMPILERS + %w(linker git)
 
+    attr_reader :options
     attr_block COMMANDS
 
+    Exts = Struct.new(:object, :executable, :library)
+
     def initialize(name = 'host', options = {dest: 'build'}, &block)
       @name = name.to_s
       @dest = (options[:dest] || 'build').to_s
@@ -26,15 +29,25 @@ module Magica
       @exe_name = @name
       @exe_path = "bin"
 
+      @exts = Exts.new('.o', '', '.a')
+
+      @cc = Command::Compiler.new(self, %w(.c))
       @cxx = Command::Compiler.new(self, %w(.cpp))
       @linker = Command::Linker.new(self)
 
+      @compiler = @cc
+
+      @git = Command::Git.new(self)
+
       @defines = %w()
       @include_paths = %w()
       @libaries = %w()
       @libary_paths = %w()
       @flags = %w()
 
+      @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)
@@ -43,15 +56,30 @@ module Magica
     end
 
     def define(name)
-      @defines << name.to_s.upcase
+      if name.is_a?(Array)
+        name.flatten.map { |n| define(n) }
+      else
+        @defines<< name.to_s.upcase
+      end
+      @defines
     end
 
     def include_path(path)
-      @include_paths << path.to_s
+      if path.is_a?(Array)
+        path.flatten.map  { |p| include_path(p) }
+      else
+        @include_paths << path.to_s
+      end
+      @include_paths
     end
 
     def flag(flag)
-      @flags << flag.to_s
+      if flag.is_a?(Array)
+        flag.flatten.map { |f| flag(f) }
+      else
+        @flags << flag.to_s
+      end
+      @flags
     end
 
     def library(name, path)
@@ -63,9 +91,10 @@ module Magica
       config = PackageConfig[name]
       @libaries.push(*config.libaries)
       @libary_paths.push(*config.libary_paths)
-      @include_paths.push(*config.include_paths)
-      @defines.push(*config.defines)
-      @flags.push(*config.flags)
+
+      include_path(config.include_paths)
+      define(config.defines)
+      flag(config.flags)
     end
 
     def source(path)
@@ -76,6 +105,21 @@ module Magica
       @dest = path.to_s
     end
 
+    def dependency(name, options = {}, &block)
+      Dependency.new(name, options, &block)
+      desc "The targets #{@name}'s dependency project : #{name}"
+      task "#{@name}:dependency:#{name}" do |t|
+        Dependency[name].build(self)
+      end
+      @dependencies << "#{@name}:dependency:#{name}"
+      @static_libraries.push(*Dependency[name].static_libraries)
+    end
+
+    def use(compiler)
+      return @compiler = self.send(compiler.to_s) if COMPILERS.include?(compiler.to_s)
+      @compiler = @cc
+    end
+
     def filename(name)
       '"%s"' % name
     end
@@ -89,11 +133,11 @@ module Magica
     end
 
     def exefile(name = nil)
-      return exefile(@exe_name) if name.nil?
+      return exefile("#{@exe_name}#{@exts.executable}") if name.nil?
       if name.is_a?(Array)
         name.flatten.map { |n| exefile(n) }
       else
-        File.join(*[Magica.root, @exe_path, "#{name}"].flatten.reject(&:empty?))
+        File.join(*[Magica.root, @exe_path, "#{name}#{@exts.executable}"].flatten.reject(&:empty?))
       end
     end
 
@@ -104,7 +148,7 @@ module Magica
       if name.is_a?(Array)
         name.flatten.map { |n| objfile(n) }
       else
-        File.join(*[Magica.root, @dest, "#{name}.o"].flatten.reject(&:empty?))
+        File.join(*[Magica.root, @dest, "#{name}#{@exts.object}"].flatten.reject(&:empty?))
       end
     end
 
@@ -123,6 +167,10 @@ module Magica
       clear_exe
     end
 
+    def add(source)
+      FileUtils.cp(source, File.join(*[Magica.root, @dest].flatten.reject(&:empty?)))
+    end
+
     def toolchain(name, params = {})
       toolchain = Toolchain.toolchains[name]
       fail I18n.t("magica.unknow_toolchain", toolchain: name) unless toolchain
@@ -132,15 +180,15 @@ module Magica
     def compile(source)
       file objfile(source) => source do |t|
         Build.current = Magica.targets[@name]
-        @cxx.run t.name, t.prerequisites.first, @defines, @include_paths, @flags
+        @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}" => objects do
+      task "build:#{@name}" => @dependencies + objects  do
         Build.current = Magica.targets[@name]
-        @linker.run "#{exec}", objects, @libaries, @libary_paths, @flags
+        @linker.run "#{exec}", objects + @static_libraries, @libaries, @libary_paths, @flags
       end
     end
 

data/lib/magica/command.rb

@@ -14,7 +14,7 @@ module Magica
 
     private
     def _run(options, params = {})
-      sh command + ' ' + (options % params)
+      sh command + ' ' + (options % params), verbose: false
     end
 
   end

data/lib/magica/commands/compiler.rb

@@ -24,6 +24,7 @@ module Magica
 
     def run(outfile, infile, _defines = [], _include_paths = [], _flags = [])
       FileUtils.mkdir_p File.dirname(outfile)
+      puts "COMPILE\t#{outfile}"
       _run @compile_options, { outfile: outfile, infile: infile, flags: combine_flags(_defines, _include_paths, _flags) }
     end
   end

data/lib/magica/commands/git.rb

@@ -0,0 +1,45 @@
+module Magica
+  class Command::Git < Command
+    attr_accessor :flags
+    attr_accessor :clone_options, :pull_options, :checkout_options
+
+    def initialize(build)
+      super
+
+      @command = "git"
+      @flags = %w[]
+      @clone_options = "clone %{flags} %{url} %{dir}"
+      @pull_options = "pull %{flags} %{remote} %{branch}"
+      @checkout_options = "checkout %{flags} %{checksum_hash}"
+    end
+
+    def clone(dir, url, _flags = [])
+      _run @clone_options % {
+        flags: [@flags, _flags].flatten.join(" "),
+        dir: filename(dir),
+        url: url
+      }
+    end
+
+    def pull(dir, remote = 'origin', branch = 'master')
+      workin dir do
+        _run @pull_options % {remote: remote, branch: branch, flags: @flags.join(" ")}
+      end
+    end
+
+    def checkout(dir, checksum_hash)
+      workin dir do
+        _run @checkout_options % {checksum_hash: checksum_hash, flags: @flags.join(" ")}
+      end
+    end
+
+    private
+    def workin(dir)
+      root = Dir.pwd
+      Dir.chdir dir
+      yield if block_given?
+      Dir.chdir root
+    end
+
+  end
+end

data/lib/magica/commands/linker.rb

@@ -25,6 +25,7 @@ module Magica
 
       libary_flags = [@libaries, _libaries].flatten.map { |library| @option_libary % library }
 
+      puts "LINK\t#{outfile}"
       _run @link_options, {
         outfile: outfile,
         objects: objects.join(" "),

data/lib/magica/dependency.rb

@@ -0,0 +1,128 @@
+module Magica
+  class Dependency
+    class << self
+      def [](name)
+        @dependencies ||= {}
+        @dependencies[name.to_s]
+      end
+
+      def []=(name, value)
+        @dependencies ||= {}
+        @dependencies[name.to_s] = value
+      end
+    end
+
+    include Rake::DSL
+
+    def initialize(name, options = {}, &block)
+
+      @name = name.to_s
+      @vcs = nil
+      @command = :git
+      @source = ""
+      @version = nil
+      @dir = "lib/#{@name}"
+      @install_dir = "#{@dir}/build"
+      @build_command = "make"
+      @environments = {}
+
+      @static_libraries = []
+
+      Dependency[name] = self
+      Dependency[name].instance_eval(&block)
+    end
+
+    def use(name)
+      @vcs = name.to_sym
+    end
+
+    def env(name, value)
+      @environments[name.to_s] = value
+    end
+
+    def source(_source)
+      @source = _source.to_s
+    end
+
+    def dir(_dir)
+      @dir = _dir.to_s
+    end
+
+    def install_dir(_dir)
+      @install_dir = _dir.to_s
+    end
+
+    def version(_version)
+      @version = _version.to_s
+    end
+
+    def command(_command)
+      @build_command = _command.to_s
+    end
+
+    def static_library(*name)
+      @static_libraries.push(*name.flatten)
+    end
+
+    def build(builder)
+      root = Dir.pwd
+
+      options = builder.send(:options)
+      clean if options[:clean_all]
+
+      return if !options[:clean_all] & File.exists?(@install_dir)
+
+      setup_environment
+
+      @vcs = builder.send(@command)
+      @vcs.flags = %w(--quiet)
+      clone
+
+      Dir.chdir source_dir
+      sh @build_command, verbose: false
+      Dir.chdir root
+    end
+
+    def static_libraries
+      @static_libraries.map do |library|
+        File.join(*[Magica.root, @install_dir, library].flatten.reject(&:empty?))
+      end
+    end
+
+    private
+    def clone
+      if Dir.exists?(source_dir)
+        puts "UPDATE DEPENDENCY\t#{@name}-#{@version}"
+        checkout if @version
+        pull
+      else
+        puts "DOWNLOAD DEPENDENCY\t#{@name}-#{@version}"
+        @vcs.clone(source_dir, @source)
+        checkout if @version
+      end
+    end
+
+    def checkout
+      @vcs.checkout(source_dir, @version)
+    end
+
+    def pull
+      @vcs.pull(source_dir, 'origin', @version)
+    end
+
+    def source_dir
+      File.join(Magica.root, @dir)
+    end
+
+    def setup_environment
+      @environments.each do |name, value|
+        ENV[name] = value
+      end
+    end
+
+    def clean
+      FileUtils.rm_r(@install_dir, force: true)
+    end
+
+  end
+end

data/lib/magica/toolchains/gcc.rake

@@ -1,4 +1,16 @@
 Magica::Toolchain.new :gcc do |config, params|
-  config.cxx.command = "g++"
-  config.linker.command = "g++"
+  config.cc do |cc|
+    cc.command = ENV['CC'] || "gcc"
+    cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings)]
+  end
+
+  config.cxx do |cxx|
+    cxx.command = [ENV['CXX'] || "g++"]
+    cxx.flags = [ENV['CXXFLAGS'] || %w(-g -O3 -Wall -Werror-implicit-function-declaration)]
+  end
+
+  config.linker do |linker|
+    linker.command = ENV['LD'] || "gcc"
+    linker.flags = [ENV['LDFLAGS'] || %w()]
+  end
 end

data/lib/magica/version.rb

@@ -1,3 +1,3 @@
 module Magica
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magica
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,7 +88,9 @@ files:
 - lib/magica/build.rb
 - lib/magica/command.rb
 - lib/magica/commands/compiler.rb
+- lib/magica/commands/git.rb
 - lib/magica/commands/linker.rb
+- lib/magica/dependency.rb
 - lib/magica/dsl.rb
 - lib/magica/extension.rb
 - lib/magica/framework.rb