Changeset 284 for trunk


Ignore:
Timestamp:
Aug 1, 2011, 7:08:27 PM (13 years ago)
Author:
djay
Message:

Add the ZOOMakefile.opts file used from service providers' Makefiles.

Location:
trunk
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/thirds/cgic206/Makefile

    r78 r284  
    11OS:=$(shell uname -s)
    22ifeq ($(OS),Darwin)
    3         MACOS_CFLAGS=-arch i386 -arch ppc -arch x86_64
     3        MACOS_CFLAGS=-arch $(shell uname -m)
    44        LIBS= -L./ -lcgic /usr/lib/libfcgi.dylib
    55else

  • trunk/zoo-kernel/Makefile.in

    r114 r284  
    22ifeq ($(OS),Darwin)
    33        MACOS_LD_FLAGS=-lintl -framework SystemConfiguration -framework CoreFoundation
    4         MACOS_CFLAGS=-arch i386 -arch ppc -arch x86_64
     4        MACOS_CFLAGS=-arch $(shell uname -m)
    55endif
    66

  • trunk/zoo-kernel/configure.ac

    r276 r284  
    122122        [PYTHON_PATH="$withval"; PYTHON_ENABLED="-DUSE_PYTHON"], [PYTHON_ENABLED=""])
    123123
     124AC_ARG_WITH([python-version],
     125        [AS_HELP_STRING([--with-python-version=NUMBER], [To enable python support using a speficific version of python])],
     126        [PYTHON_VERS="$withval"], [PYTHON_VERS=""])
     127
    124128
    125129if test -z "$PYTHON_ENABLED"
    … …  
    127131        PYTHON_FILE=""
    128132else
    129         PYTHONCONFIG="$PYTHON_PATH/bin/python-config"
     133        PYTHONCONFIG="$PYTHON_PATH/bin/python${PYTHON_VERS}-config"
    130134        PYTHON_FILE="service_internal_python.o"
    131135        if test  "$PYTHON_PATH" = "yes"
    132136        then
    133137                # PHP was not specified, so search within the current path
    134                 AC_PATH_PROG([PYTHONCONFIG], [python-config])
    135         else
    136                 PYTHONCONFIG="$PYTHON_PATH/bin/python-config"
     138                AC_PATH_PROG([PYTHONCONFIG], [python${PYTHON_VERS}-config])
     139        else
     140                PYTHONCONFIG="$PYTHON_PATH/bin/python${PYTHON_VERS}-config"
    137141        fi
    138142
    … …  
    366370
    367371AC_CONFIG_FILES([Makefile])
    368 #AC_CONFIG_FILES([ZOOMakefile.opts])
     372AC_CONFIG_FILES([ZOOMakefile.opts])
    369373AC_OUTPUT

  • trunk/zoo-kernel/service.h

    r282 r284  
    502502    map* tmpMap=getMap(tmp,key);
    503503    if(tmpMap==NULL){
    504       addToMap(tmp,key,value);
     504      if(tmp!=NULL)
     505        addToMap(tmp,key,value);
     506      else
     507        tmp=createMap(key,value);
    505508      tmpMap=getMap(tmp,key);
    506509    }

  • trunk/zoo-kernel/service_internal.c

    r283 r284  
    11171117      if(hasDefault!=true && strncmp(type,"Input",5)==0)
    11181118        xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
    1119       xmlFreeNodeList(nc5);
    1120       xmlFreeNodeList(nc4);
    11211119    }
    11221120   
    … …  
    24162414}
    24172415
     2416int errorException(maps *m, const char *message, const char *errorcode)
     2417{
     2418  map* errormap = createMap("text", message);
     2419  addToMap(errormap,"code", errorcode);
     2420  printExceptionReportResponse(m,errormap);
     2421  freeMap(&errormap);
     2422  free(errormap);
     2423  return -1;
     2424}

  • trunk/zoo-kernel/service_internal.h

    r281 r284  
    121121  char* addDefaultValues(maps**,elements*,maps*,int);
    122122
    123   /*defined in zoo_loader.c*/
    124123  int errorException(maps *m, const char *message, const char *errorcode);
    125124

  • trunk/zoo-kernel/zoo_loader.c

    r280 r284  
    5454
    5555using namespace std;
    56 
    57 /* ************************************************************************* */
    58 
    59 int errorException(maps *m, const char *message, const char *errorcode)
    60 {
    61   map* errormap = createMap("text", message);
    62   addToMap(errormap,"code", errorcode);
    63   printExceptionReportResponse(m,errormap);
    64   freeMap(&errormap);
    65   free(errormap);
    66   return -1;
    67 }
    68 
    69 /* ************************************************************************* */
    70 
    7156
    7257#define TRUE 1

  • trunk/zoo-services/cgal/Makefile

    r116 r284  
    1 CFLAGS=-I../../zoo-kernel/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/cgal_service.zo: service.c
    5         g++ ${CFLAGS} -shared -fpic -o cgi-env/cgal_service.zo ./service.c -lgdal -lCGAL
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/cgal_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lCGAL
    68
    79clean:
    8         rm -f cgi-env/*.zo *.o *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling
    9         rm -rf service_loader.dSYM
     10        rm -f cgi-env/*.zo

  • trunk/zoo-services/gdal/grid/Makefile

    r1 r284  
    1 CFLAGS=-I../../../zoo-kernel-svn/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/service.zo: service.c
    5         g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c -lgdal
     7        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
    68
    79clean:

  • trunk/zoo-services/gdal/grid/service.c

    r1 r284  
    879879      char *ext=new char[4];
    880880      ext="tif";
    881       if(strcmp(mtoupper((char*)pszFormat),"AAIGRID")==0)
     881      if(strncasecmp(pszFormat,"AAIGRID",7)==0)
    882882        ext="csv";
    883883      else
    884         if(strcmp(mtoupper((char*)pszFormat),"PNG")==0)
     884        if(strncasecmp(pszFormat,"PNG",3)==0)
    885885          ext="png";
    886886        else
    887           if(strcmp(mtoupper((char*)pszFormat),"GIF")==0)
     887          if(strncasecmp(pszFormat,"GIF",3)==0)
    888888            ext="gif";
    889889          else
    890             if(strcmp(mtoupper((char*)pszFormat),"JPEG")==0)
     890            if(strncasecmp(pszFormat,"JPEG",4)==0)
    891891              ext="jpg";
    892892      sprintf((char*)pszDest,"%s/%s.%s",tempPath,tmpMap->value,ext);

  • trunk/zoo-services/gdal/profile/Makefile

    r50 r284  
    1 CFLAGS=-I../../../zoo-kernel/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/gdal_profile_service.zo: service.c
    5         g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_profile_service.zo ./service.c -lgdal
     7        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
    68
    79clean:

  • trunk/zoo-services/gdal/translate/Makefile

    r1 r284  
    1 CFLAGS=-I../../../zoo-kernel-svn/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/service.zo: service.c
    5         g++ ${CFLAGS} -shared -fpic -o cgi-env/service.zo ./service.c -lgdal
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
    68
    79clean:
    8         rm -f *.zo *.o *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling
    9         rm -rf service_loader.dSYM
     10        rm -f cgi-env/*.zo

  • trunk/zoo-services/gdal/translate/service.c

    r1 r284  
    133133      char *ext=new char[4];
    134134      ext="tif";
    135       if(strcmp(mtoupper((char*)pszFormat),"AAIGRID")==0)
     135      if(strncasecmp(pszFormat,"AAIGRID",7)==0)
    136136        ext="csv";
    137137      else
    138         if(strcmp(mtoupper((char*)pszFormat),"PNG")==0)
     138        if(strncasecmp(pszFormat,"PNG",3)==0)
    139139          ext="png";
    140140        else
    141           if(strcmp(mtoupper((char*)pszFormat),"GIF")==0)
     141          if(strncasecmp(pszFormat,"GIF",3)==0)
    142142            ext="gif";
    143143          else
    144             if(strcmp(mtoupper((char*)pszFormat),"JPEG")==0)
     144            if(strncasecmp(pszFormat,"JPEG",4)==0)
    145145              ext="jpg";
    146146      sprintf((char*)pszDest,"%s/%s.%s",tempPath,tmpMap->value,ext);

  • trunk/zoo-services/ogr/base-vect-ops/Makefile

    r106 r284  
    1 CFLAGS=-I../../../zoo-kernel/ -I./ `geos-config --cflags` `xml2-config --cflags`  `gdal-config --cflags`  -DLINUX_FREE_ISSUE #-DDEBUG
    2 # if JS_ENABLED flag is set to true in your ZOO-Kernel Makefile then you'll have
    3 # uncomment the following line
    4 # JS_LDFLAGS=../../../zoo-kernel/ulinet.o ../../../zoo-kernel/service_internal_js.o
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${JSCFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} `geos-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
    54
    65cgi-env/ogr_service.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} `xml2-config --libs` `gdal-config --libs` `geos-config --libs`
     6        g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} `geos-config --libs`
    87
    98clean:

  • trunk/zoo-services/ogr/base-vect-ops/service.c

    r216 r284  
    4444  void printExceptionReportResponse(maps*,map*);
    4545  char *base64(const char *input, int length);
     46  int errorException(maps *m, const char *message, const char *errorcode);
    4647
    4748  OGRGeometryH createGeometryFromGML(maps* conf,char* inputStr){

  • trunk/zoo-services/utils/status/Makefile

    r255 r284  
    1 CFLAGS=-I../../../thirds/cgic206/ -I../../../zoo-kernel/ -I./ `xslt-config --cflags` `xml2-config --cflags` -lintl -lfcgi -lcrypto -DLINUX_FREE_ISSUE #-DDEBUG
    2 # if JS_ENABLED flag is set to true in your ZOO-Kernel Makefile then you'll have
    3 # uncomment the following line
    4 # JS_LDFLAGS=../../../zoo-kernel/ulinet.o ../../../zoo-kernel/service_internal_js.o
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    54
    65cgi-env/wps_status.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} `xml2-config --libs` `xslt-config --libs`
     6        g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} `xslt-config --libs` -lfcgi
    87
    98clean:
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