Move all source into the new src directory, and shuffle a few other things around.

13 files changed, 29 insertions, 6 deletions

diff --git a/LuaSL/LuaSL.edc b/src/LuaSL/LuaSL.edc
index 844fc8e..844fc8e 100644
--- a/LuaSL/LuaSL.edc
+++ b/src/LuaSL/LuaSL.edc
diff --git a/LuaSL/LuaSL.h b/src/LuaSL/LuaSL.h
index d1f448e..d1f448e 100644
--- a/LuaSL/LuaSL.h
+++ b/src/LuaSL/LuaSL.h
diff --git a/LuaSL/LuaSL_LSL_tree.h b/src/LuaSL/LuaSL_LSL_tree.h
index 5415228..5415228 100644
--- a/LuaSL/LuaSL_LSL_tree.h
+++ b/src/LuaSL/LuaSL_LSL_tree.h
diff --git a/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 4a0a42f..771888e 100644
--- a/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -2119,9 +2119,9 @@ boolean compilerSetup(gameGlobals *ourGlobals)
         }
 
         // Compile the constants.
-        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/libraries/constants.lsl", PACKAGE_DATA_DIR);
         system(buf);
-        snprintf(buf, sizeof(buf), "%s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "%s/libraries/constants.lsl", PACKAGE_DATA_DIR);
         compileLSL(ourGlobals, NULL, "FAKE_SID", buf, TRUE);
 
         return TRUE;
diff --git a/LuaSL/LuaSL_lemon_yaccer.y b/src/LuaSL/LuaSL_lemon_yaccer.y
index 182789f..182789f 100644
--- a/LuaSL/LuaSL_lemon_yaccer.y
+++ b/src/LuaSL/LuaSL_lemon_yaccer.y
diff --git a/LuaSL/LuaSL_lexer.l b/src/LuaSL/LuaSL_lexer.l
index 85b2821..85b2821 100644
--- a/LuaSL/LuaSL_lexer.l
+++ b/src/LuaSL/LuaSL_lexer.l
diff --git a/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c
index 0a40712..0a40712 100644
--- a/LuaSL/LuaSL_main.c
+++ b/src/LuaSL/LuaSL_main.c
diff --git a/LuaSL/LuaSL_test.c b/src/LuaSL/LuaSL_test.c
index 58d6225..58d6225 100644
--- a/LuaSL/LuaSL_test.c
+++ b/src/LuaSL/LuaSL_test.c
diff --git a/LuaSL/LuaSL_threads.c b/src/LuaSL/LuaSL_threads.c
index 234a7c5..234a7c5 100644
--- a/LuaSL/LuaSL_threads.c
+++ b/src/LuaSL/LuaSL_threads.c
diff --git a/LuaSL/LuaSL_threads.h b/src/LuaSL/LuaSL_threads.h
index 9a11b5c..9a11b5c 100644
--- a/LuaSL/LuaSL_threads.h
+++ b/src/LuaSL/LuaSL_threads.h
diff --git a/LuaSL/LuaSL_utilities.c b/src/LuaSL/LuaSL_utilities.c
index 40263df..40263df 100644
--- a/LuaSL/LuaSL_utilities.c
+++ b/src/LuaSL/LuaSL_utilities.c
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
new file mode 100755
index 0000000..f86715c
--- /dev/null
+++ b/src/LuaSL/build.lua
@@ -0,0 +1,23 @@
+#!/usr/bin/env lua
+
+local dir = ...
+
+if 'nil' == type(dir) then
+  local build, err = loadfile('../../build.lua')
+  if build then
+    setfenv(build, getfenv(2))
+    build(2)
+  else
+    print("ERROR - " .. err)
+  end
+  dir = workingDir
+end
+
+removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', '../../media/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
+
+-- Run lemon first, flex depends on it to define the symbol values.
+runCommand('lemon',   dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
+runCommand('flex',    dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
+runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj')
+compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
+compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'})
diff --git a/LuaSL/test.sh b/src/LuaSL/test.sh
index 91ee412..1c26ade 100755
--- a/LuaSL/test.sh
+++ b/src/LuaSL/test.sh
@@ -4,21 +4,21 @@ wd=$(pwd)
 
 # Kill any left overs.
 killall -KILL LuaSL
-export LUA_PATH="$wd/?.lua"
+export LUA_PATH="$wd/../../libraries/?.lua"
 
 case $@ in
 
     ddd)
-        ddd ./LuaSL
+        ddd ../../LuaSL
         ;;
 
     gdb)
-        gdb ./LuaSL
+        gdb ../../LuaSL
         ;;
 
     *)
         echo "_______________ STARTING LuaSL _______________"
-        ./LuaSL &
+        ../../LuaSL &
         sleep 1
         echo "_______________ STARTING LuaSL_test _______________"
         ./LuaSL_test