From 909753417ac4c77c205ecd1da78ac11c968d253b Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 9 Feb 2021 09:37:14 +0000 Subject: Use --disable-vfs when linking with Tcl 8.6 --- .github/workflows/linux-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index e29b95d..52c5096 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -37,7 +37,7 @@ jobs: sudo apt-get install tcl8.6-dev libxss-dev mkdir "$HOME/install dir" touch tk/doc/man.macros tk/generic/tkStubInit.c - echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV + echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6" --disable-vfs >> $GITHUB_ENV echo "CC=$COMPILER" >> $GITHUB_ENV echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV @@ -121,7 +121,7 @@ jobs: sudo apt-get install tcl8.6-dev libxss-dev xvfb mkdir "$HOME/install dir" touch tk/doc/man.macros tk/generic/tkStubInit.c - echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV + echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6 --disable-vfs" >> $GITHUB_ENV echo "CC=$COMPILER" >> $GITHUB_ENV working-directory: "." env: -- cgit v0.12 From e2783a46a50587ed2de262d891e80ba0e5f1cad6 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 9 Feb 2021 12:56:48 +0000 Subject: Add "dllfile,runtime" to Tk package configuration --- generic/tkPkgConfig.c | 1 + unix/Makefile.in | 1 + unix/configure | 2 +- unix/configure.ac | 2 +- win/Makefile.in | 6 ++++++ win/configure | 4 +--- win/configure.ac | 2 +- win/makefile.vc | 5 +++++ win/tcl.m4 | 2 -- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c index d9e5981..1083d77 100644 --- a/generic/tkPkgConfig.c +++ b/generic/tkPkgConfig.c @@ -126,6 +126,7 @@ static const Tcl_Config cfg[] = { #ifdef CFG_RUNTIME_DEMODIR {"demodir,runtime", CFG_RUNTIME_DEMODIR}, #endif + {"dllfile,runtime", CFG_RUNTIME_DLLFILE}, /* Installation paths to various stuff */ diff --git a/unix/Makefile.in b/unix/Makefile.in index 1b42143..6f75076 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1095,6 +1095,7 @@ tkPkgConfig.o: $(GENERIC_DIR)/tkPkgConfig.c -DCFG_RUNTIME_SCRDIR="\"$(TK_LIBRARY)\"" \ -DCFG_RUNTIME_INCDIR="\"$(includedir)\"" \ -DCFG_RUNTIME_DOCDIR="\"$(mandir)\"" \ + -DCFG_RUNTIME_DLLFILE="\"$(TK_LIB_FILE)\"" \ -DCFG_RUNTIME_DEMODIR="\"$(DEMO_INSTALL_DIR)\"" \ \ $(GENERIC_DIR)/tkPkgConfig.c diff --git a/unix/configure b/unix/configure index 192993a..a51070d 100755 --- a/unix/configure +++ b/unix/configure @@ -8837,7 +8837,7 @@ printf "%s\n" "No zip found on PATH. Building minizip" >&6; } ZIPFS_BUILD=1 - TK_ZIP_FILE=libtk_${TK_MAJOR_VERSION}_${TK_MINOR_VERSION}_${TK_PATCH_LEVEL}.zip + TK_ZIP_FILE=libtk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip else ZIPFS_BUILD=0 TK_ZIP_FILE= diff --git a/unix/configure.ac b/unix/configure.ac index 5a3b813..ba34137 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -678,7 +678,7 @@ if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then # SC_ZIPFS_SUPPORT ZIPFS_BUILD=1 - TK_ZIP_FILE=libtk_${TK_MAJOR_VERSION}_${TK_MINOR_VERSION}_${TK_PATCH_LEVEL}.zip + TK_ZIP_FILE=libtk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip else ZIPFS_BUILD=0 TK_ZIP_FILE= diff --git a/win/Makefile.in b/win/Makefile.in index 9ccf0c2..836df4a 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -774,6 +774,12 @@ tkUnixMenubu.$(OBJEXT): ${UNIX_DIR}/tkUnixMenubu.c tkUnixScale.$(OBJEXT): ${UNIX_DIR}/tkUnixScale.c $(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME) +tkPkgConfig.$(OBJEXT): $(GENERIC_DIR)/tkPkgConfig.c + $(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk \ + -DCFG_RUNTIME_DLLFILE="\"$(TK_DLL_FILE)\"" \ + @DEPARG@ $(CC_OBJNAME) + + # Extra dependency info tkConsole.$(OBJEXT): configure Makefile tkMain.$(OBJEXT): configure Makefile diff --git a/win/configure b/win/configure index d9ef96e..dc846fa 100755 --- a/win/configure +++ b/win/configure @@ -740,7 +740,6 @@ TCL_STUB_LIB_FILE TCL_LIB_SPEC TCL_LIB_FLAG TCL_LIB_FILE -TCL_ZIP_FILE TCL_SRC_DIR TCL_BIN_DIR TCL_VERSION @@ -4042,7 +4041,6 @@ printf "%s\n" "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; } - if test "${TCL_MAJOR_VERSION}" -lt 9 ; then if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then as_fn_error $? "${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. @@ -5754,7 +5752,7 @@ printf "%s\n" "No zip found on PATH building minizip" >&6; } ZIPFS_BUILD=1 - TK_ZIP_FILE=libtk_${TK_MAJOR_VERSION}_${TK_MINOR_VERSION}_${TK_PATCH_LEVEL}.zip + TK_ZIP_FILE=libtk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip else ZIPFS_BUILD=0 TCL_ZIP_FILE= diff --git a/win/configure.ac b/win/configure.ac index 456833e..0b62869 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -195,7 +195,7 @@ if test "$tcl_ok" = "yes" ; then # SC_ZIPFS_SUPPORT ZIPFS_BUILD=1 - TK_ZIP_FILE=libtk_${TK_MAJOR_VERSION}_${TK_MINOR_VERSION}_${TK_PATCH_LEVEL}.zip + TK_ZIP_FILE=libtk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip else ZIPFS_BUILD=0 TCL_ZIP_FILE= diff --git a/win/makefile.vc b/win/makefile.vc index ba19f17..912f781 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -630,6 +630,11 @@ $(TMP_DIR)\winMain.obj: $(WIN_DIR)\winMain.c $(TMP_DIR)\tkMain2.obj: $(GENERICDIR)\tkMain.c $(cc32) $(pkgcflags) /DUNICODE /D_UNICODE -Fo$@ $? +$(TMP_DIR)\tkPkgConfig.obj: $(GENERICDIR)\tkPkgConfig.c + $(cc32) $(pkgcflags) \ + -DCFG_RUNTIME_DLLFILE="\"$(TKLIBNAME)\"" \ + -Fo$@ $? + # The following objects are part of the stub library and should not # be built as DLL objects but none of the symbols should be exported # and no reference made to a C runtime. diff --git a/win/tcl.m4 b/win/tcl.m4 index b9a164c..76711dd 100644 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -251,7 +251,6 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ # TCL_BIN_DIR # TCL_SRC_DIR # TCL_LIB_FILE -# TCL_ZIP_FILE # #------------------------------------------------------------------------ @@ -288,7 +287,6 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [ AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_SRC_DIR) - AC_SUBST(TCL_ZIP_FILE) AC_SUBST(TCL_LIB_FILE) AC_SUBST(TCL_LIB_FLAG) AC_SUBST(TCL_LIB_SPEC) -- cgit v0.12 From 271a1451209c74b1a79d18dcd35f3213e26b21f6 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 9 Feb 2021 14:13:38 +0000 Subject: Add --disable-zipfs to macosx/GNUmakefile --- macosx/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 2451e5c..9828be5 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -193,7 +193,7 @@ ${objdir}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure \ mkdir -p "${OBJ_DIR}" && cd "${OBJ_DIR}" && \ if [ ${UNIX_DIR}/configure -nt config.status ]; then ${UNIX_DIR}/configure -C \ --prefix="${PREFIX}" --bindir="${BINDIR}" --libdir="${LIBDIR}" \ - --mandir="${MANDIR}" --enable-framework \ + --mandir="${MANDIR}" --enable-framework --disable-zipfs \ --with-tcl="${TCL_DIR}" \ ${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}; else ./config.status; fi ifneq (${VERSION},${TCL_VERSION}) -- cgit v0.12 From 83095713a097a6ce469db18bdabf75849543e066 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 9 Feb 2021 16:39:15 +0000 Subject: Only set the dllfile,runtime key info when doing a shared build --- generic/tkPkgConfig.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c index 1083d77..2c0615d 100644 --- a/generic/tkPkgConfig.c +++ b/generic/tkPkgConfig.c @@ -126,7 +126,9 @@ static const Tcl_Config cfg[] = { #ifdef CFG_RUNTIME_DEMODIR {"demodir,runtime", CFG_RUNTIME_DEMODIR}, #endif +#if !defined(STATIC_BUILD) {"dllfile,runtime", CFG_RUNTIME_DLLFILE}, +#endif /* Installation paths to various stuff */ -- cgit v0.12 From 0cc51a73051817c20a15232e5695b6d084812241 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 9 Feb 2021 16:45:17 +0000 Subject: In Github actions, build against the Tcl bug-87e840c26c branch --- .github/workflows/linux-build.yml | 2 +- .github/workflows/mac-build.yml | 4 ++-- .github/workflows/onefiledist.yml | 6 +++--- .github/workflows/win-build.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 52c5096..7961675 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Setup Environment (compiler=${{ matrix.compiler }}) run: | diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index e0f0281..c1f6316 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Prepare checked out repositories run: | @@ -60,7 +60,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Prepare checked out repositories run: | diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 9668cb5..352a7fb 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Setup Environment run: | @@ -84,7 +84,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Checkout create-dmg uses: actions/checkout@v2 @@ -166,7 +166,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Install MSYS2, Make, Zip run: choco install -y msys2 make zip diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 8c388ec..e7124ff 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Init MSVC uses: ilammy/msvc-dev-cmd@v1 @@ -102,7 +102,7 @@ jobs: uses: actions/checkout@v2 with: repository: tcltk/tcl - ref: core-8-branch + ref: bug-87e840c26c path: tcl - name: Install MSYS2, Make, Zip run: choco install -y msys2 make zip -- cgit v0.12