From 304d7884afe269e28288af652df584eea35eb095 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Tue, 11 Apr 2017 18:37:11 +0200 Subject: [PATCH] Fixing deps mistake in cicn build script Change-Id: I0ca31046c069c7a364058a29876c61f4c007fde2 Signed-off-by: Mauro Sardara --- jjb/cicn/build-package.sh | 241 --------------------- jjb/cicn/cicn.yaml | 23 +- jjb/cicn/include-raw-cicn-http-server-build.sh | 6 +- jjb/cicn/include-raw-cicn-libccnx-common-build.sh | 6 +- jjb/cicn/include-raw-cicn-libccnx-portal-build.sh | 6 +- ...include-raw-cicn-libccnx-transport-rta-build.sh | 6 +- jjb/cicn/include-raw-cicn-libicnet-build.sh | 6 +- jjb/cicn/include-raw-cicn-libparc-build.sh | 6 +- jjb/cicn/include-raw-cicn-longbow-build.sh | 8 +- jjb/cicn/include-raw-cicn-metis-build.sh | 8 +- jjb/cicn/include-raw-cicn-radio-emulators-build.sh | 84 +------ jjb/cicn/include-raw-cicn-viper-build.sh | 95 +------- jjb/cicn/include-raw-cicn-vpp-plugin-build.sh | 11 +- 13 files changed, 34 insertions(+), 472 deletions(-) delete mode 100644 jjb/cicn/build-package.sh diff --git a/jjb/cicn/build-package.sh b/jjb/cicn/build-package.sh deleted file mode 100644 index 6a81ccb03..000000000 --- a/jjb/cicn/build-package.sh +++ /dev/null @@ -1,241 +0,0 @@ -#!/bin/bash -# basic build script example -set -euxo pipefail -IFS=$'\n\t' - -APT_PATH=`which apt-get` || true -apt_get=${APT_PATH:-"/usr/local/bin/apt-get"} - -# Parameters: -# $1 = Distribution [trusty / CentOS] -# -update_cmake_repo() { - - DISTRIBUTION=$1 - - if [ "$DISTRIBUTION" == "trusty" ]; then - sudo ${apt_get} install -y --allow-unauthenticated software-properties-common - sudo add-apt-repository --yes ppa:george-edison55/cmake-3.x - elif [ "$DISTRIBUTION" == "CentOS" ]; then - sudo cat << EOF > cmake.repo -[cmake-repo] -name=Repo for cmake3 -baseurl=http://mirror.ghettoforge.org/distributions/gf/el/7/plus/x86_64/ -enabled=1 -gpgcheck=0 -EOF - sudo cat << EOF > jsoncpp.repo -[jsoncp-repo] -name=Repo for jsoncpp -baseurl=http://dl.fedoraproject.org/pub/epel/7/x86_64/ -enabled=1 -gpgcheck=0 -EOF - sudo mv cmake.repo /etc/yum.repos.d/cmake.repo - sudo mv jsoncpp.repo /etc/yum.repos.d/jsoncpp.repo - fi -} - -# Parameters: -# $1 = Distribution codename -# -update_qt_repo() { - DISTRIBUTION_CODENAME=$1 - - if [ "$DISTRIBUTION_CODENAME" != "trusty" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ]; then - echo "No valid distribution specified when calling 'update_qt_repo'. Exiting.." - exit -1 - fi - - sudo ${apt_get} install -y --allow-unauthenticated software-properties-common - sudo add-apt-repository --yes ppa:beineri/opt-qt571-$DISTRIBUTION_CODENAME - - wget -q -O - http://archive.getdeb.net/getdeb-archive.key | sudo apt-key add - - sudo sh -c "echo 'deb http://archive.getdeb.net/ubuntu $DISTRIBUTION_CODENAME-getdeb apps' >> /etc/apt/sources.list.d/getdeb.list" - - sudo ${apt_get} update -} - -# Parameters: -# $1 = Distribution id -# $2 = Distribution codename -# -update_fdio_repo() { - DISTRIB_ID=$1 - DISTRIB_CODENAME=$2 - - if ! [ -z ${REPO_NAME} ]; then - REPO_CICN_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}" - REPO_VPP_URL="" - - if [ "$DISTRIB_ID" == "Ubuntu" ]; then - - if [ "$DISTRIB_CODENAME" == "xenial" ]; then - REPO_VPP_URL="${NEXUSPROXY}/content/repositories/fd.io.stable.1701.ubuntu.xenial.main/" - elif [ "$DISTRIB_CODENAME" == "trusty" ]; then - REPO_VPP_URL="${NEXUSPROXY}/content/repositories/fd.io.stable.1701.ubuntu.trusty.main/" - else - echo "Distribution $DISTRIB_CODENAME is not supported" - exit -1 - fi - - echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list - echo "deb ${REPO_CICN_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.master.list - - elif [ "$DISTRIB_ID" == "CentOS" ]; then - REPO_VPP_URL="${NEXUSPROXY}/content/repositories/fd.io.centos7/" - sudo cat << EOF > fdio.repo -[fdio-vpp-master] -name=fd.io master branch latest merge -baseurl=${REPO_VPP_URL} -enabled=1 -gpgcheck=0 - -[fdio-cicn-master] -name=fd.io master branch latest merge -baseurl=${REPO_CICN_URL} -enabled=1 -gpgcheck=0 -EOF - sudo mv fdio.repo /etc/yum.repos.d/fdio.repo - else - echo "Distribution $DISTRIB_CODENAME is not supported" - fi - else - exit -1 - fi - -} - -setup() { - - DISTRIB_ID=$1 - DISTRIB_CODENAME=$2 - - if [ "$DISTRIB_ID" == "Ubuntu" ]; then - if [ "$DISTRIB_CODENAME" == "trusty" ]; then - update_cmake_repo $DISTRIB_CODENAME - fi - - update_fdio_repo $DISTRIB_ID $DISTRIB_CODENAME - - sudo ${apt_get} update || true - - elif [ "$DISTRIB_ID" == "CentOS" ]; then - update_cmake_repo $DISTRIB_ID - update_fdio_repo $DISTRIB_ID $DISTRIB_CODENAME - fi -} - -build_package() { - - ARCHITECTURE=`uname -m` - - # Figure out what system we are running on - if [ -f /etc/lsb-release ];then - - BUILD_TOOLS="build-essential cmake" - LIBSSL_LIBEVENT="libevent-dev libssl-dev" - LONGBOW_DEPS="" - LIBPARC_DEPS="longbow $LIBSSL_LIBEVENT" - LIBCCNX_COMMON_DEPS="$LIBPARC_DEPS libparc" - LIBCCNX_TRANSPORT_RTA_DEPS="$LIBCCNX_COMMON_DEPS libccnx-common" - LIBCCNX_PORTAL_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta" - LIBICNET_DEPS="$LIBCCNX_PORTAL_DEPS libboost-system-dev" - METIS_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta" - HTTP_SERVER_DEPS="$LIBICNET_DEPS libicnet libboost-regex-dev libboost-filesystem-dev" - VPP_PLUGIN_DEPS="vpp-dev vpp-dpdk-dev" - - . /etc/lsb-release - DEB=ON - RPM=OFF - - if [ "$ARCHITECTURE" == "x86_64" ]; then - ARCHITECTURE="amd64" - fi - - elif [ -f /etc/redhat-release ];then - - BUILD_TOOLS_GROUP="'Development Tools'" - BUILD_TOOLS_SINGLE="cmake" - LIBSSL_LIBEVENT="libevent-devel openssl-devel" - LONGBOW_DEPS="" - LIBPARC_DEPS="longbow $LIBSSL_LIBEVENT" - LIBCCNX_COMMON_DEPS="$LIBPARC_DEPS libparc" - LIBCCNX_TRANSPORT_RTA_DEPS="$LIBCCNX_COMMON_DEPS libccnx-common" - LIBCCNX_PORTAL_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta" - LIBICNET_DEPS="$LIBCCNX_PORTAL_DEPS boost-devel" - METIS_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta" - HTTP_SERVER_DEPS="$LIBICNET_DEPS libicnet boost-devel" - - sudo yum install -y redhat-lsb - DISTRIB_ID=`lsb_release -si` - DISTRIB_RELEASE=`lsb_release -sr` - DISTRIB_CODENAME=`lsb_release -sc` - DISTRIB_DESCRIPTION=`lsb_release -sd` - - DEB=OFF - RPM=ON - else - echo "ERROR: System configuration not recognized. Build failed" - exit -1 - fi - - echo ARCHITECTURE: $ARCHITECTURE - echo DISTRIB_ID: $DISTRIB_ID - echo DISTRIB_RELEASE: $DISTRIB_RELEASE - echo DISTRIB_CODENAME: $DISTRIB_CODENAME - echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION - - setup $DISTRIB_ID $DISTRIB_CODENAME - - if [ $DISTRIB_ID == "Ubuntu" ]; then - echo $BUILD_TOOLS ${!PACKAGE_DEPS} | xargs sudo ${apt_get} install -y --allow-unauthenticated - elif [ $DISTRIB_ID == "CentOS" ]; then - echo $BUILD_TOOLS_GROUP | xargs sudo yum groupinstall -y --nogpgcheck || true - echo $BUILD_TOOLS_SINGLE | xargs sudo yum install -y --nogpgcheck || true - echo ${!PACKAGE_DEPS} | xargs sudo yum install -y --nogpgcheck || true - fi - - # do nothing but print the current slave hostname - hostname - - # Install package dependencies - - export CCACHE_DIR=/tmp/ccache - if [ -d $CCACHE_DIR ];then - echo $CCACHE_DIR exists - du -sk $CCACHE_DIR - else - echo $CCACHE_DIR does not exist. This must be a new slave. - fi - - echo "cat /etc/bootstrap.sha" - if [ -f /etc/bootstrap.sha ];then - cat /etc/bootstrap.sha - else - echo "Cannot find cat /etc/bootstrap.sha" - fi - - echo "cat /etc/bootstrap-functions.sha" - if [ -f /etc/bootstrap-functions.sha ];then - cat /etc/bootstrap-functions.sha - else - echo "Cannot find cat /etc/bootstrap-functions.sha" - fi - - # Make the package - mkdir -p build && pushd build - - rm -rf * - cmake -DCMAKE_INSTALL_PREFIX=/usr -DRPM_PACKAGE=$RPM -DDEB_PACKAGE=$DEB -DDISTRIBUTION=$DISTRIB_CODENAME -DARCHITECTURE=$ARCHITECTURE .. - make package - - popd - - echo "*******************************************************************" - echo "* $PACKAGE_NAME BUILD SUCCESSFULLY COMPLETED" - echo "*******************************************************************" - - exit 0 -} diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index 4b5c839d4..4b03eecf6 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -262,7 +262,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-longbow-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -335,7 +334,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-libparc-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -395,7 +393,7 @@ name: '{project}' branch: '{branch}' - reverse: - jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}' + jobs: 'cicn-libparc-merge-{stream}-{os}' result: 'failure' builders: @@ -408,7 +406,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-libccnx-common-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -468,7 +465,7 @@ name: '{project}' branch: '{branch}' - reverse: - jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}' + jobs: 'cicn-libccnx-common-merge-{stream}-{os}' result: 'failure' builders: @@ -481,7 +478,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-libccnx-transport-rta-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -541,7 +537,7 @@ name: '{project}' branch: '{branch}' - reverse: - jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}, cicn-libccnx-transport-rta-merge-{stream}-{os}' + jobs: 'cicn-libccnx-transport-rta-merge-{stream}-{os}' result: 'failure' builders: @@ -554,7 +550,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-libccnx-portal-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -614,7 +609,7 @@ name: '{project}' branch: '{branch}' - reverse: - jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}, cicn-libccnx-transport-rta-merge-{stream}-{os}, cicn-libccnx-portal-merge-{stream}-{os}' + jobs: 'cicn-libccnx-portal-merge-{stream}-{os}' result: 'failure' builders: @@ -627,7 +622,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-libicnet-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -687,7 +681,7 @@ name: '{project}' branch: '{branch}' - reverse: - jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}, cicn-libccnx-transport-rta-merge-{stream}-{os}, cicn-libccnx-portal-merge-{stream}-{os}' + jobs: 'cicn-libccnx-portal-merge-{stream}-{os}' result: 'failure' builders: @@ -700,7 +694,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-metis-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -773,7 +766,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-http-server-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -844,7 +836,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-vpp-plugin-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -917,7 +908,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-viper-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -985,7 +975,6 @@ global-settings-type: cfp - shell: !include-raw-escape: - - build-package.sh - include-raw-cicn-radio-emulators-build.sh - provide-maven-settings: settings-file: 'cicn-settings' @@ -1002,4 +991,4 @@ only-if-success: true default-excludes: false - fdio-infra-shiplogs: - maven-version: 'mvn33-new' \ No newline at end of file + maven-version: 'mvn33-new' diff --git a/jjb/cicn/include-raw-cicn-http-server-build.sh b/jjb/cicn/include-raw-cicn-http-server-build.sh index d75b6c71a..92bf809e4 100644 --- a/jjb/cicn/include-raw-cicn-http-server-build.sh +++ b/jjb/cicn/include-raw-cicn-http-server-build.sh @@ -3,6 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="HTTP_SERVER" -PACKAGE_DEPS="HTTP_SERVER_DEPS" -build_package $PACKAGE_NAME $PACKAGE_DEPS +pushd scripts +bash build-package.sh +popd diff --git a/jjb/cicn/include-raw-cicn-libccnx-common-build.sh b/jjb/cicn/include-raw-cicn-libccnx-common-build.sh index 43bad9dd1..3fd0ca5a0 100644 --- a/jjb/cicn/include-raw-cicn-libccnx-common-build.sh +++ b/jjb/cicn/include-raw-cicn-libccnx-common-build.sh @@ -3,8 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="LIBCCNX_COMMON" -PACKAGE_DEPS="LIBCCNX_COMMON_DEPS" -pushd libccnx-common -build_package $PACKAGE_NAME $PACKAGE_DEPS +pushd libccnx-common/scripts +bash build-package.sh popd diff --git a/jjb/cicn/include-raw-cicn-libccnx-portal-build.sh b/jjb/cicn/include-raw-cicn-libccnx-portal-build.sh index e5e48092c..8280311db 100644 --- a/jjb/cicn/include-raw-cicn-libccnx-portal-build.sh +++ b/jjb/cicn/include-raw-cicn-libccnx-portal-build.sh @@ -3,8 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="LIBCCNX_PORTAL" -PACKAGE_DEPS="LIBCCNX_PORTAL_DEPS" -pushd libccnx-portal -build_package $PACKAGE_NAME $PACKAGE_DEPS +pushd libccnx-portal/scripts +bash build-package.sh popd diff --git a/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh b/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh index 74c309547..33aa1da7f 100644 --- a/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh +++ b/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh @@ -3,8 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="LIBCCNX_TRANSPORT_RTA" -PACKAGE_DEPS="LIBCCNX_TRANSPORT_RTA_DEPS" -pushd libccnx-transport-rta -build_package $PACKAGE_NAME $PACKAGE_DEPS +pushd libccnx-transport-rta/scripts +bash build-package.sh popd diff --git a/jjb/cicn/include-raw-cicn-libicnet-build.sh b/jjb/cicn/include-raw-cicn-libicnet-build.sh index 9b8be609b..92bf809e4 100644 --- a/jjb/cicn/include-raw-cicn-libicnet-build.sh +++ b/jjb/cicn/include-raw-cicn-libicnet-build.sh @@ -3,6 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="LIBICNET" -PACKAGE_DEPS="LIBICNET_DEPS" -build_package $PACKAGE_NAME $PACKAGE_DEPS +pushd scripts +bash build-package.sh +popd diff --git a/jjb/cicn/include-raw-cicn-libparc-build.sh b/jjb/cicn/include-raw-cicn-libparc-build.sh index 74513fd65..4943501c1 100644 --- a/jjb/cicn/include-raw-cicn-libparc-build.sh +++ b/jjb/cicn/include-raw-cicn-libparc-build.sh @@ -3,8 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="LIBPARC" -PACKAGE_DEPS="LIBPARC_DEPS" -pushd libparc -build_package $PACKAGE_NAME $PACKAGE_DEPS +pushd libparc/scripts +bash build-package.sh popd diff --git a/jjb/cicn/include-raw-cicn-longbow-build.sh b/jjb/cicn/include-raw-cicn-longbow-build.sh index 73c65d70f..f2b8bf27c 100644 --- a/jjb/cicn/include-raw-cicn-longbow-build.sh +++ b/jjb/cicn/include-raw-cicn-longbow-build.sh @@ -3,8 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="LONGBOW" -PACKAGE_DEPS="LONGBOW_DEPS" -pushd longbow -build_package $PACKAGE_NAME $PACKAGE_DEPS -popd \ No newline at end of file +pushd longbow/scripts +bash build-package.sh +popd diff --git a/jjb/cicn/include-raw-cicn-metis-build.sh b/jjb/cicn/include-raw-cicn-metis-build.sh index 03d426238..8ff7d3c43 100644 --- a/jjb/cicn/include-raw-cicn-metis-build.sh +++ b/jjb/cicn/include-raw-cicn-metis-build.sh @@ -3,8 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="METIS" -PACKAGE_DEPS="METIS_DEPS" -pushd metis -build_package $PACKAGE_NAME $PACKAGE_DEPS -popd \ No newline at end of file +pushd metis/scripts +bash build-package.sh +popd diff --git a/jjb/cicn/include-raw-cicn-radio-emulators-build.sh b/jjb/cicn/include-raw-cicn-radio-emulators-build.sh index c5b762bd0..41653d739 100644 --- a/jjb/cicn/include-raw-cicn-radio-emulators-build.sh +++ b/jjb/cicn/include-raw-cicn-radio-emulators-build.sh @@ -3,86 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -APT_PATH=`which apt-get` || true -apt_get=${APT_PATH:-"/usr/local/bin/apt-get"} - -PACKAGE_NAME="RADIO_EMULATOR" -RADIO_EMULATOR_DEPS_UBUNTU="pkg-config libboost-all-dev libsqlite3-dev libopenmpi-dev libxml2-dev libwebsocketpp-dev" - -BUILD_TOOLS="build-essential cmake" - -ARCHITECTURE=`uname -m` - -# Figure out what system we are running on -if [ -f /etc/lsb-release ];then - - . /etc/lsb-release - DEB=ON - RPM=OFF - - if [ "$ARCHITECTURE" == "x86_64" ]; then - ARCHITECTURE="amd64" - fi - -elif [ -f /etc/redhat-release ];then - - sudo yum install -y redhat-lsb - DISTRIB_ID=`lsb_release -si` - DISTRIB_RELEASE=`lsb_release -sr` - DISTRIB_CODENAME=`lsb_release -sc` - DISTRIB_DESCRIPTION=`lsb_release -sd` - - DEB=OFF - RPM=ON -else - echo "ERROR: System configuration not recognized. Build failed" - exit -1 -fi - -echo ARCHITECTURE: $ARCHITECTURE -echo DISTRIB_ID: $DISTRIB_ID -echo DISTRIB_RELEASE: $DISTRIB_RELEASE -echo DISTRIB_CODENAME: $DISTRIB_CODENAME -echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION - -setup $DISTRIB_ID $DISTRIB_CODENAME - -# Install deps - -if [ $DISTRIB_ID == "Ubuntu" ]; then - echo $BUILD_TOOLS $RADIO_EMULATOR_DEPS_UBUNTU | xargs sudo ${apt_get} install -y --allow-unauthenticated || true -else - echo "This package is currently supported only for ubuntu. Exiting.." - exit -1 -fi - -# Parameters -# $1 = WIFI / LTE -# -build() { - PARAM=$1 - mkdir -p build - cd build - ls | grep -v *.deb | xargs rm -rf || true - echo $PARAM | xargs cmake -DCMAKE_INSTALL_PREFIX=/usr -DRPM_PACKAGE=$RPM -DDEB_PACKAGE=$DEB -DDISTRIBUTION=$DISTRIB_CODENAME -DARCHITECTURE=$ARCHITECTURE .. - make -} - -# Install libns3 - -pushd emu-radio/ns3-packages -sudo dpkg -i *.deb || true -sudo apt-get -f install -y --allow-unauthenticated || true -popd - -# Build wifi-emualtor -pushd emu-radio -build "-DWIFI=ON -DLTE=OFF" -make package +pushd emu-radio/scripts +bash build-package.sh popd - -# Build lte-emualtor -pushd emu-radio -build "-DLTE=ON -DWIFI=OFF" -make package -popd \ No newline at end of file diff --git a/jjb/cicn/include-raw-cicn-viper-build.sh b/jjb/cicn/include-raw-cicn-viper-build.sh index e636a14f4..92bf809e4 100644 --- a/jjb/cicn/include-raw-cicn-viper-build.sh +++ b/jjb/cicn/include-raw-cicn-viper-build.sh @@ -3,97 +3,6 @@ set -euxo pipefail IFS=$'\n\t' -APT_PATH=`which apt-get` || true -apt_get=${APT_PATH:-"/usr/local/bin/apt-get"} - -PACKAGE_NAME="VIPER" -VIPER_DEPS_UBUNTU="zlib1g-dev git-core build-essential libxml2-dev libcurl4-openssl-dev \ - qt57base qt57svg qt57charts-no-lgpl qt57multimedia libqtav-dev libicnet \ - libavcodec-dev libavformat-dev libswscale-dev libavresample-dev libqml-module-qtav \ - qt57quickcontrols qt57quickcontrols2 libxml2-dev" - -BUILD_TOOLS="build-essential cmake" - -ARCHITECTURE=`uname -m` - -# Figure out what system we are running on -if [ -f /etc/lsb-release ];then - - . /etc/lsb-release - DEB=ON - RPM=OFF - - if [ "$ARCHITECTURE" == "x86_64" ]; then - ARCHITECTURE="amd64" - fi - -elif [ -f /etc/redhat-release ];then - - sudo yum install -y redhat-lsb - DISTRIB_ID=`lsb_release -si` - DISTRIB_RELEASE=`lsb_release -sr` - DISTRIB_CODENAME=`lsb_release -sc` - DISTRIB_DESCRIPTION=`lsb_release -sd` - - DEB=OFF - RPM=ON -else - echo "ERROR: System configuration not recognized. Build failed" - exit -1 -fi - -echo ARCHITECTURE: $ARCHITECTURE -echo DISTRIB_ID: $DISTRIB_ID -echo DISTRIB_RELEASE: $DISTRIB_RELEASE -echo DISTRIB_CODENAME: $DISTRIB_CODENAME -echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION - -setup $DISTRIB_ID $DISTRIB_CODENAME - -# Install deps - -if [ $DISTRIB_ID == "Ubuntu" ]; then - update_qt_repo $DISTRIB_CODENAME - echo $BUILD_TOOLS $VIPER_DEPS_UBUNTU | xargs sudo ${apt_get} install -y --allow-unauthenticated -else - echo "This package is currently supported only for ubuntu. Exiting.." - exit -1 -fi - -# Create links - -sudo ln -sf /usr/include/x86_64-linux-gnu/qt5/QtAV /opt/qt57/include/QtAV -sudo ln -sf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/av.prf /opt/qt57/mkspecs/features/av.prf -sudo ln -sf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/avwidgets.prf /opt/qt57/mkspecs/features/avwidgets.prf -sudo ln -sf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_avwidgets.pri /opt/qt57/mkspecs/modules/qt_lib_avwidgets.pri -sudo ln -sf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_av.pri /opt/qt57/mkspecs/modules/qt_lib_av.pri -sudo ln -sf /usr/lib/x86_64-linux-gnu/libQtAV.prl /opt/qt57/lib/libQtAV.prl -sudo ln -sf /usr/lib/x86_64-linux-gnu/libQtAVWidgets.prl /opt/qt57/lib/libQtAVWidgets.prl -sudo ln -sf /usr/lib/x86_64-linux-gnu/libQtAVWidgets.so /opt/qt57/lib/libQt5AVWidgets.so -sudo ln -sf /usr/lib/x86_64-linux-gnu/libQt5AV.so /opt/qt57/lib/libQt5AV.so -sudo ln -sf /usr/lib/x86_64-linux-gnu/libQtAV.so /opt/qt57/lib/libQtAV.so -sudo ln -sf /usr/lib/x86_64-linux-gnu/libQt5AVWidgets.so /opt/qt57/lib/libQtAVWidgets.so - -# Compile libdash - - -build() { - mkdir -p build - cd build - rm -rf * - cmake -DCMAKE_INSTALL_PREFIX=/usr -DRPM_PACKAGE=$RPM -DDEB_PACKAGE=$DEB -DDISTRIBUTION=$DISTRIB_CODENAME -DARCHITECTURE=$ARCHITECTURE .. - make -} - -# Build libdash -pushd libdash -build -make package -sudo make install -popd - -# Build viper -pushd . -build -make package +pushd scripts +bash build-package.sh popd diff --git a/jjb/cicn/include-raw-cicn-vpp-plugin-build.sh b/jjb/cicn/include-raw-cicn-vpp-plugin-build.sh index 1da7b4763..194fb6321 100644 --- a/jjb/cicn/include-raw-cicn-vpp-plugin-build.sh +++ b/jjb/cicn/include-raw-cicn-vpp-plugin-build.sh @@ -1,11 +1,8 @@ #!/bin/bash # basic build script example -set -exuo pipefail +set -euxo pipefail IFS=$'\n\t' -PACKAGE_NAME="VPP_PLUGIN" -PACKAGE_DEPS="VPP_PLUGIN_DEPS" - -pushd cicn-plugin -build_package $PACKAGE_NAME $PACKAGE_DEPS -popd \ No newline at end of file +pushd cicn-plugin/scripts +bash build-package.sh +popd -- 2.16.6