configure.sh: add src in jar and add sjar

[fanfix.git] / configure.sh

diff --git a/configure.sh b/configure.sh
index 8952fef2d7ec607ded0d7c6b4a3af0a1931339fe..4177ea9a1611929e9fd2cbb31537978ce664087b 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -4,12 +4,7 @@
 PREFIX=/usr/local
 PROGS="java javac jar make sed"
 
-CLI=be/nikiroo/fanfix/reader/cli/CliReader
-TUI=
-GUI=be/nikiroo/fanfix/reader/ui/GuiReader
-JCLI=
-JTUI=
-JGUI=
+IMG=be/nikiroo/utils/ui/ImageUtilsAwt
 
 valid=true
 while [ "$*" != "" ]; do
@@ -29,19 +24,6 @@ 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= && JCLI=
-       ;;
-       --tui) #=yes    Enable TUI support (Jexer, experimental)
-               [ "$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=
-       ;;
        *)
                echo "Unsupported parameter: '$1'" >&2
                echo >&2
@@ -70,21 +52,21 @@ 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;
 
 echo "MAIN = be/nikiroo/fanfix/Main" > Makefile
-echo "MORE = $CLI $TUI $GUI" >> Makefile
+echo "MORE = $IMG" >> Makefile
 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 ./ src/ -C bin/ org -C bin/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
+echo "SJAR_FLAGS += -C src/ org -C src/ be" >> Makefile
 
 cat Makefile.base >> Makefile