diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-26 19:46:50 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-26 19:46:50 (GMT) |
| commit | adaebefda1abc0271332855f347931004304a1c1 (patch) | |
| tree | dade7b923a0d5e5230ba931e8c54d6829cc40282 | |
| parent | 3f77184803a9d41e9df462d6770e4075205d92dd (diff) | |
| download | Qt-adaebefda1abc0271332855f347931004304a1c1.zip Qt-adaebefda1abc0271332855f347931004304a1c1.tar.gz Qt-adaebefda1abc0271332855f347931004304a1c1.tar.bz2 | |
Reworked post processing and renamed packagesrefs/changes/86/11086/1
Change-Id: I110a20c7bcb379909b07cda326101146a80e8395
| -rw-r--r-- | Jenkinsfile | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 60dbabf..08d484c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -129,32 +129,42 @@ stage ("Post processing") { mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux64-shared tar -xzf $WORKSPACE/qt-$QT_VER-shared-x86-linux64.tgz -C $WORKSPACE/INST/$QT_VER/x86-linux64-shared + rm -f $WORKSPACE/qt-$QT_VER-shared-x86-linux64.tgz + cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-linux64-shared/bin + mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux64-static tar -xzf $WORKSPACE/qt-$QT_VER-static-x86-linux64.tgz -C $WORKSPACE/INST/$QT_VER/x86-linux64-static + rm -f $WORKSPACE/qt-$QT_VER-static-x86-linux64.tgz + cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64 tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64 - mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64 - cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-shared/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64 + rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz + cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-mingw64/bin + mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin + cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin + rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/linguist + rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/designer + rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/assistant mkdir -p $WORKSPACE/INST/$QT_VER/x86_64-msvc - unzip -o $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86_64-msvc + unzip -qo $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86_64-msvc + rm -f $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip + cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86_64-msvc/bin - # generate qt.conf for linux to windows cross builds ... - rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf - echo "[Paths]" > $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf - echo "Prefix=.." >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf - echo "Libraries = lib" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf - echo "Plugins = plugins" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf - echo "HostBinaries=xbin" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf - echo "TargetSpec=win32-g++" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf - cp -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf \ - $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/ # - # finally recreate the whole mingw64-shared archive ... - rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz + # finally recreate packages ... cd $WORKSPACE/INST/$QT_VER/x86-mingw64 - tar -zcf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz . + zip -qr $WORKSPACE/qt-$QT_VER-$(BUILD_NUMBER)-x86-mingw64.zip . + + cd $WORKSPACE/INST/$QT_VER/x86-linux64-shared + tar -zcf $WORKSPACE/qt-$QT_VER-$(BUILD_NUMBER)-x86-linux64-shared.tgz . + + cd $WORKSPACE/INST/$QT_VER/x86-linux64-static + tar -zcf $WORKSPACE/qt-$QT_VER-$(BUILD_NUMBER)-x86-linux64-static.tgz . + + cd $WORKSPACE/INST/$QT_VER/x86_64-msvc + zip -qr $WORKSPACE/qt-$QT_VER-$(BUILD_NUMBER)-x86_64-msvc.zip . cd $WORKSPACE/ rm -Rf $WORKSPACE/INST |