configure.sh: add src in jar and add sjar

[fanfix.git] / configure.sh

diff --git a/configure.sh b/configure.sh
index ffdf498562370acd1224d82030662ec7ac6d0bb1..4177ea9a1611929e9fd2cbb31537978ce664087b 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -4,16 +4,30 @@
 PREFIX=/usr/local
 PROGS="java javac jar make sed"
 
+IMG=be/nikiroo/utils/ui/ImageUtilsAwt
+
 valid=true
 while [ "$*" != "" ]; do
-       key=`echo "$1" | cut -c1-9`
-       val=`echo "$1" | cut -c10-`
+       key=`echo "$1" | cut -f1 -d=`
+       val=`echo "$1" | cut -f2 -d=`
        case "$key" in
-       --prefix=)
+       --)
+       ;;
+       --help) #               This help message
+               echo The following arguments can be used:
+               cat "$0" | grep '^\s*--' | grep '#' | while read ln; do
+                       cmd=`echo "$ln" | cut -f1 -d')'`
+                       msg=`echo "$ln" | cut -f2 -d'#'`
+                       echo "  $cmd$msg"
+               done
+       ;;
+       --prefix) #=PATH        Change the prefix to the given path
                PREFIX="$val"
        ;;
        *)
                echo "Unsupported parameter: '$1'" >&2
+               echo >&2
+               sh "$0" --help >&2
                valid=false
        ;;
        esac
@@ -38,18 +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 = $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 -C bin/ be -C ./ VERSION" >> Makefile
-#echo "SJAR_FLAGS += -C src/ org -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