Browse Source

ENH: Always do tar.Z since we do have compress now builtin

Andy Cedilnik 19 years ago
parent
commit
3ef750a42c
2 changed files with 52 additions and 52 deletions
  1. 26 26
      Tests/SimpleInstall/CMakeLists.txt
  2. 26 26
      Tests/SimpleInstallS2/CMakeLists.txt

+ 26 - 26
Tests/SimpleInstall/CMakeLists.txt

@@ -213,32 +213,32 @@ IF(WIN32 AND NOT UNIX)
   ENDIF(NOT NSIS_MAKENSIS)
 ENDIF(WIN32 AND NOT UNIX)
 IF(UNIX AND NOT APPLE)
-  SET(CPACK_GENERATOR "TGZ;STGZ")
-  FIND_PROGRAM(found_compress
-    NAMES compress)
-  IF(found_compress)
-    FIND_PROGRAM(file_command NAMES file)
-    IF(NOT file_command)
-      set(file_command file)
-    ENDIF(NOT file_command)
-    EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
-      OUTPUT_VARIABLE output)
-    set(SKIP_TZ FALSE)
-    if("${output}" MATCHES "script")
-      set(SKIP_TZ TRUE)
-    endif("${output}" MATCHES "script")
-    if("${output}" MATCHES "dummy.sh")
-      set(SKIP_TZ TRUE)
-    endif("${output}" MATCHES "dummy.sh")
-    if(NOT SKIP_TZ)
-      message("compress found and it was not a script")
-      message("output from file command: [${output}]")
-      SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
-    else(NOT SKIP_TZ)
-      message("compress found, but it was a script so dont use it")
-      message("output from file command: [${output}]")
-    endif(NOT SKIP_TZ)
-  ENDIF(found_compress)
+  #  SET(CPACK_GENERATOR "TGZ;STGZ")
+  #  FIND_PROGRAM(found_compress
+  #    NAMES compress)
+  #  IF(found_compress)
+  #    FIND_PROGRAM(file_command NAMES file)
+  #    IF(NOT file_command)
+  #      set(file_command file)
+  #    ENDIF(NOT file_command)
+  #    EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
+  #      OUTPUT_VARIABLE output)
+  #    set(SKIP_TZ FALSE)
+  #    if("${output}" MATCHES "script")
+  #      set(SKIP_TZ TRUE)
+  #    endif("${output}" MATCHES "script")
+  #    if("${output}" MATCHES "dummy.sh")
+  #      set(SKIP_TZ TRUE)
+  #    endif("${output}" MATCHES "dummy.sh")
+  #    if(NOT SKIP_TZ)
+  #      message("compress found and it was not a script")
+  #      message("output from file command: [${output}]")
+  #      SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
+  #    else(NOT SKIP_TZ)
+  #      message("compress found, but it was a script so dont use it")
+  #      message("output from file command: [${output}]")
+  #    endif(NOT SKIP_TZ)
+  #  ENDIF(found_compress)
   FIND_PROGRAM(found_bz2
     NAMES bzip2)
   IF(found_bz2)

+ 26 - 26
Tests/SimpleInstallS2/CMakeLists.txt

@@ -213,32 +213,32 @@ IF(WIN32 AND NOT UNIX)
   ENDIF(NOT NSIS_MAKENSIS)
 ENDIF(WIN32 AND NOT UNIX)
 IF(UNIX AND NOT APPLE)
-  SET(CPACK_GENERATOR "TGZ;STGZ")
-  FIND_PROGRAM(found_compress
-    NAMES compress)
-  IF(found_compress)
-    FIND_PROGRAM(file_command NAMES file)
-    IF(NOT file_command)
-      set(file_command file)
-    ENDIF(NOT file_command)
-    EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
-      OUTPUT_VARIABLE output)
-    set(SKIP_TZ FALSE)
-    if("${output}" MATCHES "script")
-      set(SKIP_TZ TRUE)
-    endif("${output}" MATCHES "script")
-    if("${output}" MATCHES "dummy.sh")
-      set(SKIP_TZ TRUE)
-    endif("${output}" MATCHES "dummy.sh")
-    if(NOT SKIP_TZ)
-      message("compress found and it was not a script")
-      message("output from file command: [${output}]")
-      SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
-    else(NOT SKIP_TZ)
-      message("compress found, but it was a script so dont use it")
-      message("output from file command: [${output}]")
-    endif(NOT SKIP_TZ)
-  ENDIF(found_compress)
+  #  SET(CPACK_GENERATOR "TGZ;STGZ")
+  #  FIND_PROGRAM(found_compress
+  #    NAMES compress)
+  #  IF(found_compress)
+  #    FIND_PROGRAM(file_command NAMES file)
+  #    IF(NOT file_command)
+  #      set(file_command file)
+  #    ENDIF(NOT file_command)
+  #    EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
+  #      OUTPUT_VARIABLE output)
+  #    set(SKIP_TZ FALSE)
+  #    if("${output}" MATCHES "script")
+  #      set(SKIP_TZ TRUE)
+  #    endif("${output}" MATCHES "script")
+  #    if("${output}" MATCHES "dummy.sh")
+  #      set(SKIP_TZ TRUE)
+  #    endif("${output}" MATCHES "dummy.sh")
+  #    if(NOT SKIP_TZ)
+  #      message("compress found and it was not a script")
+  #      message("output from file command: [${output}]")
+  #      SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
+  #    else(NOT SKIP_TZ)
+  #      message("compress found, but it was a script so dont use it")
+  #      message("output from file command: [${output}]")
+  #    endif(NOT SKIP_TZ)
+  #  ENDIF(found_compress)
   FIND_PROGRAM(found_bz2
     NAMES bzip2)
   IF(found_bz2)