diff --git a/.gitignore b/.gitignore index 3ca13af..2ec23ae 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,9 @@ *.dat test.lua test2.lua -test3.lua \ No newline at end of file +test3.lua +lua5.1* +luajit* +lua5.2* +lua5.3* +lua5.4* \ No newline at end of file diff --git a/makeENV.bat b/makeENV.bat new file mode 100644 index 0000000..8e1aa82 --- /dev/null +++ b/makeENV.bat @@ -0,0 +1,10 @@ +mkdir lua5.1 +mkdir lua5.2 +mkdir lua5.3 +mkdir lua5.4 +mkdir luajit +python -m hererocks -j 2.1.0-beta3 -r latest --compat all ./luajit +python -m hererocks -l 5.1 -r latest --compat all ./lua5.1 +python -m hererocks -l 5.2 -r latest --compat all ./lua5.2 +python -m hererocks -l 5.3 -r latest --compat all ./lua5.3 +python -m hererocks -l 5.4 -r latest --compat all ./lua5.4 \ No newline at end of file diff --git a/makeENV.sh b/makeENV.sh new file mode 100755 index 0000000..2840d20 --- /dev/null +++ b/makeENV.sh @@ -0,0 +1,31 @@ +#!/bin/bash +mkdir luajit +hererocks -j 2.1.0-beta3 -r latest --compat all ./luajit +. luajit/bin/activate +echo | lua -v +luarocks install multi +deactivate-lua +mkdir lua5.1 +hererocks -l 5.1 -r latest --patch --compat all ./lua5.1 +. lua5.1/bin/activate +echo | lua -v +luarocks install multi +deactivate-lua +mkdir lua5.2 +hererocks -l 5.2 -r latest --patch --compat all ./lua5.2 +. lua5.2/bin/activate +echo | lua -v +luarocks install multi +deactivate-lua +mkdir lua5.3 +hererocks -l 5.3 -r latest --patch --compat all ./lua5.3 +. lua5.3/bin/activate +echo | lua -v +luarocks install multi +deactivate-lua +mkdir lua5.4 +hererocks -l 5.4 -r latest --patch --compat all ./lua5.4 +. lua5.4/bin/activate +echo | lua -v +luarocks install multi +deactivate-lua \ No newline at end of file diff --git a/test3.lua b/test3.lua index 9cf4338..9327646 100644 --- a/test3.lua +++ b/test3.lua @@ -52,10 +52,5 @@ multi:benchMark(sleep_for,multi.Priority_Core,"Core:"):OnBench(bench) multi.OnExit(function() print("Total: ".. a) end) -<<<<<<< HEAD -multi:mainloop{print=true,priority=3} -======= -multi:mainloop() ->>>>>>> f1f6e30a9833625630b84f8e6bfff179807b0102 ---multi:lightloop() \ No newline at end of file +multi:mainloop{print=true,priority=3}