Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | make/configure review: normalizes the latest fixes across unix/win |
|---|---|
| Timelines: | family | ancestors | descendants | both | core-8-branch |
| Files: | files | file ages | folders |
| SHA3-256: |
fc958af3807acc9eaadded3b0345be93 |
| User & Date: | sebres 2018-11-23 11:59:53.234 |
Context
|
2018-11-23
| ||
| 19:59 | make: better algo to wrap to absolute zip-path (for systems resp. toolchains without readlink/realpa... check-in: 78fe053f4a user: sebres tags: core-8-branch | |
| 13:11 | Pulling changes from core-8-branch check-in: b5d6dd151f user: hypnotoad tags: nmake-zipfs | |
| 12:03 | merge 8.7 check-in: 606764504a user: sebres tags: trunk | |
| 11:59 | make/configure review: normalizes the latest fixes across unix/win check-in: fc958af380 user: sebres tags: core-8-branch | |
|
2018-11-22
| ||
| 23:17 | unix build (if ZIPFS_BUILD): fixed relative path to zip-program (in case of minizip), ignore possibl... check-in: e59b2f0ded user: sebres tags: core-8-branch | |
Changes
Changes to unix/Makefile.in.
| ︙ | ︙ | |||
679 680 681 682 683 684 685 |
${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS}
@rm -rf ${TCL_VFS_ROOT}
@mkdir -p ${TCL_VFS_PATH}
cp -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}
cp -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl
find ${TCL_VFS_ROOT} -type d -empty -delete
| < | | | 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 |
${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS}
@rm -rf ${TCL_VFS_ROOT}
@mkdir -p ${TCL_VFS_PATH}
cp -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}
cp -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl
find ${TCL_VFS_ROOT} -type d -empty -delete
(zip=`readlink -m '${NATIVE_ZIP}'`; cd ${TCL_VFS_ROOT} && \
$$zip ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && cd ..)
# The following target is configured by autoconf to generate either a shared
# library or non-shared library for Tcl.
${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${TCL_ZIP_FILE}
rm -f $@
@MAKE_LIB@
@if test "${ZIPFS_BUILD}" = "1" ; then \
|
| ︙ | ︙ |
Changes to unix/tcl.m4.
| ︙ | ︙ | |||
3007 3008 3009 3010 3011 3012 3013 |
break
fi
fi
done
done
])
if test -f "$ac_cv_path_zip" ; then
| | | 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 |
break
fi
fi
done
done
])
if test -f "$ac_cv_path_zip" ; then
ZIP_PROG="$ac_cv_path_zip"
AC_MSG_RESULT([$ZIP_PROG])
ZIP_PROG_OPTIONS="-rq"
ZIP_PROG_VFSSEARCH="."
AC_MSG_RESULT([Found INFO Zip in environment])
# Use standard arguments for zip
else
# It is not an error if an installed version of Zip can't be located.
|
| ︙ | ︙ |
Changes to win/Makefile.in.
| ︙ | ︙ | |||
486 487 488 489 490 491 492 |
${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE}
rm -rf ${TCL_VFS_ROOT}
mkdir -p ${TCL_VFS_PATH}
$(COPY) -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}
$(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
| | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 |
${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE}
rm -rf ${TCL_VFS_ROOT}
mkdir -p ${TCL_VFS_PATH}
$(COPY) -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}
$(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
(zip=`readlink -m '${NATIVE_ZIP}'`; cd ${TCL_VFS_ROOT} && \
$$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) \
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
@VC_MANIFEST_EMBED_EXE@
|
| ︙ | ︙ |
Changes to win/tcl.m4.
| ︙ | ︙ | |||
1263 1264 1265 1266 1267 1268 1269 |
break
fi
fi
done
done
])
if test -f "$ac_cv_path_zip" ; then
| | | | 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 |
break
fi
fi
done
done
])
if test -f "$ac_cv_path_zip" ; then
ZIP_PROG="$ac_cv_path_zip"
AC_MSG_RESULT([$ZIP_PROG])
ZIP_PROG_OPTIONS="-rq"
ZIP_PROG_VFSSEARCH="."
AC_MSG_RESULT([Found INFO Zip in environment])
# Use standard arguments for zip
else
# It is not an error if an installed version of Zip can't be located.
# We can use the locally distributed minizip instead
ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}"
ZIP_PROG_OPTIONS="-o -r"
ZIP_PROG_VFSSEARCH="."
ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}"
AC_MSG_RESULT([No zip found on PATH building minizip])
fi
AC_SUBST(ZIP_PROG)
AC_SUBST(ZIP_PROG_OPTIONS)
|
| ︙ | ︙ |