diff options
| author | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-31 07:29:38 (GMT) |
|---|---|---|
| committer | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-31 07:29:38 (GMT) |
| commit | c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99 (patch) | |
| tree | 739c2daaf2a9ca06686132c3983ea3e38571d15b /Jenkinsfile | |
| parent | c0ef01f7801e75a8042268a597f5f79821dfbb10 (diff) | |
| download | Qt-c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99.zip Qt-c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99.tar.gz Qt-c3e0ff338d1dbd0dfb60a03f1d13b1574b0a9f99.tar.bz2 | |
Fixed MinGW buildrefs/changes/93/7693/1
Change-Id: Ic453a7d5e8e0ff2a1e541ff4b93ae9cac7b5490c
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index d65800e..8f5b5b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,12 +69,9 @@ stage('Build') { rm -Rf openssl-1.0.2r cp -Rf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 ./ echo "Done." - ''' - sh ''' - export PATH=$PWD/gcc-8.2.0/bin:/c/dev-tools/msys/x86/usr/bin:$PATH - make -f Makefile.mingw64 all - rm -Rf build.$(ARCH) - rm -Rf install.$(ARCH) + make GCC_PATH=$PWD/gcc-8.2.0 -f Makefile.mingw64 all + rm -Rf build.$(ARCH) + rm -Rf install.$(ARCH) ''' } stash name: "qtwin", includes: "*-msvc.zip, *-x86-mingw64.tgz" @@ -100,17 +97,19 @@ stage ("Post processing") { # # cleanup temporary destination folder for final distribution ... # unpack Linux archives ... - mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux64 - tar -xzf $WORKSPACE/qt-$QT_VER-x86-linux64.tgz -C $WORKSPACE/INST/$QT_VER/x86-linux64 + 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 + 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 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 mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64 tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64 - # - # remove temporary folder ... - rm -Rf $WORKSPACE/tmp + + 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 # # finally create the whole archive ... cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-bin_64.tgz ./ |