esruby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa89a3c4039892f83c2c7b3ebce054b7a590b504
-  data.tar.gz: 3f0af5171ea47cf7c2bf5ce443d5992f2202e3d0
+  metadata.gz: d89614de5a1ee1efad1386baf4ca5a949f3449e8
+  data.tar.gz: 432fc37ab54c1d7506b299183be1a8726f7f5137
 SHA512:
-  metadata.gz: 0adb672c9cfab13601617f4868a87074d83523380df97ecdb8d799028f12c19ff7c3ba81f62823084a293dc08d88336cea04f1b47c8eb4e39174fb36471596a6
-  data.tar.gz: e9654d5efd4d12cdd012b88d3f696b515895117bf67819f0798d12570fbad3d474fb8f8b7ec08b8758480dae75c95fb204f5205020667858c0d525b761c67147
+  metadata.gz: 75b010a206ab65ce6b5775d6ac12d93bb75781362e8be7c0befeff49c1059b97b6a15e184b86fd7470528b0852150c6da16a4791a8083fc50a6ea24ae088ca6c
+  data.tar.gz: 13ca29a12ce4dc90b028479a152022d2d7da7cb1a088fb512d6581c50d6b444f7649c8a70050a5cba2e468c1de5384999543fe7ead0293a1489a47eb75f11466

data/README.md

@@ -3,20 +3,36 @@ This project brings *mruby* to the browser. It uses *emscripten*
 (https://github.com/kripken/emscripten) to compile the mruby source code into
 JavaScript (ECMAScript) and runs in the browser. It is heavily based off *webruby* (https://github.com/xxuejie/webruby) but has been adjusted to work with the updates to *emscripten* and *mruby*.
 
-# How to Install
+# Install
+*ESRuby* depends on [emsdk](http://kripken.github.io/emscripten-site/index.html) to provide a tool chain consisting of *emscripten* and *LLVM*. Although the tool chain is available from `apt-get` we will need to build emscripten from source using my branch as I have introduced some new features that have not made it into the release yet.
 
-*ESRuby* depends on [emsdk](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html) to provide emscripten and LLVM infrustructure. To try *ESRuby*, follow these steps:
-
-TODO: instructions will not work yet
-
-1. Install emsdk following instructions at [here](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html)
-2. Install latest incoming version of emscripten sdk(right now webruby still depends on code from incoming branch of emscripten, once this goes into a release version, we will lock the version for better stability)
-3. Activate latest incoming version
-4. Webruby should be able to pick up the correct version of emscripten from emsdk. If not, feel free to create an issue :)
-5. Install gem `gem install esruby`
-6. Create new project with `esruby new <name>`
-7. Build project with `esruby build [config.rb]`
+* we will start with a clean instance of Ubuntu 16.04 with ruby MRI installed
+* `cd` to a directory where you want *emsdk* downloaded
+* `git clone https://github.com/juj/emsdk.git`
+* `cd emsdk`
+* `git reset --hard 313d5ef` # optional, but it may help if you find that `master` is too new for my fork
+* as per the [documentation](http://kripken.github.io/emscripten-site/docs/building_from_source/building_emscripten_from_source_using_the_sdk.html) we will first install from the main repositories then replace *emscripten* with my fork:
+* `./emsdk install sdk-incoming-64bit`
+* `./emsdk activate sdk-incoming-64bit`
+* `cd emscripten/incoming`
+* `git remote add fork https://github.com/robfors/emscripten.git`
+* `git fetch fork esruby`
+* `git checkout -b esruby fork/esruby`
+* `cd ../..`
+* `source ./emsdk_env.sh` # calling this will add necessary paths to bash
+* optional: make the last command persistent by adding\
+`[ -f /path_to_emsdk/emsdk_env.sh ] && source /path_to_emsdk/emsdk_env.sh > /dev/null 2>&1`\
+to your `.bashrc` and `.profile`
+* verify emsdk is working with `emcc -v`
+* install this gem with `gem install esruby`
 
+# Try
+* create a new esruby project with `esruby new project`
+* `cd project`
+* build the project with `esruby build config.rb`
+* you will now have `www/app.js` and `www/index.html`
+* a simple way to serve these files would be `ruby -run -e httpd www -p 4444`
+* the app with be available at http://localhost:4444
 # License
 
 This project is distributed under the MIT License. See LICENSE for further details.

data/lib/esruby/build.rb

@@ -14,7 +14,7 @@ module ESRuby
     end
     
     def_delegators :@configuration, :root_directory, :ruby_sources, :build_directory,
-      :build_mode, :output, :emsdk_directory, :mruby_directory, :gems
+      :build_mode, :output, :mruby_directory, :gems
     
     def initialize(&block)
       @configuration = Configuration.new
@@ -58,20 +58,10 @@ module ESRuby
       js_files
     end
     
-    def emcc
-      "#{emsdk_directory}/emscripten/incoming/emcc"
-    end
-    
-    def emar
-      "#{emsdk_directory}/emscripten/incoming/emar"
-    end
-    
     def build_mruby_config
       template = File.read("#{gem_directory}/resources/build_config.eruby")
       eruby = Erubis::Eruby.new(template)
       config = {}
-      config[:emcc] = emcc
-      config[:emar] = emar
       config[:prepended_js_sources] = prepended_js_sources
       config[:appended_js_sources] = appended_js_sources
       config[:optimization_argument] = optimization_argument
@@ -124,10 +114,10 @@ module ESRuby
       js_arguments = prepended_js_sources.map { |path| "--pre-js #{path}" }.join(" ")
       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}"
-      RakeFileUtils.sh "#{emcc} -std=c++11 --bind -I #{mruby_directory}/include #{gem_directory}/resources/cpp/esruby.cpp -o #{build_directory}/esruby.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
-      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}"
-      RakeFileUtils.sh "#{emcc} --bind -I #{mruby_directory}/include -o #{build_directory}/output.js #{build_directory}/app.o #{build_directory}/esruby.o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
+      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}"
+      RakeFileUtils.sh "emcc -std=c++11 --bind -I #{mruby_directory}/include #{gem_directory}/resources/cpp/esruby.cpp -o #{build_directory}/esruby.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
+      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}"
+      RakeFileUtils.sh "emcc --bind -I #{mruby_directory}/include -o #{build_directory}/output.js #{build_directory}/app.o #{build_directory}/esruby.o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
       #if build.build_mode == 'production'
       #  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}"
       #else

