diff --git a/.travis.yml b/.travis.yml index cf483331..966080f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ before_install: jobs: fast_finish: true allow_failures: - - env: TARGET=ipk - env: TARGET=android include: - &run-with-clang-minimal @@ -88,9 +87,5 @@ jobs: env: TARGET=examples - <<: *run-additional-jobs env: TARGET=sonar-scan - - <<: *run-additional-jobs - env: TARGET=ipk - - <<: *run-additional-jobs - env: TARGET=rpm - <<: *run-additional-jobs env: TARGET=npm diff --git a/CMakeLists.txt b/CMakeLists.txt index 92adf53a..66da0cda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,6 @@ option (BUILDSWIGNODE "Build swig node modules" ON) option (BUILDSWIGJAVA "Build swig java modules" OFF) option (BUILDCORDOVA "Build cordova bindings" OFF) option (BUILDEXAMPLES "Build C/C++/JAVA examples" OFF) -option (IPK "Generate IPK using CPack" OFF) -option (RPM "Generate RPM using CPack" OFF) option (NPM "Generate NPM/GYP tarballs" OFF) option (BUILDTESTS "Generate check-ups for upm" OFF) option (WERROR "Make all warnings into errors." ON) @@ -425,68 +423,6 @@ function (CreateDocumentationTargets) endif(BUILDSWIGNODE) endfunction() -if (IPK) - # Get target package arch from Yocto ADT sysroot if set or host OS, mapping to Ubuntu name if necessary - if (DEFINED ENV{OECORE_TARGET_SYSROOT}) - GET_FILENAME_COMPONENT (DETECTED_SYSROOT $ENV{OECORE_TARGET_SYSROOT} NAME) - string (REGEX REPLACE "-poky-linux" "" TARGET_ARCH "${DETECTED_SYSROOT}") - else () - # Debian uses amd64 to denote x86_64 - if (DETECTED_ARCH STREQUAL "x86_64") - set (TARGET_ARCH "amd64") - else () - set (TARGET_ARCH ${DETECTED_ARCH}) - endif () - endif () - message (STATUS "Package arch is ${TARGET_ARCH}") - - set(CPACK_GENERATOR "DEB") - set(OPKG_ARCH ${TARGET_ARCH}) - set(CPACK_BINARY_DIR ${CMAKE_BINARY_DIR}) - set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Intel IoT-Devkit") #required - set(upm_PACKAGE_ON_TAG ".") - if ("${VERSION_COMMIT}" STREQUAL "") - set(upm_PACKAGE_ON_TAG "") - endif() - set(CPACK_PACKAGE_VERSION - "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}") - set(CPACK_PACKAGE_NAME "upm") - set(CPACK_DEBIAN_PACKAGE_SECTION "libs") - set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${TARGET_ARCH}) - set(CPACK_SYSTEM_NAME ${TARGET_ARCH}) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "mraa (>= ${MRAA_VERSION})") - set(CPACK_DEBIAN_PACKAGE_PROVIDES "upm-dev, upm-dbg, upm-doc") - set(CPACK_DEBIAN_PACKAGE_REPLACES ${CPACK_DEBIAN_PACKAGE_PROVIDES}) - set(CPACK_DEBIAN_PACKAGE_CONFLICTS ${CPACK_DEBIAN_PACKAGE_PROVIDES}) - set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}") - include (CPack) -endif() - -if (RPM) - message (STATUS "RPM packaging enabled for ${DETECTED_ARCH}") - set(CPACK_GENERATOR "RPM") - set(CPACK_PACKAGE_NAME "upm") - set(upm_PACKAGE_ON_TAG ".") - if ("${VERSION_COMMIT}" STREQUAL "") - set(upm_PACKAGE_ON_TAG "") - endif() - set(CPACK_PACKAGE_VERSION - "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}") - set(CPACK_PACKAGE_CONTACT "Intel IoT-Devkit") - set(CPACK_PACKAGE_VENDOR "Intel IoT-Devkit") - set(CPACK_RPM_PACKAGE_REQUIRES "mraa >= ${MRAA_VERSION}") - set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_PACKAGE_NAME}-devel") - set(CPACK_RPM_PACKAGE_LICENSE "MIT") - EXECUTE_PROCESS(COMMAND rpm --showrc - COMMAND grep -E "dist[[:space:]]*\\." - COMMAND sed -e "s/^.*dist\\s*\\.//" - COMMAND tr \\n \\t - COMMAND sed -e s/\\t// - OUTPUT_VARIABLE DIST_TAG) - set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${DIST_TAG}.${DETECTED_ARCH}") - include(CPack) -endif() - # UPM common headers set (UPM_COMMON_HEADER_DIRS ${CMAKE_HOME_DIRECTORY}/include) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6c4ce7f3..4fa6815f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -56,20 +56,6 @@ services: - BUILDEXAMPLES=ON command: bash -c "./scripts/run-cmake.sh && cd build && make -j8" - ipk: - extends: all - environment: - - IPK=ON - - BUILDDOC=OFF - command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 package" - - rpm: - extends: all - environment: - - RPM=ON - - BUILDDOC=OFF - command: bash -c "./scripts/run-cmake.sh && make -Cbuild -j8 package" - npm: extends: all environment: