Add DDadmin compilation

Benjamin Renard
1 parent 8a4ef20b
Showing 4 changed files with 28 additions and 2 deletions Show diff stats
CMakeLists.txt
compilAndInstall.sh
src/DDADMIN/CMakeLists.txt
src/DDADMIN/DDadmin.c
@@ -68,6 +68,7 @@ add_subdirectory(src/DECODERS/nc2nc)
 add_subdirectory(src/DECODERS/themis)
 add_subdirectory(src/DATA/TOOLS)
 add_subdirectory(src/DDSERVICES/TOOLS)
+add_subdirectory(src/DDADMIN)
 add_subdirectory(tests)
  
 install(FILES "scripts/StartServer" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
@@ -5,7 +5,7 @@ usage=&quot;
     \n
     \n    Usage : $0 -d <Destination path> -u <DDService URL> -r <DD.res directory path> -b <DDBASE path> [-l <User local directory. By default, it's /usr/local>] [-p <Proxy host:port>] [-a <Proxy user name:password for authentication>]
     \n
-    \n            $0 -d /opt/tools/DDServer -u http://amdadev.fr/DDService -r /var/amda-data/ -b /var/amda-data/DDBASE -l /opt/local -h 'myproxy.fr:9090' -p 'username:userpwd'
+    \n            $0 -d /opt/tools/DDServer -u http://amdadev.fr/DDService -r /var/amda-data/ -b /var/amda-data/DDBASE -l /opt/local -p 'myproxy.fr:9090' -a 'username:userpwd'
     \n
     \n
     \n ###"
@@ -0,0 +1,25 @@
+
+PROJECT(DDadmin)
+
+include_directories(
+  ${DDCLIENTINCLUDE_DIR}
+  ${NETCDFINCLUDE_DIR}
+)
+
+#Configuration de l'exécutable
+file(
+        GLOB_RECURSE
+        source_files
+        ./*
+)
+  
+ADD_EXECUTABLE (DDadmin ${source_files} )
+
+target_link_libraries(
+  DDadmin
+  ${CRYPT_LIBRARY}
+  ${DDCLIENTLIBRARY}
+  ${NETCDFLIBRARY}
+)
+
+install (TARGETS DDadmin DESTINATION bin)
@@ -330,7 +330,7 @@ int GetFileInfo(t_UserFileInfo *fileInfo)
 {
   int status;
  
-  if (((status = nc_inq_unlimdim(fileInfo->ncID, (size_t *)&fileInfo->UserID))                       != NC_NOERR) ||
+  if (((status = nc_inq_unlimdim(fileInfo->ncID, (int *)&fileInfo->UserID))                       != NC_NOERR) ||
       ((status = nc_inq_dimlen(fileInfo->ncID, fileInfo->UserID,  (size_t *)&fileInfo->MaxRecords))  != NC_NOERR) ||
       ((status = nc_inq_dimid(fileInfo->ncID, NC_USER_LEN_NAME, &fileInfo->UserLenID))     != NC_NOERR) ||
       ((status = nc_inq_dimid(fileInfo->ncID, NC_PWD_LEN_NAME, &fileInfo->PwdLenID))       != NC_NOERR) ||