monitoring/cockpit/CMakeLists.txt now installs all of its directory and

subdirectories.

hbase-consumer/CMakeLists.txt now installs all of its directory and
subdirectories.

lemon-sensor-py/CMakeLists.txt now installs its all of its directory.

CMakeLists.txt

@@ -54,20 +54,7 @@ set (CASTOR_DEST_C_HEADERS_DIR ${CASTOR_DEST_INCLUDE_DIR}/castor/h)
 set (CASTOR_DEST_CPP_HEADERS_DIR ${CASTOR_DEST_INCLUDE_DIR}/castor/castor)
 
 find_package (uuid REQUIRED)
-
-execute_process (COMMAND python ${CMAKE_SOURCE_DIR}/config/pycompile.py --libs
-  OUTPUT_VARIABLE CASTOR_PYTHON_LIBS)
- string (REGEX REPLACE "\n" "" CASTOR_PYTHON_LIBS ${CASTOR_PYTHON_LIBS})
-message (STATUS "CASTOR_PYTHON_LIBS = '${CASTOR_PYTHON_LIBS}'")
-execute_process (COMMAND python ${CMAKE_SOURCE_DIR}/config/pycompile.py --inc
-  OUTPUT_VARIABLE CASTOR_PYTHON_INC)
- string (REGEX REPLACE "\n" "" CASTOR_PYTHON_INC ${CASTOR_PYTHON_INC})
-message (STATUS "CASTOR_PYTHON_INC = '${CASTOR_PYTHON_INC}'")
-execute_process (
-    COMMAND python -c "from distutils import sysconfig; print sysconfig.get_python_lib()"
-  OUTPUT_VARIABLE CASTOR_DEST_PYTHON_LIBDIR)
- string (REGEX REPLACE "\n" "" CASTOR_DEST_PYTHON_LIBDIR ${CASTOR_DEST_PYTHON_LIBDIR})
-message (STATUS "CASTOR_DEST_PYTHON_LIBDIR = '${CASTOR_DEST_PYTHON_LIBDIR}'")
+find_package (python REQUIRED)
 
 set (CASTOR_BIN_SCRIPT_PERMS
   OWNER_READ OWNER_WRITE OWNER_EXECUTE
@@ -104,6 +91,11 @@ set (CASTOR_MAN_PAGE_PERMS
   GROUP_READ
   WORLD_READ)
 
+set (CASTOR_NON_EXEC_PERMS
+  OWNER_READ OWNER_WRITE
+  GROUP_READ
+  WORLD_READ)
+
 set (CASTOR_SYSCONFIG_PERMS
   OWNER_READ OWNER_WRITE
   GROUP_READ

cmake/Findglobus.cmake

@@ -22,7 +22,7 @@
 
 # - Find globus
 # Finds the locations of the Globus headers and executables to be used by
-# CASTOR.  the following variables are set if globus is found.
+# CASTOR.  The following variables are set if globus is found.
 #
 # GLOBUS_FOUND
 # GLOBUS_CONFINC_PATH
@@ -69,7 +69,6 @@ message (STATUS "GLOBUS_GSSLIB_THR = ${GLOBUS_GSSLIB_THR}")
 
 include (FindPackageHandleStandardArgs)
 find_package_handle_standard_args (globus DEFAULT_MSG 
-  GLOBUS_FOUND
   GLOBUS_CONFINC_PATH
   GLOBUS_INC_PATH
   GLOBUS_LIB_PATH

cmake/Findpython.cmake

+#                      cmake/Findpython.cmake
+#
+# This file is part of the Castor project.
+# See http://castor.web.cern.ch/castor
+#
+# Copyright (C) 2003  CERN
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# Steven.Murray@cern.ch
+#
+
+# - Find python
+# The following variables are set if python is found.
+#
+# CASTOR_PYTHON_LIBS
+# CASTOR_PYTHON_INC
+# CASTOR_DEST_PYTHON_LIBDIR
+
+# Be silent if GLOBUS_CONFINC_PATH is already cached
+if (CASTOR_PYTHON_LIBS)
+  set(PYTHON_FIND_QUIETLY TRUE)
+endif (CASTOR_PYTHON_LIBS)
+
+execute_process (COMMAND python ${CMAKE_SOURCE_DIR}/config/pycompile.py --libs
+  OUTPUT_VARIABLE CASTOR_PYTHON_LIBS)
+string (REGEX REPLACE "\n" "" CASTOR_PYTHON_LIBS ${CASTOR_PYTHON_LIBS})
+message (STATUS "CASTOR_PYTHON_LIBS = ${CASTOR_PYTHON_LIBS}")
+
+execute_process (COMMAND python ${CMAKE_SOURCE_DIR}/config/pycompile.py --inc
+  OUTPUT_VARIABLE CASTOR_PYTHON_INC)
+string (REGEX REPLACE "\n" "" CASTOR_PYTHON_INC ${CASTOR_PYTHON_INC})
+message (STATUS "CASTOR_PYTHON_INC = ${CASTOR_PYTHON_INC}")
+
+execute_process ( COMMAND python -c "from distutils import sysconfig; print sysconfig.get_python_lib()"
+  OUTPUT_VARIABLE CASTOR_DEST_PYTHON_LIBDIR)
+string (REGEX REPLACE "\n" "" CASTOR_DEST_PYTHON_LIBDIR
+  ${CASTOR_DEST_PYTHON_LIBDIR})
+message (STATUS "CASTOR_DEST_PYTHON_LIBDIR = ${CASTOR_DEST_PYTHON_LIBDIR}")
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (python DEFAULT_MSG 
+  CASTOR_PYTHON_LIBS
+  CASTOR_PYTHON_INC
+  CASTOR_DEST_PYTHON_LIBDIR)

monitoring/CMakeLists.txt

@@ -23,3 +23,5 @@
 cmake_minimum_required (VERSION 2.6)
 
 add_subdirectory (cockpit)
+add_subdirectory (hbase-consumer)
+add_subdirectory (lemon-sensor-py)

monitoring/cockpit/CMakeLists.txt

@@ -22,4 +22,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 
+add_subdirectory (castormon)
+
 CastorInstallLogRotate (castor-cockpit)
+CastorInstallExample (cockpit-credentials.conf /etc/castor)

monitoring/cockpit/castormon/CMakeLists.txt

+#
+#                      monitoring/cockpit/castormon/CMakeLists.txt
+#
+# This file is part of the Castor project.
+# See http://castor.web.cern.ch/castor
+#
+# Copyright (C) 2003  CERN
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# Steven.Murray@cern.ch
+#
+cmake_minimum_required (VERSION 2.6)
+
+install (FILES
+  django.wsgi
+  __init__.py
+  manage.py
+  settings.py
+  urls.py
+  DESTINATION /var/www)
+
+install (DIRECTORY
+  cockpit
+  logviewer
+  staticfiles
+  templates
+  DESTINATION /var/www)

monitoring/hbase-consumer/CMakeLists.txt

+#
+#                      monitoring/hbase-consumer/CMakeLists.txt
+#
+# This file is part of the Castor project.
+# See http://castor.web.cern.ch/castor
+#
+# Copyright (C) 2003  CERN
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# Steven.Murray@cern.ch
+#
+cmake_minimum_required (VERSION 2.6)
+
+add_subdirectory (hbaseconsumerlib)
+
+CastorInstallScript (hbase-consumer.py)
+CastorInstallExample (hbase-consumer.conf /etc/hbase-consumer)

monitoring/hbase-consumer/hbaseconsumerlib/CMakeLists.txt

+#
+#              monitoring/hbase-consumer/hbaseconsumerlib/CMakeLists.txt
+#
+# This file is part of the Castor project.
+# See http://castor.web.cern.ch/castor
+#
+# Copyright (C) 2003  CERN
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# Steven.Murray@cern.ch
+#
+cmake_minimum_required (VERSION 2.6)
+
+install (FILES
+  __init__.py
+  pusher.py
+  utils.py
+  DESTINATION ${CASTOR_DEST_PYTHON_LIBDIR})

monitoring/lemon-sensor-py/CMakeLists.txt

+#
+#                      monitoring/lemon-sensor-py/CMakeLists.txt
+#
+# This file is part of the Castor project.
+# See http://castor.web.cern.ch/castor
+#
+# Copyright (C) 2003  CERN
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# Steven.Murray@cern.ch
+#
+cmake_minimum_required (VERSION 2.6)
+
+install (FILES CastorMon.py DESTINATION /usr/libexec/sensors
+  PERMISSIONS ${CASTOR_NON_EXEC_PERMS})