Changeset 284 for trunk/zoo-kernel

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/zoo-kernel

Files:

• Makefile.in (modified) (1 diff)
• ZOOMakefile.opts.in (added)
• configure.ac (modified) (3 diffs)
• service.h (modified) (1 diff)
• service_internal.c (modified) (2 diffs)
• service_internal.h (modified) (1 diff)
• zoo_loader.c (modified) (1 diff)

trunk/zoo-kernel/Makefile.in

@@ -2 +2 @@
 ifeq ($(OS),Darwin)
         MACOS_LD_FLAGS=-lintl -framework SystemConfiguration -framework CoreFoundation
-        MACOS_CFLAGS=-arch i386 -arch ppc -arch x86_64
+        MACOS_CFLAGS=-arch $(shell uname -m)
 endif
 

trunk/zoo-kernel/configure.ac

@@ -122 +122 @@
         [PYTHON_PATH="$withval"; PYTHON_ENABLED="-DUSE_PYTHON"], [PYTHON_ENABLED=""])
 
+AC_ARG_WITH([python-version], 
+        [AS_HELP_STRING([--with-python-version=NUMBER], [To enable python support using a speficific version of python])], 
+        [PYTHON_VERS="$withval"], [PYTHON_VERS=""])
+
 
 if test -z "$PYTHON_ENABLED"
@@ -127 +131 @@
         PYTHON_FILE=""
 else
-        PYTHONCONFIG="$PYTHON_PATH/bin/python-config"
+        PYTHONCONFIG="$PYTHON_PATH/bin/python${PYTHON_VERS}-config"
         PYTHON_FILE="service_internal_python.o"
         if test  "$PYTHON_PATH" = "yes"
         then
                 # PHP was not specified, so search within the current path
-                AC_PATH_PROG([PYTHONCONFIG], [python-config])
-        else
-                PYTHONCONFIG="$PYTHON_PATH/bin/python-config"
+                AC_PATH_PROG([PYTHONCONFIG], [python${PYTHON_VERS}-config])
+        else
+                PYTHONCONFIG="$PYTHON_PATH/bin/python${PYTHON_VERS}-config"
         fi
 
@@ -366 +370 @@
 
 AC_CONFIG_FILES([Makefile])
-#AC_CONFIG_FILES([ZOOMakefile.opts])
+AC_CONFIG_FILES([ZOOMakefile.opts])
 AC_OUTPUT

trunk/zoo-kernel/service.h

@@ -502 +502 @@
     map* tmpMap=getMap(tmp,key);
     if(tmpMap==NULL){
-      addToMap(tmp,key,value);
+      if(tmp!=NULL)
+        addToMap(tmp,key,value);
+      else
+        tmp=createMap(key,value);
       tmpMap=getMap(tmp,key);
     }

trunk/zoo-kernel/service_internal.c

@@ -1117 +1117 @@
       if(hasDefault!=true && strncmp(type,"Input",5)==0)
         xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
-      xmlFreeNodeList(nc5);
-      xmlFreeNodeList(nc4);
     }
     
@@ -2416 +2414 @@
 }
 
+int errorException(maps *m, const char *message, const char *errorcode) 
+{
+  map* errormap = createMap("text", message);
+  addToMap(errormap,"code", errorcode);
+  printExceptionReportResponse(m,errormap);
+  freeMap(&errormap);
+  free(errormap);
+  return -1;
+}

trunk/zoo-kernel/service_internal.h

@@ -121 +121 @@
   char* addDefaultValues(maps**,elements*,maps*,int);
 
-  /*defined in zoo_loader.c*/ 
   int errorException(maps *m, const char *message, const char *errorcode);
 

trunk/zoo-kernel/zoo_loader.c

@@ -54 +54 @@
 
 using namespace std;
-
-/* ************************************************************************* */
-
-int errorException(maps *m, const char *message, const char *errorcode) 
-{
-  map* errormap = createMap("text", message);
-  addToMap(errormap,"code", errorcode);
-  printExceptionReportResponse(m,errormap);
-  freeMap(&errormap);
-  free(errormap);
-  return -1;
-}
-
-/* ************************************************************************* */
-
 
 #define TRUE 1