diff --git a/HOWTO b/HOWTO new file mode 100644 index 0000000..035800e --- /dev/null +++ b/HOWTO @@ -0,0 +1,18 @@ +INSTALL +1. Cd into directory where you to have the project +2. git-clone git@github.com:jeena/GGS.git (remember to have a local key) +3. cd GGS/ +4. git submodule init +5. git submodule update +6. cd erlang_js +7. make +8. make test (If not all tests are passed then you are screwed!) +10. cd ../ +11. ./build +12. + +USAGE +1. start a second terminal +2. telnet localhost 7000 +3. back to first terminal +4. ./start diff --git a/build b/build index 849596f..d468113 100755 --- a/build +++ b/build @@ -4,4 +4,3 @@ for i in `find src -name "*.erl"` do erlc -o ebin $i done - diff --git a/echo_test.rb b/echo_test.rb index e884391..106635c 100644 --- a/echo_test.rb +++ b/echo_test.rb @@ -15,4 +15,4 @@ while true line = s.gets # Read lines from the socket puts "Got Echo: " + line.chop # And print with platform line terminator end -s.close # Close the socket when done \ No newline at end of file +s.close # Close the socket when done diff --git a/src/.ggs_app.erl.swp b/src/.ggs_app.erl.swp deleted file mode 100644 index 1c83d6c..0000000 Binary files a/src/.ggs_app.erl.swp and /dev/null differ diff --git a/src/.ggs_server.erl.swo b/src/.ggs_server.erl.swo index d75ef3b..3048659 100644 Binary files a/src/.ggs_server.erl.swo and b/src/.ggs_server.erl.swo differ diff --git a/src/ggs_server.erl b/src/ggs_server.erl index 9f33de7..e4f055f 100644 --- a/src/ggs_server.erl +++ b/src/ggs_server.erl @@ -91,11 +91,7 @@ code_change(_OldVsn, State, _Extra) -> %%----------------------------------------------------- do_JSCall(Socket, Data) -> + io:format("Data: ~p", [Data]), Port = js_runner:boot(), Ret = js_runner:executeJS(Port, Data), gen_tcp:send(Socket, io_lib:fwrite("~p~n", [Ret])). - -args_to_terms(RawArgs) -> - {ok, Toks, _Line} = erl_scan:string("[" ++ RawArgs ++ "]. ", 1), - {ok, Args} = erl_parse:parse_term(Toks), - Args. diff --git a/src/js_runner.erl b/src/js_runner.erl index f9bb5aa..52878ee 100644 --- a/src/js_runner.erl +++ b/src/js_runner.erl @@ -8,4 +8,4 @@ boot() -> executeJS(Port, Data) -> ok = js:define(Port, <<"function helloworld(name){return 'Hello, ' + name}">>), - js:call(Port, <<"helloworld">>, [Data]). + js:call(Port, <<"helloworld">>, [list_to_binary(Data)]). diff --git a/start b/start new file mode 100755 index 0000000..949f66f --- /dev/null +++ b/start @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +erl -boot start_sasl -pa ebin -pa erlang_js/ebin/ -pa src -eval 'ggs_server:start_link(7000)'