Changeset 812 for branches/branch-1.6

Timestamp:

Jan 29, 2017, 3:31:19 PM (8 years ago)

Author:

djay

Message:

Merge branch-1.6 with trunk and create the tag for the 1.6.0 release

Location:

branches/branch-1.6

Files:

• . (modified) (1 prop)
• docs/install/installation.rst (modified) (1 diff)
• zoo-project/zoo-kernel/Makefile.in (modified) (3 diffs)
• zoo-project/zoo-kernel/ZOOMakefile.opts.in (modified) (1 diff)
• zoo-project/zoo-kernel/configure.ac (modified) (2 diffs)
• zoo-project/zoo-kernel/locale/po/it_IT.po (modified) (6 diffs)
• zoo-project/zoo-kernel/main.cfg (deleted)
• zoo-project/zoo-kernel/main.cfg.in (copied) (copied from trunk/zoo-project/zoo-kernel/main.cfg.in)
• zoo-project/zoo-services/utils/status/Makefile (modified) (1 diff)

branches/branch-1.6/docs/install/installation.rst

@@ -343 +343 @@
 file.
 
+.. note:: 
+   You can use the `--with-java-rpath` option to produce a binary
+   aware of the libjvm location.
+
 
 .. note:: 

branches/branch-1.6/zoo-project/zoo-kernel/Makefile.in

@@ -61 +61 @@
 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
@@ -112 +113 @@
         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}/
@@ -119 +120 @@
          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}

branches/branch-1.6/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -105 +105 @@
 
 DATAROOTDIR=@datarootdir@/zoo-project
+SHAREDSTATEDIR=@sharedstatedir@/zoo-project

branches/branch-1.6/zoo-project/zoo-kernel/configure.ac

@@ -595 +595 @@
         [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
@@ -621 +625 @@
                         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

branches/branch-1.6/zoo-project/zoo-kernel/locale/po/it_IT.po

@@ -4 +4 @@
 # 
 # Translators:
-# Luca Delucchi <lucadeluge@gmail.com>, 2015
+# Luca Delucchi <lucadeluge@gmail.com>, 2015,2017
 msgid ""
 msgstr ""
@@ -10 +10 @@
 "Report-Msgid-Bugs-To: zoo-discuss@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@geolabs.fr>\n"
+"PO-Revision-Date: 2017-01-25 07:49+0000\n"
+"Last-Translator: Luca Delucchi <lucadeluge@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"
@@ -199 +199 @@
 #: server_internal.c:1063
 msgid "Unable to open the registry directory."
-msgstr ""
+msgstr "Impossibile aprire la directory del registro"
 
 #: server_internal.c:1082
@@ -243 +243 @@
 "%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
@@ -253 +253 @@
 #, 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
@@ -277 +277 @@
 #: 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

branches/branch-1.6/zoo-project/zoo-services/utils/status/Makefile

@@ -8 +8 @@
 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