Changeset b09e2f4f in tol

Timestamp:

Mar 28, 2017, 11:52:19 AM (10 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

fe5b9e1

Parents:

bb5f9a8

Message:

fixes #1950 corregimos las reglas para cpack, detectamos sistemas basandonos en uname y lsb_release

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7446 be4846ae-f051-483a-831f-b64e7d08527f

Location:

installer/linux

Files:

• CMakeLists.txt (modified) (3 diffs)
• cpack_generator.cmake (modified) (1 diff)

installer/linux/CMakeLists.txt

@@ -20 +20 @@
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
+#include(cpack_generator)
 include(cpack_generator)
-
-message(STATUS "LINUX_NAME = ${LINUX_NAME}")
 
 if(CPACK_GENERATOR)
@@ -42 +41 @@
 
 # Variable PACKAGE_ARCHITECTURE
-if(CPACK_GENERATOR STREQUAL "RPM")
-  execute_process(COMMAND uname "-m"
-    OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
-    OUTPUT_STRIP_TRAILING_WHITESPACE )
-elseif(CPACK_GENERATOR STREQUAL "DEB")
-  message(STATUS "CPACK_DEBIAN_PACKAGE_ARCHITECTURE = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  find_program(DPKG_CMD dpkg)
-  if(NOT DPKG_CMD)
-    message(STATUS "Can not find dpkg in your path, default to i386.")
-    set(PACKAGE_ARCHITECTURE i386)
-  endif(NOT DPKG_CMD)
-  execute_process(COMMAND "${DPKG_CMD}" --print-architecture
-    OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
-    OUTPUT_STRIP_TRAILING_WHITESPACE) 
-else(CPACK_GENERATOR STREQUAL "RPM")
-  set(PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
-endif(CPACK_GENERATOR STREQUAL "RPM")
+# if(CPACK_GENERATOR STREQUAL "RPM")
+#   execute_process(COMMAND uname "-m"
+#     OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
+#     OUTPUT_STRIP_TRAILING_WHITESPACE )
+# elseif(CPACK_GENERATOR STREQUAL "DEB")
+#   message(STATUS "CPACK_DEBIAN_PACKAGE_ARCHITECTURE = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+#   find_program(DPKG_CMD dpkg)
+#   if(NOT DPKG_CMD)
+#     message(STATUS "Can not find dpkg in your path, default to i386.")
+#     set(PACKAGE_ARCHITECTURE i386)
+#   endif(NOT DPKG_CMD)
+#   execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+#     OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
+#     OUTPUT_STRIP_TRAILING_WHITESPACE) 
+# else(CPACK_GENERATOR STREQUAL "RPM")
+#   set(PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+# endif(CPACK_GENERATOR STREQUAL "RPM")
+set(PACKAGE_ARCHITECTURE ${SPECIFIC_SYSTEM_ARCHITECTURE})
 message(STATUS "PACKAGE_ARCHITECTURE=${PACKAGE_ARCHITECTURE}")
 
 # Variable CPACK_SYSTEM_NAME
-string( TOLOWER "${LINUX_NAME}.${PACKAGE_ARCHITECTURE}" _CPACK_SYSTEM_NAME )
-set( CPACK_SYSTEM_NAME ${_CPACK_SYSTEM_NAME} CACHE STRING "" )
+string(TOLOWER "${SPECIFIC_SYSTEM_NAME}.${PACKAGE_ARCHITECTURE}" _CPACK_SYSTEM_NAME)
+set(CPACK_SYSTEM_NAME ${_CPACK_SYSTEM_NAME} CACHE STRING "")
 message(STATUS "CPACK_SYSTEM_NAME=${CPACK_SYSTEM_NAME}")
 
@@ -70 +70 @@
 #   ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}
 # See: cpack --help-variable CPACK_PACKAGE_FILE_NAME
-message(STATUS "CPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
+#message(STATUS "CPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
 
 #=== Components ==============================================================

installer/linux/cpack_generator.cmake

@@ +1 @@
+message(STATUS HELLO)
 if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
-  set( SPECIFIC_SYSTEM_VERSION_NAME "${CMAKE_SYSTEM_NAME}" )
-  set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "TGZ" )
-  if( EXISTS "/etc/issue" )
-    set( LINUX_NAME "" )
-    file( READ "/etc/issue" LINUX_ISSUE )
-    message( STATUS "LINUX_ISSUE = ${LINUX_ISSUE}" )
-    # CentOS case
-    if( LINUX_ISSUE MATCHES "CentOS" )
-      string( REGEX MATCH "release ([0-9]+)" CENTOS "${LINUX_ISSUE}" )
-      set( LINUX_NAME "CentOS_${CMAKE_MATCH_1}" )  
-      set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM" )      
-    endif( LINUX_ISSUE MATCHES "CentOS" )
-    # Fedora case
-    if( LINUX_ISSUE MATCHES "Fedora" )
-      string( REGEX MATCH "release ([0-9]+)" FEDORA "${LINUX_ISSUE}" )
-      set( LINUX_NAME "FC${CMAKE_MATCH_1}" )  
-      set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM" )      
-    endif( LINUX_ISSUE MATCHES "Fedora" )
-    # Ubuntu case
-    if( LINUX_ISSUE MATCHES "Ubuntu" )
-      string( REGEX MATCH "buntu ([0-9]+\\.[0-9]+)" UBUNTU "${LINUX_ISSUE}" )
-      set( LINUX_NAME "Ubuntu_${CMAKE_MATCH_1}" )        
-      set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "DEB" )
-    endif( LINUX_ISSUE MATCHES "Ubuntu" )
-    # Debian case
-    if( LINUX_ISSUE MATCHES "Debian" )
-      string( REGEX MATCH "Debian .*ux ([a-zA-Z]*/?[a-zA-Z]*) .*" DEBIAN "${LINUX_ISSUE}" )
-      set( LINUX_NAME "Debian_${CMAKE_MATCH_1}" )
-      string( REPLACE "/" "_" LINUX_NAME ${LINUX_NAME} ) 
-      set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "DEB" )       
-    endif( LINUX_ISSUE MATCHES "Debian" )      
-    # Open SuSE case
-    if( LINUX_ISSUE MATCHES "SUSE" )
-      string( REGEX MATCH "SUSE  ([0-9]+\\.[0-9]+)" SUSE "${LINUX_ISSUE}" )
-      set( LINUX_NAME "openSUSE_${CMAKE_MATCH_1}" )
-      string( REPLACE "/" "_" LINUX_NAME ${LINUX_NAME} )   
-      set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM" )     
-    endif( LINUX_ISSUE MATCHES "SUSE" )
-    # Mandriva case
-    # TODO      
-    if( LINUX_NAME ) 
-      set( SPECIFIC_SYSTEM_VERSION_NAME "${CMAKE_SYSTEM_NAME}-${LINUX_NAME}" )
-    endif( LINUX_NAME )    
-  endif( EXISTS "/etc/issue" )      
+  execute_process(COMMAND uname "-m"
+    OUTPUT_VARIABLE SPECIFIC_SYSTEM_ARCHITECTURE
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  execute_process(COMMAND lsb_release "-i"
+    OUTPUT_VARIABLE LSB_RELEASE_ID
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  string(REGEX MATCH "Distributor ID:(.+)" LSB_Distributor_ID "${LSB_RELEASE_ID}")
+  string(STRIP ${CMAKE_MATCH_1} SPECIFIC_SYSTEM_NAME)
+  execute_process(COMMAND lsb_release "-r"
+    OUTPUT_VARIABLE LSB_RELEASE_R
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  string(REGEX MATCH "Release:(.+)" LSB_Release "${LSB_RELEASE_R}")
+  string(STRIP ${CMAKE_MATCH_1} SPECIFIC_SYSTEM_RELEASE)
+  if(SPECIFIC_SYSTEM_NAME MATCHES "CentOS")
+    set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM")
+  elseif(SPECIFIC_SYSTEM_NAME MATCHES "Fedora")
+    set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM")
+  elseif(SPECIFIC_SYSTEM_NAME MATCHES "SUSE")
+    set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM")
+  elseif(SPECIFIC_SYSTEM_NAME MATCHES "Ubuntu")
+    set(SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "DEB")
+  else(SPECIFIC_SYSTEM_NAME MATCHES "CentOS")
+    set( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "TGZ" )
+  endif(SPECIFIC_SYSTEM_NAME MATCHES "CentOS")
+  
+  message("SPECIFIC_SYSTEM_ARCHITECTURE=${SPECIFIC_SYSTEM_ARCHITECTURE}")
+  message("SPECIFIC_SYSTEM_NAME=${SPECIFIC_SYSTEM_NAME}")
+  message("SPECIFIC_SYSTEM_RELEASE=${SPECIFIC_SYSTEM_RELEASE}")
 endif( CMAKE_SYSTEM_NAME MATCHES "Linux" )
 
-set( SPECIFIC_SYSTEM_VERSION_NAME "${SPECIFIC_SYSTEM_VERSION_NAME}-${CMAKE_SYSTEM_PROCESSOR}" )
-
-message( STATUS "SPECIFIC_SYSTEM_VERSION_NAME = ${SPECIFIC_SYSTEM_VERSION_NAME}" )