webruby 0.9.2 → 0.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/webruby/config.rb +2 -5
- data/lib/webruby/environment.rb +12 -11
- data/templates/minimal/Rakefile +2 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5fc56b2fbe8ff5bb47f4c55af0a4b57266d22840
|
|
4
|
+
data.tar.gz: e5d58048d21485af3d1a60f172082e2bdd801a29
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e3203ebe5255a5f23b248b7891d22a0ab872abe1a7176c46d1515419b6809c4d315dc22b613a19dd18d20cb69862326396d18f318c8223519f253c25182f6eac
|
|
7
|
+
data.tar.gz: 8c93b0e718506478e0e818cdc8014640b805cd1419b2cbc1e9c40a5966f38be4d2b3b4a08d1a9fcb41195613c88a39f40210e27702f62ffff203a443c770eed3
|
data/lib/webruby/config.rb
CHANGED
|
@@ -18,12 +18,9 @@ module Webruby
|
|
|
18
18
|
@static_libs = []
|
|
19
19
|
end
|
|
20
20
|
|
|
21
|
-
def is_release_mode
|
|
22
|
-
compile_mode == 'release'
|
|
23
|
-
end
|
|
24
|
-
|
|
25
21
|
def optimization_flag
|
|
26
|
-
|
|
22
|
+
return compile_mode if compile_mode.start_with? "-"
|
|
23
|
+
compile_mode == "release" ? "-O2" : "-O0"
|
|
27
24
|
end
|
|
28
25
|
|
|
29
26
|
def gem(g)
|
data/lib/webruby/environment.rb
CHANGED
|
@@ -9,21 +9,22 @@ def root
|
|
|
9
9
|
MRUBY_DIR
|
|
10
10
|
end
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
unless
|
|
12
|
+
emscripten_dir = ENV["EMSCRIPTEN"]
|
|
13
|
+
unless emscripten_dir
|
|
14
14
|
# Read ~/.emscripten if needed
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
file = File.join(ENV["HOME"], ".emscripten")
|
|
16
|
+
if File.exists?(file)
|
|
17
|
+
File.readlines(file).each do |line|
|
|
17
18
|
m = line.match(/EMSCRIPTEN_ROOT='([^']+)'/)
|
|
18
19
|
if m
|
|
19
|
-
|
|
20
|
+
emscripten_dir = m[1]
|
|
20
21
|
end
|
|
21
22
|
end
|
|
22
|
-
ENV["EMSCRIPTEN"] =
|
|
23
|
+
ENV["EMSCRIPTEN"] = emscripten_dir
|
|
23
24
|
end
|
|
24
25
|
end
|
|
25
26
|
|
|
26
|
-
unless
|
|
27
|
+
unless emscripten_dir && emscripten_dir.length > 0
|
|
27
28
|
puts <<__EOF__
|
|
28
29
|
WARNING: We found out that you have not configured emscripten. Please
|
|
29
30
|
install emsdk followings steps at http://kripken.github.io/emscripten-site/
|
|
@@ -32,10 +33,10 @@ __EOF__
|
|
|
32
33
|
exit(1)
|
|
33
34
|
end
|
|
34
35
|
|
|
35
|
-
EMCC = File.join(
|
|
36
|
-
EMXX = File.join(
|
|
37
|
-
EMLD = File.join(
|
|
38
|
-
EMAR = File.join(
|
|
36
|
+
EMCC = File.join(emscripten_dir, 'emcc')
|
|
37
|
+
EMXX = File.join(emscripten_dir, 'em++')
|
|
38
|
+
EMLD = File.join(emscripten_dir, 'emcc')
|
|
39
|
+
EMAR = File.join(emscripten_dir, 'emar')
|
|
39
40
|
|
|
40
41
|
# TODO: maybe change these two to functions?
|
|
41
42
|
SCRIPT_GEN_POST = File.join(SCRIPTS_DIR, "gen_post.rb")
|
data/templates/minimal/Rakefile
CHANGED
|
@@ -8,7 +8,8 @@ Webruby::App.setup do |conf|
|
|
|
8
8
|
# By default, the build output directory is "build/"
|
|
9
9
|
conf.build_dir = 'build'
|
|
10
10
|
|
|
11
|
-
# Use 'release' for O2 mode build, and everything else for O0 mode
|
|
11
|
+
# Use 'release' for O2 mode build, and everything else for O0 mode.
|
|
12
|
+
# Or you can also use '-O0', '-O1', '-O2', '-O3', etc. directly
|
|
12
13
|
conf.compile_mode = 'debug'
|
|
13
14
|
|
|
14
15
|
# Note that different functions are needed for the 3 different loading methods,
|