From dddd8a92c845d74c8d639736032715e66d0d7996 Mon Sep 17 00:00:00 2001 From: umarcor Date: Sat, 17 Jul 2021 12:09:31 +0200 Subject: [PATCH] create subdir 'scripts', mv msys2 there --- .github/workflows/Test.yml | 6 +++--- {msys2 => scripts/msys2}/PKGBUILD | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) rename {msys2 => scripts/msys2}/PKGBUILD (82%) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 500d70a..1d5d1e3 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -48,20 +48,20 @@ jobs: - name: '🚧 Build package' run: | - cd msys2 + cd scripts/msys2 makepkg-mingw --noconfirm --noprogressbar -sCLf - name: '📤 Upload artifact: package' uses: actions/upload-artifact@v2 with: name: ${{ matrix.sys }}-openFPGALoader - path: msys2/*${{ matrix.env }}*.zst + path: scripts/msys2/*${{ matrix.env }}*.zst - name: '🔍 Show package content' run: | mkdir tmp cd tmp - tar -xf ../msys2/*.zst + tar -xf ../scripts/msys2/*.zst tree . diff --git a/msys2/PKGBUILD b/scripts/msys2/PKGBUILD similarity index 82% rename from msys2/PKGBUILD rename to scripts/msys2/PKGBUILD index f33d09a..e7d187d 100644 --- a/msys2/PKGBUILD +++ b/scripts/msys2/PKGBUILD @@ -17,25 +17,25 @@ source=() sha256sums=() build() { - cd "${srcdir}"/../.. + cd "${srcdir}" mkdir build cd build MSYS2_ARG_CONV_EXCL=- cmake \ -G "MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ - ../ + ../../../.. cmake --build . } check() { - "${srcdir}"/../../build/openFPGALoader.exe --help + "${srcdir}"/build/openFPGALoader.exe --help } package() { - cd "${srcdir}"/../../build + cd "${srcdir}"/build make DESTDIR="${pkgdir}" install _licenses="${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}" mkdir -p "${_licenses}" - install -m 644 ../LICENSE "${_licenses}" + install -m 644 ../../../../LICENSE "${_licenses}" }