X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=configure.sh;h=4256eb36f1952e465a17dd932a9b4519721af527;hb=aaef3a5165f7cd1dc1a5babb104e328d13859408;hp=7d87f4c6bfd4ad547c0074f0cbd596964ade29d8;hpb=9119671d3774c0b74ce8661b5262ff14e6bfb010;p=fanfix.git

diff --git a/configure.sh b/configure.sh
index 7d87f4c..4256eb3 100755
--- a/configure.sh
+++ b/configure.sh
@@ -2,19 +2,16 @@
 
 # default:
 PREFIX=/usr/local
-PROGS="java javac jar make sed"
+PROGS="java javac jar"
 
-CLI=be/nikiroo/fanfix/reader/CliReader
-TUI=be/nikiroo/fanfix/reader/TuiReader
-GUI=be/nikiroo/fanfix/reader/LocalReader
+UI=be/nikiroo/utils/ui/test/TestUI
+ANDOIRD=
 
 valid=true
 while [ "$*" != "" ]; do
 	key=`echo "$1" | cut -f1 -d=`
 	val=`echo "$1" | cut -f2 -d=`
 	case "$key" in
-	--)
-	;;
 	--help) #		This help message
 		echo The following arguments can be used:
 		cat "$0" | grep '^\s*--' | grep '#' | while read ln; do
@@ -26,19 +23,20 @@ while [ "$*" != "" ]; do
 	--prefix) #=PATH	Change the prefix to the given path
 		PREFIX="$val"
 	;;
-	--cli) #=no	Disable CLI support (System.out)
-		[ "$val" = no -o "$val" = false ] && CLI=
-	;;
-	--tui) #=no	Disable TUI support (Jexer)
-		[ "$val" = no -o "$val" = false ] && TUI=
+	--ui) #=no	Disable UI (Swing/AWT) support
+		[ "$val" = no -o "$val" = false ] && UI= && JUI=
+		if [ "$val" = yes -o "$val" = true ]; then
+			UI=be/nikiroo/utils/ui/test/TestUI
+		fi
 	;;
-	--gui) #=no	Disable GUI support (Swing)
-		[ "$val" = no -o "$val" = false ] && GUI=
+	--android) #=yes	Enable Android UI support
+		[ "$val" = no -o "$val" = false ] && ANDROID= && JANDROID=
+		if [ "$val" = yes -o "$val" = true ]; then
+			ANDROID=be/nikiroo/utils/android/test/TestAndroid
+		fi
 	;;
 	*)
 		echo "Unsupported parameter: '$1'" >&2
-		echo >&2
-		sh "$0" --help >&2
 		valid=false
 	;;
 	esac
@@ -68,14 +66,15 @@ else
 	cols='"`tput cols`"';
 fi;
 
-echo "MAIN = be/nikiroo/fanfix/Main" > Makefile
-echo "MORE = $CLI $TUI $GUI" >> Makefile
-echo "TEST = be/nikiroo/fanfix/test/Test" >> Makefile
+
+echo "MAIN = be/nikiroo/utils/test_code/Test" > Makefile
+echo "MORE = $UI $ANDROID" >> Makefile
+echo "TEST = be/nikiroo/utils/test_code/Test" >> Makefile
 echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
-echo "NAME = fanfix" >> Makefile
+echo "NAME = nikiroo-utils" >> Makefile
 echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/ org -C bin/ jexer -C bin/ be -C bin/ VERSION" >> Makefile
-#echo "SJAR_FLAGS += -C src/ org -C src/ jexer -C src/ be -C ./ LICENSE -C ./ README.md -C ./ VERSION" >> Makefile
+echo "JAR_FLAGS += -C bin/ be -C bin/ org -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
+echo "SJAR_FLAGS += -C src/ org -C src/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
 
 cat Makefile.base >> Makefile