magica 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1259e052adafafdb1d4552c0352b3bf67553d66f
-  data.tar.gz: 916a17a280d294aeb52b2f0d1837d661b371bcad
+  metadata.gz: c76457397a26e8c8f5530223241085a5de1ed2cd
+  data.tar.gz: a00d14e584583a1b50774002f0ebe94ea05c5d0c
 SHA512:
-  metadata.gz: 90796306ad23fc5f3afb39479056bc869a282a6fac40f10fd505ee681aec4e4b7855628a1898e4555ce9a6cbb6e27cd0ac1195dcb874e9ec2fa4ea3f7ce66428
-  data.tar.gz: 554feb338c2ed4bb1c6211c594dddb46f3529c776a670841935739e3567b726a7e403b2fc570a367461268f312c6ad0958906fd21183f5ec32f28a5198e8ce43
+  metadata.gz: 7acc35bd25b2c8d3c416097a78ae04a47ff813c85eaad74e7ef921406533947ec58f13ea7e62dd89dd40385ef8bc49d65b74c9aa1e14a2df0303acc5d52c2646
+  data.tar.gz: 8518c22efb3a15fbd7834847e1a655b9b05448f25272d0c004e4a5fdc8be0599c091ae569d3b912f00b6bc7094a751f8aa09bc09f80e98b40946af3d48356654

data/lib/magica/builder.rb

@@ -13,6 +13,11 @@ module Magica
       @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?
@@ -20,11 +25,29 @@ module Magica
       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
+    def filename(name)
+      '"%s"' % name
     end
 
     def exefile(name)
@@ -54,13 +77,13 @@ module Magica
 
     def compile(source)
       file objfile(source) => source do |t|
-        @cxx.run t.name, t.prerequisites.first
+        @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
+        @linker.run "#{exec}", objects, @libaries, @libary_paths, @flags
       end
     end
   end

data/lib/magica/commands/compiler.rb

@@ -9,11 +9,22 @@ module Magica
       @flags = [ENV['CFLAGS'] || []]
       @source_exts = source_exts
       @compile_options = "%{flags} -o %{outfile} -c %{infile}"
+      @include_paths = ["include"]
+      @defines = %w()
+
+      @option_include_path = "-I%s"
+      @option_defines = "-D%s"
+    end
+
+    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(' ')
     end
 
-    def run(outfile, infile)
+    def run(outfile, infile, _defines = [], _include_paths = [], _flags = [])
       FileUtils.mkdir_p File.dirname(outfile)
-      _run @compile_options, { outfile: outfile, infile: infile, flags: "" }
+      _run @compile_options, { outfile: outfile, infile: infile, flags: combine_flags(_defines, _include_paths, _flags) }
     end
   end
 end

data/lib/magica/commands/linker.rb

@@ -7,11 +7,28 @@ module Magica
 
       @command = ENV['LD'] || 'ld'
       @flags = (ENV['LDFLAGS'] || [])
-      @link_options = "%{flags} -o %{outfile} %{objects}"
+      @link_options = "%{flags} -o %{outfile} %{objects} %{libs}"
+      @libaries = []
+      @libary_paths = []
+
+      @option_libary = "-l%s"
+      @option_libary_path = "-L%s"
+    end
+
+    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(" ")
     end
 
-    def run(outfile, objects)
-      _run @link_options, { outfile: outfile, objects: objects.join(" "), flags: "" }
+    def run(outfile, objects, _libaries = [], _library_paths = [], _flags = [])
+      libary_flags = [@libaries, _libaries].flatten.map { |library| @option_libary % library }
+
+      _run @link_options, {
+        outfile: outfile,
+        objects: objects.join(" "),
+        libs: libary_flags.join(" "),
+        flags: combine_flags(_library_paths, _flags)
+      }
     end
   end
 end

data/lib/magica/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magica
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake