mundler 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 116dbf6f2648c2b5d533e5a03fe121fc9978a8543c19245ecb4cc4867a8ae6b0
-  data.tar.gz: d413e06db8bc72d52036fc02795f90e7924e381fe0adf64d76819e05fd5ba8a7
+  metadata.gz: 48991edd8f68a6db41fc93f84ba8631ffce3e296aecfaeac6bfd8ed1cd8d7a4c
+  data.tar.gz: 6b09d50fe5fb6a5b79f6fdf92a87a1968a1e028474a606f98312acd18e00a23a
 SHA512:
-  metadata.gz: 1b325ac5b0576556356d973fbe5a34c5f9ea9e1a16bc9e5011fee9f83c6df7d0db2009ae190eaf190de407e12b65bbddb56de2be524b6d97820e1d537af10a23
-  data.tar.gz: 1d968eec2ce1176215d45e4690dc5b87dcf0e17ce9c7d78c64a94aff4111bd7f0e729bb146806c842572681c56b20fa6248430ea7788367981952c0934ca145c
+  metadata.gz: ab39110a71818d4f1f544e7dd6effe6ff2cb88557db5d2d18cd430f70bff5bd6a4947d3533f8b66f4aea3bca12210910ce42f452e089c72138d0e2ed0becf65e
+  data.tar.gz: d33d00f82e5be842c712e9b90fba5d101453ce52dcbc3e171d41922c22d4ae0bc7cb14a6fdcc6a4f8f35e9f6cc0b4791368a91589235553b599d62690a292068

data/lib/mundler/build_config.rb

@@ -47,29 +47,51 @@ module Mundler
 
     private
 
-    def platforms
-      @config.platforms.map do |platform|
-        type = @config.platform_types[platform[:name].to_s]
-        raise "Can't find platform: #{platform[:name]}" unless type
-        type.config(platform, self)
-      end.join("\n")
+    def host_platform
+      @config.platforms
+        .select { |attributes| attributes[:name].to_s == "host" }
+        .map { |attributes| platform(attributes) }
+        .join("\n")
+    end
+
+    def non_host_platforms
+      @config.platforms
+        .select { |attributes| attributes[:name].to_s != "host" }
+        .map { |attributes| platform(attributes) }
+        .join("\n")
+    end
+
+    def platform(attributes)
+      type = @config.platform_types[attributes[:name].to_s]
+      raise "Can't find platform: #{attributes[:name]}" unless type
+      type.config(attributes, self)
+    end
+
+    def env_vars
+      str = ""
+      @config.env.each do |key, value|
+        str = str + "\nENV[\"#{key}\"] = \"#{value}\""
+      end
+      str
     end
 
     def contents
       contents = <<~CONTENTS
         # #{mruby_version}
+        #{env_vars}
 
         MRuby::Build.new do |conf|
           toolchain :clang
 
+        #{host_platform}
           #{gemboxes}
           #{gems}
         end
 
-        #{platforms}
+        #{non_host_platforms}
       CONTENTS
 
-      contents.strip + "\n"
+      (contents.strip + "\n").gsub("\n\n\n", "\n\n")
     end
   end
 end

data/lib/mundler/config.rb

@@ -10,10 +10,12 @@ module Mundler
       @gemboxes = []
       @gems = []
       @platform_types = {}
+      @env = {}
     end
 
     attr_reader :mruby
     attr_reader :platform_types
+    attr_reader :env
 
     def hex
       Digest::MD5.hexdigest(to_s)
@@ -36,9 +38,23 @@ module Mundler
         #{mruby.inspect}
         #{platforms.inspect}
         #{platform_types.keys.sort.inspect}
+        #{hashable_string_for_hash(env)}
         #{gemboxes.inspect}
         #{gems.inspect}
       HASHABLE
     end
+
+    private
+
+    def hashable_string_for_hash(hash)
+      str = "{"
+      sorted_keys = hash.keys.sort
+
+      sorted_keys.each do |key|
+        str = str + "#{key}=>#{hash[key]}"
+      end
+
+      str + "}"
+    end
   end
 end

data/lib/mundler/dsl.rb

@@ -41,7 +41,16 @@ module Mundler
     end
 
     def gem(name, core: nil, path: nil, github: nil)
+      if path && !path.start_with?("/")
+        app_path = Pathname.new(@path).dirname.to_s
+        path = File.expand_path(File.join(app_path, path))
+      end
+
       config.gems << { name: name, path: path, github: github, core: core }
     end
