Convert to build generation to cmake.

Author: bbockelm

CMakeLists.txt

@@ -0,0 +1,98 @@
+
+cmake_minimum_required( VERSION 2.6 )
+project( gridftp-hdfs )
+
+set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
+
+find_package( Hdfs REQUIRED )
+find_package( Jvm REQUIRED )
+
+include (FindPkgConfig)
+pkg_check_modules(OPENSSL REQUIRED libcrypto)
+pkg_check_modules(GLOBUS_GRIDFTP_SERVER REQUIRED globus-gridftp-server)
+pkg_check_modules(GLOBUS_COMMON REQUIRED globus-common)
+
+if( CMAKE_COMPILER_IS_GNUCXX )
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror" )
+endif()
+
+if( CMAKE_COMPILER_IS_GNUCC )
+  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror" )
+endif()
+
+SET( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
+SET( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined")
+SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-undefined")
+
+include_directories(${HDFS_INCLUDES} ${JVM_INCLUDES} ${JVM_MD_INCLUDES} ${OPENSSL_INCLUDEDIR} ${GLOBUS_GRIDFTP_SERVER_INCLUDE_DIRS} ${GLOBUS_COMMON_INCLUDE_DIRS})
+
+include_directories( ${PROJECT_SOURCE_DIR} )
+
+add_library(globus_gridftp_server_hdfs MODULE
+              src/gridftp_hdfs_buffers.c
+              src/gridftp_hdfs.c
+              src/gridftp_hdfs_cksm.c
+              src/gridftp_hdfs_recv.c
+              src/gridftp_hdfs_send.c
+              src/gridftp_hdfs_stat.c
+              src/gridftp_hdfs_error.h
+              src/gridftp_hdfs.h
+           )
+target_link_libraries(globus_gridftp_server_hdfs -lz -lrt -pthread ${HDFS_LIB} ${GLOBUS_GRIDFTP_SERVER_LIBRARIES} ${GLOBUS_COMMON_LIBRARIES} ${OPENSSL_LIBRARIES})
+
+if (NOT DEFINED LIB_INSTALL_DIR)
+  SET(LIB_INSTALL_DIR "lib")
+endif()
+
+if (NOT DEFINED SHARE_INSTALL_PREFIX)
+  SET(SHARE_INSTALL_PREFIX "share")
+endif()
+
+if (NOT DEFINED SYSCONF_INSTALL_DIR)
+  SET(SYSCONF_INSTALL_DIR "etc")
+endif()
+
+install(
+  TARGETS globus_gridftp_server_hdfs
+  LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
+
+install(
+  PROGRAMS scripts/gridftp-hdfs-standalone
+  DESTINATION bin)
+
+install(
+  PROGRAMS scripts/xinetd/gridftp-hdfs-inetd
+  DESTINATION sbin)
+
+set_target_properties(
+  globus_gridftp_server_hdfs
+  PROPERTIES
+  VERSION   "0.0.1"
+  SOVERSION "0"
+  LINK_INTERFACE_LIBRARIES "" )
+
+install(
+  FILES ${CMAKE_SOURCE_DIR}/conf/gridftp.conf ${CMAKE_SOURCE_DIR}/conf/gridftp-inetd.conf ${CMAKE_SOURCE_DIR}/conf/gridftp-debug.conf ${CMAKE_SOURCE_DIR}/conf/replica-map.conf
+  DESTINATION ${SYSCONF_INSTALL_DIR}/gridftp-hdfs
+)
+
+install(
+  FILES ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs-environment-bootstrap
+  DESTINATION ${SYSCONF_INSTALL_DIR}/sysconfig/gridftp.conf.d
+)
+
+install(
+  FILES ${CMAKE_SOURCE_DIR}/conf/gridftp-hdfs-environment
+  DESTINATION ${SHARE_INSTALL_PREFIX}/gridftp-hdfs
+)
+
+install(
+  FILES ${CMAKE_SOURCE_DIR}/conf/globus-gridftp-server-plugin
+  DESTINATION ${SHARE_INSTALL_PREFIX}/osg/sysconfig
+)
+
+install(
+  FILES ${CMAKE_SOURCE_DIR}/conf/gridftp.d/gridftp-hdfs.conf ${CMAKE_SOURCE_DIR}/conf/gridftp.d/gridftp-hdfs.osg-extensions.conf
+  DESTINATION ${SYSCONF_INSTALL_DIR}/gridftp.d
+)
+

cmake/FindHdfs.cmake

@@ -0,0 +1,22 @@
+
+FIND_PATH(HDFS_INCLUDES hdfs.h
+  HINTS
+  ${HDFS_INCLUDE_DIR}
+  $ENV{HDFS_INCLUDE_DIR}
+  /usr
+  PATH_SUFFIXES include
+)
+
+FIND_LIBRARY(HDFS_LIB hdfs
+  HINTS
+  ${HDFS_LIB_DIR}
+  $ENV{HDFS_LIB_DIR}
+  /usr
+  PATH_SUFFIXES lib
+)
+
+GET_FILENAME_COMPONENT(HDFS_LIB_DIR ${HDFS_LIB} PATH)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Hdfs DEFAULT_MSG HDFS_LIB HDFS_LIB_DIR HDFS_INCLUDES)
+

cmake/FindJvm.cmake

@@ -0,0 +1,34 @@
+
+FIND_PATH(JVM_INCLUDES jni.h
+  HINTS
+  ${JVM_INCLUDE_DIR}
+  $ENV{JVM_INCLUDE_DIR}
+  /usr/lib/jvm/java
+  /usr/java/default
+  /usr
+  PATH_SUFFIXES include 
+)
+
+GET_FILENAME_COMPONENT(JVM_INCLUDE_PATH ${JVM_INCLUDES} PATH)
+
+FIND_PATH(JVM_MD_INCLUDES jni_md.h
+  HINTS
+  ${JVM_INCLUDE_PATH}
+  PATH_SUFFIXES include/linux
+)
+
+FIND_LIBRARY(JVM_LIB jvm
+  HINTS
+  ${JVM_LIB_DIR}
+  $ENV{JVM_LIB_DIR}
+  /usr
+  /usr/java/default/jre
+  /usr/lib/jvm/java/jre
+  PATH_SUFFIXES lib lib/amd64/server  lib/i386/server
+)
+
+GET_FILENAME_COMPONENT(JVM_LIB_DIR ${JVM_LIB} PATH)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jvm DEFAULT_MSG JVM_LIB JVM_INCLUDES JVM_MD_INCLUDES)
+

src/gridftp_hdfs.c

@@ -219,7 +219,7 @@ setup_hdfs_logging()
     pthread_attr_t attr;
     if ((err = pthread_attr_init(&attr)))
     {
-        globus_gfs_log_message(GLOBUS_GFS_LOG_ERR, "Unable to initialize pthread attribute: (errno=%d, %s).\n", err, sterror(err));
+        globus_gfs_log_message(GLOBUS_GFS_LOG_ERR, "Unable to initialize pthread attribute: (errno=%d, %s).\n", err, strerror(err));
         globus_mutex_unlock(&g_hdfs_mutex);
         return;
     }