moved erlang_js and erlv8 to lib
This commit is contained in:
parent
ad4ccadc15
commit
0b649c35ac
7 changed files with 18 additions and 3160 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -6,4 +6,5 @@ Mnesia.*
|
||||||
games/Pong/build/**/*
|
games/Pong/build/**/*
|
||||||
*~
|
*~
|
||||||
games/Pong/Pong.xcodeproj/project.xcworkspace/**/*
|
games/Pong/Pong.xcodeproj/project.xcworkspace/**/*
|
||||||
|
games/Pong/Pong.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate
|
||||||
games/Pong/Pong.xcodeproj/xcuserdata/**/*
|
games/Pong/Pong.xcodeproj/xcuserdata/**/*
|
||||||
|
|
9
.gitmodules
vendored
9
.gitmodules
vendored
|
@ -1,6 +1,9 @@
|
||||||
[submodule "erlang_js"]
|
|
||||||
path = erlang_js
|
|
||||||
url = https://github.com/jonte/erlang_js.git
|
|
||||||
[submodule "doc/report"]
|
[submodule "doc/report"]
|
||||||
path = doc/report
|
path = doc/report
|
||||||
url = git@github.com:jeena/GGS-report.git
|
url = git@github.com:jeena/GGS-report.git
|
||||||
|
[submodule "lib/erlv8"]
|
||||||
|
path = lib/erlv8
|
||||||
|
url = https://github.com/beamjs/erlv8.git
|
||||||
|
[submodule "lib/erlang_js"]
|
||||||
|
path = lib/erlang_js
|
||||||
|
url = git@github.com:jonte/erlang_js.git
|
||||||
|
|
13
Makefile
13
Makefile
|
@ -2,16 +2,20 @@ ERLC=erlc
|
||||||
ERLCFLAGS=-o
|
ERLCFLAGS=-o
|
||||||
SRCDIR=src
|
SRCDIR=src
|
||||||
TESTDIR=tests
|
TESTDIR=tests
|
||||||
|
LIBDIR=lib
|
||||||
BEAMDIR=ebin
|
BEAMDIR=ebin
|
||||||
|
|
||||||
all: compile erlang_js
|
all: compile
|
||||||
|
|
||||||
compile:
|
compile:
|
||||||
mkdir -p $(BEAMDIR) ;
|
mkdir -p $(BEAMDIR) ;
|
||||||
$(ERLC) $(ERLCFLAGS) $(BEAMDIR) $(SRCDIR)/*.erl ;
|
$(ERLC) $(ERLCFLAGS) $(BEAMDIR) $(SRCDIR)/*.erl ;
|
||||||
|
|
||||||
erlang_js: force_look
|
erlang_js: force_look
|
||||||
cd erlang_js ; $(MAKE) $(MFLAGS);
|
cd $(LIBDIR)/erlang_js ; $(MAKE) $(MFLAGS);
|
||||||
|
|
||||||
|
erlv8: force_look
|
||||||
|
cd $(LIBDIR)/erlv8 ; $(MAKE) $(MFLAGS);
|
||||||
|
|
||||||
test:
|
test:
|
||||||
echo "==> test $(MOD)" ;
|
echo "==> test $(MOD)" ;
|
||||||
|
@ -29,14 +33,15 @@ clean:
|
||||||
rm -rf $(SRCDIR)/*.beam ;
|
rm -rf $(SRCDIR)/*.beam ;
|
||||||
rm -rf erl_crush.dump ;
|
rm -rf erl_crush.dump ;
|
||||||
echo "==> clean ggs" ;
|
echo "==> clean ggs" ;
|
||||||
$(MAKE) -C erlang_js/ clean
|
$(MAKE) -C $(LIBDIR)/erlang_js/ clean
|
||||||
|
$(MAKE) -C $(LIBDIR)/erlv8/ clean
|
||||||
|
|
||||||
run:
|
run:
|
||||||
erl \
|
erl \
|
||||||
-sname ggs \
|
-sname ggs \
|
||||||
-mnesia dir '"/tmp/ggs"' \
|
-mnesia dir '"/tmp/ggs"' \
|
||||||
-boot start_sasl \
|
-boot start_sasl \
|
||||||
-pa erlang_js/ebin/ \
|
-pa $(LIBDIR)/erlv8/ebin/ \
|
||||||
-pa ebin \
|
-pa ebin \
|
||||||
-pa src \
|
-pa src \
|
||||||
-s start_ggs
|
-s start_ggs
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 2f2785fafb0da6db75810eb6fa97d09c58257588
|
|
File diff suppressed because it is too large
Load diff
1
lib/erlang_js
Submodule
1
lib/erlang_js
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 709b568efbc99c954507d1593bc5633f900bc5dc
|
1
lib/erlv8
Submodule
1
lib/erlv8
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 7443cc8e2e06f7907a9e1e44c181255e188cfb97
|
Reference in a new issue