Changeset 979 for branches


Ignore:
Timestamp:
Dec 30, 2020, 4:18:43 PM (4 years ago)
Author:
djay
Message:

Update branch and create tag for the 1.8.0 release

Location:
branches/branch-1.8
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/branch-1.8

  • branches/branch-1.8/zoo-project/zoo-kernel/Makefile.in

    r967 r979  
    5151
    5252sqlapi.o: sqlapi.c sqlapi.h
    53         g++ -fPIC ${METADB_ENABLED} ${GDAL_CFLAGS} ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
     53        g++ -fPIC ${JSON_CFLAGS} ${METADB_ENABLED} ${GDAL_CFLAGS} ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
    5454
    5555caching.o: caching.c
    … …  
    120120        g++ -g -O2 ${JSON_CFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${CFLAGS} ${MONO_CFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${RCFLAGS} ${PYTHONCFLAGS} ${JAVACFLAGS} ${JSCFLAGS} ${PERLCFLAGS} ${PHPCFLAGS} ${SAGA_ENABLED} ${OTB_ENABLED} ${HPC_ENABLED} ${PYTHON_ENABLED} ${R_ENABLED} ${JS_ENABLED} ${PHP_ENABLED} ${PERL_ENABLED} ${JAVA_ENABLED} ${MONO_ENABLED} ${METADB_ENABLED} -c zoo_service_loader.c  -fno-common -DPIC -o zoo_service_loader.o
    121121
    122 libzoo_service.${EXT}: version.h service_internal.o service.o sqlapi.o
    123         g++ -shared  ${GDAL_CFLAGS} ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS}  service_internal.o service.o sqlapi.o ${FCGI_LDFLAGS} ${GDAL_LIBS} ${ZOO_LDFLAGS} ${MACOS_LD_FLAGS}
     122libzoo_service.${EXT}: version.h service_internal.o service.o sqlapi.o ${CALLBACK_FILE}
     123        g++ -shared  ${GDAL_CFLAGS} ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS}  service_internal.o service.o sqlapi.o ${CALLBACK_FILE} ${FCGI_LDFLAGS} ${GDAL_LIBS} ${ZOO_LDFLAGS} ${MACOS_LD_FLAGS}
    124124
    125 zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${R_FILE} ${SAGA_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE} ${CALLBACK_FILE}
     125zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${R_FILE} ${SAGA_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE}
    126126        g++ -g -O2 ${JSON_CFLAGS} ${JSCFLAGS} ${PHPCFLAGS}  ${PERLCFLAGS} ${RUBYCFLAGS}  ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c  -fno-common -DPIC -o zoo_loader.o
    127         g++  ${JSON_CFLAGS} ${JSCFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o ${MS_FILE} ${PYTHON_FILE}  ${PERL_FILE} ${PHP_FILE}  ${JS_FILE} ${JAVA_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} ${MONO_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE} ${R_FILE} ${CALLBACK_FILE} response_print.o server_internal.o caching.o request_parser.o ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -L. ${LDFLAGS}
     127        g++  ${JSON_CFLAGS} ${JSCFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o ${MS_FILE} ${PYTHON_FILE}  ${PERL_FILE} ${PHP_FILE}  ${JS_FILE} ${JAVA_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} ${MONO_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE} ${R_FILE} response_print.o server_internal.o caching.o request_parser.o ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -L. ${LDFLAGS}
    128128
    129 zcfg2yaml: zcfg2yaml.c service.h lex.sr.o service_conf.tab.o service_conf.y main_conf_read.tab.o lex.cr.o response_print.o server_internal.o service_internal.o ${MS_FILE} ${YAML_FILE} ${CALLBACK_FILE}
     129zcfg2yaml: zcfg2yaml.c service.h lex.sr.o service_conf.tab.o service_conf.y main_conf_read.tab.o lex.cr.o response_print.o server_internal.o service_internal.o ${MS_FILE} ${YAML_FILE}
    130130        g++ -g -O2 ${JSCFLAGS} ${RUBYCFLAGS} ${XML2CFLAGS} ${CFLAGS} -c zcfg2yaml.c  -fno-common -DPIC -o zcfg2yaml.o
    131         g++  ${XML2CFLAGS} ${CFLAGS} zcfg2yaml.o caching.o ulinet.o ${CALLBACK_FILE} 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}
     131        g++  ${XML2CFLAGS} ${CFLAGS} zcfg2yaml.o caching.o ulinet.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}
    132132
    133133install: zoo_loader.cgi

  • branches/branch-1.8/zoo-project/zoo-kernel/makefile.vc

    r934 r979  
    107107        link zoo_loader.obj request_parser.obj response_print.obj server_internal.obj caching.obj service_json.obj service_callback.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(MONO_FILE) $(RUBY_FILE) $(PHP_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj  zoo_service_loader.obj ./libzoo_service.lib /out:$(PROGRAMNAME) $(LDFLAGS) $(LDFLAGSCGI) $(JSONC_LIB) $(PTHREADS_LIB) $(XSLT_LIB)
    108108
    109 zcfg2yaml: version.h zcfg2yaml.obj zoo_service_loader.obj service_internal.obj caching.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(MONO_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj
    110         link zcfg2yaml.obj server_internal.obj caching.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(MONO_FILE) $(RUBY_FILE) $(PHP_FILE) ulinet.obj response_print.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj ./libzoo_service.lib /out:zcfg2yaml.exe $(LDFLAGS) $(LDFLAGSCGI)
     109zcfg2yaml: version.h zcfg2yaml.obj zoo_service_loader.obj service_internal.obj caching.obj service_json.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(MONO_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj
     110        link zcfg2yaml.obj server_internal.obj caching.obj service_json.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(MONO_FILE) $(RUBY_FILE) $(PHP_FILE) ulinet.obj response_print.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj ./libzoo_service.lib /out:zcfg2yaml.exe $(LDFLAGS) $(LDFLAGSCGI) $(JSONC_LIB)
    111111
    112112clean:

  • branches/branch-1.8/zoo-project/zoo-kernel/service.h

    r962 r979  
    8888
    8989#else
     90#include <sys/stat.h>
    9091/**
    9192 * The crossplatform strdup alias
    … …  
    9596 * The crossplatform mkdir alias
    9697 */
    97 #define zMkdir mkdir
     98static int zMkdir(const char* pccPath){
     99  return mkdir(pccPath,0777);
     100}
    98101/**
    99102 * The crossplatform open alias

  • branches/branch-1.8/zoo-project/zoo-kernel/service_callback.c

    r962 r979  
    2727 */
    2828
     29#ifdef USE_CALLBACK
    2930#include "service_internal_ms.h"
     31#endif
    3032#include <pthread.h>
    3133#include <libxml/tree.h>
    … …  
    284286    return true;
    285287  }
    286  
     288
     289#ifdef USE_CALLBACK
    287290  /**
    288291   * Practically invoke the callback, meaning sending the HTTP POST request.
    … …  
    10351038    return true;
    10361039  }
    1037 
     1040#endif
     1041 
    10381042  /**
    10391043   * Wait for the threads to end then, clean used memory.

  • branches/branch-1.8/zoo-project/zoo-kernel/service_callback.h

    r962 r979  
    3939
    4040  bool invokeBasicCallback(maps*,int);
     41#ifdef USE_CALLBACK
    4142  bool invokeCallback(maps*,maps*,maps*,int,int);
     43#endif
    4244  void cleanupCallbackThreads();
    4345 

  • branches/branch-1.8/zoo-project/zoo-kernel/service_internal.c

    r962 r979  
    3030#endif
    3131#include "service_internal.h"
     32#include "service_callback.h"
    3233
    3334#ifdef WIN32
    … …  
    471472      fflush(fstatus);
    472473      fclose(fstatus);
     474#ifdef USE_JSON
    473475      invokeBasicCallback(conf,SERVICE_STARTED);
     476#endif
    474477    }
    475478    if(stat!=NULL){

  • branches/branch-1.8/zoo-project/zoo-kernel/service_json.c

    r967 r979  
    13181318            tmpPath->value,
    13191319            cIdentifier->value);
    1320     if(mkdir(tmp1,0777) != 0 && errno != EEXIST){
     1320    if(zMkdir(tmp1) != 0 && errno != EEXIST){
    13211321      fprintf(stderr,"Issue creating directory %s\n",tmp1);
    13221322      return NULL;

  • branches/branch-1.8/zoo-project/zoo-kernel/service_json.h

    r967 r979  
    5050  void printGetCapabilitiesForProcessJ(registry*, maps*,void*,void*,service*);
    5151  void printExceptionReportResponseJ(maps*,map*);
    52   void parseJRequest(maps*,service* s,json_object*,map*,maps**,maps**);
     52  void parseJRequest(maps*,service*,json_object*,map*,maps**,maps**);
    5353  json_object*  printJResult(maps*,service*,maps*,int);
    5454  json_object* printJobStatus(maps*,char*);

  • branches/branch-1.8/zoo-project/zoo-kernel/sqlapi.c

    r962 r979  
    389389  cleanUpResultSet(conf,zoo_ds_nb-1);
    390390  free(sqlQuery);
     391#ifdef USE_JSON 
    391392  invokeBasicCallback(conf,SERVICE_STARTED);
     393#endif
    392394  return 0;
    393395}

  • branches/branch-1.8/zoo-project/zoo-kernel/zoo_service_loader.c

    r967 r979  
    6969#include "service.h"
    7070
    71 #ifdef USE_JSON
     71#if defined(WIN32) || defined(USE_JSON)
    7272#include "caching.h"
    7373#endif
    … …  
    696696}
    697697
     698#ifdef USE_JSON
    698699/**
    699700 * Run every HTTP request to download inputs passed as reference
    … …  
    738739  return 0;
    739740}
     741#endif
    740742
    741743/**
    … …  
    985987    addToMap (request_inputs, "status", "true");
    986988    setMapInMaps (conf, "lenv", "osid", test1->value);
    987     status = getMap (request_inputs, "status");
     989    //status = getMap (request_inputs, "status");
    988990  }
    989991  test1 = getMap (request_inputs, "usid");
Note: See TracChangeset for help on using the changeset viewer.

Download now !

Search

Context Navigation

Main 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