Changeset 444 for trunk

Timestamp:

Oct 14, 2013, 11:24:53 AM (11 years ago)

Author:

djay

Message:

Fixing issue on Linux / Mac OS X about language gesture. Fixing strange issue in some services using MapServer? support on WIN32. Use the MapServer? nmake.opt to make sure to get all the definitions settled correctly.

Location:

trunk/zoo-project

Files:

• zoo-kernel/makefile.vc (modified) (1 diff)
• zoo-kernel/nmake.opt (modified) (1 diff)
• zoo-kernel/service.h (modified) (2 diffs)
• zoo-kernel/zoo_service_loader.c (modified) (2 diffs)
• zoo-services/gdal/dem/makefile.vc (modified) (1 diff)
• zoo-services/gdal/dem/service.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/makefile.vc

@@ -6 +6 @@
 #
 
+!IF DEFINED(MS_DIR)
+MS_BASE=$(MS_DIR)
+!INCLUDE $(MS_DIR)\nmake.opt
+!ENDIF
 !INCLUDE nmake.opt
 

trunk/zoo-project/zoo-kernel/nmake.opt

@@ -36 +36 @@
 PYTHON_CPATH=$(PY_DIR)
 
-CFLAGS=$(CFLAGS1) /nologo /MD /W3 /EHsc /Ox /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I$(ZOOK_DIR) -I./ $(JAVA_CFLAGS) $(MS_CFLAGS) -I$(TROOT)\..\..\thirds\dirent-win32 -I$(INTL_DIR) -I$(CURL_DIR)\include -I$(XML2_DIR)\include -I$(GDAL_DIR)\port $(JS_CFLAGS) -I$(GDAL_DIR)\ogr -I$(GDAL_DIR)\gcore -I$(GD_DIR) -I$(ICONV_DIR) -I$(TROOT)\..\..\thirds\include -I$(TROOT)\..\..\thirds\cgic206 -I$(PYTHON_CPATH)\include -I$(SSL_DIR)/inc32 -I$(FCGI_DIR)\include $(PY_CFLAGS) -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+CFLAGS=$(MS_DEFS) $(INCLUDES) $(CFLAGS1) /nologo /MD /W3 /EHsc /Ox /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I$(ZOOK_DIR) -I./ $(JAVA_CFLAGS) $(MS_CFLAGS) -I$(TROOT)\..\..\thirds\dirent-win32 -I$(INTL_DIR) -I$(CURL_DIR)\include -I$(XML2_DIR)\include -I$(GDAL_DIR)\port $(JS_CFLAGS) -I$(GDAL_DIR)\ogr -I$(GDAL_DIR)\gcore -I$(GD_DIR) -I$(ICONV_DIR) -I$(TROOT)\..\..\thirds\include -I$(TROOT)\..\..\thirds\cgic206 -I$(PYTHON_CPATH)\include -I$(SSL_DIR)/inc32 -I$(FCGI_DIR)\include $(PY_CFLAGS) -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
 
 LDFLAGSCGI=$(TROOT)/../../thirds/cgic206/libcgic.lib 

trunk/zoo-project/zoo-kernel/service.h

@@ -29 +29 @@
 
 #ifdef WIN32
+#ifndef USE_MS
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
+#endif
 #ifndef snprintf
 #define snprintf sprintf_s
@@ -42 +44 @@
 #endif
 
+#ifdef WIN32
+#ifdef USE_MS
+#include <mapserver.h>
+#endif
+#endif
 #include <stdlib.h>
 #include <ctype.h>

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -599 +599 @@
     translateChar(tmp,'-','_');
     setlocale (LC_ALL, tmp);
-#ifdef WIN32
+#ifndef WIN32
+    setenv("LC_ALL",tmp,1);
+#else
     char tmp1[12];
     sprintf(tmp1,"LC_ALL=%s",tmp);
@@ -608 +610 @@
   else{
     setlocale (LC_ALL, "en_US");
-#ifdef WIN32
+#ifndef WIN32
+    setenv("LC_ALL","en_US",1);
+#else
     char tmp1[12];
     sprintf(tmp1,"LC_ALL=en_US");

trunk/zoo-project/zoo-services/gdal/dem/makefile.vc

@@ -1 +1 @@
 TROOT= $(ZOOK_DIR)
-!INCLUDE $(ZOOK_DIR)/nmake.opt
+!INCLUDE $(ZOOK_DIR)nmake.opt
 
 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj 

trunk/zoo-project/zoo-services/gdal/dem/service.c

@@ -2561 +2561 @@
     if(tmpMap1!=NULL && strcasecmp(tmpMap1->value,"NULL")!=0 )
       scale = atof(tmpMap1->value);
-    map* tmpMap1=getMapFromMaps(inputs,"b","value");
+    tmpMap1=getMapFromMaps(inputs,"b","value");
     if(tmpMap1!=NULL && strcasecmp(tmpMap1->value,"NULL")!=0 )
       nBand = atoi(tmpMap1->value);