diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-11-22 22:14:24 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-11-22 22:14:24 (GMT) |
| commit | 1c22d353a9a3a0ea2d36a2009cfeb2c6a463d48f (patch) | |
| tree | 5faf0ee76424004eb57b78481a0c0247448a8bf7 | |
| parent | cae3501f7a647be921654d936ae0f66e3695ea70 (diff) | |
| download | tcl-1c22d353a9a3a0ea2d36a2009cfeb2c6a463d48f.zip tcl-1c22d353a9a3a0ea2d36a2009cfeb2c6a463d48f.tar.gz tcl-1c22d353a9a3a0ea2d36a2009cfeb2c6a463d48f.tar.bz2 | |
win/mingw build (if ZIPFS_BUILD): ignore following zip-error by adjust sfx process:
zip error: Zip file structure invalid (tcl87.dll)
dll is loadable and contains zip archive (openable with zip and zipfs with tcl_library is available), so ignores return code of `zip -A`, just write it (as warning) now, and continue build process.
| -rw-r--r-- | win/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 8da7058..1703c4d 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -490,7 +490,9 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE} $(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl $(COPY) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde $(COPY) ${REG_DLL_FILE} ${TCL_VFS_PATH}/reg - cd ${TCL_VFS_ROOT} ; ${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} + (cd ${TCL_VFS_ROOT} && \ + ${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && \ + cd ..) $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ @@ -517,7 +519,8 @@ ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ ${TCL_ZIP_FILE} @VC_MANIFEST_EMBED_DLL@ @if test "${ZIPFS_BUILD}" = "1" ; then \ cat ${TCL_ZIP_FILE} >> ${TCL_DLL_FILE}; \ - ${NATIVE_ZIP} -A ${TCL_DLL_FILE}; \ + ${NATIVE_ZIP} -A ${TCL_DLL_FILE} \ + || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi ${TCL_LIB_FILE}: ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS} |