[zoo-project] 01/12: Imported Upstream version 1.6.0+ds
Bas Couwenberg
sebastic at debian.org
Sun Jan 29 19:42:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository zoo-project.
commit d81b87c4f72b7705fe8f7164db5a3ef82f33edd0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jan 29 17:41:03 2017 +0100
Imported Upstream version 1.6.0+ds
---
.DS_Store | Bin 0 -> 6148 bytes
._.DS_Store | Bin 0 -> 120 bytes
zoo-project/zoo-kernel/Makefile.in | 6 ++++--
zoo-project/zoo-kernel/ZOOMakefile.opts.in | 3 ++-
zoo-project/zoo-kernel/configure | 20 ++++++++++++++++++++
zoo-project/zoo-kernel/configure.ac | 13 +++++++++++++
zoo-project/zoo-kernel/locale/po/it_IT.po | 14 +++++++-------
zoo-project/zoo-kernel/{main.cfg => main.cfg.in} | 4 ++--
zoo-project/zoo-services/utils/status/Makefile | 5 ++++-
9 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..7642a45
Binary files /dev/null and b/.DS_Store differ
diff --git a/._.DS_Store b/._.DS_Store
new file mode 100644
index 0000000..09fa6bd
Binary files /dev/null and b/._.DS_Store differ
diff --git a/zoo-project/zoo-kernel/Makefile.in b/zoo-project/zoo-kernel/Makefile.in
index ce2b7f3..c90f87b 100644
--- a/zoo-project/zoo-kernel/Makefile.in
+++ b/zoo-project/zoo-kernel/Makefile.in
@@ -60,6 +60,7 @@ service_yaml.o: service_yaml.c service.h
service_internal_ms.o: service_internal_ms.c
gcc ${JS_ENABLED} ${GDAL_CFLAGS} ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
+ echo "SYMBOLSET\nEND" > sybols.sym
service_internal_python.o: service_internal_python.c service.h
g++ ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c service_internal_python.c
@@ -111,15 +112,16 @@ zcfg2yaml: zcfg2yaml.c service.h lex.sr.o service_conf.tab.o service_conf.y main
g++ -g -O2 ${JSCFLAGS} ${RUBYCFLAGS} ${XML2CFLAGS} ${CFLAGS} -c zcfg2yaml.c -fno-common -DPIC -o zcfg2yaml.o
g++ ${XML2CFLAGS} ${CFLAGS} zcfg2yaml.o server_internal.o service_internal.o ${MS_FILE} response_print.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o ${YAML_FILE} -o zcfg2yaml -L. ${LDFLAGS}
-install:
+install: zoo_loader.cgi
install -d ${DESTDIR}${CGI_DIR}
install zoo_loader.cgi ${DESTDIR}${CGI_DIR}/
install libzoo_service.${EXT} ${DESTDIR}${INST_LIB}/${LIBZOO_SERVICE}
(cd ${DESTDIR}${INST_LIB} ; \
if [ -e "libzoo_service.${EXT}" ]; then rm libzoo_service.${EXT}; fi ; \
ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
+ if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
install -d ${DESTDIR}${INST_INCLUDE}/zoo
install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
clean:
- rm -f version.h *.o *.zo *.eo *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling service_loader.dSYM *${EXT}
+ rm -f version.h symbols.sym *.o *.cgi *.eo *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling service_loader.dSYM *${EXT}
diff --git a/zoo-project/zoo-kernel/ZOOMakefile.opts.in b/zoo-project/zoo-kernel/ZOOMakefile.opts.in
index 7138895..2ffb2d9 100644
--- a/zoo-project/zoo-kernel/ZOOMakefile.opts.in
+++ b/zoo-project/zoo-kernel/ZOOMakefile.opts.in
@@ -103,4 +103,5 @@ MONO_FILE=@MONO_FILE@
CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS}
-DATAROOTDIR=@datarootdir@/zoo-project
\ No newline at end of file
+DATAROOTDIR=@datarootdir@/zoo-project
+SHAREDSTATEDIR=@sharedstatedir@/zoo-project
\ No newline at end of file
diff --git a/zoo-project/zoo-kernel/configure b/zoo-project/zoo-kernel/configure
index c3115ef..a2a9577 100755
--- a/zoo-project/zoo-kernel/configure
+++ b/zoo-project/zoo-kernel/configure
@@ -776,6 +776,7 @@ with_js
with_php
with_php_version
with_java
+with_java_rpath
with_mono
with_ruby
with_rvers
@@ -1444,6 +1445,7 @@ Optional Packages:
--with-phpvers=NUM To use a specific php version
--with-java=PATH To enable java support, specify a JDK_HOME, disabled
by default
+ --with-java-rpath=yes To set rpath for java support, disabled by default
--with-mono=PATH To enable mono support, specify the path to find
pkg-config, disabled by default
--with-ruby=PATH To enable ruby support or specify an alternative
@@ -6864,6 +6866,15 @@ else
fi
+
+# Check whether --with-java-rpath was given.
+if test "${with_java_rpath+set}" = set; then :
+ withval=$with_java_rpath; JAVA_RPATH="$withval"
+else
+ JAVA_RPATH=""
+fi
+
+
if test -z "$JAVA_ENABLED"
then
JAVA_FILE=""
@@ -6890,13 +6901,22 @@ else
then
JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+ if test x$JAVA_RPATH = "xyes"; then
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/i386/server/"
+ fi
else
if test -d "$JDKHOME/jre/lib/amd64"; then
JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+ if test x$JAVA_RPATH = "xyes"; then
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/amd64/server/"
+ fi
else
JAVA_LDFLAGS="-L$JDKHOME/jre/lib/server/ -ljvm -lpthread"
JAVA_CPPFLAGS="-I$JDKHOME/include/ -I$JDKHOME/include/darwin"
+ if test x$JAVA_RPATH = "xyes"; then
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/server/"
+ fi
fi
fi
fi
diff --git a/zoo-project/zoo-kernel/configure.ac b/zoo-project/zoo-kernel/configure.ac
index 6174d99..d1f0e8b 100644
--- a/zoo-project/zoo-kernel/configure.ac
+++ b/zoo-project/zoo-kernel/configure.ac
@@ -594,6 +594,10 @@ AC_ARG_WITH([java],
[AS_HELP_STRING([--with-java=PATH], [To enable java support, specify a JDK_HOME, disabled by default])],
[JDKHOME="$withval"; JAVA_ENABLED="-DUSE_JAVA"], [JAVA_ENABLED=""])
+AC_ARG_WITH([java-rpath],
+ [AS_HELP_STRING([--with-java-rpath=yes], [To set rpath for java support, disabled by default])],
+ [JAVA_RPATH="$withval"], [JAVA_RPATH=""])
+
if test -z "$JAVA_ENABLED"
then
JAVA_FILE=""
@@ -620,13 +624,22 @@ else
then
JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+ if test x$JAVA_RPATH = "xyes"; then
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/i386/server/"
+ fi
else
if test -d "$JDKHOME/jre/lib/amd64"; then
JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+ if test x$JAVA_RPATH = "xyes"; then
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/amd64/server/"
+ fi
else
JAVA_LDFLAGS="-L$JDKHOME/jre/lib/server/ -ljvm -lpthread"
JAVA_CPPFLAGS="-I$JDKHOME/include/ -I$JDKHOME/include/darwin"
+ if test x$JAVA_RPATH = "xyes"; then
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/server/"
+ fi
fi
fi
fi
diff --git a/zoo-project/zoo-kernel/locale/po/it_IT.po b/zoo-project/zoo-kernel/locale/po/it_IT.po
index 52465c3..4271941 100644
--- a/zoo-project/zoo-kernel/locale/po/it_IT.po
+++ b/zoo-project/zoo-kernel/locale/po/it_IT.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Luca Delucchi <lucadeluge at gmail.com>, 2015
+# Luca Delucchi <lucadeluge at gmail.com>, 2015,2017
msgid ""
msgstr ""
"Project-Id-Version: ZOO-Kernel Internationalization\n"
"Report-Msgid-Bugs-To: zoo-discuss at lists.osgeo.org\n"
"POT-Creation-Date: 2015-07-02 18:06+0200\n"
-"PO-Revision-Date: 2016-06-30 09:31+0000\n"
-"Last-Translator: Gérald FENOY <gerald.fenoy at geolabs.fr>\n"
+"PO-Revision-Date: 2017-01-25 07:49+0000\n"
+"Last-Translator: Luca Delucchi <lucadeluge at gmail.com>\n"
"Language-Team: Italian (Italy) (http://www.transifex.com/zoo-project/zoo-kernel-internationalization/language/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -198,7 +198,7 @@ msgstr "Il processo non può essere rimosso, un file non può essere rimosso"
#: server_internal.c:1063
msgid "Unable to open the registry directory."
-msgstr ""
+msgstr "Impossibile aprire la directory del registro"
#: server_internal.c:1082
msgid "Unable to allocate memory."
@@ -242,7 +242,7 @@ msgstr "%s\nImpossibile eseguire il processo di Python correttamente. Controllar
msgid ""
"%s \n"
" Unable to run your python process properly. Unable to provide any further information."
-msgstr ""
+msgstr "%s\nImpossibile eseguire il processo python correttamente. Impossible fornire nessun'altra informazione"
#: zoo_service_loader.c:352
#, c-format
@@ -252,7 +252,7 @@ msgstr "ZOO Kernel è fallito processando la richiesta, ricevendo il segnale %d
#: zoo_service_loader.c:527
#, c-format
msgid "Error occurred while running the %s function: %s"
-msgstr ""
+msgstr "Errore accaduto durante l'esecuzione della funzione %s: %s"
#: zoo_service_loader.c:578
#, c-format
@@ -276,7 +276,7 @@ msgstr "Impossibile caricare il file main.cfg"
#: zoo_service_loader.c:895
msgid "%s The following file: %s cannot be found."
-msgstr ""
+msgstr "%s il senguente file: %s non può essere trovato"
#: zoo_service_loader.c:940
#, c-format
diff --git a/zoo-project/zoo-kernel/main.cfg b/zoo-project/zoo-kernel/main.cfg.in
similarity index 89%
rename from zoo-project/zoo-kernel/main.cfg
rename to zoo-project/zoo-kernel/main.cfg.in
index 92b6305..a1fa085 100644
--- a/zoo-project/zoo-kernel/main.cfg
+++ b/zoo-project/zoo-kernel/main.cfg.in
@@ -5,8 +5,8 @@ serverAddress = http://www.zoo-project.org/zoo/
language = en-US
lang = fr-FR,en-CA,en-US
tmpPath=/tmp/
-tmpUrl = ../mpPathRelativeToServerAdress/
-dataPath = /tmp/
+tmpUrl = ../tmpPathRelativeToServerAdress/
+dataPath = @sharedstatedir@/zoo-project
cacheDir = /tmp/
[identification]
diff --git a/zoo-project/zoo-services/utils/status/Makefile b/zoo-project/zoo-services/utils/status/Makefile
index 0d9d913..e870863 100644
--- a/zoo-project/zoo-services/utils/status/Makefile
+++ b/zoo-project/zoo-services/utils/status/Makefile
@@ -7,6 +7,9 @@ cgi-env/wps_status.zo: service.c
install:
install -d ${CGI_DIR}
- install cgi-env/* ${CGI_DIR}/
+ install cgi-env/*.zcfg ${CGI_DIR}/
+ install cgi-env/*.zo ${CGI_DIR}/
+ install cgi-env/updateStatus.xsl ${SHAREDSTATEDIR}/
+
clean:
rm -f cgi-env/wps_status.zo
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git
More information about the Pkg-grass-devel
mailing list