diff options
| author | Sergio Martins <smartins@kde.org> | 2019-10-14 16:36:27 +0100 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2019-10-14 16:36:27 +0100 |
| commit | 5eedfd8b72174d8a12a761410383d2b16d0739d0 (patch) | |
| tree | 6ac019023c8227717fc2d6490fd67638f500dfec | |
| parent | c3c52e9800fcee0e839f03bc08ce411faea3642d (diff) | |
Update make_appimage.sh so it matches the new docker container
| -rw-r--r-- | dev-scripts/docker/AppImage/Dockerfile | 1 | ||||
| -rwxr-xr-x | dev-scripts/docker/make_appimage.sh | 14 |
2 files changed, 4 insertions, 11 deletions
diff --git a/dev-scripts/docker/AppImage/Dockerfile b/dev-scripts/docker/AppImage/Dockerfile index 2325a2a0..7aa73884 100644 --- a/dev-scripts/docker/AppImage/Dockerfile +++ b/dev-scripts/docker/AppImage/Dockerfile @@ -51,6 +51,7 @@ RUN rm -rf /clazy.AppDir/usr/lib/cmake RUN rm -rf /clazy.AppDir/usr/bin/ll* WORKDIR /clazy.AppDir/usr/bin/ RUN rm -rf bugpoint clang-change-namespace clang-doc clang-format verify-uselistorder c-index-test clang-include-fixer clang-query clang-rename clang-scan-deps diagtool find-all-symbols hmaptool obj2yaml sancov scan-build verify-uselistorderc-index-test clang-check clang-extdef-mapping clang-import-test clang-offload-bundler clang-refactor clang-reorder-fields clang-tidy dsymutil git-clang-format modularize opt sanstats scan-view yaml2obj +RUN chmod +x * #Clone clazy WORKDIR / diff --git a/dev-scripts/docker/make_appimage.sh b/dev-scripts/docker/make_appimage.sh index 469d987d..f4a9fba7 100755 --- a/dev-scripts/docker/make_appimage.sh +++ b/dev-scripts/docker/make_appimage.sh @@ -5,20 +5,12 @@ # $1 clazy sha1 to build # $2 user uid to chown the files to before leaving docker -PATH=/opt/rh/python27/root/usr/bin:/opt/rh/devtoolset-6/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - -# edit here the LLVM version used -PATH=$PATH:/llvm900/bin/ - CC=gcc CXX=g++ -cp -r /clazy.AppDir /tmp/clazy_work/ +mkdir /tmp/clazy_work/ +cp -r /clazy.AppDir/ /tmp/clazy_work/ -cd /llvm -echo "LLVM sha1: `git rev-parse HEAD`" > /tmp/clazy_work/clazy.AppDir/sha1 -cd tools/clang -echo "Clang sha1: `git rev-parse HEAD`" >> /tmp/clazy_work/clazy.AppDir/sha1 cd /clazy echo "Clazy sha1: `git rev-parse HEAD`" >> /tmp/clazy_work/clazy.AppDir/sha1 @@ -33,7 +25,7 @@ echo "Checking out $1..." git checkout $1 echo "Building..." -cmake3 -DCMAKE_BUILD_TYPE=Release -DLINK_CLAZY_TO_LLVM=OFF -DCMAKE_INSTALL_PREFIX=/tmp/clazy_work/clazy.AppDir/usr . && make -j12 && make install +cmake -DCMAKE_BUILD_TYPE=Release -DLINK_CLAZY_TO_LLVM=OFF -DCMAKE_INSTALL_PREFIX=/tmp/clazy_work/clazy.AppDir/usr . && make -j12 && make install echo "Fixing permissions..." chown -R $2 /tmp/clazy_work/clazy.AppDir/ |