Check-in [aca2c7e988]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fix generiation of tclUuid.h on win32/unix. Add build information (experimental)
Timelines: family | ancestors | descendants | both | tip-439 | semver
Files: files | file ages | folders
SHA1: aca2c7e9887f650e4ef67fd598b4fe8b6aa4ebd1
User & Date: jan.nijtmans 2016-01-22 12:51:25.677
Context
2016-01-23
21:54
Remove build information from TIP-439 implementation: At the least should be a different separate TI... check-in: 77ccc6004e user: jan.nijtmans tags: tip-439, semver
2016-01-22
12:51
fix generiation of tclUuid.h on win32/unix. Add build information (experimental) check-in: aca2c7e988 user: jan.nijtmans tags: tip-439, semver
10:56
Merge trunk. Simplify build information to "+core.<UUID>" check-in: 241c75449a user: jan.nijtmans tags: tip-439, semver
Changes
Unified Diff Ignore Whitespace Patch
Changes to generic/tclBasic.c.
955
956
957
958
959
960
961
962
963
964
965



























966
967
968
969
970
971
972

    Tcl_SetVar2(interp, "tcl_platform", "threaded", "1", TCL_GLOBAL_ONLY);
#endif

    /*
     * Register Tcl's version number.
     * TIP #268: Full patchlevel instead of just major.minor
     * TIP #339: Append build information "+core.<UUID>"
     */

    Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL "+core."



























	    STRINGIFY(TCL_VERSION_UUID), &tclStubs);

    if (TclTommath_Init(interp) != TCL_OK) {
	Tcl_Panic("%s", Tcl_GetString(Tcl_GetObjResult(interp)));
    }

    if (TclOOInit(interp) != TCL_OK) {







|



>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999

    Tcl_SetVar2(interp, "tcl_platform", "threaded", "1", TCL_GLOBAL_ONLY);
#endif

    /*
     * Register Tcl's version number.
     * TIP #268: Full patchlevel instead of just major.minor
     * 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) {
	Tcl_Panic("%s", Tcl_GetString(Tcl_GetObjResult(interp)));
    }

    if (TclOOInit(interp) != TCL_OK) {
Changes to unix/Makefile.in.
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084

tclBasic.o: $(GENERIC_DIR)/tclBasic.c $(COMPILEHDR) $(MATHHDRS) $(NREHDR) tclUuid.h
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBasic.c

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

tclCkalloc.o: $(GENERIC_DIR)/tclCkalloc.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCkalloc.c








<







1070
1071
1072
1073
1074
1075
1076

1077
1078
1079
1080
1081
1082
1083

tclBasic.o: $(GENERIC_DIR)/tclBasic.c $(COMPILEHDR) $(MATHHDRS) $(NREHDR) tclUuid.h
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBasic.c

tclUuid.h: $(TOP_DIR)/manifest.uuid
	echo "#define TCL_VERSION_UUID \\" >$@
	cat $(TOP_DIR)/manifest.uuid >>$@


tclBinary.o: $(GENERIC_DIR)/tclBinary.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBinary.c

tclCkalloc.o: $(GENERIC_DIR)/tclCkalloc.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCkalloc.c

Changes to win/Makefile.in.
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
		@DEPARG@ $(CC_OBJNAME)

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

tclStubLib.${OBJEXT}: tclStubLib.c
	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)








<







519
520
521
522
523
524
525

526
527
528
529
530
531
532
		@DEPARG@ $(CC_OBJNAME)

tclBasic.${OBJEXT}: tclBasic.c tclUuid.h

tclUuid.h:	$(TOP_DIR)/manifest.uuid
	echo "#define TCL_VERSION_UUID \\" >$@
	cat $(TOP_DIR)/manifest.uuid >>$@


# 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

tclStubLib.${OBJEXT}: tclStubLib.c
	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)