From 7bd67b95e78214876375dd525edade1bae5e2823 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 11 Jan 2024 17:53:06 +0000 Subject: [PATCH 1/3] Split off 9.4.26 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 9a670919..8eb2d84e 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 4 ) -set ( HPCC_POINT 25 ) +set ( HPCC_POINT 27 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 63369d0fe2ac18508b1a33d6d96c08ad9d3169b9 Mon Sep 17 00:00:00 2001 From: xwang2713 Date: Fri, 12 Jan 2024 08:39:26 -0500 Subject: [PATCH 2/3] IDE-1124 Support build with 64bit Clienttools Remove hard-coded clienttools installation location --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ef0e6e8..bac4d2a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,9 @@ PROJECT(ECLIDE) set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD_REQUIRED ON) +# General Options --- +option(EMBED_64BIT_CLIENTTOOLS "Embed 64bit client tools (OFF=32bit)" ON) + # Build tag generation --- INCLUDE("${PROJECT_SOURCE_DIR}/version.cmake") @@ -183,13 +186,17 @@ ENDIF() SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}${CPACK_SYSTEM_NAME}") MESSAGE ("-- Current release version is ${CPACK_PACKAGE_FILE_NAME}") -find_file(CLIENTTOOLS_PACKAGE_FILE "hpccsystems-clienttools-community_${version}-${stagever}${CMAKE_SYSTEM_NAME}-${CPACK_RPM_PACKAGE_ARCHITECTURE}.exe" HINTS ${CMAKE_CURRENT_BINARY_DIR}/../HPCC-Platform ) +SET(CT_ARCH "i386") +IF (EMBED_64BIT_CLIENTTOOLS) + SET(CT_ARCH "x86_64") +ENDIF () +find_file(CLIENTTOOLS_PACKAGE_FILE "hpccsystems-clienttools-community_${version}-${stagever}${CMAKE_SYSTEM_NAME}-${CT_ARCH}.exe" HINTS ${CMAKE_CURRENT_BINARY_DIR}/../HPCC-Platform ) MESSAGE ("-- Clienttools package: ${CLIENTTOOLS_PACKAGE_FILE}") if (CLIENTTOOLS_PACKAGE_FILE) install ( PROGRAMS ${CLIENTTOOLS_PACKAGE_FILE} DESTINATION tmp ) get_filename_component(CLIENTTOOLS_PACKAGE_FILE_NAME ${CLIENTTOOLS_PACKAGE_FILE} NAME) list ( APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS " - ExecWait '$INSTDIR\\\\tmp\\\\${CLIENTTOOLS_PACKAGE_FILE_NAME} /S /D=$INSTDIR\\\\..\\\\clienttools' + ExecWait '$INSTDIR\\\\tmp\\\\${CLIENTTOOLS_PACKAGE_FILE_NAME} /S' ") endif (CLIENTTOOLS_PACKAGE_FILE) From bf588b532182ca05a525f1433014fd48b3184841 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 19 Jan 2024 17:54:10 +0000 Subject: [PATCH 3/3] Split off 9.4.28 Signed-off-by: Gavin Halliday --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 8eb2d84e..6e3db000 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 4 ) -set ( HPCC_POINT 27 ) +set ( HPCC_POINT 29 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ###