From 904eae7ebd93739decd55521a7876164c3684fee Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Tue, 2 Oct 2018 14:05:45 +0200 Subject: [PATCH 1/8] Copy directory into container --- .travis.yml | 5 +---- Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8998af4..b862ac1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,10 @@ addons: before_install: - export TRAVIS_TAG=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec` - - echo $TRAVIS_TAG - docker build -t android-dispatch . - - docker run -it -d --user build --name dispatch-container -v `pwd`:/home/build/app -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash + - docker run -it -d --user build --name dispatch-container -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash script: - - docker exec --user build dispatch-container sh ls -al /home/build/app - - docker exec --user build dispatch-container sh whoami - docker exec --user build dispatch-container sh /home/build/app/dispatch.sh - docker exec --user build dispatch-container sh /home/build/app/package.sh diff --git a/Dockerfile b/Dockerfile index 116fed9..cc05860 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,4 +67,6 @@ RUN useradd build -m -u 112 USER build RUN mkdir -p /home/build/.m2 && mkdir -p /home/build/app -WORKDIR /home/build/app +COPY . /home/build/app/ + +WORKDIR /home/build/app/ From f9c86176d6150a8fb5687728a9abb804b327dab6 Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Tue, 2 Oct 2018 14:35:51 +0200 Subject: [PATCH 2/8] Fix package and travis release files --- .travis.yml | 3 ++- package.sh | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b862ac1..0526797 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,9 @@ addons: before_install: - export TRAVIS_TAG=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec` + - mkdir `pwd`/dist - docker build -t android-dispatch . - - docker run -it -d --user build --name dispatch-container -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash + - docker run -it -d --user build --name dispatch-container -v `pwd`/dist:/home/build/app/dist -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash script: - docker exec --user build dispatch-container sh /home/build/app/dispatch.sh diff --git a/package.sh b/package.sh index f687dc6..35fca56 100644 --- a/package.sh +++ b/package.sh @@ -1,6 +1,7 @@ #!/usr/bin/bash LIBS_HOME=/home/build/app/libs +TARGET_DIR=/home/build/app/dist if [ ! -d "${LIBS_HOME}" ]; then echo "Missing library folder" @@ -9,8 +10,8 @@ fi cd ${LIBS_HOME}/android zip -r dispatch-${TRAVIS_TAG}-android.zip . -mv *.zip ${LIBS_HOME} +mv *.zip ${TARGET_DIR} cd ${LIBS_HOME}/linux zip -r dispatch-${TRAVIS_TAG}-linux.zip . -mv *.zip ${LIBS_HOME} +mv *.zip ${TARGET_DIR} From f7adcee40141fdbcc55b19cfe2e70518dfaf3a35 Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Tue, 2 Oct 2018 15:29:14 +0200 Subject: [PATCH 3/8] Update travis dist dir --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0526797..8d12935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: before_install: - export TRAVIS_TAG=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec` - - mkdir `pwd`/dist + - mkdir `pwd`/dist && chmod a+w `pwd`/dist - docker build -t android-dispatch . - docker run -it -d --user build --name dispatch-container -v `pwd`/dist:/home/build/app/dist -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash From fae64cc59e7322ef91b1692c1ec5e702df738d9f Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Tue, 2 Oct 2018 15:55:13 +0200 Subject: [PATCH 4/8] Fix travis file release --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d12935..6a24c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ addons: before_install: - export TRAVIS_TAG=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec` - - mkdir `pwd`/dist && chmod a+w `pwd`/dist + - mkdir $TRAVIS_BUILD_DIR/dist && chmod a+w $TRAVIS_BUILD_DIR/dist - docker build -t android-dispatch . - - docker run -it -d --user build --name dispatch-container -v `pwd`/dist:/home/build/app/dist -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash + - docker run -it -d --user build --name dispatch-container -v `$TRAVIS_BUILD_DIR/dist:/home/build/app/dist -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash script: - docker exec --user build dispatch-container sh /home/build/app/dispatch.sh @@ -31,7 +31,7 @@ deploy: secure: "YaRLBvXCW3V+HEuk6n/gJlXOMXEGLGYvNFaKawboLcTJEOtvn0ur72hzXHJRYWC2JGNgPdLxl8f9AHGt3pgU5JpCgDm/zxpUx6lrKAKwnSD+WKNeE9n0HIKhzskd5tsaFPWN0njkoZocUAyNuuePslYj+QCUvlV0U1B1xGKICkxYSyRD2rBKSan7XpMW0PP45O2EhSkcnodx2nJjZqSuP3ErF5OLt2qfEORzVX/KmohmAJUZnefsg+v50Y76746QEmPDuhfAXa/ETGPkZt31a0AqlOcLAdgFmhX9RC3Piv7jRjb81kE4uRlkRg7acMvQmqtFeT6NoFP4bBLKIepNDCqNvaSEd9NLwiygXHeu3j3qhxSk3a8jZmiIt+DUENDKTiRwj4+GMFwmW7rgKZ2ZVo6btTfyv0cy3cCtfsheZurnclH2OFRsdxc1Ps+gnjfX4vZhtbAkG0ROBtuhfe3TnyJEXkzHeVhmYCmsbhc7MF7oy7cvWLsyszGuwGI31wYVqSCuxQcob4rMSN1wCSuA9PrDmFoa7VYeMmJlvJdy7J1qcNlZpE/kGzJJW5MezMO/YyCS/VxNudq29xqUkQ3RFc2QemNMtqLeb63F6WeIbrG7UTSPO8vubUklwCTEt1glf2o6nx4hGOYyFkotx+NXchlh4Pt8Vf0IX529APmNw4o=" file_glob: true tag_name: $TRAVIS_TAG - file: $TRAVIS_BUILD_DIR/libs/*.zip + file: $TRAVIS_BUILD_DIR/dist/*.zip name: Release-$TRAVIS_TAG skip_cleanup: true on: From 7dbdab4b285794cf65ab05572542089bb96729c3 Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Thu, 4 Oct 2018 08:18:28 +0200 Subject: [PATCH 5/8] Fix travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a24c28..b4b4efe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: - export TRAVIS_TAG=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec` - mkdir $TRAVIS_BUILD_DIR/dist && chmod a+w $TRAVIS_BUILD_DIR/dist - docker build -t android-dispatch . - - docker run -it -d --user build --name dispatch-container -v `$TRAVIS_BUILD_DIR/dist:/home/build/app/dist -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash + - docker run -it -d --user build --name dispatch-container -v $TRAVIS_BUILD_DIR/dist:/home/build/app/dist -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash script: - docker exec --user build dispatch-container sh /home/build/app/dispatch.sh From 743907092a6a58daf1388defacb696cd154ff9c0 Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Thu, 4 Oct 2018 15:38:41 +0200 Subject: [PATCH 6/8] Version 1.2 - build static libraries. --- dispatch.sh | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dispatch.sh b/dispatch.sh index a26ae78..055923d 100755 --- a/dispatch.sh +++ b/dispatch.sh @@ -91,7 +91,7 @@ build_android() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSROOT=${TOOLCHAIN_ROOT_PATH}/sysroot \ - -DBUILD_SHARED_LIBS=YES \ + -DBUILD_SHARED_LIBS=NO \ -DENABLE_TESTING=OFF \ -DCMAKE_ANDROID_ARCH_ABI=${ABI} \ -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \ @@ -119,7 +119,7 @@ build_linux() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DBUILD_SHARED_LIBS=YES \ + -DBUILD_SHARED_LIBS=NO \ -DENABLE_TESTING=OFF \ -DCMAKE_INSTALL_PREFIX=${LIBS}/linux diff --git a/pom.xml b/pom.xml index 63b12b0..c51f3d0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.letsdev.intern lib-dispatch - 1.1.1 + 1.2 Apple dispatch library for android and linux From 45323f6a22499079f1c163694933d17a41e75825 Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Tue, 9 Oct 2018 12:09:55 +0200 Subject: [PATCH 7/8] Provide linux version as shared library --- dispatch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dispatch.sh b/dispatch.sh index 055923d..c1c9840 100755 --- a/dispatch.sh +++ b/dispatch.sh @@ -119,12 +119,12 @@ build_linux() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DBUILD_SHARED_LIBS=NO \ + -DBUILD_SHARED_LIBS=YES \ -DENABLE_TESTING=OFF \ + -DCMAKE_SYSTEM_NAME=Linux \ -DCMAKE_INSTALL_PREFIX=${LIBS}/linux ninja - cmake -P cmake_install.cmake } From 7ef1018297af8504b0f924a8e8a4c0ee7bb6e3e1 Mon Sep 17 00:00:00 2001 From: Martin Schwamberger Date: Tue, 9 Oct 2018 12:10:18 +0200 Subject: [PATCH 8/8] Version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c51f3d0..77e5ec2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.letsdev.intern lib-dispatch - 1.2 + 1.2.1 Apple dispatch library for android and linux