magica 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f04070e0b7212c42adf61fcc943d580bc02376cf
-  data.tar.gz: 4d68852ee46e8db313b93c636d734cc7b01b11ef
+  metadata.gz: 6f5bc8404caba27dd15970275321c3d5a958cc26
+  data.tar.gz: 08ff1d882bad86af8f8ef836f7ba63ab4f8ac1af
 SHA512:
-  metadata.gz: f924d910bafa6af724b25c255da7da0838b16a6a23d716dd116cc75ed3bdec7a1702d35cd54fe9147f18d477b3a469a0148eee33743fbaee9f8aba7788955eab
-  data.tar.gz: 810c03aa3874ddf1b614a264cba229d6c5d439fbbf2d5c0b323f44d8d51ec93e85a290e2880176d11c6f061d219d5585bf0d5ac2b403ed2cd2b794747e8eaa25
+  metadata.gz: 39391cb975a0c415e32cc35e8233868c96242089bcce361a3fc0ff0acec95e4044e38bb57bb8022ecef4448b3757b144954037fcb6cffdc4e182f7f570e43188
+  data.tar.gz: 8df1a7fa318883a97f8619e108897d26d4ed43336682cb0588f7c859edf80266f26931db40a250d94163dbec1f81183c697b4cc22dd28f48a95c36e1e638d67a

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2016 Zheng Xian Qiu
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,28 +1,60 @@
 # Magica
+[![Gem Version](https://badge.fury.io/rb/magica.svg)](https://badge.fury.io/rb/magica)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/magica`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Magica is a build script based on Rake, it helps you compile C and C++ project with easier way.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ gem install magica
+
+## Usage
+
+Like Rake, you need a `Magicafile` to setup your build task.
+
+The magica provides `magica init` command helps your start your first project.
+
+### Build Task
+
+To define a new build task, you can use the `build` DSL to create it.
+
+`build :main`
+
+If you want to do more setting for your project, you can do like below.
 
 ```ruby
-gem 'magica'
+build :main do
+  dynamic_library "sdl2" # Use pkg-config to find dependency and add to build command
+  include_path "extra/include" # Add include path
+  define :debug # Add defines when build
+  flag "-Wall" # Add build flags
+  source "src/**/*.cpp" # Define source file, it will use FileList to scan it
+  dest "build" # Define the build files to place
+  use :cxx # If your project is C++ project, set it to use C++ compiler instead C compiler
+end
 ```
 
-And then execute:
+### Dependency
 
-    $ bundle
+If you have some 3rd-party library wants to include, the `dependency` can help you compile it.
 
-Or install it yourself as:
-
-    $ gem install magica
+**WARNING**: Current only support git as version control
 
-## Usage
+```ruby
+build :main do
+  dependency :mruby do
+    source "git@github.com:mruby/mruby.git" # Define source
+    version "1.2.0" # Define version ( tag or branch )
+    command "./minirake" # The build command
+
+    env :MRUBY_CONFIG, File.join(Dir.pwd, 'mruby_config.rb') # Build environment variable
+
+    install_dir "#{@dir}/build/host/lib" # The compiled files path
+    static_library "libmruby.a", "libmruby_core.a" # The library name
+  end
+end
+```
 
-TODO: Write usage instructions here
+**NOTICE**: Current the build task will direct use install directory's file as link object.
 
 ## Development
 
@@ -32,5 +64,5 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/magica.
+Bug reports and pull requests are welcome on GitHub at https://github.com/elct9620/magica.
 

data/lib/magica/build.rb

@@ -41,8 +41,8 @@ module Magica
 
       @defines = %w()
       @include_paths = %w()
-      @libaries = %w()
-      @libary_paths = %w()
+      @libraries = %w()
+      @library_paths = %w()
       @flags = %w()
 
       @dependencies = []
@@ -83,14 +83,18 @@ module Magica
     end
 
     def library(name, path)
-      @libaries << name.to_s
-      @libary_paths << path.to_s
+      @libraries << name.to_s
+      @library_paths << path.to_s if path
+    end
+
+    def library_path(path)
+      @library_path << path.to_s
     end
 
     def dynamic_library(name)
       config = PackageConfig[name]
-      @libaries.push(*config.libaries)
-      @libary_paths.push(*config.libary_paths)
+      @libraries.push(*config.libraries)
+      @library_paths.push(*config.library_paths)
 
       include_path(config.include_paths)
       define(config.defines)
@@ -188,7 +192,7 @@ module Magica
       desc "Build target #{@name}'s executable file"
       task "build:#{@name}" => @dependencies + objects  do
         Build.current = Magica.targets[@name]
-        @linker.run "#{exec}", objects + @static_libraries, @libaries, @libary_paths, @flags
+        @linker.run "#{exec}", objects + @static_libraries, @libraries, @library_paths, @flags
       end
     end
 

data/lib/magica/commands/linker.rb

@@ -8,28 +8,28 @@ module Magica
       @command = ENV['LD'] || 'ld'
       @flags = (ENV['LDFLAGS'] || [])
       @link_options = "%{flags} -o %{outfile} %{objects} %{libs}"
-      @libaries = []
-      @libary_paths = []
+      @libraries = []
+      @library_paths = []
 
-      @option_libary = "-l%s"
-      @option_libary_path = "-L%s"
+      @option_library = "-l%s"
+      @option_library_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.uniq.join(" ")
+      library_paths = [@library_paths, _library_paths].flatten.map { |path| @option_library_path % filename(path) }
+      [flags, library_paths, _flags].flatten.uniq.join(" ")
     end
 
-    def run(outfile, objects, _libaries = [], _library_paths = [], _flags = [])
+    def run(outfile, objects, _libraries = [], _library_paths = [], _flags = [])
       FileUtils.mkdir_p File.dirname(outfile)
 
-      libary_flags = [@libaries, _libaries].flatten.map { |library| @option_libary % library }
+      library_flags = [@libraries, _libraries].flatten.map { |library| @option_library % library }
 
       puts "LINK\t#{outfile}"
       _run @link_options, {
         outfile: outfile,
         objects: objects.join(" "),
-        libs: libary_flags.uniq.join(" "),
+        libs: library_flags.uniq.join(" "),
         flags: combine_flags(_library_paths, _flags)
       }
     end

data/lib/magica/package_config.rb

@@ -9,23 +9,23 @@ module Magica
       end
     end
 
-    LIBARY_PATH_RULE = /-L([^\s]+)/
-    LIBARY_RULE = /-l([^\s]+)/
-    LIBARY_FLAG_RULE = /-[^lL][^\s]+/
+    LIBRARY_PATH_RULE = /-L([^\s]+)/
+    LIBRARY_RULE = /-l([^\s]+)/
+    LIBRARY_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
+    attr_reader :library_paths, :libraries, :library_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
+      @package_libraries = `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
+      @library_paths = @package_libraries.scan(LIBRARY_PATH_RULE).flatten
+      @libraries = @package_libraries.scan(LIBRARY_RULE).flatten
+      @library_flags = @package_libraries.scan(LIBRARY_FLAG_RULE).flatten
 
       @package_cflags = `pkg-config --cflags #{name}`.strip
       @include_paths = @package_cflags.scan(INCLUDE_RULE).flatten

data/lib/magica/version.rb

@@ -1,3 +1,3 @@
 module Magica
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magica
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,6 +78,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/magica