From ba3d3ced6db543cf309142a3e53bd8a72f8d9053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Tue, 25 Jan 2011 14:41:11 +0100 Subject: [PATCH 1/4] Added run script --- build | 1 + js_runner.beam | Bin 804 -> 0 bytes js_test.beam | Bin 784 -> 0 bytes src/.ggs_app.erl.swp | Bin 12288 -> 0 bytes src/.ggs_server.erl.swo | Bin 12288 -> 12288 bytes src/ggs_app.beam | Bin 680 -> 0 bytes src/ggs_server.beam | Bin 1732 -> 0 bytes src/ggs_server.erl | 6 +----- src/ggs_sup.beam | Bin 776 -> 0 bytes 9 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 js_runner.beam delete mode 100644 js_test.beam delete mode 100644 src/.ggs_app.erl.swp delete mode 100644 src/ggs_app.beam delete mode 100644 src/ggs_server.beam delete mode 100644 src/ggs_sup.beam diff --git a/build b/build index 5d7627b..5f57dd4 100755 --- a/build +++ b/build @@ -1,3 +1,4 @@ #!/usr/bin/env bash erlc *.erl -o ebin +erlc src/*.erl -o ebin diff --git a/js_runner.beam b/js_runner.beam deleted file mode 100644 index 229fc5687265f3700e0f5a486bebc5b6162234ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 804 zcmaKq&ubGw6vtkv zj8i_}3?i<3ZmTui7Jj$It3k9WQh!v&x45dF2rmks!XMzppayG5Oj*gajPv|2j!`4iP?!nBY`wp`(U{~0>k{fUjvfS?AxB{dA2Iv5q z0bmR*4GaO=v5z%i?kF$@&=bB^+D$a)A%6b^np~-$efAsCBl%F}%d-|^b>T{_-eNgHR{kUMK&l_E% zZS38;T6sYpW=|D|$=BxTJ`^ZC)JzI=gUF8Sze`#SN4&4`ndXpIQbJyqQF{Z1a%^RsYw8|Hkx|8mxd)A#vRAbSV9&eIM V|2#bVx98`eQA1Lw#|kb^egic6wDbS~ diff --git a/js_test.beam b/js_test.beam deleted file mode 100644 index 412ab0f62a5ef1f805f5f2f20e188882375d92d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 784 zcmaKqF>KR76o$_}J82RMRx+SaK!#A!s-j7yrczjNQru7}l!$@^Q|#K8)=pwqcbB%2 z*qGP~1E{DALkDkw#DJJULZ}NH3k*yw4Ba|p>>-34U_9xw7AK5j+7D8McI{xj^6W%(JMvI|KpwA;f1B9&rV*r*kIeQsN`e_X%5qw&ujIWom zUc)F?!&+gcoTEk^<%|M0u#(jEnKFiimNV*l!BFs6siaAzTUavW>{}!?jVxZ#49S9( zCT$uxClY!SuX1`1`l03Crtl3Q0boD@gsFhY2@`iq0rDtLgBRLUz&IeCh-Gspt~muc zp~;N);XQE-F0L(V36mQh7kB6Y+dKP?Wm#>@dcE;geYWHs3=SvvhJ$oIs#J!*hGu2@ z+~CRk=;b#vnmjNE>E9Ri)CIM#_SD^**P1WTgW}m*X7}pPeS9Tf&3-zH29ddUm_9O& z(;p*~MCL>EZsF2X)Ce8XGk$B8a|-d)<1YNA4cSF_iv{r_(9rXVSEYt> zcRl()nI9L2VPjCegVg!ih1q$LQ@Gb78;La-ksr2X=k0NO!k&(+vanAb(m|8|Y+fAA Q_bkk(4>zu^F%Ay>0anMiOaK4? diff --git a/src/.ggs_app.erl.swp b/src/.ggs_app.erl.swp deleted file mode 100644 index 1c83d6c0dc6142557b571ab1691fc101cf659e7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&&q~8E90%~so8Uk6q^IaE9dzwB4~oJ-6o%lKF!i9w=+^9yn@dSEQO5M{3wZGr zJgX1lYxoTQ(ses{nL7@@fnSsSl7{4SD@`?Xaa`m(PL5GoVeIWaUwmD7X16Dd-N>#M zCO@HEia^T=bIkB#w4i$=!nT%ydnkS377ArIR5iEJ2rFI?I6`&)uo9*~00L79^mIMF zyU4b4*^GHFxwXmHR?nwe0+S&C0SG_<0uX=z1Rwx`*%r`2f<4g@=Hg>4#dYFW9d}Vd z00Izz00bZa0SG_<0uX=z1RyYj0-jI*{OO}Vu}qt%|No=!|8MGlQG8N-P`ps|De4p@ ziabSxEmAz4 zXUq(UuJ1$*(=nwll#lJ&nsXIRb#pd1CvdaZDTk%2qUqhW cWKUUir@qswdAcRLX5d!(y^gTr+xC?C0aJQz$p8QV diff --git a/src/.ggs_server.erl.swo b/src/.ggs_server.erl.swo index d75ef3b29ec8bb309f9f1a6513b35e94356fad7d..bb7307667c4875975b92cf7c453d7f5d3f7deb53 100644 GIT binary patch delta 163 zcmZojXh;xCG6?hZRWR2xVgLdG28NJJcD}mY8^wO{GbU~p6!^@~dzzVnA)6H<3lvhQ zW|VskR5=#=T6zU3;bQGdN?AXoRYF{}4Zq6zI delta 191 zcmZojXh;xCG6?hZRWR2xVgLdG1_rs)cD}p0Hj4e?XH4BJDDat|*PWSx;X4aN7AT}p z%_#Sgm4V?H5cdIbFAx_4u^tdJ0`Yg2jSJnFCx1{;nyjO$9T@MEnU`9tV5^W?loMZ^ zoS0`-TvC*om#(1{t)!r>tq_!0?pTyw3}Pz9>M1DcC>Uz$FeCzn;!E=5OHzw+i#4EX UG!=C17#JpJt2S)rQ~SgT0Ld>h@c;k- diff --git a/src/ggs_app.beam b/src/ggs_app.beam deleted file mode 100644 index 3788ca02e58644ea914d36378af64a62604a677b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcma))O^(wr6o8-Yw4E~iSjmb7QpB)80yP~p6=GIthG{hX3}}WGo8mTZo2H2)+bwL6 zM&be-fi*i$fH(jbfGdCmH{dxMiP?drFVFA!{W;I0XD7P=^h0tud^)tM1c1j#w==@qnQBYD64m_LT-xykGaRT)V!ktkBW@id zmk^I|>fa1Wcp0Dr@L<692P{k&1PS9icLqVi`~6YK(j?vSAs~I;=c6!4Pf`{K%voaU zPdIrVCoCYZsIP(4vCobeUgRbdrRiy8^wh<+)!Jsc{txe_yUs>xgS851?e*^W x?zt46%}cpxPw=077erhaS41FgHOUQLV=4={`>$4_^M}{N2ZeVWPK?Dn!XFXpmqq{p diff --git a/src/ggs_server.beam b/src/ggs_server.beam deleted file mode 100644 index cd973491611d969c74f1eef680185d404a5a9e2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 zcma)7U2GIp6ux)vbpPne-MKBLl%IjA0bJ7^X_L~%nAO zo^!r)&P?u1JpIgLgrvSG?;U$;Oh*ku=uSdNe{Oa*nMqW9M8&y8`>~#>2jN0)R)uYA zc2?<`YSap~S@r96Gtp5KSfb4!40IYDb+wtQ2Z>gp5iN8;7OmFI`C+ZDW-z29R?Ye= zDHYfKaJECmaTKo}Cpr~Ial^0QHwEG0h(ShL%q2>zx@xFUr@;r4q;=3xQA?-%YE?CL zR;#!Xgs4}IYM=(HvnpGQX7*2ygK~C0nTcCrsA97cMLMgFscK8B{nM!+f<7y$!$;#l zD>G4HZA~MpwV-0uUyD6I@C<_*hx~*XF9PKNT&DpxAWykrZR6DDHs8w(M_NJ}gVG~x zQWEOI8KF|1*}_u%VLD}4WkL_hvXB;=v^i}WR)x?LvU1O0)3b*4I;R(RUtnWQI71hl zPHs!Vq{oG1X4-Z~ZnDvv%q}w`%8Wb3o8lTj>rP1FEqSKrcyz*L-Zf8n)Z&6(eUi~d z!}`Icw~F7g^2o9?y6niZLs;2yMRA!e@uoXr4`Kuc{^kvOj-Yp?XR}Ez>7Ry`E7&x{ zi+`~Smp1xTyqx6;K{Ew76mV#bi9{3hmZv9BU zAV5vP6hTecgQ&FB$t6gDR+=|Q^4(BR_q{0<^W88amrU3Uvza)SOcyqo;gZu#H;gE= z4qDj&t@Oxi435{sW1mYiz1+1i4yFUv4Pe~}PJNv=yc1Kht~5EZQZrB6XYaj#Aw8F+ z?TeBLX|jxc6%;l?oI_}46TWo5NHd$!00&#p3qOQgjF4#^KMUUz+1F^|eg*Il08WSj zFx$MN{fzc>n`dFqwfS1u@f)Q8O*K%Y&3%>Z1;w*b)J25fC}^xxLz zn5Q3bKRpTAV;OFn3xO8J+U|1YH|ITxt-G1%)_dh&! zXY1wdTYvfP?N4uf{rKlpTZC+ldLGirn#NkV*} zAt(Ol=U(V-o;m*BDd)?#T9 %%----------------------------------------------------- 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/ggs_sup.beam b/src/ggs_sup.beam deleted file mode 100644 index 2440432dd7dbd8c73909efbed56e6e8b84fe90f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 776 zcmZ?s4>Dw6U}kV~b@X*C$FSCR@H$SB`CpA7ZFD;)fwJ0YsFP%RFuVPMU&q2OJ3IZ<6C2p@s-`~Gr zw;1Eiw1rilp78(jR8qI~Rm;D}V8GC)pU-hyC4D-_WgGG6YfBr`+1(bI*Ew5wq*V)U z)s?+7;a18A<;44<*Q{Tce-DnThOG=7>lxK4ekYvhWN?~9wE6xLP81n=eu5j@RZa(w;%7^_=Hx#kR zcV&STa3-Z@B$j37mllDQr7$2xa8?#jr?Y2X8j!jLHj@RUg+0HZBr`v+7-30rc}g~e zf__GRZmND(eqKqczDsIxc1eDLJ}Bn(-Q9!ri;I#$dfD Date: Tue, 25 Jan 2011 14:53:45 +0100 Subject: [PATCH 2/4] Added start script --- start | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 start 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)' From ee97a0b044e164f67e662ba31be04e2e18097113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Tue, 25 Jan 2011 14:58:40 +0100 Subject: [PATCH 3/4] Added unicode support when running JS --- echo_test.rb | 2 +- js_runner.erl | 2 +- src/.ggs_server.erl.swo | Bin 12288 -> 12288 bytes 3 files changed, 2 insertions(+), 2 deletions(-) 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/js_runner.erl b/js_runner.erl index f9bb5aa..52878ee 100644 --- a/js_runner.erl +++ b/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/src/.ggs_server.erl.swo b/src/.ggs_server.erl.swo index bb7307667c4875975b92cf7c453d7f5d3f7deb53..3048659e6c270c2fdc0a8944634561aaeb5b0a7f 100644 GIT binary patch delta 41 tcmZojXh;xCG6?hZRWR2xVgLdG1_s6}cD~2BHi`wRvM2z-=4{oeTmaJe3GV;^ delta 41 vcmZojXh;xCG6?hZRWR2xVgLdG28NJJcD}mY8^r=uS#%T}i#BJgPUQjs(+mnH From a4f7774143ccbb92159738332dd2bff78a669292 Mon Sep 17 00:00:00 2001 From: Kallfaktorn Date: Tue, 25 Jan 2011 16:01:42 +0100 Subject: [PATCH 4/4] Howto added. Installation and usage included. --- HOWTO | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 HOWTO 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