aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-01-13 19:59:13 +1000
committerDavid Walter Seikel2013-01-13 19:59:13 +1000
commite49a9d4d24fb151d0f0499a22ffc1d51662f0181 (patch)
treeb0718a4f3a81333f4a7f6d83cb34511558004ce6
parentFixed some of the bit rot in LuaSL, it compiles now, but not working still. (diff)
downloadSledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.zip
SledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.tar.gz
SledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.tar.bz2
SledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.tar.xz
Add extantz into the build and test framework.
-rwxr-xr-xClientHamr/extantz/build.sh (renamed from ClientHamr/extantz/make.sh)4
-rwxr-xr-xClientHamr/extantz/test.sh1
-rwxr-xr-xbuild.sh4
-rwxr-xr-xtest.sh7
4 files changed, 14 insertions, 2 deletions
diff --git a/ClientHamr/extantz/make.sh b/ClientHamr/extantz/build.sh
index 45694e6..9649947 100755
--- a/ClientHamr/extantz/make.sh
+++ b/ClientHamr/extantz/build.sh
@@ -1,6 +1,6 @@
1export PKG_CONFIG_PATH="/opt/e17/lib/pkgconfig" 1export PKG_CONFIG_PATH="/opt/e17/lib/pkgconfig"
2 2
3echo "rm" 3echo "clean"
4rm -f extantz crappisspuke.o extantz.edj 4rm -f extantz crappisspuke.o extantz.edj
5echo "edje" 5echo "edje"
6edje_cc -id images extantz.edc extantz.edj 6edje_cc -id images extantz.edc extantz.edj
@@ -8,4 +8,4 @@ echo "Irrlicht"
8#g++ -O3 -ffast-math crappisspuke.cpp -o crappisspuke -I../../libraries/irrlicht-1.8/include -I/usr/X11R6/include -L../../libraries/irrlicht-1.8/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor && ./crappisspuke 8#g++ -O3 -ffast-math crappisspuke.cpp -o crappisspuke -I../../libraries/irrlicht-1.8/include -I/usr/X11R6/include -L../../libraries/irrlicht-1.8/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor && ./crappisspuke
9g++ -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o -I../../libraries/irrlicht-1.8/include -I/usr/X11R6/include $(pkg-config --cflags elementary) 9g++ -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o -I../../libraries/irrlicht-1.8/include -I/usr/X11R6/include $(pkg-config --cflags elementary)
10echo "extantz" 10echo "extantz"
11gcc -g -DPACKAGE_DATA_DIR="\"$(pwd)\"" extantz.c crappisspuke.o -o extantz $(pkg-config --cflags --libs eo) $(pkg-config --cflags --libs ecore-x) $(pkg-config --cflags --libs elementary) $(pkg-config --cflags --libs ephysics) -L../../libraries/irrlicht-1.8/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor && strip extantz && ./extantz 11gcc -g -DPACKAGE_DATA_DIR="\"$(pwd)\"" extantz.c crappisspuke.o -o extantz $(pkg-config --cflags --libs eo) $(pkg-config --cflags --libs ecore-x) $(pkg-config --cflags --libs elementary) $(pkg-config --cflags --libs ephysics) -L../../libraries/irrlicht-1.8/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor && strip extantz
diff --git a/ClientHamr/extantz/test.sh b/ClientHamr/extantz/test.sh
new file mode 100755
index 0000000..01c2abe
--- /dev/null
+++ b/ClientHamr/extantz/test.sh
@@ -0,0 +1 @@
./build.sh && ./extantz
diff --git a/build.sh b/build.sh
index 731713a..ff1c714 100755
--- a/build.sh
+++ b/build.sh
@@ -71,4 +71,8 @@ echo "_______________ BUILDING LuaSL _______________"
71cd $wd/LuaSL 71cd $wd/LuaSL
72./build.sh 72./build.sh
73 73
74echo "_______________ BUILDING extantz _______________"
75cd $wd/ClientHamr/extantz
76./build.sh
77
74 78
diff --git a/test.sh b/test.sh
index b9455c0..4f34b18 100755
--- a/test.sh
+++ b/test.sh
@@ -6,6 +6,11 @@ wd=$(pwd)
6 6
7./build.sh || exit 7./build.sh || exit
8 8
9echo "_______________ TESTING extantz _______________"
10cd $wd/ClientHamr/extantz
11./extantz &
12sleep 1
13
9echo "_______________ TESTING LuaSL _______________" 14echo "_______________ TESTING LuaSL _______________"
10# Kill any left overs. 15# Kill any left overs.
11killall -KILL LuaSL 16killall -KILL LuaSL
@@ -26,8 +31,10 @@ case $@ in
26 ;; 31 ;;
27 32
28 *) 33 *)
34 echo "_______________ STARTING LuaSL _______________"
29 ../LuaSL & 35 ../LuaSL &
30 sleep 1 36 sleep 1
37 echo "_______________ STARTING LuaSL_test _______________"
31 ../LuaSL_test 38 ../LuaSL_test
32 ;; 39 ;;
33 40