Clean up svn references in cmake files

Unneeded references to svn removed from the hpcc project.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

CMakeLists.txt

@@ -44,7 +44,7 @@
 #       cmake c:\hpcc -G "Visual Studio 9 2008"
 #      The sln file hpccsystems-platform.sln will be created in the current directory, and will support debug and release targets
 #   5. To build the project, load the solution into the visual studio IDE and build in the usual way.
-#   6. Executables will be created in (for example) c:\hpcc\bin\<release_mode>
+#   6. Executables will be created in .\hpcc\bin\<release_mode>
 #
 #########################################################
 
@@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH "${HPCC_SOURCE_DIR}/cmake_modules/")
 ###
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 3 )
-set ( HPCC_MINOR 0 )
+set ( HPCC_MINOR 1 )
 set ( HPCC_POINT 0 )
 set ( HPCC_MATURITY "trunk" )
 set ( HPCC_SEQUENCE 1 )
@@ -316,6 +316,7 @@ set(CPACK_SOURCE_IGNORE_FILES
         "\\\\.cvsignore$"
         "^${PROJECT_SOURCE_DIR}.*/CVS/"
         "^${PROJECT_SOURCE_DIR}.*/.svn/"
+        "^${PROJECT_SOURCE_DIR}.*/.git/"
         "^${PROJECT_SOURCE_DIR}/ln/"
         "^${PROJECT_SOURCE_DIR}/externals/"
         "^${PROJECT_SOURCE_DIR}.*/*.mk$"
@@ -389,11 +390,11 @@ if (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.1")
         endif ()
 
     endif ( CMAKE_SYSTEM MATCHES Linux )
-    if ( EXISTS ${CMAKE_MODULE_PATH}/dependencies/${packageRevision}.cmake )
-        include( ${CMAKE_MODULE_PATH}/dependencies/${packageRevision}.cmake )
+    if ( EXISTS ${HPCC_SOURCE_DIR}/cmake_modules/dependencies/${packageRevision}.cmake )
+        include( ${HPCC_SOURCE_DIR}/cmake_modules/dependencies/${packageRevision}.cmake )
     else()
         message("-- WARNING: DEPENDENCY FILE FOR ${packageRevision} NOT FOUND, Using deps template.")
-        include( ${CMAKE_MODULE_PATH}/dependencies/template.cmake )
+        include( ${HPCC_SOURCE_DIR}/cmake_modules/dependencies/template.cmake )
     endif()
 else()
     message("WARNING: CMAKE 2.8.1 or later required to create RPMs from this project")

cmake_modules/FindSVN.cmake

@@ -1,94 +0,0 @@
-################################################################################
-#    Copyright (C) 2011 HPCC Systems.
-#
-#    All rights reserved. This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-
-# - Try to find the SVN library
-# Once done this will define
-#
-#  SVN_FOUND - system has the SVN library
-#  SVN_INCLUDE_DIR - the SVN include directory
-#  SVN_APR_INCLUDE_DIR - the SVN APR include directory
-#  SVN_LIBRARIES - The libraries needed to use SVN
-
-IF (NOT SVN_FOUND)
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
-    IF (UNIX)
-      IF (${ARCH64BIT} EQUAL 1)
-        SET (osdir "linux-x86_64-gcc4")
-      ELSE()
-        SET (osdir "linux-i686-gcc4")
-      ENDIF()
-    ELSEIF(WIN32)
-      SET (osdir "windows-i386-vc90")
-    ELSE()
-      SET (osdir "unknown")
-    ENDIF()
-    IF (NOT ("${osdir}" STREQUAL "unknown"))
-      IF (UNIX)
-    FIND_PATH (SVN_INCLUDE_DIR NAMES svn_wc.h PATHS "${EXTERNALS_DIRECTORY}/subversion/${osdir}/include/subversion-1" NO_DEFAULT_PATH)
-    FIND_PATH (SVN_APR_INCLUDE_DIR NAMES apr.h PATHS "${EXTERNALS_DIRECTORY}/subversion/${osdir}/include/apr-1" NO_DEFAULT_PATH)
-      ELSEIF(WIN32)
-    FIND_PATH (SVN_INCLUDE_DIR NAMES apr.h PATHS "${EXTERNALS_DIRECTORY}/subversion/${osdir}/include" NO_DEFAULT_PATH)
-      ENDIF()
-      IF(WIN32)
-        FIND_LIBRARY (SVN_LIBRARIES NAMES libapr-1 PATHS "${EXTERNALS_DIRECTORY}/subversion/${osdir}/lib" NO_DEFAULT_PATH)
-      ELSE()
-        FIND_LIBRARY (SVN_LIBRARIES NAMES svn_client-1 PATHS "${EXTERNALS_DIRECTORY}/subversion/${osdir}/lib" NO_DEFAULT_PATH)
-      ENDIF()
-    ENDIF()
-  ENDIF()
-
-  if (USE_NATIVE_LIBRARIES)
-    # if we didn't find in externals, look in system include path
-    IF(WIN32)
-        FIND_PATH (SVN_INCLUDE_DIR NAMES apr.h)
-        FIND_LIBRARY (SVN_LIBRARIES NAMES libapr-1)
-    ELSE()
-        FIND_PATH (SVN_INCLUDE_DIR NAMES apr.h)
-        FIND_LIBRARY (SVN_LIBRARIES NAMES svn_client-1)
-    ENDIF()
-  endif()
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(SVN DEFAULT_MSG
-    SVN_LIBRARIES 
-    SVN_INCLUDE_DIR
-  )
-  IF (SVN_FOUND)
-    IF(WIN32)
-        STRING(REPLACE "libapr-1" "libapriconv-1" SVN_EXTRA1 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "libaprutil-1" SVN_EXTRA2 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_client-1" SVN_EXTRA3 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_delta-1" SVN_EXTRA4 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_diff-1" SVN_EXTRA5 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_fs-1" SVN_EXTRA6 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "libsvn_fs_util-1" SVN_EXTRA7 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "libsvn_fs_fs-1" SVN_EXTRA8 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_ra-1" SVN_EXTRA9 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "libsvn_ra_local-1" SVN_EXTRA10 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "libsvn_ra_svn-1" SVN_EXTRA11 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_repos-1" SVN_EXTRA12 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_subr-1" SVN_EXTRA13 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "svn_wc-1" SVN_EXTRA14 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "ShFolder" SVN_EXTRA15 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "xml" SVN_EXTRA16 "${SVN_LIBRARIES}")
-        STRING(REPLACE "libapr-1" "zlibstat" SVN_EXTRA17 "${SVN_LIBRARIES}")
-
-        set (SVN_LIBRARIES ${SVN_LIBRARIES} ${SVN_EXTRA1} ${SVN_EXTRA2} ${SVN_EXTRA3} ${SVN_EXTRA4} ${SVN_EXTRA5} ${SVN_EXTRA6} ${SVN_EXTRA7} ${SVN_EXTRA8} ${SVN_EXTRA9} ${SVN_EXTRA10} ${SVN_EXTRA11} ${SVN_EXTRA12} ${SVN_EXTRA13} ${SVN_EXTRA14} ${SVN_EXTRA15} ${SVN_EXTRA16} ${SVN_EXTRA17} )
-    ENDIF()
-  ENDIF()
-ENDIF()

cmake_modules/Version.cmake

@@ -1,83 +0,0 @@
-  MACRO(Subversion_WC_PROJNAME dir prefix)
-    EXECUTE_PROCESS(COMMAND
-          ${Subversion_SVN_EXECUTABLE} pg version:project_name ${dir}
-          OUTPUT_VARIABLE ${prefix}_WC_PROJNAME
-          ERROR_VARIABLE Subversion_svn_log_error
-          RESULT_VARIABLE Subversion_svn_log_result
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message("---- PROJNAME: ${${prefix}_WC_PROJNAME}")
-  ENDMACRO(Subversion_WC_PROJNAME)
-
-  MACRO(Subversion_WC_MAJOR dir prefix)
-        EXECUTE_PROCESS(COMMAND
-          ${Subversion_SVN_EXECUTABLE} pg version:major ${dir}
-          OUTPUT_VARIABLE ${prefix}_WC_MAJOR
-          ERROR_VARIABLE Subversion_svn_log_error
-          RESULT_VARIABLE Subversion_svn_log_result
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-        message("---- MAJOR: ${${prefix}_WC_MAJOR}")
-  ENDMACRO(Subversion_WC_MAJOR)
-
-  MACRO(Subversion_WC_MINOR dir prefix)
-        EXECUTE_PROCESS(COMMAND
-          ${Subversion_SVN_EXECUTABLE} pg version:minor ${dir}
-          OUTPUT_VARIABLE ${prefix}_WC_MINOR
-          ERROR_VARIABLE Subversion_svn_log_error
-          RESULT_VARIABLE Subversion_svn_log_result
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-        message("---- MINOR: ${${prefix}_WC_MINOR}")
-  ENDMACRO(Subversion_WC_MINOR)
-
-  MACRO(Subversion_WC_POINT dir prefix)
-        EXECUTE_PROCESS(COMMAND
-          ${Subversion_SVN_EXECUTABLE} pg version:point ${dir}
-          OUTPUT_VARIABLE ${prefix}_WC_POINT
-          ERROR_VARIABLE Subversion_svn_log_error
-          RESULT_VARIABLE Subversion_svn_log_result
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-        message("---- POINT: ${${prefix}_WC_POINT}")
-  ENDMACRO(Subversion_WC_POINT)
-
-  MACRO(Subversion_WC_SUFFIX dir prefix)
-        EXECUTE_PROCESS(COMMAND
-          ${Subversion_SVN_EXECUTABLE} pg version:suffix ${dir}
-          OUTPUT_VARIABLE ${prefix}_WC_SUFFIX
-          ERROR_VARIABLE Subversion_svn_log_error
-          RESULT_VARIABLE Subversion_svn_log_result
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-        message("---- SUFFIX: ${${prefix}_WC_SUFFIX}")
-  ENDMACRO(Subversion_WC_SUFFIX)
-
-  MACRO(Subversion_WC_MATURITY dir prefix)
-        EXECUTE_PROCESS(COMMAND
-          ${Subversion_SVN_EXECUTABLE} pg version:maturity ${dir}
-          OUTPUT_VARIABLE ${prefix}_WC_MATURITY
-          ERROR_VARIABLE Subversion_svn_log_error
-          RESULT_VARIABLE Subversion_svn_log_result
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if( ${prefix}_WC_MATURITY STREQUAL "")
-        set(${prefix}_WC_MATURITY "dev")
-    endif()
-        message("---- MATURITY: ${${prefix}_WC_MATURITY}")
-  ENDMACRO(Subversion_WC_MATURITY)
-
-  MACRO(Subversion_WC_SEQUENCE dir prefix)
-        EXECUTE_PROCESS(COMMAND
-          ${Subversion_SVN_EXECUTABLE} pg version:sequence ${dir}
-          OUTPUT_VARIABLE ${prefix}_WC_SEQUENCE
-          ERROR_VARIABLE Subversion_svn_log_error
-          RESULT_VARIABLE Subversion_svn_log_result
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-        message("---- SEQUENCE: ${${prefix}_WC_SEQUENCE}")
-  ENDMACRO(Subversion_WC_SEQUENCE)
-
-  MACRO(Subversion_WC_PG dir prefix)
-    Subversion_WC_PROJNAME(${dir} ${prefix})
-    Subversion_WC_MAJOR(${dir} ${prefix})
-    Subversion_WC_MINOR(${dir} ${prefix})
-    Subversion_WC_POINT(${dir} ${prefix})
-    Subversion_WC_SUFFIX(${dir} ${prefix})
-    Subversion_WC_MATURITY(${dir} ${prefix})
-    Subversion_WC_SEQUENCE(${dir} ${prefix})
-  ENDMACRO(Subversion_WC_PG)
-

cmake_modules/commonSetup.cmake

@@ -52,7 +52,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   set (USE_OPENSSL 1)      # option(USE_OPENSSL "Configure use of OpenSSL" ON)
   option(USE_ZLIB "Configure use of zlib" ON)
   option(USE_NATIVE_LIBRARIES "Search standard OS locations for thirdparty libraries" ON)
-  option(LEGACYTHOR "Turn on building of Legacy Thor" OFF)
 
   option(PORTALURL "Set url to hpccsystems portal download page")
 
@@ -60,6 +59,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     set( PORTALURL "http://hpccsystems.com/download" )
   endif()
 
+  set(CMAKE_MODULE_PATH "${HPCC_SOURCE_DIR}/cmake_modules")
 
   ##########################################################
 
@@ -122,7 +122,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
 
   ##################################################################
 
-  # Build tag generation from svn info
+  # Build tag generation
 
   set(projname ${HPCC_PROJECT})
   set(majorver ${HPCC_MAJOR})
@@ -303,14 +303,5 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     add_definitions (-D_NO_MYSQL)
   endif(USE_MYSQL)
 
-  if(USE_SVN)
-    find_package(SVN)
-    if (SVN_FOUND)
-      add_definitions (-D_USE_SVN)
-    else()
-      message(FATAL_ERROR "SVN requested but package not found")
-    endif()
-  endif(USE_SVN)
-
   ###########################################################################
 endif ("${COMMONSETUP_DONE}" STREQUAL "")