Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'

[fanfix.git] / configure.sh

diff --git a/configure.sh b/configure.sh
index e054bf646ad3b7fbcafdbb333bf817217bb45bf0..15ae18088ba8d961b401fa8187334898ebe17fad 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -6,11 +6,11 @@ PROGS="java javac jar make sed"
 
 IMG=be/nikiroo/utils/ui/ImageUtilsAwt
 CLI=be/nikiroo/fanfix/reader/cli/CliReader
-TUI=
+TUI=be/nikiroo/fanfix/reader/tui/TuiReader
 GUI=be/nikiroo/fanfix/reader/ui/GuiReader
 JIMG=
 JCLI=
-JTUI=
+JTUI="-C bin/ jexer"
 JGUI=
 
 valid=true
@@ -34,12 +34,8 @@ while [ "$*" != "" ]; do
        --cli) #=no     Disable CLI support (System.out)
                [ "$val" = no -o "$val" = false ] && CLI= && JCLI=
        ;;
-       --tui) #=yes    Enable TUI support (Jexer, experimental)
+       --tui) #=no     Enable TUI support (Jexer)
                [ "$val" = no -o "$val" = false ] && TUI= && JTUI=
-               if [ "$val" = yes -o "$val" = true ]; then
-                       TUI=be/nikiroo/fanfix/reader/tui/TuiReader
-                       JTUI="-C bin/ jexer"
-               fi
        ;;
        --gui) #=no     Disable GUI support (Swing)
                [ "$val" = no -o "$val" = false ] && GUI= && JGUI=
@@ -72,8 +68,10 @@ if [ "`whereis tput`" = "tput:" ]; then
        ko='"[ !! ]"';
        cols=80;
 else
-       ok='"`tput bold`[`tput setf 2` OK `tput init``tput bold`]`tput init`"';
-       ko='"`tput bold`[`tput setf 4` !! `tput init``tput bold`]`tput init`"';
+       #ok='"`tput bold`[`tput setf 2` OK `tput init``tput bold`]`tput init`"';
+       #ko='"`tput bold`[`tput setf 4` !! `tput init``tput bold`]`tput init`"';
+       ok='"`tput bold`[`tput setaf 2` OK `tput init``tput bold`]`tput init`"';
+       ko='"`tput bold`[`tput setaf 1` !! `tput init``tput bold`]`tput init`"';
        cols='"`tput cols`"';
 fi;
 
@@ -83,10 +81,8 @@ echo "TEST = be/nikiroo/fanfix/test/Test" >> Makefile
 echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
 echo "NAME = fanfix" >> Makefile
 echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/ org $JCLI $JTUI $JGUI -C bin/ be -C bin/ VERSION" >> Makefile
-echo "RM_FOR_ANDROID = jexer be/nikiroo/utils/ui/* be/nikiroo/fanfix/reader/tui/* be/nikiroo/fanfix/reader/ui/*" >> Makefile
-echo "ID_FOR_ANDROID = be.nikiroo.fanfix.reader.android" >> 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/ org $JCLI $JTUI $JGUI -C bin/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
+#echo "SJAR_FLAGS += -C src/ org -C src/ jexer -C src/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
 
 cat Makefile.base >> Makefile