[svn-r28130] Updated scripts

2 files changed, 59 insertions, 35 deletions

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 9d0953e..d7c777d 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -56,6 +56,13 @@ if(APPLE)
   set(ENV{CC} "${XCODE_CC}")

   set(ENV{CXX} "${XCODE_CXX}")

 

+  if(NOT NO_MAC_FORTRAN)

+    # Shared fortran is not supported, build static 

+    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")

+  else(NOT NO_MAC_FORTRAN)

+    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")

+  endif(NOT NO_MAC_FORTRAN)

+

   set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")

 endif(APPLE)

 

@@ -66,13 +73,13 @@ if(CTEST_USE_TAR_SOURCE)
   ## Uncompress source if tar file provided

   ## --------------------------

   if(WIN32)

-    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_USE_TAR_SOURCE}.zip]")

+    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")

     execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)

   else()

-    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.tar]")

+    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar]")

     execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)

   endif()

-

+ 

   if(NOT rv EQUAL 0)

     message(STATUS "extracting... [error-(${rv}) clean up]")

     file(REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")

@@ -159,12 +166,23 @@ endif()
 

 #-----------------------------------------------------------------------------

 # Send the main script as a note.

-list(APPEND CTEST_NOTES_FILES

-    "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"

-    "${CMAKE_CURRENT_LIST_FILE}"

-    "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"

-)

-

+if(USE_AUTOTOOLS)

+  ## autotools builds need to use make and does not use the cacheinit.cmake file

+  ## -- make command

+  ## -----------------

+  find_program(MAKE NAMES make)

+  list(APPEND CTEST_NOTES_FILES

+      "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"

+      "${CMAKE_CURRENT_LIST_FILE}"

+  )

+else()

+  list(APPEND CTEST_NOTES_FILES

+      "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"

+      "${CMAKE_CURRENT_LIST_FILE}"

+      "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"

+  )

+endif()

+ 

 #-----------------------------------------------------------------------------

 # Check for required variables.

 # --------------------------

@@ -181,20 +199,27 @@ endforeach(req)
 #-----------------------------------------------------------------------------

 # Initialize the CTEST commands

 #------------------------------

-if(LOCAL_MEMCHECK_TEST)

-  find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)

-  set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

-  )

-else()

-  if(LOCAL_COVERAGE_TEST)

-    find_program(CTEST_COVERAGE_COMMAND NAMES gcov)

+if(USE_AUTOTOOLS)

+  set(CTEST_CONFIGURE_COMMAND  "${CTEST_SOURCE_DIRECTORY}/configure ${ADD_BUILD_OPTIONS}")

+  set(CTEST_BUILD_COMMAND      "${MAKE} ${CTEST_BUILD_FLAGS}")

+  configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)

+  file(WRITE ${CTEST_BINARY_DIRECTORY}/CTestTestfile.cmake "ADD_TEST(makecheck \"${MAKE}\" \"${CTEST_BUILD_FLAGS}\" \"-i\" \"check\")")

+else(USE_AUTOTOOLS)

+  if(LOCAL_MEMCHECK_TEST)

+    find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)

+    set (CTEST_CONFIGURE_COMMAND

+        "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

+    )

+  else()

+    if(LOCAL_COVERAGE_TEST)

+      find_program(CTEST_COVERAGE_COMMAND NAMES gcov)

+    endif()

+    set (CTEST_CONFIGURE_COMMAND

+        "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

+    )

   endif()

-  set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

-  )

 endif()

-

+ 

 #-----------------------------------------------------------------------------

 ## -- set output to english

 set($ENV{LC_MESSAGES}  "en_EN")

@@ -230,8 +255,6 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
   if(LOCAL_UPDATE)

     ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")

   endif()

-  configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)

-  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")

   ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}")

   if(LOCAL_SUBMIT)

     ctest_submit (PARTS Update Configure Notes)

diff --git a/config/cmake/scripts/HDF518config.cmake b/config/cmake/scripts/HDF518config.cmake
index 897bcbe..1c92e1e 100755
--- a/config/cmake/scripts/HDF518config.cmake
+++ b/config/cmake/scripts/HDF518config.cmake
@@ -23,14 +23,15 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 #     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac

 ##############################################################################

 

-set(CTEST_SOURCE_VERSION 1.9)

+set(CTEST_SOURCE_VERSION 1.8.16)

+set(CTEST_SOURCE_VERSEXT "-pre1")

 

 ##############################################################################

 # handle input parameters to script.

 #BUILD_GENERATOR - which CMake generator to use, required

-#INSTALLDIR - HDF5-1.9 root folder

+#INSTALLDIR - HDF5-1.8 root folder

 #CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo

-#CTEST_SOURCE_NAME - name of source folder; HDF5-1.9

+#CTEST_SOURCE_NAME - name of source folder; HDF5-1.8

 #STATICLIBRARIES - Default is YES

 #NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac

 if(DEFINED CTEST_SCRIPT_ARG)

@@ -50,15 +51,15 @@ if(NOT DEFINED BUILD_GENERATOR)
   message(FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2013, VS201364, VS2012, or VS201264")

 else()

   if(${BUILD_GENERATOR} STREQUAL "Unix")

-    set(CMAKE_GENERATOR "Unix Makefiles")

+    set(CTEST_CMAKE_GENERATOR "Unix Makefiles")

   elseif(${BUILD_GENERATOR} STREQUAL "VS2013")

-    set(CMAKE_GENERATOR "Visual Studio 12 2013")

+    set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")

   elseif(${BUILD_GENERATOR} STREQUAL "VS201364")

-    set(CMAKE_GENERATOR "Visual Studio 12 2013 Win64")

+    set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")

   elseif(${BUILD_GENERATOR} STREQUAL "VS2012")

-    set(CMAKE_GENERATOR "Visual Studio 11 2012")

+    set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")

   elseif(${BUILD_GENERATOR} STREQUAL "VS201264")

-    set(CMAKE_GENERATOR "Visual Studio 11 2012 Win64")

+    set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")

   else()

     message(FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2013, VS201364, VS2012, or VS201264")

   endif()

@@ -66,9 +67,9 @@ endif()
 

 if(NOT DEFINED INSTALLDIR)

   if(WIN32)

-    set(INSTALLDIR "/usr/local/myhdf5")

-  else()

     set(INSTALLDIR "C:\\Program\ Files\\myhdf5")

+  else()

+    set(INSTALLDIR "/usr/local/myhdf5")

   endif()

 endif()

 if(NOT DEFINED CTEST_BUILD_CONFIGURATION)

@@ -145,9 +146,9 @@ set(MODEL "Experimental")
 #set(LOCAL_NO_PACKAGE "TRUE")

 #####       Following controls source update                  #####

 #set(LOCAL_UPDATE "TRUE")

-set(REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/trunk")

+set(REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/branches/hdf5_1_8_16")

 #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows

-#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")

+#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")

 ###################################################################

 

 ###################################################################