magica 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76457397a26e8c8f5530223241085a5de1ed2cd
-  data.tar.gz: a00d14e584583a1b50774002f0ebe94ea05c5d0c
+  metadata.gz: e2da1bed863df770f3cda733a7fd15f2ebbd2e14
+  data.tar.gz: b5753f85c89bedf34cc8f277f8adc9445e3389e6
 SHA512:
-  metadata.gz: 7acc35bd25b2c8d3c416097a78ae04a47ff813c85eaad74e7ef921406533947ec58f13ea7e62dd89dd40385ef8bc49d65b74c9aa1e14a2df0303acc5d52c2646
-  data.tar.gz: 8518c22efb3a15fbd7834847e1a655b9b05448f25272d0c004e4a5fdc8be0599c091ae569d3b912f00b6bc7094a751f8aa09bc09f80e98b40946af3d48356654
+  metadata.gz: c0c39a627e37f94cf9c0c321967964f836ad3d3e4add99df62bd2ab245752453a7cbf123f0deb2547b2c89beceb52d631a7de3966a2440a71e6deb5790b4f84d
+  data.tar.gz: f710c1b786149e677b4c2440d96c2003f797ce1808d4e94b9e197472dd8576bb02ec0e1d74f0c08162f0c0ed5d5abf5c8be21add03b9d861d0137461ac54c214

data/lib/magica/all.rb

@@ -1,10 +1,11 @@
 require "rake"
 
+require "magica/version"
+require "magica/package_config"
 require "magica/extension"
 require "magica/i18n"
 require "magica/dsl"
 require "magica/toolchain"
-require "magica/builder"
 require "magica/application"
 
 require "magica/command"

data/lib/magica/application.rb

@@ -22,6 +22,31 @@ module Magica
       super
     end
 
+    def handle_options
+      options.rakelib = ["rakelib"]
+      options.trace_output = $stderr
+
+      OptionParser.new do |opts|
+        opts.on_tail("-h", "--help", "-H", "Display this help message.") do
+          puts opts
+          exit
+        end
+
+        standard_rake_options.each { |args| opts.on(*args) }
+        opts.environment("RAKEOPT")
+      end.parse!
+    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)
+
+      options.reject! do |(switch, *)|
+        switch =~ /--#{Regexp.union(not_applicable_to_capistrano)}/
+      end
+
+      super.push(version, clean)
+    end
+
     def top_level_tasks
       unless File.exists?("Magicafile")
         @top_level_tasks.unshift(warning_not_init.to_s) unless default_tasks.include?(@top_level_tasks.first)
@@ -44,5 +69,22 @@ module Magica
     def default_tasks
       %{init}
     end
+
+    def version
+      ["--version", "-V",
+       "Display the program version.",
+       lambda do |_value|
+         puts "Magica Version: #{Magica::VERSION} (Rake Version: #{Rake::VERSION})"
+         exit
+       end]
+    end
+
+    def clean
+      ["--clean", nil,
+       "Clean all files before build",
+       lambda do |_value|
+         options.clean = true
+       end]
+    end
   end
 end

data/lib/magica/build.rb

@@ -4,3 +4,148 @@ require "magica/framework"
 
 load File.expand_path("../tasks/build.rake", __FILE__)
 
