Changeset 736 for branches

Timestamp:

Jul 10, 2015, 2:39:24 PM (9 years ago)

Author:

djay

Message:

Merge trunk in branch-1.5 and created tag for the 1.5.0 release

Location:

branches/branch-1.5

Files:

• . (modified) (1 prop)
• docs/contribute/release.rst (modified) (1 diff)
• zoo-project/zoo-kernel/Makefile.in (modified) (2 diffs)
• zoo-project/zoo-kernel/sqlapi.c (modified) (11 diffs)

branches/branch-1.5/docs/contribute/release.rst

@@ -77 +77 @@
     cd zoo-project/zoo-kernel
     autoconf
+    # In case you did not build ZOO-Kernel
     cd ../../..
+    # In case you built ZOO-Kernel, then remove the generated file from the archive
+    make clean
+    rm -f  {Makefile,ZOOMakefile.opts}
+    cd ../../..
+    # In case you built one or more ZOO-Services, then remove the generated file from the archive
+    rm $(find ./zoo-project-$VERSION/zoo-project/zoo-services -name "*zo")
     # Remove documentation from the archive
-    rm -rf ./zoo-project-$VERSION/docs
+    rm -rf ./zoo-project-$VERSION/{docs,workshop}
     tar -cvjf ./zoo-project-$VERSION.tar.bz2 ./zoo-project-$VERSION
     zip -r ./zoo-project-$VERSION.zip ./zoo-project-$VERSION

branches/branch-1.5/zoo-project/zoo-kernel/Makefile.in

@@ -40 +40 @@
 
 sqlapi.o: sqlapi.c sqlapi.h
-        g++ -fPIC ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
+        g++ -fPIC ${GDAL_CFLAGS} ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
 
 caching.o: caching.c
@@ -112 +112 @@
          ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
         install -d ${DESTDIR}${INST_INCLUDE}/zoo
-        install service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
+        install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
 
 clean:

branches/branch-1.5/zoo-project/zoo-kernel/sqlapi.c

@@ -183 +183 @@
     sprintf(sqlQuery,"INSERT INTO %s.files (uuid,filename,nature,name) VALUES ('%s','%s','%s',NULL);",schema->value,uusid->value,filename,type);
   execSql(conf,sqlQuery);
+  free(sqlQuery);
   cleanUpResultSet(conf);
 }
@@ -206 +207 @@
           uusid->value,sid->value,osid->value);
   execSql(conf,sqlQuery);
+  free(sqlQuery);
   cleanUpResultSet(conf);
 }
@@ -229 +231 @@
   sprintf(sqlQuery,"INSERT INTO %s.responses (content,uuid) VALUES ($$%s$$,$$%s$$);",schema->value,tmps,sid->value);
   execSql(conf,sqlQuery);
+  free(sqlQuery);
+  free(tmps);
   cleanUpResultSet(conf);
 }
@@ -250 +254 @@
   execSql(conf,sqlQuery);
   cleanUpResultSet(conf);
+  free(sqlQuery);
   return 0;
 }
@@ -280 +285 @@
   }
   cleanUpResultSet(conf);
+  free(sqlQuery);
   return (char*)tmp1;
 }
@@ -316 +322 @@
     tmp1=NULL;
   cleanUpResultSet(conf);
+  free(sqlQuery);
   return (char*)tmp1;
 }
@@ -338 +345 @@
   cleanUpResultSet(conf);
   close_sql(conf);
+  free(sqlQuery);
   end_sql();
 }
@@ -363 +371 @@
   cleanUpResultSet(conf);
   close_sql(conf);
+  free(sqlQuery);
   end_sql();
 }
@@ -397 +406 @@
   if(hasRes<0)
     tmp1=NULL;
+  free(sqlQuery);
   return (char*)tmp1;
 }
@@ -429 +439 @@
   if(hasRes<0)
     addToMap(statusInfo,"Status","Failed");
+  free(sqlQuery);
   return;
 }
@@ -460 +471 @@
   }
   cleanUpResultSet(conf);
+  free(sqlQuery);
   return res;
 }