Changeset 811 for trunk

Timestamp:

Jan 29, 2017, 3:23:31 PM (8 years ago)

Author:

djay

Message:

Generate main.cfg SHAREDSTATEDIR as dataPath. Small modifications to generate and install minimal symbols.sym in dataPath. Install updateStatus.xsl in the right place.

Location:

trunk/zoo-project

Files:

• zoo-kernel/Makefile.in (modified) (3 diffs)
• zoo-kernel/ZOOMakefile.opts.in (modified) (1 diff)
• zoo-kernel/main.cfg (deleted)
• zoo-kernel/main.cfg.in (added)
• zoo-services/utils/status/Makefile (modified) (1 diff)

trunk/zoo-project/zoo-kernel/Makefile.in

@@ -61 +61 @@
 service_internal_ms.o: service_internal_ms.c
         gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
+        echo "SYMBOLSET\nEND" > sybols.sym
 
 service_internal_python.o: service_internal_python.c service.h
@@ -112 +113 @@
         g++  ${XML2CFLAGS} ${CFLAGS} zcfg2yaml.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}
 
-install:
+install: zoo_loader.cgi
         install -d ${DESTDIR}${CGI_DIR}
         install zoo_loader.cgi ${DESTDIR}${CGI_DIR}/
@@ -119 +120 @@
          if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
          ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
+        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
         install -d ${DESTDIR}${INST_INCLUDE}/zoo
         install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
 
 clean:
-        rm -f version.h *.o *.zo *.eo *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling service_loader.dSYM *${EXT}
+        rm -f version.h symbols.sym *.o *.cgi *.eo *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling service_loader.dSYM *${EXT}

trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -105 +105 @@
 
 DATAROOTDIR=@datarootdir@/zoo-project
+SHAREDSTATEDIR=@sharedstatedir@/zoo-project

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

@@ -8 +8 @@
 install:
         install -d ${CGI_DIR}
-        install cgi-env/* ${CGI_DIR}/
+        install cgi-env/*.zcfg ${CGI_DIR}/
+        install cgi-env/*.zo ${CGI_DIR}/
+        install cgi-env/updateStatus.xsl ${SHAREDSTATEDIR}/
+
 clean:
         rm -f cgi-env/wps_status.zo