data/lib/esruby/build/configuration.rb

@@ -3,12 +3,11 @@ module ESRuby
     class Configuration
     
       attr_reader :ruby_sources, :prepended_js_sources, :appended_js_sources,
-        :build_directory, :build_mode, :gems, :emsdk_directory, :mruby_directory,
+        :build_directory, :build_mode, :gems, :mruby_directory,
         :output
       
       def initialize
         @root_directory = nil
-        @emsdk_directory = 'emsdk'
         @mruby_directory = "#{ESRuby.gem_directory}/resources/mruby"
         @output = 'output.js'
         @ruby_sources = []
@@ -54,12 +53,6 @@ module ESRuby
         @output = File.expand_path(new_output, root_directory)
       end
       
-      def emsdk_directory=(new_emsdk_directory)
-        emsdk_directory = File.expand_path(new_emsdk_directory, root_directory)
-        raise "'emsdk_directory' not found" unless File.directory?(emsdk_directory)
-        @emsdk_directory = emsdk_directory
-      end
-      
       def mruby_directory=(new_mruby_directory)
         mruby_directory = File.expand_path(new_mruby_directory, root_directory)
         raise "'mruby_directory' not found" unless File.directory?(mruby_directory)

data/resources/build_config.eruby

@@ -31,10 +31,10 @@ MRuby::Toolchain.new('emscripten') do |conf|
     c.flags << "<%= debug_argument %>"
   end
   
-  conf.cc.command = "<%= emcc %>"
-  conf.cxx.command = "<%= emcc %>"
-  conf.linker.command = "<%= emcc %>"
-  conf.archiver.command = "<%= emar %>"
+  conf.cc.command = "emcc"
+  conf.cxx.command = "emcc"
+  conf.linker.command = "emcc"
+  conf.archiver.command = "emar"
 
 end
 

data/resources/project_template/config.rb

@@ -18,7 +18,6 @@ ESRuby::Build.new do |conf|
   # By default the final output file name is "webruby.js"
   conf.output = "www/app.js"
   
-  conf.emsdk_directory = '../emsdk'
   #conf.mruby_directory = 'mruby'
   
   # We found that if memory init file is used, browsers will hang

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Rob Fors
@@ -442,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby running in the browser