aboutsummaryrefslogtreecommitdiffstats
path: root/dev-scripts
diff options
context:
space:
mode:
authorSergio Martins <smartins@kde.org>2018-11-15 12:57:29 +0000
committerSergio Martins <smartins@kde.org>2018-11-15 12:57:29 +0000
commit6852b50a57d7e707c80ba29842249f35ac688b70 (patch)
treede17039cf33a49fbd732ba927a58c0f2b2388515 /dev-scripts
parenta406ee71187610f6b25e3a051d6e42fc214477c4 (diff)
Minor app image improvements
Like adding a file with the sha1s used to build llvm/clang/clazy
Diffstat (limited to 'dev-scripts')
-rwxr-xr-xdev-scripts/docker/make_appimage.sh8
-rw-r--r--dev-scripts/make_appimage.py10
2 files changed, 12 insertions, 6 deletions
diff --git a/dev-scripts/docker/make_appimage.sh b/dev-scripts/docker/make_appimage.sh
index c031c950..d1c1008b 100755
--- a/dev-scripts/docker/make_appimage.sh
+++ b/dev-scripts/docker/make_appimage.sh
@@ -6,7 +6,15 @@
# $2 user uid to chown the files to before leaving docker
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
+
git clean -fdx .
git checkout .
diff --git a/dev-scripts/make_appimage.py b/dev-scripts/make_appimage.py
index 3d7c6e87..55a72edb 100644
--- a/dev-scripts/make_appimage.py
+++ b/dev-scripts/make_appimage.py
@@ -29,7 +29,7 @@ import sys, os, getpass
CLAZY_SHA1 = ''
WORK_FOLDER = '/tmp/clazy_work/'
DOCKER_IMAGE = 'iamsergio/clazy-centos68'
-
+DEST_FILE = WORK_FOLDER + '/Clazy-x86_64.AppImage'
def print_usage():
print sys.argv[0] + ' <clazy sha1>'
@@ -52,13 +52,9 @@ def make_appimage_in_docker():
print 'Error running docker. Make sure docker is running and that you have ' + DOCKER_IMAGE
os.environ['ARCH'] = 'x86_64'
- dest = WORK_FOLDER + '/Clazy-x86_64.AppImage'
- if not run_command('appimagetool-x86_64.AppImage %s/clazy.AppDir/ %s' % (WORK_FOLDER, dest)):
+ if not run_command('appimagetool-x86_64.AppImage %s/clazy.AppDir/ %s' % (WORK_FOLDER, DEST_FILE)):
return False
- print ''
- print 'Created ' + dest
-
return True
@@ -86,3 +82,5 @@ if not make_appimage_in_docker():
if not run_tests():
sys.exit(1)
+
+print 'Success: ' + DEST_FILE