Changeset 917 for trunk/zoo-project/zoo-services/utils
- Timestamp:
- May 7, 2019, 2:17:08 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property
svn:mergeinfo
set to
False
/branches/prototype-v0 merged eligible
-
Property
svn:mergeinfo
set to
False
-
trunk/zoo-project/zoo-services/utils/registry/Makefile
r779 r917 1 1 ZRPATH=../../.. 2 2 include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts 3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG3 ZCFLAGS=-I${ZRPATH}/zoo-kernel/ ${CFLAGS} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG 4 4 5 5 YAML_FILES="" … … 16 16 17 17 cgi-env/wps_registry.zo: service.c 18 g++ ${ CFLAGS} -shared -fpic -o cgi-env/wps_registry.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} -lfcgi -L${ZRPATH}/zoo-kernel/ -lzoo_service ${ZRPATH}/zoo-kernel/server_internal.o ${ZRPATH}/zoo-kernel/lex.cr.o ${ZRPATH}/zoo-kernel/lex.sr.o ${ZRPATH}/zoo-kernel/service_conf.tab.o ${ZRPATH}/zoo-kernel/main_conf_read.tab.o ${ZRPATH}/zoo-kernel/response_print.o ${YAML_FILES} ${MS_FILES} ${MS_LDFLAGS} ${YAML_LDFLAGS}18 g++ ${ZCFLAGS} -shared -fpic -o cgi-env/wps_registry.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} -lfcgi -L${ZRPATH}/zoo-kernel/ -lzoo_service ${ZRPATH}/zoo-kernel/server_internal.o ${ZRPATH}/zoo-kernel/lex.cr.o ${ZRPATH}/zoo-kernel/lex.sr.o ${ZRPATH}/zoo-kernel/service_conf.tab.o ${ZRPATH}/zoo-kernel/main_conf_read.tab.o ${ZRPATH}/zoo-kernel/response_print.o ${YAML_FILES} ${MS_FILES} ${MS_LDFLAGS} ${YAML_LDFLAGS} 19 19 20 20 install: -
trunk/zoo-project/zoo-services/utils/registry/service.c
r778 r917 80 80 root_nodes[1][1],"2.0.0",1); 81 81 setMapInMaps(conf,"main","rversion","2.0.0"); 82 printDescribeProcessForProcess(zooRegistry,conf, n,inherited);82 printDescribeProcessForProcess(zooRegistry,conf,doc,n,inherited); 83 83 setMapInMaps(conf,"main","rversion","1.0.0"); 84 84 -
trunk/zoo-project/zoo-services/utils/status/Makefile
r811 r917 1 1 ZRPATH=../../.. 2 2 include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts 3 CFLAGS =-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG3 CFLAGS1=${CFLAGS} -I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG 4 4 5 5 cgi-env/wps_status.zo: service.c 6 g++ ${CFLAGS } -shared -fpic -o cgi-env/wps_status.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} ${FCGI_LDFLAGS} -L${ZRPATH}/zoo-kernel/ -lzoo_service6 g++ ${CFLAGS1} -shared -fpic -o cgi-env/wps_status.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} ${FCGI_LDFLAGS} -L${ZRPATH}/zoo-kernel/ -lzoo_service 7 7 8 8 install: -
trunk/zoo-project/zoo-services/utils/status/service.c
r788 r917 72 72 return SERVICE_FAILED; 73 73 } 74 map* tmpMap1=getMapFromMaps(conf,"lenv","semaphore"); 75 if(tmpMap1!=NULL && strcasecmp(tmpMap1->value,"Created")==0) 76 removeShmLock(conf,1); 74 77 sprintf(xslFileName,"%s/updateStatus.xsl",tmpMmap->value); 75 78 xmlSubstituteEntitiesDefault(1); … … 85 88 */ 86 89 char *tmpStr=_getStatus(conf,tmpMap->value); 87 #ifdef DEBUG90 //#ifdef DEBUG 88 91 fprintf(stderr,"DEBUG: %s \n",tmpStr); 89 #endif92 //#endif 90 93 if(tmpStr!=NULL && strncmp(tmpStr,"-1",2)!=0){ 91 94 char *tmpStr1=strdup(tmpStr); … … 140 143 char message[10]; 141 144 sprintf(message,"Step %d",i); 145 fprintf (stderr, "RUN IN BACKGROUND MODE %s %d \n",__FILE__,__LINE__); 146 fflush(stderr); 142 147 updateStatus(conf,i,message); 143 148 #ifndef WIN32
Note: See TracChangeset
for help on using the changeset viewer.