Commit 6b9a2fd4508b94a59f693b1a7b2a44321061aebb
1 parent
dce67294
Exists in
develop
Debugging bundle.
Showing
3 changed files
with
24 additions
and
18 deletions
Show diff stats
.github/workflows/winpkg.yml
| @@ -66,22 +66,10 @@ jobs: | @@ -66,22 +66,10 @@ jobs: | ||
| 66 | repository: PerryWerneck/pw3270-plugin-ipc | 66 | repository: PerryWerneck/pw3270-plugin-ipc |
| 67 | latest: true | 67 | latest: true |
| 68 | fileName: mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst | 68 | fileName: mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst |
| 69 | - - name: Unpack lib3270 | ||
| 70 | - run: tar -C ./.build --zstd -xf mingw-w64-x86_64-lib3270-5.4-0-x86_64.pkg.tar.zst | ||
| 71 | - - name: Unpack libv3270 | ||
| 72 | - run: tar -C ./.build --zstd -xf mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst | ||
| 73 | - - name: Unpack ipcplugin | ||
| 74 | - run: tar -C ./.build --zstd -xf mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst | ||
| 75 | - - name: Unpack ipc3270 | ||
| 76 | - run: tar -C ./.build --zstd -xf mingw-w64-x86_64-libipc3270-5.5-0-x86_64.pkg.tar.zst | ||
| 77 | - - name: Unpack hllapi | ||
| 78 | - run: tar -C ./.build --zstd -xf mingw-w64-x86_64-libhllapi-5.5-0-x86_64.pkg.tar.zst | ||
| 79 | - - name: Unpack pw3270 | ||
| 80 | - run: tar -C ./.build --zstd -xf mingw-w64-x86_64-pw3270-*-x86_64.pkg.tar.zst | ||
| 81 | - - name: Make Runtime | 69 | + - name: Make bundle |
| 82 | run: /bin/bash ./win/bundle | 70 | run: /bin/bash ./win/bundle |
| 83 | - name: Make Package | 71 | - name: Make Package |
| 84 | - run: tar -C ./.build -Jcf mingw-w64-x86_64-pw3270-x86_64.tar.xz . | 72 | + run: tar -C ./.build -Jcf mingw-w64-x86_64-pw3270-bundle-x86_64.tar.xz . |
| 85 | - uses: ncipollo/release-action@v1 | 73 | - uses: ncipollo/release-action@v1 |
| 86 | with: | 74 | with: |
| 87 | tag: ${{ steps.gettag.outputs.tag }} | 75 | tag: ${{ steps.gettag.outputs.tag }} |
src/include/config.h.in
| @@ -24,12 +24,12 @@ | @@ -24,12 +24,12 @@ | ||
| 24 | /* do we have malloc.h? */ | 24 | /* do we have malloc.h? */ |
| 25 | #undef HAVE_MALLOC_H | 25 | #undef HAVE_MALLOC_H |
| 26 | 26 | ||
| 27 | -/* Define to 1 if you have the <memory.h> header file. */ | ||
| 28 | -#undef HAVE_MEMORY_H | ||
| 29 | - | ||
| 30 | /* Define to 1 if you have the <stdint.h> header file. */ | 27 | /* Define to 1 if you have the <stdint.h> header file. */ |
| 31 | #undef HAVE_STDINT_H | 28 | #undef HAVE_STDINT_H |
| 32 | 29 | ||
| 30 | +/* Define to 1 if you have the <stdio.h> header file. */ | ||
| 31 | +#undef HAVE_STDIO_H | ||
| 32 | + | ||
| 33 | /* Define to 1 if you have the <stdlib.h> header file. */ | 33 | /* Define to 1 if you have the <stdlib.h> header file. */ |
| 34 | #undef HAVE_STDLIB_H | 34 | #undef HAVE_STDLIB_H |
| 35 | 35 | ||
| @@ -105,7 +105,9 @@ | @@ -105,7 +105,9 @@ | ||
| 105 | /* The schema path */ | 105 | /* The schema path */ |
| 106 | #undef PRODUCT_PATH | 106 | #undef PRODUCT_PATH |
| 107 | 107 | ||
| 108 | -/* Define to 1 if you have the ANSI C header files. */ | 108 | +/* Define to 1 if all of the C90 standard headers exist (not just the ones |
| 109 | + required in a freestanding environment). This macro is provided for | ||
| 110 | + backward compatibility; new code need not use it. */ | ||
| 109 | #undef STDC_HEADERS | 111 | #undef STDC_HEADERS |
| 110 | 112 | ||
| 111 | /* Version number of package */ | 113 | /* Version number of package */ |
win/bundle.in
| @@ -288,6 +288,22 @@ install_loaders() { | @@ -288,6 +288,22 @@ install_loaders() { | ||
| 288 | 288 | ||
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | +unpack() { | ||
| 292 | + | ||
| 293 | + for package in ${srcdir}/*.pkg.tar.zst | ||
| 294 | + do | ||
| 295 | + echo ${package} | ||
| 296 | + tar -C ${buildroot} --zstd -xf ${package} | ||
| 297 | + if [ "$?" != "0" ]; then | ||
| 298 | + echo "Error unpacking ${package}" | ||
| 299 | + exit -1 | ||
| 300 | + fi | ||
| 301 | + done | ||
| 302 | + | ||
| 303 | +} | ||
| 304 | + | ||
| 305 | +unpack | ||
| 306 | + | ||
| 291 | install_loaders | 307 | install_loaders |
| 292 | install_bin | 308 | install_bin |
| 293 | install_locale | 309 | install_locale |