create subdir 'scripts', mv msys2 there

This commit is contained in:
umarcor 2021-07-17 12:09:31 +02:00
parent a493ed0c3b
commit dddd8a92c8
2 changed files with 8 additions and 8 deletions

View File

@ -48,20 +48,20 @@ jobs:
- name: '🚧 Build package' - name: '🚧 Build package'
run: | run: |
cd msys2 cd scripts/msys2
makepkg-mingw --noconfirm --noprogressbar -sCLf makepkg-mingw --noconfirm --noprogressbar -sCLf
- name: '📤 Upload artifact: package' - name: '📤 Upload artifact: package'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.sys }}-openFPGALoader name: ${{ matrix.sys }}-openFPGALoader
path: msys2/*${{ matrix.env }}*.zst path: scripts/msys2/*${{ matrix.env }}*.zst
- name: '🔍 Show package content' - name: '🔍 Show package content'
run: | run: |
mkdir tmp mkdir tmp
cd tmp cd tmp
tar -xf ../msys2/*.zst tar -xf ../scripts/msys2/*.zst
tree . tree .

View File

@ -17,25 +17,25 @@ source=()
sha256sums=() sha256sums=()
build() { build() {
cd "${srcdir}"/../.. cd "${srcdir}"
mkdir build mkdir build
cd build cd build
MSYS2_ARG_CONV_EXCL=- cmake \ MSYS2_ARG_CONV_EXCL=- cmake \
-G "MSYS Makefiles" \ -G "MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
../ ../../../..
cmake --build . cmake --build .
} }
check() { check() {
"${srcdir}"/../../build/openFPGALoader.exe --help "${srcdir}"/build/openFPGALoader.exe --help
} }
package() { package() {
cd "${srcdir}"/../../build cd "${srcdir}"/build
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
_licenses="${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}" _licenses="${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"
mkdir -p "${_licenses}" mkdir -p "${_licenses}"
install -m 644 ../LICENSE "${_licenses}" install -m 644 ../../../../LICENSE "${_licenses}"
} }