esruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83c4bc99e505210308204d172ef590d38be10fffef77266dbbac4391b25f021
-  data.tar.gz: 94959709df300badc78dc4d2f15cafe77e41b6e377aaa6f2a688062bc7836ad1
+  metadata.gz: 7bf021af36d9a903dcc2b8e518ccbb3d38c694eef0d9f649ce93a169ac0aafd0
+  data.tar.gz: 8bae64f3191ca9ddcfa223eb1dfd104e39ee6aec9aa4d123b8923289012c7638
 SHA512:
-  metadata.gz: 733f130ed20b96ba50ba48c1f2ae7b234c02e58ea5d03788cf0d1b271f97561574f432ac5173ce1937e8ab7a021f3aaeae40816622dc57e02e38b6c7d1035933
-  data.tar.gz: e6ad27ef2da2a27a1cbabae8bd61049ecb394c54dbda8515b8724969f58838fcce0ce9c2cf7e4adc37753c2fc4df88837fd40976aac84051493623ce7ae73abf
+  metadata.gz: 8dc47a21efba8732a65b644609b56fdf5e07acc7ca7870c6d0cac68eb2f9d34c0bfed27f664a9b78684a686c4b2fe27fa4d9de42be91a85e510383d12bfa5c99
+  data.tar.gz: c3d78c1c8ec27d9627d88219d8c67889db89c4af56d6f92ada2d3962f7f3329fa493a3b9d70638075517850728b389c3652d9575313ec1b3f67ba8f704d65758

data/lib/esruby/build.rb

@@ -34,7 +34,6 @@ module ESRuby
     end
     
     def load_gems
-      gem_paths = JSON.parse(File.read(gem_paths_file))
       gem_paths.each do |gem_path|
         esruby_spec_path = "#{gem_path}/esruby_gem"
         load(esruby_spec_path) if File.file?(esruby_spec_path)
@@ -42,10 +41,22 @@ module ESRuby
       nil
     end
     
+    def gem_paths
+      JSON.parse(File.read(gem_paths_file))
+    end
+    
     def gem_paths_file
       "#{build_directory}/gem_paths.json"
     end
     
+    def cxx_include_argument
+      paths = []
+      paths << "#{mruby_directory}/include"
+      paths += gem_paths.map { |gem_path| "#{gem_path}/include" }
+      arguments = paths.map { |path| "-I #{path}" }
+      argument = arguments.join(" ")
+    end
+    
     def prepended_js_sources
       js_files = []
       Gem::Specification.specifications.each do |specification|
@@ -125,9 +136,9 @@ module ESRuby
       js_arguments += " "
       js_arguments += appended_js_sources.map { |path| "--post-js #{path}" }.join(" ")
       RakeFileUtils.sh "#{mrbc} -B app -o #{build_directory}/app.c #{ruby_sources.join(" ")}"
-      RakeFileUtils.sh "emcc --bind -I #{mruby_directory}/include #{build_directory}/app.c -o #{build_directory}/app.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument} -s ALLOW_MEMORY_GROWTH=1"
-      RakeFileUtils.sh "emcc -std=c++11 --bind -I #{mruby_directory}/include #{gem_directory}/resources/cpp/main.cpp -o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument} -s ALLOW_MEMORY_GROWTH=1"
-      RakeFileUtils.sh "emcc --bind -I #{mruby_directory}/include -o #{build_directory}/output.js #{build_directory}/app.o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument} -s ALLOW_MEMORY_GROWTH=1"
+      RakeFileUtils.sh "emcc --bind #{cxx_include_argument} #{build_directory}/app.c -o #{build_directory}/app.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument} -s ALLOW_MEMORY_GROWTH=1"
+      RakeFileUtils.sh "emcc -std=c++11 --bind #{cxx_include_argument} #{gem_directory}/resources/cpp/main.cpp -o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument} -s ALLOW_MEMORY_GROWTH=1"
+      RakeFileUtils.sh "emcc --bind #{cxx_include_argument} -o #{build_directory}/output.js #{build_directory}/app.o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument} -s ALLOW_MEMORY_GROWTH=1"
       #if build.build_mode == 'production'
       # ENV["EMCC_CLOSURE_ARGS"] = "--language_in=ECMASCRIPT6" #possibly allow setting output: --language_out=ECMASCRIPT6
       #  sh "java -jar #{PROJECT_DIRECTORY}/emsdk/emscripten/incoming/third_party/closure-compiler/compiler.jar --js #{build.absolute_build_directory}/output.js --js_output_file #{build.absolute_output}"

data/resources/cpp/main.cpp

@@ -1,10 +1,10 @@
-#include "/media/file_server/file_drive/projects/esruby/esruby-esruby/include/esruby.hpp"
+#include "esruby.hpp"
 
 // we need to load the esruby bindings here, see issue:
 //   https://github.com/kripken/emscripten/issues/5537
 // although you can observe that the bindings in esruby-bind do work
 //   so im not sure what the problem is
-// idealy i would like to use a compiler option like EXPORTED_FUNCTIONS, for classes
+// idealy i would like to use a compiler option like EXPORTED_FUNCTIONS, but for classes
 EMSCRIPTEN_BINDINGS(esruby)
 {
   emscripten::class_<ESRuby>("ESRuby")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rob Fors