diff options
| -rw-r--r-- | libtransport/src/hicn/transport/core/portal.h | 1 | ||||
| -rw-r--r-- | scripts/build-packages.sh | 67 |
2 files changed, 67 insertions, 1 deletions
diff --git a/libtransport/src/hicn/transport/core/portal.h b/libtransport/src/hicn/transport/core/portal.h index 0932b56c6..e26e490ad 100644 --- a/libtransport/src/hicn/transport/core/portal.h +++ b/libtransport/src/hicn/transport/core/portal.h @@ -255,6 +255,7 @@ class Portal { private: TRANSPORT_ALWAYS_INLINE void processIncomingMessages( Packet::MemBufPtr &&packet_buffer) { + bool is_stopped = io_service_.stopped(); if (TRANSPORT_EXPECT_FALSE(is_stopped)) { return; diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 6bbd0d5c9..90d967aab 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -144,6 +144,8 @@ build_package() { # Make the package mkdir -p build && pushd build + pwd + rm -rf * cmake -DCMAKE_INSTALL_PREFIX=/usr ${SCRIPT_PATH}/.. make package @@ -161,15 +163,78 @@ 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 "*******************************************************************" echo "***************** BUILD COMPLETED SUCCESSFULLY *******************" echo "*******************************************************************" +} - exit 0 +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 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>io.fd.hicn</groupId> + <artifactId>docs</artifactId> + <version>1.0.0</version> + <packaging>pom</packaging> + + <properties> + <generateReports>false</generateReports> + </properties> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.9</version> + </extension> + </extensions> + </build> + <distributionManagement> + <site> + <id>fdio-site</id> + <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url> + </site> + </distributionManagement> +</project> +EOF + ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C + cd - + fi } build_package +push_doc exit 0 |