diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-12-06 18:25:28 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-12-10 17:50:49 +0100 |
| commit | 3f21100e1d2ec47b64670a8b08d0c9d067bf9ef3 (patch) | |
| tree | 6774ce7f2bc020b646366503eaa6acf2f0af13eb /scripts/build-packages.sh | |
| parent | e8eda2c819b36555d9d6b080eaf8b4b1109d7646 (diff) | |
[HICN-430] Rework on CMake
Change way targets are defined: each project defines targets.
Fix project BUILD flags
Add build-extras bash script
Rework build tree of extras folder, using ExternalProject_Add
Change-Id: I82fa29896e54c8a033490eba013c3f0431bec9d0
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'scripts/build-packages.sh')
| -rw-r--r-- | scripts/build-packages.sh | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 76aa7b389..2205d6277 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -29,12 +29,43 @@ VPP_VERSION_RPM="19.08.1-release.x86_64" BUILD_TOOLS_UBUNTU="build-essential doxygen" LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev" -DEPS_UBUNTU="libparc-dev libasio-dev libconfig-dev libcurl4-openssl-dev vpp=${VPP_VERSION_DEB} vpp-dev=${VPP_VERSION_DEB} libvppinfra=${VPP_VERSION_DEB} libvppinfra-dev=${VPP_VERSION_DEB} vpp-plugin-core=${VPP_VERSION_DEB} python3-ply" +DEPS_UBUNTU="libparc-dev \ + libmemif-dev \ + libmemif \ + libasio-dev \ + libconfig-dev \ + libcurl4-openssl-dev \ + vpp=${VPP_VERSION_DEB} \ + vpp-dev=${VPP_VERSION_DEB} \ + libvppinfra=${VPP_VERSION_DEB} \ + libvppinfra-dev=${VPP_VERSION_DEB} \ + vpp-plugin-core=${VPP_VERSION_DEB} \ + python3-ply" + DEPS_CMAKE_UBUNTU="curl" # BUILD_TOOLS_GROUP_CENTOS="'Development Tools'" -DEPS_CENTOS="vpp-devel-${VPP_VERSION_RPM} vpp-lib-${VPP_VERSION_RPM} libparc-devel libcurl-devel asio-devel libconfig-devel centos-release-scl devtoolset-7" -DEPS_CENTOS_NOVERSION="vpp-devel vpp-lib libparc-devel libcurl-devel asio-devel centos-release-scl devtoolset-7" +DEPS_CENTOS="vpp-devel-${VPP_VERSION_RPM} \ + vpp-lib-${VPP_VERSION_RPM} \ + libparc-devel \ + libmemif-devel \ + libmemif \ + libcurl-devel \ + asio-devel \ + libconfig-devel \ + centos-release-scl \ + devtoolset-7" + +DEPS_CENTOS_NOVERSION="vpp-devel \ + vpp-lib \ + libparc-devel \ + libcurl-devel \ + asio-devel \ + libmemif-devel \ + libmemif \ + centos-release-scl \ + devtoolset-7" + LATEST_EPEL_REPO="http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" install_cmake() { @@ -143,11 +174,10 @@ build_package() { cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_APPS=ON ${SCRIPT_PATH}/.. make -j8 package - rm -rf libtransport + rm -rf libtransport ctrl/libctrl cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_HICNPLUGIN=ON \ - -DBUILD_HICNEXTRAPLUGIN=ON \ -DBUILD_LIBTRANSPORT=ON \ -DBUILD_APPS=ON \ ${SCRIPT_PATH}/.. |