Merge pull request #191 from redhatrises/travis_qt5

[v1-2] Fix OSX builds

Author: yuumasato

.travis.yml

@@ -7,10 +7,13 @@ language: cpp
 compiler:
   - gcc
 
+env:
+  - PATH="/usr/local/opt/qt/bin:$PATH"
+
 before_install:
   - brew update
   - brew install jq
-  - brew install cartr/qt4/qt@4
+  - brew install qt5
   - brew install asciidoc
 
 before_script:
@@ -23,8 +26,17 @@ before_script:
 
 script:
   - ./build-for-osx.sh
-  - wget `curl -s https://api.github.com/repos/openscap/scap-security-guide/releases/latest?access_token=$GITHUB_TOKEN | jq -r ".assets[] | select(.name | test(\"(scap-security-guide-[0-9].[0-9].[0-9]*).zip\")) | .browser_download_url"` -O ssg.zip
-  - mkdir -p `pwd`/scap-workbench.app/Contents/Resources/ssg/ && unzip ssg.zip -d `pwd`/scap-workbench.app/Contents/Resources/ssg/
+# Parse release page json to obtain link to latest content zip file and download it
+  - |
+    REL_TAG=`curl -s "https://github.com/ComplianceAsCode/content/releases/latest" | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}'`
+    REL_TAG_NUM=`echo ${REL_TAG} | cut -d"v" -f2`
+    DWN_LINK=https://github.com/ComplianceAsCode/content/releases/download/${REL_TAG}/scap-security-guide-${REL_TAG_NUM}.zip
+    if [ -z "${DWN_LINK}" ] ; then
+        echo "Could not get the ZIP URL! It is empty!"
+        exit 1
+    fi
+  - wget "${DWN_LINK}" -O ssg.zip
+  - mkdir -p `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/ && unzip ssg.zip && cp -a scap-security-guide-*/* `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/
   - cd build-osx && sh osx-create-dmg.sh
 
 deploy:

CMakeLists.txt

@@ -125,6 +125,23 @@ set(SCAP_WORKBENCH_LINK_LIBRARIES
     Qt5::Widgets Qt5::XmlPatterns
     ${OPENSCAP_LIBRARIES})
 
+# ---------- RPATHS for linking
+
+# see https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling
+
+# when building, use the install RPATH
+# (but later on when installing)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+
+set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+# Turn on RPATH for OSX
+set(CMAKE_MACOSX_RPATH ON)
+
 configure_file("include/Config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/Config.h")
 # It is not trivial to make the resulting file executable :-(
 # People will have to `bash runwrapper.sh ...` in the meantime.

build-for-osx.sh

@@ -1,10 +1,12 @@
+set -e
+
 mkdir -p build-osx/
 pushd build-osx/
 cmake -D SCAP_WORKBENCH_LOCAL_SCAN_ENABLED=false -D SCAP_AS_RPM_EXECUTABLE="" ../
 make -j 4
 mkdir -p ./scap-workbench.app/Contents/Frameworks/
 cp /usr/local/lib/libpcre.1.dylib ./scap-workbench.app/Contents/Frameworks/
-cp /usr/local/lib/libopenscap.8.dylib ./scap-workbench.app/Contents/Frameworks/
+cp /usr/local/lib/libopenscap*.dylib ./scap-workbench.app/Contents/Frameworks/
 chmod 755 ./scap-workbench.app/Contents/Frameworks/*.dylib
 echo "Copy fresh extracted SSG zip into `pwd`/scap-workbench.app/Contents/Resources/ssg/"
 echo "so that SSG README.md is at `pwd`/scap-workbench.app/Contents/Resources/ssg/README.md"

osx-create-dmg.sh.in

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # Original by Andy Maloney
 # http://asmaloney.com/2013/07/howto/packaging-a-mac-os-x-application-using-a-dmg/
 # Changes specific to SCAP Workbench by Martin Preisler <[email protected]>