From 5df5ca96428f53bfc216f32e2c1f4d9cb545e0cf Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 30 May 2018 19:47:39 +0200 Subject: [PATCH 1/7] Travis configuration, mk. 1 --- .travis.yml | 20 ++++++++++++++++++++ resources/linuxdeploy.png | Bin 0 -> 1046 bytes 2 files changed, 20 insertions(+) create mode 100644 .travis.yml create mode 100644 resources/linuxdeploy.png diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..6ed9dfc6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,20 @@ +language: cpp +sudo: required + +plugins: + apt: + update: true + packages: + - libboost-regex-dev + - libboost-filesystem-dev + - libmagick++-dev + +script: + - mkdir build + - cd build + - cmake .. + - make -j$(nproc) + - bin/linuxdeploy --init-appdir --appdir AppDir -e bin/linuxdeploy -i ../resources/linuxdeploy.png --create-desktop-file + - wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage + - chmod +x appimagetool-x86_64.AppImage + - ./appimagetool-x86_64.AppImage AppDir diff --git a/resources/linuxdeploy.png b/resources/linuxdeploy.png new file mode 100644 index 0000000000000000000000000000000000000000..2536bce8991dbfad3ae3e99ffd785d588eb8b700 GIT binary patch literal 1046 zcmV+x1nK*UP)$!02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00VwWL_t(|+U=S+gvVOnZ0iIkz{lZOmlYUzcas`*_}COOaOrJgUt*-+&BOZfCJzFIDnsQzm(pH zNMA0POs2ASKx@1B6yN|j01kiy-~c!P4uAvT062j1nB8uN)zwu9hr^J`WPlI?k|Y5k z1hUyI#9}cB1OhNVK5pE8LP?P`rS(4-i^YQ5+uQi|_J&IABQ^nYgA(|FE8lvc-RFnIXQ_>Pfw`DL{Y@4sVVjV3=a=uDwRS#?Dh2(old9bc9}q7 zVnmOC$l>83I2;by>vwl|u)n_#2L}gmdU^^~RaMa2+Y3WOLohfv2u)2*|J)ys$DymM zOLMzQG6Fmv4@#0GJES)@Honvd1Ok}P=M{~RikkxW_xG}2_u1K5#X9rz^H?Yp*aG15 z`DE*FZf+L+A>G;8VGBSg6r$FBczD2uhK8a6w6wHfCX-guZU0o2#mQ~l@X=bE+k&@dc8O-+qqjb~yCR99D1{emE9)=sC>>;kyBxX`Sv zhXxOc8T|l42-V---mY0&4~?<`_`J2%^AA%|0CKq;)o-<0HEVZvc2+(Bxi7UI0QAr> z9Khw}CDm`SSTt+5wzgJ2fJh`FJA6AjI#lc0Y&Kn{fZ@AAhr@xQC{pV#E-rrm?Jxk~ z$;k<|t{@0lTU)CtAd*g}bpcS4h0xyK9@XF2*a#~tD@E%qEG$4>T^(DgF+mVygQ7Dt zGm3TQ=H}Q7iUI(7z25(3de+z1ztr&i{kn(6OPUxtK0b#2{(jl(x3{+t348qyj z8JNvx=CdcO^>@= zF1)$9QT^t0fT2(b$HvCWb3nqVGB7ZJYiny5iA3=6 z@exH)L`jm65Q5ok7US_aZf$Mh#KeRl&sY2x;1MAXfCJzFH~(^b07*qoM6N<$g0a=szW@LL literal 0 HcmV?d00001 From 3273b49a32b5a02926948d717206c1d847990e30 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 30 May 2018 19:58:11 +0200 Subject: [PATCH 2/7] Travis configuration, mk. 2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ed9dfc6..b9dde733 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp sudo: required -plugins: +addons: apt: update: true packages: From 5f9a5709338258b25abb4f4a54d0a1b2ed94cd05 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 30 May 2018 20:06:38 +0200 Subject: [PATCH 3/7] Travis configuration, mk. 3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9dde733..40730365 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - mkdir build - cd build - cmake .. - - make -j$(nproc) + - make VERBOSE=1 - bin/linuxdeploy --init-appdir --appdir AppDir -e bin/linuxdeploy -i ../resources/linuxdeploy.png --create-desktop-file - wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage - chmod +x appimagetool-x86_64.AppImage From 383157babb3dc545c32eb03cfc7bbbe4a5fd73ab Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 30 May 2018 20:49:05 +0200 Subject: [PATCH 4/7] Fix build on trusty --- src/core/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7d8731e3..33e726c8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -20,6 +20,7 @@ execute_process( add_library(core elf.cpp log.cpp appdir.cpp desktopfile.cpp ${HEADERS}) target_link_libraries(core Boost::filesystem Boost::regex subprocess cpp-feather-ini-parser PkgConfig::magick++ ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(core PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_compile_definitions(core PUBLIC -DBOOST_NO_CXX11_SCOPED_ENUMS) add_executable(linuxdeploy main.cpp) target_link_libraries(linuxdeploy core args) From 7431b4ed41d0c7cfd9f531a852ce6bc7c237b63d Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 30 May 2018 20:49:46 +0200 Subject: [PATCH 5/7] Use most recent boost version on trusty --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40730365..66865a26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ addons: apt: update: true packages: - - libboost-regex-dev - - libboost-filesystem-dev + - libboost-regex1.55-dev + - libboost-filesystem1.55-dev - libmagick++-dev script: From cb1e18b941072a83e64f63bf37b84408f1095645 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 30 May 2018 21:14:36 +0200 Subject: [PATCH 6/7] Install patchelf from source --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 66865a26..84715a8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,16 @@ addons: - libboost-regex1.55-dev - libboost-filesystem1.55-dev - libmagick++-dev + - automake # required for patchelf + +install: + - git clone https://github.com/NixOS/patchelf.git + - cd patchelf + - ./bootstrap.sh + - ./configure --prefix=/usr + - make -j$(nproc) install + - cd .. + - rm -rf patchelf script: - mkdir build From 596fe137c2e31679616dc7c3047033208d216867 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 30 May 2018 21:21:29 +0200 Subject: [PATCH 7/7] Fix patchelf installation --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84715a8a..b3f911a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,8 @@ install: - cd patchelf - ./bootstrap.sh - ./configure --prefix=/usr - - make -j$(nproc) install + - make -j$(nproc) + - sudo make install - cd .. - rm -rf patchelf