Merge pull request #14 from bbockelm/cmake_build

Migrate build to CMake

Author: bbockelm

.gitignore

@@ -1,27 +1,2 @@
-src/*.o
-src/*.lo
-src/.deps
-src/.libs
-src/Makefile.in
-src/Makefile
-Makefile
-Makefile.in
-config.guess
-config.log
-config.status
-aclocal.m4
-autom4te.cache
 conf/gridftp-inetd.conf
-config.sub
-configure
-install-sh
-scripts/gridftp-hdfs-standalone
-scripts/init/gridftp-hdfs
-scripts/xinetd/gridftp-hdfs
-scripts/xinetd/gridftp-hdfs-inetd
-src/libglobus_gridftp_server_hdfs.la
 release_dir
-depcomp
-libtool
-ltmain.sh
-missing

CMakeLists.txt

@@ -0,0 +1,106 @@
+
+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})
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/gridftp-inetd.conf.in ${CMAKE_CURRENT_BINARY_DIR}/conf/gridftp-inetd.conf @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/gridftp-hdfs-standalone.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/gridftp-hdfs-standalone @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/init/gridftp-hdfs.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/init/gridftp-hdfs @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/xinetd/gridftp-hdfs.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/xinetd/gridftp-hdfs @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/xinetd/gridftp-hdfs-inetd.in ${CMAKE_CURRENT_BINARY_DIR}/scripts/xinetd/gridftp-hdfs-inetd @ONLY)
+
+SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Install path for libraries")
+SET(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Data directory for helper files")
+SET(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "System configuration directory")
+
+install(
+  TARGETS globus_gridftp_server_hdfs
+  LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
+
+install(
+  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/scripts/gridftp-hdfs-standalone
+  DESTINATION bin)
+
+install(
+  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/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_CURRENT_BINARY_DIR}/scripts/xinetd/gridftp-hdfs
+  DESTINATION ${SYSCONF_INSTALL_DIR}/xinetd.d
+)
+
+install(
+  FILES ${CMAKE_SOURCE_DIR}/conf/gridftp.conf ${CMAKE_CURRENT_BINARY_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_CURRENT_BINARY_DIR}/scripts/init/gridftp-hdfs
+  DESTINATION ${SYSCONF_INSTALL_DIR}/init.d/
+)
+
+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
+)
+

Makefile.am

@@ -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/FindHdfs.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)
+

cmake/FindJvm.cmake

@@ -16,16 +16,12 @@ URL:            https://github.com/opensciencegrid/gridftp_hdfs
 Source0:        %{name}-%{version}%{?gitrev:-%{gitrev}}.tar.gz
 
 Source1: globus-gridftp-server-plugin.osg-sysconfig
-%if 0%{?osg} > 0
 Source2: %{name}.conf
 Source3: %{name}.osg-extensions.conf
-%endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: cmake
 
 BuildRequires: java-devel >= 1:1.7.0
 BuildRequires: jpackage-utils
@@ -35,18 +31,14 @@ BuildRequires: hadoop-libhdfs
 BuildRequires: globus-gridftp-server-devel >= 11
 BuildRequires: globus-common-devel
 
-BuildRequires: chrpath
-
 Requires: hadoop-libhdfs
 Requires: hadoop-client >= 2.0.0+545
 # ^ was getting "No FileSystem for scheme: hdfs" without this
 # 6.14-2 added OSG plugin-style sysconfig instead of gridftp.conf.d
 # 6.38-1.3 added /etc/gridftp.d
 Requires: globus-gridftp-server-progs >= 6.38-1.3
-%if 0%{?osg} > 0
 Requires: xinetd
 Requires: globus-gridftp-osg-extensions
-%endif
 Requires: java >= 1:1.7.0
 Requires: jpackage-utils
 # for ordered data support (SOFTWARE-2436):
@@ -55,14 +47,10 @@ Requires: globus-ftp-control >= 7.7
 
 Requires(pre): shadow-utils
 Requires(preun): initscripts
-%if 0%{?osg} == 0
 Requires(preun): chkconfig
 Requires(post): chkconfig
-%endif
 Requires(postun): initscripts
-%if 0%{?osg} > 0
 Requires(postun): xinetd
-%endif
 
 %description
 HDFS DSI plugin for GridFTP
@@ -73,12 +61,7 @@ HDFS DSI plugin for GridFTP
 
 %build
 
-aclocal
-libtoolize
-automake --foreign -a
-autoconf
-
-%configure --with-java=/etc/alternatives/java_sdk
+%cmake
 
 make %{?_smp_mflags}
 
@@ -87,75 +70,48 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Remove rpaths
-chrpath -d $RPM_BUILD_ROOT%{_libdir}/*.so
-
-# Remove libtool turds
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.d
 
 # Remove the init script - in GT5.2, this gets bootstrapped appropriately
 rm $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
 rm $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridftp.conf.d/%{name}-environment-bootstrap
 
-%if 0%{?osg} > 0
 mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridftp.conf.d/%{name} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 rmdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridftp.conf.d
 rm $RPM_BUILD_ROOT%{_sysconfdir}/gridftp-hdfs/gridftp.conf
 mkdir -p $RPM_BUILD_ROOT/usr/share/osg/sysconfig
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT/usr/share/osg/sysconfig/globus-gridftp-server-plugin
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.d
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.d
-%else
-rm $RPM_BUILD_ROOT%{_sysconfdir}/gridftp-hdfs/gridftp-debug.conf
-rm $RPM_BUILD_ROOT%{_sysconfdir}/gridftp-hdfs/gridftp-inetd.conf
-rm $RPM_BUILD_ROOT%{_sysconfdir}/gridftp-hdfs/gridftp.conf
-rm $RPM_BUILD_ROOT%{_sysconfdir}/gridftp-hdfs/replica-map.conf
-rm $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/gridftp-hdfs
-rm $RPM_BUILD_ROOT%{_bindir}/gridftp-hdfs-standalone
-rm $RPM_BUILD_ROOT%{_sbindir}/gridftp-hdfs-inetd
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
 
-%if 0%{?osg} > 0
 /sbin/service globus-gridftp-server condrestart >/dev/null 2>&1 || :
-%else
 /sbin/chkconfig --add %{name}
-%endif
 
 %preun
 if [ "$1" = "0" ] ; then
-%if 0%{?osg} > 0
     /sbin/service xinetd condrestart >/dev/null 2>&1
-%endif
     /sbin/service globus-gridftp-server condrestart >/dev/null 2>&1 || :
 fi
 
 %postun
 /sbin/ldconfig
 if [ "$1" -ge "1" ]; then
-%if 0%{?osg} > 0
     /sbin/service xinetd condrestart >/dev/null 2>&1
-%endif
     /sbin/service globus-gridftp-server condrestart >/dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%if 0%{?osg} > 0
 %{_sbindir}/gridftp-hdfs-inetd
 %{_bindir}/gridftp-hdfs-standalone
-%endif
 %{_libdir}/libglobus_gridftp_server_hdfs.so*
 %{_datadir}/%{name}/%{name}-environment
-%if 0%{?osg} > 0
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/gridftp-debug.conf
 %config(noreplace) %{_sysconfdir}/%{name}/gridftp-inetd.conf
@@ -164,9 +120,6 @@ fi
 %config(noreplace) %{_sysconfdir}/gridftp.d/%{name}.conf
 %config(noreplace) %{_sysconfdir}/gridftp.d/%{name}.osg-extensions.conf
 /usr/share/osg/sysconfig/globus-gridftp-server-plugin
-%else
-%config(noreplace) %{_sysconfdir}/sysconfig/gridftp.conf.d/%{name}
-%endif
 
 %changelog
 * Thu Aug 24 2017 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.0-1

conf/Makefile.am

@@ -1,6 +1,6 @@
 inetd 1
 log_level ERROR,WARN,INFO
-log_single @logdir@/gridftp-auth.log
-log_transfer @logdir@/gridftp.log
+log_single /var/log/gridftp-auth.log
+log_transfer /var/log/gridftp.log
 blocksize 1048576
 load_dsi_module hdfs