Changeset 812


Ignore:
Timestamp:
Jan 29, 2017, 3:31:19 PM (3 years ago)
Author:
djay
Message:

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

Files:
2 deleted
13 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/branch-1.6

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

    r807 r812  
    343343file.
    344344
     345.. note::
     346   You can use the `--with-java-rpath` option to produce a binary
     347   aware of the libjvm location.
     348
    345349
    346350.. note::
  • branches/branch-1.6/zoo-project/zoo-kernel/Makefile.in

    r800 r812  
    6161service_internal_ms.o: service_internal_ms.c
    6262        gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
     63        echo "SYMBOLSET\nEND" > sybols.sym
    6364
    6465service_internal_python.o: service_internal_python.c service.h
     
    112113        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}
    113114
    114 install:
     115install: zoo_loader.cgi
    115116        install -d ${DESTDIR}${CGI_DIR}
    116117        install zoo_loader.cgi ${DESTDIR}${CGI_DIR}/
     
    119120         if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
    120121         ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
     122        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
    121123        install -d ${DESTDIR}${INST_INCLUDE}/zoo
    122124        install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
    123125
    124126clean:
    125         rm -f version.h *.o *.zo *.eo *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling service_loader.dSYM *${EXT}
     127        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

    r794 r812  
    105105
    106106DATAROOTDIR=@datarootdir@/zoo-project
     107SHAREDSTATEDIR=@sharedstatedir@/zoo-project
  • branches/branch-1.6/zoo-project/zoo-kernel/configure.ac

    r807 r812  
    595595        [JDKHOME="$withval"; JAVA_ENABLED="-DUSE_JAVA"], [JAVA_ENABLED=""])
    596596
     597AC_ARG_WITH([java-rpath],
     598        [AS_HELP_STRING([--with-java-rpath=yes], [To set rpath for java support, disabled by default])],
     599        [JAVA_RPATH="$withval"], [JAVA_RPATH=""])
     600
    597601if test -z "$JAVA_ENABLED"
    598602then
     
    621625                        JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
    622626                        JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
     627                        if test x$JAVA_RPATH = "xyes"; then
     628                           JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/i386/server/"
     629                        fi
    623630                else
    624631                        if test -d "$JDKHOME/jre/lib/amd64"; then
    625632                           JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
    626633                           JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
     634                           if test x$JAVA_RPATH = "xyes"; then
     635                              JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/amd64/server/"
     636                           fi
    627637                        else
    628638                           JAVA_LDFLAGS="-L$JDKHOME/jre/lib/server/ -ljvm -lpthread"
    629639                           JAVA_CPPFLAGS="-I$JDKHOME/include/ -I$JDKHOME/include/darwin"
     640                           if test x$JAVA_RPATH = "xyes"; then
     641                              JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/server/"
     642                           fi
    630643                        fi
    631644                fi
  • branches/branch-1.6/zoo-project/zoo-kernel/locale/po/it_IT.po

    r795 r812  
    44#
    55# Translators:
    6 # Luca Delucchi <lucadeluge@gmail.com>, 2015
     6# Luca Delucchi <lucadeluge@gmail.com>, 2015,2017
    77msgid ""
    88msgstr ""
     
    1010"Report-Msgid-Bugs-To: zoo-discuss@lists.osgeo.org\n"
    1111"POT-Creation-Date: 2015-07-02 18:06+0200\n"
    12 "PO-Revision-Date: 2016-06-30 09:31+0000\n"
    13 "Last-Translator: Gérald FENOY <gerald.fenoy@geolabs.fr>\n"
     12"PO-Revision-Date: 2017-01-25 07:49+0000\n"
     13"Last-Translator: Luca Delucchi <lucadeluge@gmail.com>\n"
    1414"Language-Team: Italian (Italy) (http://www.transifex.com/zoo-project/zoo-kernel-internationalization/language/it_IT/)\n"
    1515"MIME-Version: 1.0\n"
     
    199199#: server_internal.c:1063
    200200msgid "Unable to open the registry directory."
    201 msgstr ""
     201msgstr "Impossibile aprire la directory del registro"
    202202
    203203#: server_internal.c:1082
     
    243243"%s \n"
    244244" Unable to run your python process properly. Unable to provide any further information."
    245 msgstr ""
     245msgstr "%s\nImpossibile eseguire il processo python correttamente. Impossible fornire nessun'altra informazione"
    246246
    247247#: zoo_service_loader.c:352
     
    253253#, c-format
    254254msgid "Error occurred while running the %s function: %s"
    255 msgstr ""
     255msgstr "Errore accaduto durante l'esecuzione della funzione %s: %s"
    256256
    257257#: zoo_service_loader.c:578
     
    277277#: zoo_service_loader.c:895
    278278msgid "%s The following file: %s cannot be found."
    279 msgstr ""
     279msgstr "%s il senguente file: %s non può essere trovato"
    280280
    281281#: zoo_service_loader.c:940
  • branches/branch-1.6/zoo-project/zoo-services/utils/status/Makefile

    r779 r812  
    88install:
    99        install -d ${CGI_DIR}
    10         install cgi-env/* ${CGI_DIR}/
     10        install cgi-env/*.zcfg ${CGI_DIR}/
     11        install cgi-env/*.zo ${CGI_DIR}/
     12        install cgi-env/updateStatus.xsl ${SHAREDSTATEDIR}/
     13
    1114clean:
    1215        rm -f cgi-env/wps_status.zo
  • tags/rel-1.6.0

  • tags/rel-1.6.0/docs/install/installation.rst

    r807 r812  
    343343file.
    344344
     345.. note::
     346   You can use the `--with-java-rpath` option to produce a binary
     347   aware of the libjvm location.
     348
    345349
    346350.. note::
  • tags/rel-1.6.0/zoo-project/zoo-kernel/Makefile.in

    r800 r812  
    6161service_internal_ms.o: service_internal_ms.c
    6262        gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
     63        echo "SYMBOLSET\nEND" > sybols.sym
    6364
    6465service_internal_python.o: service_internal_python.c service.h
     
    112113        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}
    113114
    114 install:
     115install: zoo_loader.cgi
    115116        install -d ${DESTDIR}${CGI_DIR}
    116117        install zoo_loader.cgi ${DESTDIR}${CGI_DIR}/
     
    119120         if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
    120121         ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
     122        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
    121123        install -d ${DESTDIR}${INST_INCLUDE}/zoo
    122124        install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
    123125
    124126clean:
    125         rm -f version.h *.o *.zo *.eo *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling service_loader.dSYM *${EXT}
     127        rm -f version.h symbols.sym *.o *.cgi *.eo *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling service_loader.dSYM *${EXT}
  • tags/rel-1.6.0/zoo-project/zoo-kernel/ZOOMakefile.opts.in

    r794 r812  
    105105
    106106DATAROOTDIR=@datarootdir@/zoo-project
     107SHAREDSTATEDIR=@sharedstatedir@/zoo-project
  • tags/rel-1.6.0/zoo-project/zoo-kernel/configure.ac

    r807 r812  
    595595        [JDKHOME="$withval"; JAVA_ENABLED="-DUSE_JAVA"], [JAVA_ENABLED=""])
    596596
     597AC_ARG_WITH([java-rpath],
     598        [AS_HELP_STRING([--with-java-rpath=yes], [To set rpath for java support, disabled by default])],
     599        [JAVA_RPATH="$withval"], [JAVA_RPATH=""])
     600
    597601if test -z "$JAVA_ENABLED"
    598602then
     
    621625                        JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
    622626                        JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
     627                        if test x$JAVA_RPATH = "xyes"; then
     628                           JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/i386/server/"
     629                        fi
    623630                else
    624631                        if test -d "$JDKHOME/jre/lib/amd64"; then
    625632                           JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
    626633                           JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
     634                           if test x$JAVA_RPATH = "xyes"; then
     635                              JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/amd64/server/"
     636                           fi
    627637                        else
    628638                           JAVA_LDFLAGS="-L$JDKHOME/jre/lib/server/ -ljvm -lpthread"
    629639                           JAVA_CPPFLAGS="-I$JDKHOME/include/ -I$JDKHOME/include/darwin"
     640                           if test x$JAVA_RPATH = "xyes"; then
     641                              JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/server/"
     642                           fi
    630643                        fi
    631644                fi
  • tags/rel-1.6.0/zoo-project/zoo-kernel/locale/po/it_IT.po

    r795 r812  
    44#
    55# Translators:
    6 # Luca Delucchi <lucadeluge@gmail.com>, 2015
     6# Luca Delucchi <lucadeluge@gmail.com>, 2015,2017
    77msgid ""
    88msgstr ""
     
    1010"Report-Msgid-Bugs-To: zoo-discuss@lists.osgeo.org\n"
    1111"POT-Creation-Date: 2015-07-02 18:06+0200\n"
    12 "PO-Revision-Date: 2016-06-30 09:31+0000\n"
    13 "Last-Translator: Gérald FENOY <gerald.fenoy@geolabs.fr>\n"
     12"PO-Revision-Date: 2017-01-25 07:49+0000\n"
     13"Last-Translator: Luca Delucchi <lucadeluge@gmail.com>\n"
    1414"Language-Team: Italian (Italy) (http://www.transifex.com/zoo-project/zoo-kernel-internationalization/language/it_IT/)\n"
    1515"MIME-Version: 1.0\n"
     
    199199#: server_internal.c:1063
    200200msgid "Unable to open the registry directory."
    201 msgstr ""
     201msgstr "Impossibile aprire la directory del registro"
    202202
    203203#: server_internal.c:1082
     
    243243"%s \n"
    244244" Unable to run your python process properly. Unable to provide any further information."
    245 msgstr ""
     245msgstr "%s\nImpossibile eseguire il processo python correttamente. Impossible fornire nessun'altra informazione"
    246246
    247247#: zoo_service_loader.c:352
     
    253253#, c-format
    254254msgid "Error occurred while running the %s function: %s"
    255 msgstr ""
     255msgstr "Errore accaduto durante l'esecuzione della funzione %s: %s"
    256256
    257257#: zoo_service_loader.c:578
     
    277277#: zoo_service_loader.c:895
    278278msgid "%s The following file: %s cannot be found."
    279 msgstr ""
     279msgstr "%s il senguente file: %s non può essere trovato"
    280280
    281281#: zoo_service_loader.c:940
  • tags/rel-1.6.0/zoo-project/zoo-services/utils/status/Makefile

    r779 r812  
    88install:
    99        install -d ${CGI_DIR}
    10         install cgi-env/* ${CGI_DIR}/
     10        install cgi-env/*.zcfg ${CGI_DIR}/
     11        install cgi-env/*.zo ${CGI_DIR}/
     12        install cgi-env/updateStatus.xsl ${SHAREDSTATEDIR}/
     13
    1114clean:
    1215        rm -f cgi-env/wps_status.zo
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png