git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'subtree'
[fanfix.git]
/
configure.sh
diff --git
a/configure.sh
b/configure.sh
index 520afba9454ad0e7ad4ab8a3bb91152f549d7ae3..4256eb36f1952e465a17dd932a9b4519721af527 100755
(executable)
--- a/
configure.sh
+++ b/
configure.sh
@@
-2,22
+2,16
@@
# default:
PREFIX=/usr/local
# default:
PREFIX=/usr/local
-PROGS="java javac jar
make sed
"
+PROGS="java javac jar"
-CLI=be/nikiroo/fanfix/reader/CliReader
-TUI=
-GUI=be/nikiroo/fanfix/reader/GuiReader
-JCLI=
-JTUI=
-JGUI=
+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
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
--help) # This help message
echo The following arguments can be used:
cat "$0" | grep '^\s*--' | grep '#' | while read ln; do
@@
-29,23
+23,20
@@
while [ "$*" != "" ]; do
--prefix) #=PATH Change the prefix to the given path
PREFIX="$val"
;;
--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=
+ --ui) #=no Disable UI (Swing/AWT) support
+ [ "$val" = no -o "$val" = false ] && UI= && JUI=
if [ "$val" = yes -o "$val" = true ]; then
if [ "$val" = yes -o "$val" = true ]; then
- TUI=be/nikiroo/fanfix/reader/TuiReader
- JTUI="-C bin/ jexer"
+ UI=be/nikiroo/utils/ui/test/TestUI
fi
;;
fi
;;
- --gui) #=no Disable GUI support (Swing)
- [ "$val" = no -o "$val" = false ] && GUI= && JGUI=
+ --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 "Unsupported parameter: '$1'" >&2
- echo >&2
- sh "$0" --help >&2
valid=false
;;
esac
valid=false
;;
esac
@@
-75,14
+66,15
@@
else
cols='"`tput cols`"';
fi;
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 "TEST_PARAMS = $cols $ok $ko" >> Makefile
-echo "NAME =
fanfix
" >> Makefile
+echo "NAME =
nikiroo-utils
" >> Makefile
echo "PREFIX = $PREFIX" >> Makefile
echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/
org $JCLI $JTUI $JGUI -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
cat Makefile.base >> Makefile