+module Magica
+  class Build
+    class << self
+      attr_accessor :current
+    end
+
+    include Rake::DSL
+
+    COMPILERS = %w(cxx)
+    COMMANDS = COMPILERS + %w(linker)
+
+    attr_block COMMANDS
+
+    def initialize(name = 'host', options = {dest: 'build'}, &block)
+      @name = name.to_s
+      @dest = (options[:dest] || 'build').to_s
+      @sources = FileList["src/**/*.cpp"]
+      @options = OpenStruct.new(options.merge(Rake.application.options.to_h))
+
+      @exe_name = @name
+      @exe_path = "bin"
+
+      @cxx = Command::Compiler.new(self, %w(.cpp))
+      @linker = Command::Linker.new(self)
+
+      @defines = %w()
+      @include_paths = %w()
+      @libaries = %w()
+      @libary_paths = %w()
+      @flags = %w()
+
+      Magica.targets[@name] = self
+      Magica.targets[@name].instance_eval(&block) unless block.nil?
+      Magica.targets[@name].instance_exec(@options, &Magica.default_compile_task)
+
+      Magica.default_toolchain.setup(self, Magica.toolchain_params) if Magica.default_toolchain
+    end
+
+    def define(name)
+      @defines << name.to_s.upcase
+    end
+
+    def include_path(path)
+      @include_paths << path.to_s
+    end
+
+    def flag(flag)
+      @flags << flag.to_s
+    end
+
+    def library(name, path)
+      @libaries << name.to_s
+      @libary_paths << path.to_s
+    end
+
+    def dynamic_library(name)
+      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)
+    end
+
+    def source(path)
+      @sources = FileList[path]
+    end
+
+    def dest(path)
+      @dest = path.to_s
+    end
+
+    def filename(name)
+      '"%s"' % name
+    end
+
+    def exe_path(path)
+      @exe_path = path.to_s
+    end
+
+    def exe_name(name)
+      @exe_name = name.to_s
+    end
+
+    def exefile(name = nil)
+      return exefile(@exe_name) 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?))
+      end
+    end
+
+    def libfile
+    end
+
+    def objfile(name)
+      if name.is_a?(Array)
+        name.flatten.map { |n| objfile(n) }
+      else
+        File.join(*[Magica.root, @dest, "#{name}.o"].flatten.reject(&:empty?))
+      end
+    end
+
+    def clear_dest
+      path = File.join(*[Magica.root, @dest].flatten.reject(&:empty?))
+      FileUtils.rm_r(path, force: true)
+    end
+
+    def clear_exe
+      path = File.join(*[Magica.root, @exe_path].flatten.reject(&:empty?))
+      FileUtils.rm_r(path, force: true)
+    end
+
+    def clean
+      clear_dest
+      clear_exe
+    end
+
+    def toolchain(name, params = {})
+      toolchain = Toolchain.toolchains[name]
+      fail I18n.t("magica.unknow_toolchain", toolchain: name) unless toolchain
+      toolchain.setup(self, params)
+    end
+
+    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
+      end
+    end
+
+    def link(exec, objects)
+      desc "Build target #{@name}'s executable file"
+      task "build:#{@name}" => objects do
+        Build.current = Magica.targets[@name]
+        @linker.run "#{exec}", objects, @libaries, @libary_paths, @flags
+      end
+    end
+
+    def build_task(&block)
+      Magica.targets[@name].instance_eval(@options, &block)
+    end
+  end
+end

data/lib/magica/commands/compiler.rb

@@ -19,7 +19,7 @@ module Magica
     def combine_flags(_defines = [], _include_paths = [], _flags = [])
       define_flags = [@defines, _defines].flatten.map { |define| @option_defines % define }
       include_path_flags = [@include_paths, _include_paths].flatten.map { |include_path| @option_include_path % filename(include_path) }
-      [define_flags, include_path_flags, _flags].flatten.join(' ')
+      [define_flags, include_path_flags, _flags].flatten.uniq.join(' ')
     end
 
     def run(outfile, infile, _defines = [], _include_paths = [], _flags = [])

data/lib/magica/commands/linker.rb

@@ -17,16 +17,18 @@ module Magica
 
     def combine_flags(_library_paths = [], _flags = [])
       libary_paths = [@libary_paths, _library_paths].flatten.map { |path| @option_libary_path % filename(path) }
-      [flags, libary_paths, _flags].flatten.join(" ")
+      [flags, libary_paths, _flags].flatten.uniq.join(" ")
     end
 
     def run(outfile, objects, _libaries = [], _library_paths = [], _flags = [])
+      FileUtils.mkdir_p File.dirname(outfile)
+
       libary_flags = [@libaries, _libaries].flatten.map { |library| @option_libary % library }
 
       _run @link_options, {
         outfile: outfile,
         objects: objects.join(" "),
-        libs: libary_flags.join(" "),
+        libs: libary_flags.uniq.join(" "),
         flags: combine_flags(_library_paths, _flags)
       }
     end

data/lib/magica/dsl.rb

@@ -7,15 +7,12 @@ module Magica
       Magica.toolchain_params = params
     end
 
-    def define_builder(name = 'host', dest = 'build', &block)
-      Builder.new(name, dest, &block)
+    def build(name = 'host', options = {dest: 'build'}, &block)
+      Build.new(name, options, &block)
     end
 
-    def build(name, options = {}, &block)
-      builder = Magica.targets[name.to_s]
-      fail I18n.t("magica.unknow_build", build: name) unless builder
-      block = Magica.default_compile_task if block.nil?
-      builder.instance_exec(options, &block)
+    def exefile(name = nil)
+      Build.current.exefile(name)
     end
   end
 end

data/lib/magica/magica.rb

@@ -13,14 +13,18 @@ module Magica
       end
     end
 
+    def root
+      Dir.pwd
+    end
+
     def default_compile_task
       proc { |options|
-        FileUtils.rm_r(@dest, force: true) if options[:clean]
+        clean if options[:clean]
 
         objects = objfile(@sources)
         @sources.each { |source| compile source }
 
-        link exefile("#{@dest}/#{@name}"), objects
+        link exefile, objects
       }
     end
   end

data/lib/magica/package_config.rb

