From 7f4916ae09e89aadfc2029ffbe81231ba1ea8016 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Tue, 5 Feb 2019 13:45:46 +0100 Subject: [HICN-25] Revert to previous build-packages.sh Change-Id: I9bd77da03f82a2c4c6a3045184112f76762dda07 Signed-off-by: Mauro Sardara --- scripts/build-packages.sh | 67 ----------------------------------------------- 1 file changed, 67 deletions(-) (limited to 'scripts') diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 7ca2b185b..67adb39e9 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -144,8 +144,6 @@ build_package() { # Make the package mkdir -p build && pushd build - pwd - rm -rf * cmake -DCMAKE_INSTALL_PREFIX=/usr ${SCRIPT_PATH}/.. make package @@ -163,15 +161,6 @@ build_package() { find . -not -name '*.deb' -not -name '*.rpm' -print0 | xargs -0 rm -rf -- || true rm *Unspecified* - # Make the doc - cmake -DBUILD_HICNPLUGIN=OFF \ - -DBUILD_LIBTRANSPORT=OFF \ - -DBUILD_UTILS=OFF \ - -DBUILD_HICNLIGHT=OFF \ - ${SCRIPT_PATH}/.. - - make doc - popd echo "*******************************************************************" @@ -179,62 +168,6 @@ build_package() { echo "*******************************************************************" } -push_doc() { - DOCS_REPO_URL=${DOCS_REPO_URL:-"https://nexus.fd.io/content/sites/site"} - PROJECT_PATH=${PROJECT_PATH:-"io/fd/hicn"} - DOC_FILE=${DOC_FILE:-"hicn.docs.zip"} - DOC_DIR=${DOC_DIR:-"build/lib/doc/html"} - SITE_DIR=${SITE_DIR:-"build/doc/deploy-site/"} - RESOURCES_DIR=${RESOURCES_DIR:-${SITE_DIR}/src/site/resources} - MVN=${MVN:-"/opt/apache/maven/bin/mvn"} - VERSION=${VERSION:-$(git describe --abbrev=0 | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")} - - echo "Current directory: $(pwd)" - ls -la - - . /etc/os-release - - # if [[ ${JOB_NAME} == *merge* ]]; then - if [[ ${JOB_NAME} == *merge* ]] && [[ ${ID} == "ubuntu" ]] && [[ ${UBUNTU_CODENAME} == "xenial" ]]; then - mkdir -p $(dirname ${RESOURCES_DIR}) - mv -f ${DOC_DIR} ${RESOURCES_DIR} - cd ${SITE_DIR} - find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete - cat > pom.xml << EOF - - 4.0.0 - io.fd.hicn - docs - 1.0.0 - pom - - - false - - - - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.9 - - - - - - fdio-site - dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION} - - - -EOF - ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C - cd - - fi -} - build_package -push_doc exit 0 -- cgit 1.2.3-korg