diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-06 13:34:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-06 13:34:52 (GMT) |
| commit | 0bddea7ffe81b29035b6856efda14eda7d508d66 (patch) | |
| tree | 9a5bf2cb27c2290d627b3f2b9ecc1c4c3ad64356 | |
| parent | 493585e80285a37fffbfa04f560a2d37a94d3322 (diff) | |
| download | tcl-0bddea7ffe81b29035b6856efda14eda7d508d66.zip tcl-0bddea7ffe81b29035b6856efda14eda7d508d66.tar.gz tcl-0bddea7ffe81b29035b6856efda14eda7d508d66.tar.bz2 | |
Move tclOOScript.tcl from the generic to the tools directory, so "make dist" can pick it up. Reported by Pietro Cerutti.
| -rw-r--r-- | generic/tclOOScript.h | 2 | ||||
| -rw-r--r-- | tools/tclOOScript.tcl (renamed from generic/tclOOScript.tcl) | 0 | ||||
| -rw-r--r-- | unix/Makefile.in | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h index ab637dd..a1e4624 100644 --- a/generic/tclOOScript.h +++ b/generic/tclOOScript.h @@ -110,7 +110,7 @@ static const char *tclOOSetupScript = "\t\t\t&& ![info object isa class $targetDelegate]\n" "\t\t} then {\n" "\t\t\tcopy $originDelegate $targetDelegate\n" -"\t\t\tobjdefine $targetObject mixin -set \\\n" +"\t\t\tobjdefine $targetObject ::oo::objdefine::mixin -set \\\n" "\t\t\t\t{*}[lmap c [info object mixin $targetObject] {\n" "\t\t\t\t\tif {$c eq $originDelegate} {set targetDelegate} {set c}\n" "\t\t\t\t}]\n" diff --git a/generic/tclOOScript.tcl b/tools/tclOOScript.tcl index 5e0145f..5e0145f 100644 --- a/generic/tclOOScript.tcl +++ b/tools/tclOOScript.tcl diff --git a/unix/Makefile.in b/unix/Makefile.in index 42bb4c0..00cd2c9 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2106,7 +2106,7 @@ $(GENERIC_DIR)/tclOOStubInit.c: $(GENERIC_DIR)/tclOO.decls @echo "Developers may want to run \"make genstubs\" to regenerate." @echo "This warning can be safely ignored, do not report as a bug!" -$(GENERIC_DIR)/tclOOScript.h: $(GENERIC_DIR)/tclOOScript.tcl +$(GENERIC_DIR)/tclOOScript.h: $(TOOL_DIR)/tclOOScript.tcl @echo "Warning: tclOOScript.h may be out of date." @echo "Developers may want to run \"make genscript\" to regenerate." @echo "This warning can be safely ignored, do not report as a bug!" @@ -2120,7 +2120,7 @@ genstubs: genscript: $(NATIVE_TCLSH) $(TOOL_DIR)/makeHeader.tcl \ - $(GENERIC_DIR)/tclOOScript.tcl $(GENERIC_DIR)/tclOOScript.h + $(TOOL_DIR)/tclOOScript.tcl $(GENERIC_DIR)/tclOOScript.h # # Target to check that all exported functions have an entry in the stubs |