Commit eeb1e9b7d2a5b8a76e64e0711d2e2b631eddbe88
1 parent
a427785c
Exists in
develop
Debugging runtime builder.
Showing
2 changed files
with
6 additions
and
6 deletions
Show diff stats
.github/workflows/winpkg.yml
@@ -69,7 +69,7 @@ jobs: | @@ -69,7 +69,7 @@ jobs: | ||
69 | - name: Make Runtime | 69 | - name: Make Runtime |
70 | run: /bin/bash ./win/makeruntime.sh | 70 | run: /bin/bash ./win/makeruntime.sh |
71 | - name: Make Package | 71 | - name: Make Package |
72 | - run: tar -C ./.build/mingw64 -Jcvf mingw-pw3270-full.tar.xz . | 72 | + run: tar -C ./.build -Jcvf mingw-pw3270-full.tar.xz . |
73 | - uses: ncipollo/release-action@v1 | 73 | - uses: ncipollo/release-action@v1 |
74 | with: | 74 | with: |
75 | tag: ${{ steps.gettag.outputs.tag }} | 75 | tag: ${{ steps.gettag.outputs.tag }} |
win/makeruntime.sh.in
@@ -29,8 +29,8 @@ | @@ -29,8 +29,8 @@ | ||
29 | srcdir="$(dirname $(dirname $(readlink -f "${0}")))" | 29 | srcdir="$(dirname $(dirname $(readlink -f "${0}")))" |
30 | prefix="@prefix@" | 30 | prefix="@prefix@" |
31 | 31 | ||
32 | -imgdir=.build | ||
33 | -bindir="${imgdir}/bin" | 32 | +buildroot=.build |
33 | +bindir="${buildroot}${prefix}/bin" | ||
34 | 34 | ||
35 | if [ -z "${WIN_ROOT}" ]; then | 35 | if [ -z "${WIN_ROOT}" ]; then |
36 | WIN_ROOT="/c/Windows" | 36 | WIN_ROOT="/c/Windows" |
@@ -41,15 +41,15 @@ export LANG=C | @@ -41,15 +41,15 @@ export LANG=C | ||
41 | install_bin() { | 41 | install_bin() { |
42 | 42 | ||
43 | mkdir -p "${bindir}" | 43 | mkdir -p "${bindir}" |
44 | - | 44 | + |
45 | AGAIN=1 | 45 | AGAIN=1 |
46 | until [ $AGAIN = 0 ]; do | 46 | until [ $AGAIN = 0 ]; do |
47 | 47 | ||
48 | SOURCES=$(mktemp) | 48 | SOURCES=$(mktemp) |
49 | REQUIRES=$(mktemp) | 49 | REQUIRES=$(mktemp) |
50 | 50 | ||
51 | - find "${imgdir}" -iname "*.dll" > ${SOURCES} | ||
52 | - find "${imgdir}" -iname "*.exe" >> ${SOURCES} | 51 | + find "${buildroot}${prefix}" -iname "*.dll" > ${SOURCES} |
52 | + find "${buildroot}${prefix}" -iname "*.exe" >> ${SOURCES} | ||
53 | 53 | ||
54 | while read FILENAME | 54 | while read FILENAME |
55 | do | 55 | do |