Menu
▾
▴
[Eas-dev-commit] eas INSTALL, 1.4, 1.5 Makefile, 1.5, 1.6 README, 1.5, 1.6 VERSION, 1.5, 1.6 configure, 1.4, 1.5
|
From: Andrey C. <sku...@us...> - 2006-11-03 16:12:42
|
Update of /cvsroot/eas-dev/eas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30821 Modified Files: INSTALL Makefile README VERSION configure Log Message: Add localization and documentation, small fixes. Index: INSTALL =================================================================== RCS file: /cvsroot/eas-dev/eas/INSTALL,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- INSTALL 20 Oct 2006 12:56:47 -0000 1.4 +++ INSTALL 3 Nov 2006 16:12:06 -0000 1.5 @@ -4,9 +4,9 @@ 1. Go to http://eas.lrn.ru/index.php?module=download and download latest versions: -- eas -- clip-prg +- clip-prg >= 1.2.0 - ocmng +- eas 2. Unpack downloaded packages @@ -42,7 +42,8 @@ 3. Check if exist libraries in $CLIPROOT/lib: libclip-codb.so -libclip-gtk.so +libcodb-query.so +libclip-gtk.so and/or libclip-gtk2.so libclip-ui.so libclip-xml.so If any library is absent, check error messages and rebuild CLIP @@ -87,14 +88,14 @@ 2. Go to unpacked ocmng directory and run command: - make && make install + make 3. Install components: - ocmng install components/ALL.xmo - ocmng install components/ocmng/EAS.xmo + ocmng install ALL + ocmng install EAS/ALL -If you have error to update core ocmng components (components/ocmng/*.xmo), +If you have error to update core ocmng components (ocmng/*.xmo), please remove manually $CLIPROOT/etc/codb.* NOTES Index: Makefile =================================================================== RCS file: /cvsroot/eas-dev/eas/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 20 Oct 2006 12:56:47 -0000 1.5 +++ Makefile 3 Nov 2006 16:12:06 -0000 1.6 @@ -11,7 +11,8 @@ PACKAGE = "eas" DIRVERSION = "$(PACKAGE)" -SUBDIRS = libeas client server +#SUBDIRS = libeas client server $(DOCDIR) $(PODIR) +SUBDIRS = libeas client server $(PODIR) .PHONY: all clean distclean Index: README =================================================================== RCS file: /cvsroot/eas-dev/eas/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- README 20 Oct 2006 12:56:47 -0000 1.5 +++ README 3 Nov 2006 16:12:06 -0000 1.6 @@ -7,8 +7,8 @@ Type: Software platform Name: E/AS -Version: 20061015 -Date: 15 Oct 2006 +Version: 20061103 +Date: 03 Nov 2006 Author: Andrey (Skull) Cherepanov <sk...@ea...> License: GNU General Public License (GPL) v.2 @@ -34,7 +34,7 @@ Requires -------- -- CLIP (with clip-gtk, clip-ui and clip-xml) +- CLIP >= 1.2.0 (with clip-gtk, clip-gtk2, clip-ui, clip-xml, clip-codb and codb-query) - PAM Index: VERSION =================================================================== RCS file: /cvsroot/eas-dev/eas/VERSION,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- VERSION 20 Jun 2006 10:25:52 -0000 1.5 +++ VERSION 3 Nov 2006 16:12:06 -0000 1.6 @@ -1 +1 @@ -0.2.1 +20061103 Index: configure =================================================================== RCS file: /cvsroot/eas-dev/eas/configure,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- configure 20 Jun 2006 10:25:52 -0000 1.4 +++ configure 3 Nov 2006 16:12:06 -0000 1.5 @@ -14,6 +14,8 @@ datadir=$prefix/share/eas logdir=$datadir/log dbpath=/var/db/eas +withdoc=YES +withl10n=YES for ac_option do @@ -61,6 +63,12 @@ ac_prev=dbpath ;; --dbpath=*) dbpath="$ac_optarg" ;; + + --without-doc) + withdoc=NO ;; + + --without-l10n) + withl10n=NO ;; -h | --help) cat <<EOF @@ -72,7 +80,9 @@ --bindir=DIR where install executables files [$bindir] --datadir=DIR data location: modules, l10n [$datadir] --logdir=DIR location of program messages [$logdir] - --dbpath=DIR database default path [$dbpath] + --dbpath=DIR database default path [$dbpath] + --without-doc build without documentation [default=no] + --without-l10n build without localization support [default=no] EOF exit 0 ;; esac @@ -136,7 +146,7 @@ echo "CLIP installation does not found. Install CLIP from http://www.itk.ru or set \$CLIPROOT correct." 2>&6 exit fi -echo "$CLIPROOT" +echo "$CLIPROOT" 1>&6 # Check CLIP compiler echo $ac_n "checking for a CLIP compiler""... $ac_c" 1>&6 @@ -148,7 +158,7 @@ exit fi CLIP_version=`$prg --version | sed -n '1p' | tr -d '\n'` -echo "$CLIP_version" +echo "$CLIP_version" 1>&6 # Check clip-gtk echo $ac_n "checking for a clip-gtk library""... $ac_c" 1>&6 @@ -159,7 +169,7 @@ echo "Library '$prg' does not found. Configure and install clip-gtk from CLIPDISTRO/cliplibs/clip-gtk directory or appropriate binary package." 2>&6 exit fi -echo "yes" +echo "yes" 1>&6 # Check clip-gtk2 echo $ac_n "checking for a clip-gtk2 library""... $ac_c" 1>&6 @@ -170,7 +180,7 @@ echo "Library '$prg' does not found. Configure and install clip-gtk2 from CLIPDISTRO/cliplibs/clip-gtk2 directory or appropriate binary package." 2>&6 # exit fi -echo "yes" +echo "yes" 1>&6 # Check clip-ui echo $ac_n "checking for a clip-ui library""... $ac_c" 1>&6 @@ -181,7 +191,7 @@ echo "Library '$prg' does not found. Configure and install clip-ui from CLIPDISTRO/cliplibs/clip-ui directory or appropriate binary package." 2>&6 exit fi -echo "yes" +echo "yes" 1>&6 # Check clip-xml echo $ac_n "checking for a clip-xml library""... $ac_c" 1>&6 @@ -189,21 +199,32 @@ prg=$CLIPROOT/lib/libclip-xml.so if test ! -f "$prg"; then - echo "Library '$prg' does not found. Configure and install clip-ui from CLIPDISTRO/cliplibs/clip-xml directory or appropriate binary package." 2>&6 + echo "Library '$prg' does not found. Configure and install clip-xml from CLIPDISTRO/cliplibs/clip-xml directory or appropriate binary package." 2>&6 exit fi -echo "yes" +echo "yes" 1>&6 -# Check wget -echo $ac_n "checking for wget""... $ac_c" 1>&6 -echo "configure:$LINENO: checking for wget" >&5 +# Check clip-codb +echo $ac_n "checking for a clip-codb library""... $ac_c" 1>&6 +echo "configure:$LINENO: checking for a clip-codb" >&5 -prg=`wget --version | head -n 1` -if test -z "$prg"; then - echo "Wget is not installed. Build from http://wget.sunsite.dk/ or install from appropriate binary package." 2>&6 +prg=$CLIPROOT/lib/libclip-codb.so +if test ! -f "$prg"; then + echo "Library '$prg' does not found. Configure and install clip-codb from CLIPDISTRO/clip/codb directory or appropriate binary package." 2>&6 exit fi -echo "$prg" +echo "yes" 1>&6 + +# Check codb-query +echo $ac_n "checking for a codb-query library""... $ac_c" 1>&6 +echo "configure:$LINENO: checking for a codb-query" >&5 + +prg=$CLIPROOT/lib/libcodb-query.so +if test ! -f "$prg"; then + echo "Library '$prg' does not found. Configure and install codb-query from CLIPDISTRO/clip/codb directory or appropriate binary package." 2>&6 + exit +fi +echo "yes" 1>&6 # Check ocmng echo $ac_n "checking for ocmng""... $ac_c" 1>&6 @@ -214,7 +235,7 @@ echo "Component manager ocmng is not installed. Build from CLIP sources or install from appropriate binary package." 2>&6 exit fi -echo "yes" +echo "yes" 1>&6 # Check clip-gtkextra #echo $ac_n "checking for a clip-gtkextra library""... $ac_c" 1>&6 @@ -227,19 +248,63 @@ #fi #echo "yes" +# +# Check programs +# + +# Check wget +echo $ac_n "checking for wget""... $ac_c" 1>&6 +echo "configure:$LINENO: checking for wget" >&5 + +prg=`wget --version | head -n 1` +if test -z "$prg"; then + echo "Wget is not installed. Build from http://wget.sunsite.dk/ or install from appropriate binary package." 2>&6 + exit +fi +echo "$prg" 1>&6 + +if test "$withdoc" = "YES"; then + echo $ac_n "checking for docbook2html""... $ac_c" 1>&6 + echo "configure:$LINENO: checking for docbook2html" >&5 + + prg_version=`docbook2html --version 2>/dev/null | sed -n '1p' | tr -d '\n'` + echo "$prg_version" 1>&6 + if test -z "$prg_version"; then + echo "Program docbook2html is not installed. Install docbook-utils package." 2>&6 + exit + fi + docdir="doc" +else + docdir="" +fi + +if test "$withl10n" = "YES"; then + echo $ac_n "checking for msgfmt""... $ac_c" 1>&6 + echo "configure:$LINENO: checking for msgfmt" >&5 + + prg_version=`msgfmt --version 2>/dev/null | sed -n '1p' | tr -d '\n'` + echo "$prg_version" 1>&6 + if test -z "$prg_version"; then + echo "Program msgfmt is not installed. Install gettext package." 2>&6 + exit + fi + podir="po" +else + podir="" +fi + #rm -f conftest* CXXFLAGS="$ac_cxxflags_safe" LDFLAGS="$ac_ldflags_safe" LIBS="$ac_libs_safe" - -echo "" -echo "Configuration:" -echo -e " Executables: $bindir" -echo -e " Data: $datadir" -echo -e " Logs: $logdir" -echo -e " Databases: $dbpath" -echo "" +echo "" 1>&6 +echo "Configuration:" 1>&6 +echo -e " Executables: $bindir" 1>&6 +echo -e " Data: $datadir" 1>&6 +echo -e " Logs: $logdir" 1>&6 +echo -e " Databases: $dbpath" 1>&6 +echo "" 1>&6 sedline="s%@SHELL@%$SHELL%" echo "Create Makefile.var..." >&6 @@ -253,3 +318,6 @@ echo "EASDATADIR=$datadir" >>Makefile.var echo "EASLOGDIR=$logdir" >>Makefile.var echo "EASDBPATH=$dbpath" >>Makefile.var + +echo "DOCDIR=$docdir" >>Makefile.var +echo "PODIR=$podir" >>Makefile.var |
