Use only one TAPackageMaker binary

Change-Id: I840b5e7b5cbb12850b2d2f61051f4b21e189087b

diff --git a/PackageMaker/CMakeLists.txt b/PackageMaker/CMakeLists.txt
index b8d5635d4bec354f8df6f7d05254cb624f5e1a0f..dc60e08d0b85790007a3219ab3cf8aa2e7bcfdf4 100644 (file)
--- a/PackageMaker/CMakeLists.txt
+++ b/PackageMaker/CMakeLists.txt
@@ -19,15 +19,7 @@
 
 SET(PACKAGE_MAKER_SCRIPT ${PACKAGE_MAKER_PATH}/TA_PackageBuilder.sh)
 
-SET(PACKAGE_MAKER_BINARY_NAME TAPackageMaker)
-
-IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    SET(PACKAGE_MAKER_BINARY "${PACKAGE_MAKER_PATH}/TAPackageMaker64")
-ELSEIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-    SET(PACKAGE_MAKER_BINARY "${PACKAGE_MAKER_PATH}/TAPackageMaker32")
-ELSE()
-    MESSAGE(FATAL_ERROR "Incompatible architecture (only 32 and 64 bit archs are supported)")
-ENDIF()
+SET(PACKAGE_MAKER_BINARY "${PACKAGE_MAKER_PATH}/TAPackageMaker")
 
 INSTALL(PROGRAMS ${PACKAGE_MAKER_SCRIPT} DESTINATION ${BIN_DIR})
 INSTALL(PROGRAMS ${PACKAGE_MAKER_BINARY} DESTINATION ${BIN_DIR}

diff --git a/PackageMaker/TAPackageMaker b/PackageMaker/TAPackageMaker
new file mode 100755 (executable)
index 0000000..5b0fe70
Binary files /dev/null and b/PackageMaker/TAPackageMaker differ

diff --git a/PackageMaker/TAPackageMaker32 b/PackageMaker/TAPackageMaker32
deleted file mode 100755 (executable)
index 5b0fe70..0000000
Binary files a/PackageMaker/TAPackageMaker32 and /dev/null differ

diff --git a/PackageMaker/TAPackageMaker64 b/PackageMaker/TAPackageMaker64
deleted file mode 100755 (executable)
index 44b4e92..0000000
Binary files a/PackageMaker/TAPackageMaker64 and /dev/null differ