Change external source code download setting (#3116)

Use tar.gz file instead of zip file
Change external source code download setting to server path only
- Support smooth external code update
- Support simple mirror server moving

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/cmake/packages/ARMComputeSourceConfig.cmake b/cmake/packages/ARMComputeSourceConfig.cmake
index 113f3f8..b7e395c 100644 (file)
--- a/cmake/packages/ARMComputeSourceConfig.cmake
+++ b/cmake/packages/ARMComputeSourceConfig.cmake
@@ -7,8 +7,8 @@ function(_ARMComputeSource_import)
   nnfw_include(ExternalSourceTools)
   nnfw_include(OptionTools)
 
-  envoption(ARMCOMPUTE_URL https://github.com/ARM-software/ComputeLibrary/archive/v18.05.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
+  set(ARMCOMPUTE_URL ${EXTERNAL_DOWNLOAD_SERVER}/ARM-software/ComputeLibrary/archive/v18.05.tar.gz)
   ExternalSource_Download("acl" ${ARMCOMPUTE_URL})
 
   set(ARMComputeSource_DIR ${acl_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/EigenSourceConfig.cmake b/cmake/packages/EigenSourceConfig.cmake
index 0b43609..aac30df 100644 (file)
--- a/cmake/packages/EigenSourceConfig.cmake
+++ b/cmake/packages/EigenSourceConfig.cmake
@@ -8,8 +8,8 @@ function(_EigenSource_import)
   nnfw_include(OptionTools)
 
   # NOTE The following URL comes from TensorFlow 1.9
-  envoption(EIGEN_URL https://bitbucket.org/eigen/eigen/get/fd6845384b86.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://bitbucket.org")
+  set(EIGEN_URL ${EXTERNAL_DOWNLOAD_SERVER}/eigen/eigen/get/fd6845384b86.tar.gz)
   ExternalSource_Download("eigen" ${EIGEN_URL})
 
   set(EigenSource_DIR ${eigen_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/FarmhashSourceConfig.cmake b/cmake/packages/FarmhashSourceConfig.cmake
index fe22c03..29bc7f2 100644 (file)
--- a/cmake/packages/FarmhashSourceConfig.cmake
+++ b/cmake/packages/FarmhashSourceConfig.cmake
@@ -8,8 +8,8 @@ function(_FarmhashSource_import)
   nnfw_include(OptionTools)
 
   # NOTE TensorFlow 1.9 downloads farmhash from the following URL
-  envoption(FARMHASH_URL https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
+  set(FARMHASH_URL ${EXTERNAL_DOWNLOAD_SERVER}/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz)
   ExternalSource_Download("farmhash" ${FARMHASH_URL})
 
   set(FarmhashSource_DIR ${farmhash_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/FlatBuffersSourceConfig.cmake b/cmake/packages/FlatBuffersSourceConfig.cmake
index e136a26..f062c26 100644 (file)
--- a/cmake/packages/FlatBuffersSourceConfig.cmake
+++ b/cmake/packages/FlatBuffersSourceConfig.cmake
@@ -8,8 +8,8 @@ function(_FlatBuffersSource_import)
   nnfw_include(OptionTools)
 
   # NOTE TensorFlow 1.9 downloads FlatBuffers from the following URL
-  envoption(FLATBUFFERS_URL https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
+  set(FLATBUFFERS_URL ${EXTERNAL_DOWNLOAD_SERVER}/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz)
   ExternalSource_Download("flatbuffers" ${FLATBUFFERS_URL})
 
   set(FlatBuffersSource_DIR ${flatbuffers_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/GEMMLowpSourceConfig.cmake b/cmake/packages/GEMMLowpSourceConfig.cmake
index b8a2c3e..f5e7335 100644 (file)
--- a/cmake/packages/GEMMLowpSourceConfig.cmake
+++ b/cmake/packages/GEMMLowpSourceConfig.cmake
@@ -8,8 +8,8 @@ function(_GEMMLowpSource_import)
   nnfw_include(OptionTools)
 
   # NOTE TensorFlow 1.9 uses the following URL
-  envoption(GEMMLOWP_URL https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
+  set(GEMMLOWP_URL ${EXTERNAL_DOWNLOAD_SERVER}/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.tar.gz)
   ExternalSource_Download("gemmlowp" ${GEMMLOWP_URL})
 
   set(GEMMLowpSource_DIR ${gemmlowp_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/GTestConfig.cmake b/cmake/packages/GTestConfig.cmake
index a96a64a..8bb777d 100644 (file)
--- a/cmake/packages/GTestConfig.cmake
+++ b/cmake/packages/GTestConfig.cmake
@@ -11,8 +11,8 @@ if(${BUILD_GTEST})
   nnfw_include(ExternalProjectTools)
   nnfw_include(OptionTools)
 
-  envoption(GTEST_URL https://github.com/google/googletest/archive/release-1.8.0.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
+  set(GTEST_URL ${EXTERNAL_DOWNLOAD_SERVER}/google/googletest/archive/release-1.8.0.tar.gz)
   ExternalSource_Download("gtest" ${GTEST_URL})
 
   # gtest_SOURCE_DIR is used in gtest subdirectorty's cmake

diff --git a/cmake/packages/NEON2SSESourceConfig.cmake b/cmake/packages/NEON2SSESourceConfig.cmake
index 9b703ec..6258b53 100644 (file)
--- a/cmake/packages/NEON2SSESourceConfig.cmake
+++ b/cmake/packages/NEON2SSESourceConfig.cmake
@@ -8,8 +8,8 @@ function(_NEON2SSESource_import)
   nnfw_include(OptionTools)
 
   # NOTE TensorFlow 1.9 downloads NEON2SSE from the following URL
-  envoption(NEON2SSE_URL https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
+  set(NEON2SSE_URL ${EXTERNAL_DOWNLOAD_SERVER}/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz)
   ExternalSource_Download("neon_2_sse" ${NEON2SSE_URL})
 
   set(NEON2SSESource_DIR ${neon_2_sse_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/TensorFlowSourceConfig.cmake b/cmake/packages/TensorFlowSourceConfig.cmake
index b9c34b0..ee88f93 100644 (file)
--- a/cmake/packages/TensorFlowSourceConfig.cmake
+++ b/cmake/packages/TensorFlowSourceConfig.cmake
@@ -7,8 +7,8 @@ function(_TensorFlowSource_import)
   nnfw_include(ExternalSourceTools)
   nnfw_include(OptionTools)
 
-  envoption(TENSORFLOW_URL https://github.com/tensorflow/tensorflow/archive/v1.9.0.zip)
-
+  envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
+  set(TENSORFLOW_URL ${EXTERNAL_DOWNLOAD_SERVER}/tensorflow/tensorflow/archive/v1.9.0.tar.gz)
   ExternalSource_Download("tensorflow" ${TENSORFLOW_URL})
 
   set(TensorFlowSource_DIR ${tensorflow_SOURCE_DIR} PARENT_SCOPE)