+
+    def env(name, value)
+      config.env[name] = value
+    end
   end
 end

data/lib/mundler/mruby.rb

@@ -108,6 +108,7 @@ module Mundler
         ) || begin
           $stderr.print "\e[31mF\e[0m"
           $stderr.puts "\n\n"
+          $stderr.puts File.read(build_config)
           $stderr.puts File.read(logfile)
 
           raise Mundler::CompilationError
@@ -130,6 +131,7 @@ module Mundler
         ) || begin
           $stderr.print "\e[31mF\e[0m"
           $stderr.puts "\n\n"
+          $stderr.puts File.read(build_config)
           $stderr.puts File.read(logfile)
 
           raise Mundler::CompilationError

data/lib/mundler/platforms/android.rb

@@ -23,12 +23,32 @@ module AndroidPlatform
 
           toolchain :android, params
 
+        #{cc_and_linker(options[:options])}
           #{build_config.gemboxes}
           #{build_config.gems}
         end
       BUILD
     end.join("\n")
   end
+
+  def self.cc_and_linker(options)
+    build = ""
+    if options[:cc]
+      build += "  conf.cc do |cc|\n"
+      build += "    cc.command = #{options[:cc][:command].inspect}\n" if options[:cc][:command]
+      build += "    cc.flags << #{options[:cc][:flags].inspect}\n" if options[:cc][:flags]
+      build += "  end\n\n"
+    end
+
+    if options[:linker]
+      build += "  conf.linker do |linker|\n"
+      build += "    linker.command = #{options[:linker][:command].inspect}\n" if options[:linker][:command]
+      build += "    linker.flags << #{options[:linker][:flags].inspect}\n" if options[:linker][:flags]
+      build += "  end\n\n"
+    end
+
+    build
+  end
 end
 
 define_platform "android", AndroidPlatform

data/lib/mundler/platforms/host.rb

@@ -0,0 +1,24 @@
+module HostPlatform
+  def self.config(host_options, build_config)
+    build = ""
+    options = host_options[:options]
+
+    if options[:cc]
+      build += "  conf.cc do |cc|\n"
+      build += "    cc.command = #{options[:cc][:command].inspect}\n" if options[:cc][:command]
+      build += "    cc.flags << #{options[:cc][:flags].inspect}\n" if options[:cc][:flags]
+      build += "  end\n\n"
+    end
+
+    if options[:linker]
+      build += "  conf.linker do |linker|\n"
+      build += "    linker.command = #{options[:linker][:command].inspect}\n" if options[:linker][:command]
+      build += "    linker.flags << #{options[:linker][:flags].inspect}\n" if options[:linker][:flags]
+      build += "  end\n\n"
+    end
+
+    build
+  end
+end
+
+define_platform "host", HostPlatform

data/lib/mundler/platforms/ios.rb

@@ -19,19 +19,25 @@ module IOSPlatform
         -isysroot #{ios_sdk}
       )
 
+      cc_command = options.dig(:options, :cc, :command) || clang
+      linker_command = options.dig(:options, :linker, :command) || clang
+
+      cc_flags = flags + Array(options.dig(:options, :cc, :flags) || [])
+      linker_flags = flags + Array(options.dig(:options, :linker, :flags) || [])
+
       <<~BUILD
         MRuby::CrossBuild.new("ios__#{arch}") do |conf|
           #{build_config.gemboxes}
           #{build_config.gems}
 
           conf.cc do |cc|
-            cc.command = #{clang.inspect}
-            cc.flags = #{flags.inspect}
+            cc.command = #{cc_command.inspect}
+            cc.flags = #{cc_flags.inspect}
           end
 
           conf.linker do |l|
-            l.command = #{clang.inspect}
-            l.flags = #{flags.inspect}
+            l.command = #{linker_command.inspect}
+            l.flags = #{linker_flags.inspect}
           end
         end
       BUILD

data/lib/mundler/version.rb

@@ -1,3 +1,3 @@
 module Mundler
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mundler
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Daniel Inkpen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,6 +70,7 @@ files:
 - lib/mundler/dsl.rb
 - lib/mundler/mruby.rb
 - lib/mundler/platforms/android.rb
+- lib/mundler/platforms/host.rb
 - lib/mundler/platforms/ios.rb
 - lib/mundler/platforms/ios_simulator.rb
 - lib/mundler/project.rb