summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-22 12:51:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-22 12:51:25 (GMT)
commit32d356c5f403e4c3783729b761364e1a2c45d9f8 (patch)
treedc376cf2b519b74e6282d961fd971dabbf72e0c6
parenta28225db2f4c68dab83295f7b8ceadba69f9e5b3 (diff)
downloadtcl-32d356c5f403e4c3783729b761364e1a2c45d9f8.zip
tcl-32d356c5f403e4c3783729b761364e1a2c45d9f8.tar.gz
tcl-32d356c5f403e4c3783729b761364e1a2c45d9f8.tar.bz2
fix generiation of tclUuid.h on win32/unix. Add build information (experimental)
-rw-r--r--generic/tclBasic.c29
-rw-r--r--unix/Makefile.in1
-rw-r--r--win/Makefile.in1
3 files changed, 28 insertions, 3 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 905ccec..0e25e96 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -959,10 +959,37 @@ Tcl_CreateInterp(void)
/*
* Register Tcl's version number.
* TIP #268: Full patchlevel instead of just major.minor
- * TIP #339: Append build information "+core.<UUID>"
+ * TIP #439: Append build information "+core.(<tag>.)*<UUID>"
*/
Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL "+core."
+#ifdef TCL_NO_DEPRECATED
+ "no-deprecate."
+#endif
+#ifndef TCL_THREADS
+ "no-thread."
+#endif
+#ifndef TCL_CFG_OPTIMIZED
+ "no-optimize."
+#endif
+#ifndef NDEBUG
+ "debug."
+#endif
+#ifdef TCL_MEM_DEBUG
+ "mem-debug."
+#endif
+#ifdef TCL_COMPILE_DEBUG
+ "compile-debug."
+#endif
+#ifdef TCL_COMPILE_STATS
+ "compile-stats."
+#endif
+#ifdef TCL_CFG_PROFILED
+ "profiled."
+#endif
+#ifdef STATIC_BUILD
+ "static."
+#endif
STRINGIFY(TCL_VERSION_UUID), &tclStubs);
if (TclTommath_Init(interp) != TCL_OK) {
diff --git a/unix/Makefile.in b/unix/Makefile.in
index f7db798..f9de29a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1074,7 +1074,6 @@ tclBasic.o: $(GENERIC_DIR)/tclBasic.c $(COMPILEHDR) $(MATHHDRS) $(NREHDR) tclUui
tclUuid.h: $(TOP_DIR)/manifest.uuid
echo "#define TCL_VERSION_UUID \\" >$@
cat $(TOP_DIR)/manifest.uuid >>$@
- echo "\n" >>$@
tclBinary.o: $(GENERIC_DIR)/tclBinary.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBinary.c
diff --git a/win/Makefile.in b/win/Makefile.in
index e51e82e..ee1d595 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -523,7 +523,6 @@ tclBasic.${OBJEXT}: tclBasic.c tclUuid.h
tclUuid.h: $(TOP_DIR)/manifest.uuid
echo "#define TCL_VERSION_UUID \\" >$@
cat $(TOP_DIR)/manifest.uuid >>$@
- echo "\n" >>$@
# 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