Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix previous merge conflicts, not done quite right ... |
|---|---|
| Timelines: | family | ancestors | descendants | both | paths-for-9 |
| Files: | files | file ages | folders |
| SHA3-256: |
27a9f4431b544cd4fdc9ba2baf1b8952 |
| User & Date: | jan.nijtmans 2020-04-13 14:59:24.474 |
Context
|
2020-04-17
| ||
| 08:24 | Merge trunk check-in: 90a21e37fd user: jan.nijtmans tags: paths-for-9 | |
|
2020-04-13
| ||
| 14:59 | Fix previous merge conflicts, not done quite right ... check-in: 27a9f4431b user: jan.nijtmans tags: paths-for-9 | |
| 10:02 | Merge trunk check-in: b71c0374aa user: jan.nijtmans tags: paths-for-9 | |
Changes
Changes to generic/tclZipfs.c.
| ︙ | ︙ | |||
37 38 39 40 41 42 43 | ** We are compiling as part of the core. ** TIP430 style zipfs prefix */ #define ZIPFS_VOLUME "//zipfs:/" #define ZIPFS_VOLUME_LEN 9 #define ZIPFS_APP_MOUNT "//zipfs:/app" | | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | ** We are compiling as part of the core. ** TIP430 style zipfs prefix */ #define ZIPFS_VOLUME "//zipfs:/" #define ZIPFS_VOLUME_LEN 9 #define ZIPFS_APP_MOUNT "//zipfs:/app" #define ZIPFS_ZIP_MOUNT "//zipfs:/share/tcl" #else /* !CFG_RUNTIME_DLLFILE */ /* ** We are compiling from the /compat folder of tclconfig ** Pre TIP430 style zipfs prefix ** //zipfs:/ doesn't work straight out of the box on either windows or Unix ** without other changes made to tip 430 */ #define ZIPFS_VOLUME "zipfs:/" #define ZIPFS_VOLUME_LEN 7 #define ZIPFS_APP_MOUNT "zipfs:/app" #define ZIPFS_ZIP_MOUNT "zipfs:/share/tcl" #endif /* CFG_RUNTIME_DLLFILE */ /* * Various constants and offsets found in ZIP archive files */ |
| ︙ | ︙ |
Changes to unix/Makefile.in.
| ︙ | ︙ | |||
1014 1015 1016 1017 1018 1019 1020 | @for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ $(INSTALL_DATA_DIR) "$$i"; \ fi; \ done | | | 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 | @for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ $(INSTALL_DATA_DIR) "$$i"; \ fi; \ done @for i in opt0.4 cookiejar0.2 encoding; do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)/$$i"; \ else true; \ fi; \ done; @for i in 9.0 9.0/platform; \ |
| ︙ | ︙ |
Changes to win/Makefile.in.
| ︙ | ︙ | |||
838 839 840 841 842 843 844 |
fi
install-libraries-zipfs-shared: libraries
install-libraries-zipfs-static: install-libraries-zipfs-shared
$(COPY) ${TCL_ZIP_FILE} "$(LIB_INSTALL_DIR)"
| < < | | 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 |
fi
install-libraries-zipfs-shared: libraries
install-libraries-zipfs-static: install-libraries-zipfs-shared
$(COPY) ${TCL_ZIP_FILE} "$(LIB_INSTALL_DIR)"
install-libraries: libraries install-tzdata install-msgs
@for i in "$(prefix)/lib" "$(prefix)/share" "$(INCLUDE_INSTALL_DIR)" \
"$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
$(MKDIR) "$$i"; \
else true; \
fi; \
|
| ︙ | ︙ |