Import Tk 8.6.11
This commit is contained in:
@@ -101,11 +101,12 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos
|
||||
# The directory containing the Tcl sources and headers appropriate
|
||||
# for this version of Tk ("srcdir" will be replaced or has already
|
||||
# been replaced by the configure script):
|
||||
TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic
|
||||
TCLDIR = @TCL_SRC_DIR@
|
||||
TCL_GENERIC_DIR = $(TCLDIR)/generic
|
||||
|
||||
# The directory containing the platform specific Tcl sources and headers
|
||||
# appropriate for this version of Tk:
|
||||
TCL_PLATFORM_DIR = @TCL_SRC_DIR@/unix
|
||||
TCL_PLATFORM_DIR = $(TCLDIR)/unix
|
||||
|
||||
# The directory containing the Tcl library archive file appropriate
|
||||
# for this version of Tk:
|
||||
@@ -311,7 +312,7 @@ GENERIC_DIR = $(TOP_DIR)/generic
|
||||
TTK_DIR = $(GENERIC_DIR)/ttk
|
||||
UNIX_DIR = $(TOP_DIR)/unix
|
||||
BMAP_DIR = $(TOP_DIR)/bitmaps
|
||||
TOOL_DIR = @TCL_SRC_DIR@/tools
|
||||
TOOL_DIR = $(TCLDIR)/tools
|
||||
TEST_DIR = $(TOP_DIR)/tests
|
||||
MAC_OSX_DIR = $(TOP_DIR)/macosx
|
||||
XLIB_DIR = $(TOP_DIR)/xlib
|
||||
@@ -328,9 +329,9 @@ MAN_FLAGS = @MAN_FLAGS@
|
||||
|
||||
CC = @CC@
|
||||
|
||||
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
|
||||
-I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
|
||||
-I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \
|
||||
CC_SWITCHES_NO_STUBS = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
|
||||
${@TK_WINDOWINGSYSTEM@_INCLUDES} ${CFLAGS} ${CFLAGS_WARNING} \
|
||||
${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${AC_FLAGS} \
|
||||
${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
|
||||
${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
|
||||
|
||||
@@ -338,10 +339,10 @@ CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @TCL_STUB_FLAGS@
|
||||
|
||||
APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@
|
||||
|
||||
DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
|
||||
-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} \
|
||||
${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
|
||||
${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@
|
||||
DEPEND_SWITCHES = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
|
||||
${@TK_WINDOWINGSYSTEM@_INCLUDES} ${CFLAGS} -I${TCL_GENERIC_DIR} \
|
||||
-I${TCL_PLATFORM_DIR} ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} \
|
||||
${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@
|
||||
|
||||
WISH_OBJS = tkAppInit.o
|
||||
|
||||
@@ -570,7 +571,7 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
|
||||
SHELL_ENV = \
|
||||
@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
|
||||
export @LD_LIBRARY_PATH_VAR@; \
|
||||
TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \
|
||||
TCL_LIBRARY=$(TCLDIR)/library; export TCL_LIBRARY; \
|
||||
TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY;
|
||||
|
||||
all: binaries libraries doc
|
||||
@@ -580,7 +581,7 @@ binaries: ${LIB_FILE} ${WISH_EXE}
|
||||
libraries:
|
||||
|
||||
$(TOP_DIR)/doc/man.macros:
|
||||
$(INSTALL_DATA) @TCL_SRC_DIR@/doc/man.macros $(TOP_DIR)/doc/man.macros
|
||||
$(INSTALL_DATA) $(TCLDIR)/doc/man.macros $(TOP_DIR)/doc/man.macros
|
||||
|
||||
doc: $(TOP_DIR)/doc/man.macros
|
||||
|
||||
@@ -633,8 +634,8 @@ $(TKTEST_EXE): $(TKTEST_OBJS) $(TK_LIB_FILE)
|
||||
$(MAKE) tktest-real LIB_RUNTIME_DIR="`pwd`:$(TCL_BIN_DIR)"
|
||||
|
||||
tktest-real: ${TK_STUB_LIB_FILE}
|
||||
${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) ${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} @TK_BUILD_LIB_SPEC@ \
|
||||
$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE)
|
||||
${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(WISH_LIBS) \
|
||||
${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE)
|
||||
|
||||
# # FIXME: This xttest rule seems to be broken in a number of ways. It should
|
||||
# # use CC_SEARCH_FLAGS, it does not include the shared lib location logic from
|
||||
@@ -686,7 +687,7 @@ demo:
|
||||
# This target can be used to run wish inside either gdb or insight
|
||||
gdb: ${WISH_EXE}
|
||||
@echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
|
||||
@echo "set env TCL_LIBRARY=@TCL_SRC_DIR@/library" >> gdb.run
|
||||
@echo "set env TCL_LIBRARY=$(TCLDIR)/library" >> gdb.run
|
||||
@echo "set env TK_LIBRARY=@TK_SRC_DIR@/library" >> gdb.run
|
||||
gdb ./${WISH_EXE} --command=gdb.run
|
||||
rm gdb.run
|
||||
@@ -748,8 +749,8 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
|
||||
@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
|
||||
$(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
|
||||
chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
|
||||
$(INSTALL_LIBRARY) "../win/libtk${MAJOR_VERSION}${MINOR_VERSION}.a" "$(LIB_INSTALL_DIR)";\
|
||||
chmod 555 "$(LIB_INSTALL_DIR)/libtk${MAJOR_VERSION}${MINOR_VERSION}.a";\
|
||||
$(INSTALL_LIBRARY) "../win/libtk${MAJOR_VERSION}${MINOR_VERSION}.dll.a" "$(LIB_INSTALL_DIR)";\
|
||||
chmod 555 "$(LIB_INSTALL_DIR)/libtk${MAJOR_VERSION}${MINOR_VERSION}.dll.a";\
|
||||
fi
|
||||
@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
|
||||
@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
|
||||
@@ -761,8 +762,8 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
|
||||
fi
|
||||
@EXTRA_INSTALL_BINARIES@
|
||||
@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
|
||||
@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
|
||||
@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
|
||||
@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
|
||||
@$(INSTALL_DATA) tk.pc "$(LIB_INSTALL_DIR)/pkgconfig/tk.pc"
|
||||
|
||||
install-libraries: libraries
|
||||
@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
|
||||
@@ -1205,7 +1206,7 @@ tkUnixRFont.o: $(UNIX_DIR)/tkUnixRFont.c
|
||||
$(CC) -c $(CC_SWITCHES) $(XFT_CFLAGS) $(UNIX_DIR)/tkUnixRFont.c
|
||||
|
||||
tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
|
||||
$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
|
||||
$(CC) -c $(CC_SWITCHES) \
|
||||
$(UNIX_DIR)/tkUnixInit.c
|
||||
|
||||
tkUnixKey.o: $(UNIX_DIR)/tkUnixKey.c
|
||||
@@ -1281,7 +1282,7 @@ tkMacOSXImage.o: $(MAC_OSX_DIR)/tkMacOSXImage.c
|
||||
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXImage.c
|
||||
|
||||
tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
|
||||
$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
|
||||
$(CC) -c $(CC_SWITCHES) \
|
||||
$(MAC_OSX_DIR)/tkMacOSXInit.c
|
||||
|
||||
tkMacOSXKeyboard.o: $(MAC_OSX_DIR)/tkMacOSXKeyboard.c
|
||||
@@ -1530,7 +1531,7 @@ rpm: all
|
||||
|
||||
#
|
||||
# Target to create a proper Tk distribution from information in the
|
||||
# master source directory. DISTDIR must be defined to indicate where
|
||||
# source directory. DISTDIR must be defined to indicate where
|
||||
# to put the distribution. DISTDIR must be an absolute path name.
|
||||
#
|
||||
|
||||
@@ -1538,7 +1539,6 @@ DISTROOT = /tmp/dist
|
||||
DISTNAME = tk${VERSION}${PATCH_LEVEL}
|
||||
ZIPNAME = tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
|
||||
DISTDIR = $(DISTROOT)/$(DISTNAME)
|
||||
TCLDIR = @TCL_SRC_DIR@
|
||||
$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
|
||||
$(UNIX_DIR)/aclocal.m4
|
||||
cd $(UNIX_DIR); autoconf
|
||||
@@ -1547,18 +1547,23 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
|
||||
$(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
|
||||
cd $(MAC_OSX_DIR); autoheader; touch $@
|
||||
|
||||
dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure genstubs
|
||||
$(TOP_DIR)/manifest.uuid:
|
||||
printf "git." >$(TOP_DIR)/manifest.uuid
|
||||
git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
|
||||
|
||||
dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid
|
||||
rm -rf $(DISTDIR)
|
||||
mkdir -p $(DISTDIR)/unix
|
||||
cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)
|
||||
cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
|
||||
cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
|
||||
chmod 664 $(DISTDIR)/unix/Makefile.in
|
||||
cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \
|
||||
$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
|
||||
$(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \
|
||||
$(UNIX_DIR)/tkConfig.sh.in $(UNIX_DIR)/install-sh \
|
||||
$(UNIX_DIR)/README $(UNIX_DIR)/installManPage \
|
||||
$(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(DISTDIR)/unix
|
||||
chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
|
||||
chmod 775 $(DISTDIR)/unix/configure
|
||||
mkdir $(DISTDIR)/bitmaps
|
||||
@(cd $(TOP_DIR); for i in bitmaps/* ; do \
|
||||
if [ -f $$i ] ; then \
|
||||
@@ -1608,8 +1613,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M
|
||||
$(MAC_OSX_DIR)/Tk.xcodeproj/default.pbxuser \
|
||||
$(DISTDIR)/macosx/Tk.xcodeproj
|
||||
mkdir $(DISTDIR)/compat
|
||||
cp -p $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \
|
||||
$(TCLDIR)/compat/stdlib.h \
|
||||
cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/compat/unistd.h \
|
||||
$(TOP_DIR)/compat/stdlib.h \
|
||||
$(DISTDIR)/compat
|
||||
mkdir $(DISTDIR)/xlib
|
||||
cp -p $(XLIB_DIR)/*.[ch] $(DISTDIR)/xlib
|
||||
@@ -1656,13 +1661,16 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M
|
||||
done;)
|
||||
mkdir $(DISTDIR)/doc
|
||||
cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
|
||||
$(TCLDIR)/doc/man.macros $(DISTDIR)/doc
|
||||
$(TOP_DIR)/doc/man.macros $(DISTDIR)/doc
|
||||
mkdir $(DISTDIR)/tests
|
||||
cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
|
||||
$(TEST_DIR)/README $(TEST_DIR)/*.{gif,png,ppm,xbm} \
|
||||
$(TEST_DIR)/option.file* $(DISTDIR)/tests
|
||||
mkdir $(DISTDIR)/tests/ttk
|
||||
cp -p $(TEST_DIR)/ttk/*.{test,tcl} $(DISTDIR)/tests/ttk
|
||||
cp -p $(TOP_DIR)/.travis.yml $(DISTDIR)
|
||||
mkdir -p $(DISTDIR)/.github/workflows
|
||||
cp -p $(TOP_DIR)/.github/workflows/*.yml $(DISTDIR)/.github/workflows
|
||||
|
||||
alldist: dist
|
||||
rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
|
||||
|
||||
Reference in New Issue
Block a user