Skip to content

Commit 269771c

Browse files
authored
Merge pull request #60 from codecae/new_file_structure
Updating to new file structure
2 parents 54d5898 + 1c7ec1c commit 269771c

37 files changed

+1375
-940
lines changed

.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
dist: trusty
2+
sudo: false
3+
4+
language: node_js
5+
6+
before_install:
7+
- npm install -g luamin
8+
- git checkout ./bin/travis-test.sh
9+
install:
10+
- ./bin/travis-test.sh

Horus.lua

Lines changed: 0 additions & 83 deletions
This file was deleted.

Makefile

Lines changed: 0 additions & 31 deletions
This file was deleted.

X7.lua

Lines changed: 0 additions & 75 deletions
This file was deleted.

X9.lua

Lines changed: 0 additions & 76 deletions
This file was deleted.

bin/build.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
if [ -d obj ]; then
4+
rm -fR obj
5+
fi
6+
7+
cp -fR src obj
8+
9+
MANIFEST=(`find obj/ -name *.lua -type f`);
10+
11+
if [ ${#MANIFEST[@]} -eq 0 ]; then
12+
echo -e "\e[1m\e[39m[\e[31mTEST FAILED\e[39m]\e[21m No scripts could be found!."
13+
exit 1
14+
fi
15+
16+
for f in ${MANIFEST[@]};
17+
do
18+
SRC_NAME=$f
19+
OBJ_NAME=$(dirname ${f})/$(basename ${f} .lua).luac
20+
node -e "var luac = require('luac'); luac.buildToFileSync('${SRC_NAME}', '${OBJ_NAME}');"
21+
done
22+

bin/travis-test.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
echo "test: ;" > Makefile
4+
5+
if [ -d sdcard ]; then
6+
rm -fR sdcard
7+
fi
8+
9+
cp -fR src sdcard
10+
11+
MANIFEST=(`find sdcard/ -iname *.lua -type f`);
12+
FAIL=0
13+
14+
if [ ${#MANIFEST[@]} -eq 0 ]; then
15+
echo -e "\e[1m\e[39m[\e[31mTEST FAILED\e[39m]\e[21m No scripts could be found!."
16+
exit 1
17+
fi
18+
19+
for f in ${MANIFEST[@]};
20+
do
21+
luamin -f $f > $f.mini
22+
mv $f.mini $f
23+
if [ `cat $f | wc -l` -ne 1 ]; then
24+
FAIL=1
25+
echo -e "\e[1m\e[39m[\e[31mFAIL\e[39m]\e[21m ${f}"
26+
cat $f
27+
else
28+
echo -e "\e[1m\e[39m[\e[32mPASS\e[39m]\e[21m ${f}"
29+
fi
30+
done
31+
32+
if [ $FAIL -ne 0 ]; then
33+
echo -e "\e[1m\e[39m[\e[31mTEST FAILED\e[39m]\e[21m Please review your code and amend changes to the current branch."
34+
exit 1
35+
fi
36+

0 commit comments

Comments
 (0)