aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-04-22 14:31:56 +1000
committerDavid Walter Seikel2014-04-22 14:31:56 +1000
commit9410830b5d317c3da4758c8c63f5e67b708b755c (patch)
tree7a2c24875db8c85e5b55d111b88cf08888968fce
parentMove the test sim to the media directory. (diff)
downloadSledjHamr-9410830b5d317c3da4758c8c63f5e67b708b755c.zip
SledjHamr-9410830b5d317c3da4758c8c63f5e67b708b755c.tar.gz
SledjHamr-9410830b5d317c3da4758c8c63f5e67b708b755c.tar.bz2
SledjHamr-9410830b5d317c3da4758c8c63f5e67b708b755c.tar.xz
Move LuaSL source up one directory.
-rw-r--r--.gitignore16
-rw-r--r--LuaSL/LSL.lua (renamed from LuaSL/src/LSL.lua)0
-rw-r--r--LuaSL/LuaSL.edc (renamed from LuaSL/src/LuaSL.edc)0
-rw-r--r--LuaSL/LuaSL.h (renamed from LuaSL/src/LuaSL.h)0
-rw-r--r--LuaSL/LuaSL_LSL_tree.h (renamed from LuaSL/src/LuaSL_LSL_tree.h)0
-rw-r--r--LuaSL/LuaSL_compile.c (renamed from LuaSL/src/LuaSL_compile.c)0
-rw-r--r--LuaSL/LuaSL_lemon_yaccer.y (renamed from LuaSL/src/LuaSL_lemon_yaccer.y)0
-rw-r--r--LuaSL/LuaSL_lexer.l (renamed from LuaSL/src/LuaSL_lexer.l)0
-rw-r--r--LuaSL/LuaSL_main.c (renamed from LuaSL/src/LuaSL_main.c)0
-rw-r--r--LuaSL/LuaSL_test.c (renamed from LuaSL/src/LuaSL_test.c)0
-rw-r--r--LuaSL/LuaSL_threads.c (renamed from LuaSL/src/LuaSL_threads.c)0
-rw-r--r--LuaSL/LuaSL_threads.h (renamed from LuaSL/src/LuaSL_threads.h)0
-rw-r--r--LuaSL/LuaSL_utilities.c (renamed from LuaSL/src/LuaSL_utilities.c)0
-rwxr-xr-xLuaSL/build.lua12
-rwxr-xr-xLuaSL/test.sh2
15 files changed, 14 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index 84b3dc5..347d6c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -322,12 +322,12 @@ LuaSL/LuaSL
322LuaSL/LuaSL_test 322LuaSL/LuaSL_test
323LuaSL/LuaSL_parser 323LuaSL/LuaSL_parser
324LuaSL/constants.lsl 324LuaSL/constants.lsl
325LuaSL/src/LuaSL_lemon_yaccer.c 325LuaSL/LuaSL_lemon_yaccer.c
326LuaSL/src/LuaSL_lemon_yaccer.h 326LuaSL/LuaSL_lemon_yaccer.h
327LuaSL/src/LuaSL_lemon_yaccer.out 327LuaSL/LuaSL_lemon_yaccer.out
328LuaSL/src/lex.backup 328LuaSL/lex.backup
329LuaSL/src/LuaSL_lexer.c 329LuaSL/LuaSL_lexer.c
330LuaSL/src/LuaSL_lexer.h 330LuaSL/LuaSL_lexer.h
331LuaSL/src/LuaSL_LSL_lexer.c 331LuaSL/LuaSL_LSL_lexer.c
332LuaSL/src/LuaSL_LSL_lexer.h 332LuaSL/LuaSL_LSL_lexer.h
333 333
diff --git a/LuaSL/src/LSL.lua b/LuaSL/LSL.lua
index 662c880..662c880 100644
--- a/LuaSL/src/LSL.lua
+++ b/LuaSL/LSL.lua
diff --git a/LuaSL/src/LuaSL.edc b/LuaSL/LuaSL.edc
index 844fc8e..844fc8e 100644
--- a/LuaSL/src/LuaSL.edc
+++ b/LuaSL/LuaSL.edc
diff --git a/LuaSL/src/LuaSL.h b/LuaSL/LuaSL.h
index d1f448e..d1f448e 100644
--- a/LuaSL/src/LuaSL.h
+++ b/LuaSL/LuaSL.h
diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/LuaSL_LSL_tree.h
index 5415228..5415228 100644
--- a/LuaSL/src/LuaSL_LSL_tree.h
+++ b/LuaSL/LuaSL_LSL_tree.h
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/LuaSL_compile.c
index 4a0a42f..4a0a42f 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/LuaSL_compile.c
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/LuaSL_lemon_yaccer.y
index 182789f..182789f 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/LuaSL_lemon_yaccer.y
diff --git a/LuaSL/src/LuaSL_lexer.l b/LuaSL/LuaSL_lexer.l
index 85b2821..85b2821 100644
--- a/LuaSL/src/LuaSL_lexer.l
+++ b/LuaSL/LuaSL_lexer.l
diff --git a/LuaSL/src/LuaSL_main.c b/LuaSL/LuaSL_main.c
index 0a40712..0a40712 100644
--- a/LuaSL/src/LuaSL_main.c
+++ b/LuaSL/LuaSL_main.c
diff --git a/LuaSL/src/LuaSL_test.c b/LuaSL/LuaSL_test.c
index 58d6225..58d6225 100644
--- a/LuaSL/src/LuaSL_test.c
+++ b/LuaSL/LuaSL_test.c
diff --git a/LuaSL/src/LuaSL_threads.c b/LuaSL/LuaSL_threads.c
index 234a7c5..234a7c5 100644
--- a/LuaSL/src/LuaSL_threads.c
+++ b/LuaSL/LuaSL_threads.c
diff --git a/LuaSL/src/LuaSL_threads.h b/LuaSL/LuaSL_threads.h
index 9a11b5c..9a11b5c 100644
--- a/LuaSL/src/LuaSL_threads.h
+++ b/LuaSL/LuaSL_threads.h
diff --git a/LuaSL/src/LuaSL_utilities.c b/LuaSL/LuaSL_utilities.c
index 40263df..40263df 100644
--- a/LuaSL/src/LuaSL_utilities.c
+++ b/LuaSL/LuaSL_utilities.c
diff --git a/LuaSL/build.lua b/LuaSL/build.lua
index f626fb0..b5ff670 100755
--- a/LuaSL/build.lua
+++ b/LuaSL/build.lua
@@ -13,13 +13,11 @@ if 'nil' == type(dir) then
13 dir = workingDir 13 dir = workingDir
14end 14end
15 15
16dir = dir .. '/src' 16removeFiles(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'})
17
18removeFiles(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'})
19 17
20-- Run lemon first, flex depends on it to define the symbol values. 18-- Run lemon first, flex depends on it to define the symbol values.
21runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') 19runCommand('lemon', dir, '../libraries/lemon/lemon -s -T../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
22runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') 20runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
23runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj') 21runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../media/LuaSL.edj')
24compileFiles('../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}) 22compileFiles('LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
25compileFiles('../LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'}) 23compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'})
diff --git a/LuaSL/test.sh b/LuaSL/test.sh
index d1a7d4c..91ee412 100755
--- a/LuaSL/test.sh
+++ b/LuaSL/test.sh
@@ -4,7 +4,7 @@ wd=$(pwd)
4 4
5# Kill any left overs. 5# Kill any left overs.
6killall -KILL LuaSL 6killall -KILL LuaSL
7export LUA_PATH="$wd/src/?.lua" 7export LUA_PATH="$wd/?.lua"
8 8
9case $@ in 9case $@ in
10 10