@@ -0,0 +1,38 @@
+module Magica
+  class PackageConfig
+    class << self
+      def [](name)
+        @packages ||= {}
+        config = @packages[name.to_s]
+        config = @packages[name.to_s] = PackageConfig.new(name) if config.nil?
+        config
+      end
+    end
+
+    LIBARY_PATH_RULE = /-L([^\s]+)/
+    LIBARY_RULE = /-l([^\s]+)/
+    LIBARY_FLAG_RULE = /-[^lL][^\s]+/
+    INCLUDE_RULE = /-I([^\s]+)/
+    DEFINE_RULE = /-D([^\s]+)/
+    FLAG_RULE = /-[^ID][^\s]+/
+
+    attr_reader :libary_paths, :libaries, :libary_flags, :include_paths, :defines, :flags
+
+    def initialize(name)
+      fail "Cannot found library #{name}" unless system "pkg-config --exists #{name}"
+
+      @package_libaries = `pkg-config --libs #{name}`.strip
+
+      @libary_paths = @package_libaries.scan(LIBARY_PATH_RULE).flatten
+      @libaries = @package_libaries.scan(LIBARY_RULE).flatten
+      @libary_flags = @package_libaries.scan(LIBARY_FLAG_RULE).flatten
+
+      @package_cflags = `pkg-config --cflags #{name}`.strip
+      @include_paths = @package_cflags.scan(INCLUDE_RULE).flatten
+      @defines = @package_cflags.scan(DEFINE_RULE).flatten
+      @flags = @package_cflags.scan(FLAG_RULE).flatten
+
+      @version = `pkg-config --modversion #{name}`.strip
+    end
+  end
+end

data/lib/magica/tasks/framework.rake

@@ -1,4 +1,4 @@
-task :default => :_all
+task default: :_all
 
 task :_all do |t|
   if Rake::Task.task_defined?(:all)

data/lib/magica/templates/Magicafile

@@ -3,13 +3,15 @@ require "magica/build"
 # Define default toolchain
 # toolchain :gcc
 
-# Define Builder
-define_builder :main
-
-# Register Build Task
-build :main, {clean: true}
+# Define Build Task
+# build :main, {clean: true}
+build :main, {clean: true} do
+  # define :debug
+  # dynamic_library "sdl2"
+end
 
 task :run => "build:main" do
-  sh "build/main"
+  # Execute last build file
+  sh exefile
 end
 

data/lib/magica/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magica
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,7 +86,6 @@ files:
 - lib/magica/all.rb
 - lib/magica/application.rb
 - lib/magica/build.rb
-- lib/magica/builder.rb
 - lib/magica/command.rb
 - lib/magica/commands/compiler.rb
 - lib/magica/commands/linker.rb
@@ -96,6 +95,7 @@ files:
 - lib/magica/i18n.rb
 - lib/magica/initialize.rb
 - lib/magica/magica.rb
+- lib/magica/package_config.rb
 - lib/magica/tasks/build.rake
 - lib/magica/tasks/framework.rake
 - lib/magica/tasks/initialize.rake

data/lib/magica/builder.rb

@@ -1,90 +0,0 @@
-module Magica
-  class Builder
-    include Rake::DSL
-
-    COMPILERS = %w(cxx)
-    COMMANDS = COMPILERS + %w(linker)
-
-    attr_block COMMANDS
-
-    def initialize(name = 'host', dest = 'build', &block)
-      @name = name.to_s
-      @dest = dest.to_s
-      @sources = FileList["src/**/*.cpp"]
-      @cxx = Command::Compiler.new(self, %w(.cpp))
-      @linker = Command::Linker.new(self)
-      @defines = %w()
-      @include_paths = %w()
-      @libaries = %w()
-      @libary_paths = %w()
-      @flags = %w()
-
-      Magica.targets[@name] = self
-      Magica.targets[@name].instance_eval(&block) unless block.nil?
-
-      Magica.default_toolchain.setup(self, Magica.toolchain_params) if Magica.default_toolchain
-    end
-
-    def define(name)
-      @defines << name.to_s.upcase
-    end
-
-    def include_path(path)
-      @include_paths << path.to_s
-    end
-
-    def flag(flag)
-      @flags << flag.to_s
-    end
-
-    def library(name, path)
-      @libaries << name.to_s
-      @libary_paths << path.to_s
-    end
-
-    def source(path)
-      @sources = FileList[path]
-    end
-
-    def filename(name)
-      '"%s"' % name
-    end
-
-    def exefile(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| exefile(n) }
-      else
-        "#{name}"
-      end
-    end
-
-    def libfile
-    end
-
-    def objfile(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| objfile(n) }
-      else
-        "#{@dest}/#{name}.o"
-      end
-    end
-
-    def toolchain(name, params = {})
-      toolchain = Toolchain.toolchains[name]
-      fail I18n.t("magica.unknow_toolchain", toolchain: name) unless toolchain
-      toolchain.setup(self, params)
-    end
-
-    def compile(source)
-      file objfile(source) => source do |t|
-        @cxx.run t.name, t.prerequisites.first, @defines, @include_paths, @flags
-      end
-    end
-
-    def link(exec, objects)
-      task "build:#{@name}" => objects do
-        @linker.run "#{exec}", objects, @libaries, @libary_paths, @flags
-      end
-    end
-  end
-end