Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch core_zip_vfs Excluding Merge-Ins
This is equivalent to a diff from dd33f1cac6 to fae8456ce9
2016-10-20
| ||
18:59 | Updating a few calls to ::debug to point to ::practcl::debug instead check-in: d0a296b832 user: hypnotoad tags: practcl | |
16:59 | Branch to allow practcl to properly handle core_zip_vfs Closed-Leaf check-in: fae8456ce9 user: hypnotoad tags: core_zip_vfs | |
2016-10-02
| ||
11:57 |
Adding support for cross compiling. Practcl now looks for a "CONFIG_SITE"
element in the master project's define array. If present, practcl adapts itself
to perform a cross compile.
If ::practcl::config.tcl is run, this entry will be automatically created if a config.site file is in the directory of the master project build. CONFIG_SITE points to a file containing a sh compadible description of the cross compiler environment. Practcl will also read and respond to flags in this file check-in: 17134ff7ac user: hypnotoad tags: practcl | |
2016-09-23
| ||
14:57 |
Fix to cut down on the number of empty trace comments in generated C code
Added provisions of private (i.e. static) typedefs and structs in C files Moved where verbatim headers are read in from Added a the concept of a "pre C loaded" tcl init script and "post C loaded" tcl init script check-in: dd33f1cac6 user: hypnotoad tags: practcl | |
2016-08-31
| ||
16:16 | Closing a local branch check-in: 0022e43c53 user: hypnotoad tags: practcl | |
Changes to practcl.tcl.
1 2 3 4 5 6 7 | ### # Practcl # An object oriented templating system for stamping out Tcl API calls to C ### puts [list LOADED practcl.tcl from [info script]] package require TclOO | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | ### # Practcl # An object oriented templating system for stamping out Tcl API calls to C ### puts [list LOADED practcl.tcl from [info script]] package require TclOO # Do nothing. A handy way of proc ::noop args {} proc ::debug args { #puts $args ::practcl::cputs ::DEBUG_INFO $args } |
︙ | ︙ | |||
135 136 137 138 139 140 141 | set key [lindex $line 0] set value [lindex $line 1] dict set result $key $value } dict set result sandbox [file dirname [dict get $result srcdir]] dict set result download [file join [dict get $result sandbox] download] dict set result teapot [file join [dict get $result sandbox] teapot] | | | | | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | set key [lindex $line 0] set value [lindex $line 1] dict set result $key $value } dict set result sandbox [file dirname [dict get $result srcdir]] dict set result download [file join [dict get $result sandbox] download] dict set result teapot [file join [dict get $result sandbox] teapot] set result [::practcl::de_shell $result] } # If data is available from autoconf, defer to that if {[dict exists $result TEACUP_OS] && [dict get $result TEACUP_OS] ni {"@TEACUP_OS@" {}}} { return $result } # If autoconf hasn't run yet, assume we are not cross compiling # and defer to local checks dict set result TEACUP_PROFILE unknown dict set result TEACUP_OS unknown dict set result EXEEXT {} if {$::tcl_platform(platform) eq "windows"} { |
︙ | ︙ | |||
196 197 198 199 200 201 202 | } } if {$arch eq "unknown"} { catch {set arch [exec uname -m]} } switch -glob $arch { i*86 { | | | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | } } if {$arch eq "unknown"} { catch {set arch [exec uname -m]} } switch -glob $arch { i*86 { set arch "ix86" } amd64 { set arch "x86_64" } } dict set result TEACUP_ARCH $arch if {[dict get $result TEACUP_PROFILE] eq "unknown"} { |
︙ | ︙ | |||
600 601 602 603 604 605 606 | ## Append arguments to a buffer # The command works like puts in that each call will also insert # a line feed. Unlike puts, blank links in the interstitial are # suppressed proc ::practcl::cputs {varname args} { upvar 1 $varname buffer if {[llength $args]==1 && [string length [string trim [lindex $args 0]]] == 0} { | | | 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 | ## Append arguments to a buffer # The command works like puts in that each call will also insert # a line feed. Unlike puts, blank links in the interstitial are # suppressed proc ::practcl::cputs {varname args} { upvar 1 $varname buffer if {[llength $args]==1 && [string length [string trim [lindex $args 0]]] == 0} { } if {[info exist buffer]} { if {[string index $buffer end] ne "\n"} { append buffer \n } } else { set buffer \n |
︙ | ︙ | |||
694 695 696 697 698 699 700 | if { [string range $line 0 9] != "# Package " } continue set package [lindex $line 2] set version [lindex $line 3] break } # Look for a package provide statement foreach line [split $dat \n] { | | | | 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 | if { [string range $line 0 9] != "# Package " } continue set package [lindex $line 2] set version [lindex $line 3] break } # Look for a package provide statement foreach line [split $dat \n] { set line [string trim $line] if { [string range $line 0 14] != "package provide" } continue set package [lindex $line 2] set version [lindex $line 3] break } append buffer "package ifneeded $package $version \[list source \[file join \$dir [file tail $file]\]\]" \n } foreach file [glob -nocomplain $path/*.tcl] { if { [file tail $file] == "version_info.tcl" } continue set fin [open $file r] set dat [read $fin] close $fin if {![regexp "package provide" $dat]} continue set fname [file rootname [file tail $file]] # Look for a package provide statement foreach line [split $dat \n] { set line [string trim $line] if { [string range $line 0 14] != "package provide" } continue set package [lindex $line 2] set version [lindex $line 3] if {[string index $package 0] in "\$ \["} continue if {[string index $version 0] in "\$ \["} continue append buffer "package ifneeded $package $version \[list source \[file join \$dir [file tail $file]\]\]" \n break |
︙ | ︙ | |||
745 746 747 748 749 750 751 | # Ignore contditionals if {[regexp "if.*catch.*package.*Tcl.*return" $thisline]} continue if {[regexp "if.*package.*vsatisfies.*package.*provide.*return" $thisline]} continue if {![regexp "package.*ifneeded" $thisline]} { # This package index contains arbitrary code # source instead of trying to add it to the master # package index | | | 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 | # Ignore contditionals if {[regexp "if.*catch.*package.*Tcl.*return" $thisline]} continue if {[regexp "if.*package.*vsatisfies.*package.*provide.*return" $thisline]} continue if {![regexp "package.*ifneeded" $thisline]} { # This package index contains arbitrary code # source instead of trying to add it to the master # package index return {source [file join $dir pkgIndex.tcl]} } append buffer $thisline \n } on error {err opts} { puts *** puts "GOOF: $pkgidxfile" puts $line puts $err |
︙ | ︙ | |||
793 794 795 796 797 798 799 | foreach path $paths { if {$path eq $base} continue set path_indexed($path) 0 } set path_indexed($base) 1 set path_indexed([file join $base boot tcl]) 1 #set path_index([file join $base boot tk]) 1 | | | | | 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 | foreach path $paths { if {$path eq $base} continue set path_indexed($path) 0 } set path_indexed($base) 1 set path_indexed([file join $base boot tcl]) 1 #set path_index([file join $base boot tk]) 1 foreach path $paths { if {$path_indexed($path)} continue set thisdir [file_relative $base $path] #set thisdir [string range $path $i+1 end] set idxbuf [::practcl::_pkgindex_directory $path] if {[string length $idxbuf]} { incr path_indexed($path) append buffer "set dir \[set PKGDIR \[file join \[lindex \$::PATHSTACK end\] $thisdir\]\]" \n append buffer [string map {$dir $PKGDIR} [string trimright $idxbuf]] \n } } } append buffer { set dir [lindex $::PATHSTACK end] set ::PATHSTACK [lrange $::PATHSTACK 0 end-1] } return $buffer } ### # topic: 64319f4600fb63c82b2258d908f9d066 |
︙ | ︙ | |||
861 862 863 864 865 866 867 | file copy -force $f [file join $d2 $ftail] } } } ::oo::class create ::practcl::metaclass { superclass ::oo::object | | | | | | 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 | file copy -force $f [file join $d2 $ftail] } } } ::oo::class create ::practcl::metaclass { superclass ::oo::object method script script { eval $script } method source filename { source $filename } method initialize {} {} method define {submethod args} { my variable define switch $submethod { dump { return [array get define] } add { |
︙ | ︙ | |||
948 949 950 951 952 953 954 | foreach {stub object} $args { dict set organs $stub $object oo::objdefine [self] forward <${stub}> $object oo::objdefine [self] export <${stub}> } return $object } | | | | 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 | foreach {stub object} $args { dict set organs $stub $object oo::objdefine [self] forward <${stub}> $object oo::objdefine [self] export <${stub}> } return $object } method organ {{stub all}} { my variable organs if {![info exists organs]} { return {} } if { $stub eq "all" } { return $organs } if {[dict exists $organs $stub]} { return [dict get $organs $stub] } } method link {command args} { my variable links switch $command { object { foreach obj $args { foreach linktype [$obj linktype] { my link add $linktype $obj |
︙ | ︙ | |||
1016 1017 1018 1019 1020 1021 1022 | return $links($linktype) } dump { return [array get links] } } } | | | 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 | return $links($linktype) } dump { return [array get links] } } } method select {} { my variable define set class {} if {[info exists define(class)]} { if {[info command $define(class)] ne {}} { set class $define(class) } elseif {[info command ::practcl::$define(class)] ne {}} { |
︙ | ︙ | |||
1131 1132 1133 1134 1135 1136 1137 | } else { append defs " -D${field}=[string map $emap $value]" } set idx $ndx } return $defs } | | | | | | 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 | } else { append defs " -D${field}=[string map $emap $value]" } set idx $ndx } return $defs } proc ::practcl::build::tclkit_main {PROJECT PKG_OBJS} { ### # Build static package list ### set statpkglist {} dict set statpkglist Tk {autoload 0} puts [list TCLKIT MAIN $PROJECT] foreach {ofile info} [${PROJECT} compile-products] { puts [list * PROD $ofile $info] if {![dict exists $info object]} continue set cobj [dict get $info object] foreach {pkg info} [$cobj static-packages] { dict set statpkglist $pkg $info } } foreach cobj [list {*}${PKG_OBJS} $PROJECT] { puts [list * PROG $cobj] foreach {pkg info} [$cobj static-packages] { puts [list * PKG $pkg $info] dict set statpkglist $pkg $info } } set result {} $PROJECT include {<tcl.h>} $PROJECT include {"tclInt.h"} $PROJECT include {"tclFileSystem.h"} $PROJECT include {<assert.h>} $PROJECT include {<stdio.h>} $PROJECT include {<stdlib.h>} $PROJECT include {<string.h>} $PROJECT include {<math.h>} $PROJECT code header { #ifndef MODULE_SCOPE # define MODULE_SCOPE extern #endif /* ** Provide a dummy Tcl_InitStubs if we are using this as a static |
︙ | ︙ | |||
1189 1190 1191 1192 1193 1194 1195 | /* Make sure the stubbed variants of those are never used. */ #undef Tcl_ObjSetVar2 #undef Tcl_NewStringObj #undef Tk_Init #undef Tk_MainEx #undef Tk_SafeInit } | | | | 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 | /* Make sure the stubbed variants of those are never used. */ #undef Tcl_ObjSetVar2 #undef Tcl_NewStringObj #undef Tk_Init #undef Tk_MainEx #undef Tk_SafeInit } # Build an area of the file for #define directives and # function declarations set define {} set mainhook [$PROJECT define get TCL_LOCAL_MAIN_HOOK Tclkit_MainHook] set mainfunc [$PROJECT define get TCL_LOCAL_APPINIT Tclkit_AppInit] set mainscript [$PROJECT define get main.tcl main.tcl] set vfsroot [$PROJECT define get vfsroot zipfs:/app] set vfs_main "${vfsroot}/${mainscript}" set vfs_tcl_library "${vfsroot}/boot/tcl" set vfs_tk_library "${vfsroot}/boot/tk" set map {} foreach var { vfsroot mainhook mainfunc vfs_main vfs_tcl_library vfs_tk_library } { dict set map %${var}% [set $var] } set preinitscript { |
︙ | ︙ | |||
1236 1237 1238 1239 1240 1241 1242 | Tclzipfs_Init(NULL); } # We have to initialize the virtual filesystem before calling # Tcl_Init(). Otherwise, Tcl_Init() will not be able to find # its startup script files. $PROJECT include {"tclZipfs.h"} | | | 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 | Tclzipfs_Init(NULL); } # We have to initialize the virtual filesystem before calling # Tcl_Init(). Otherwise, Tcl_Init() will not be able to find # its startup script files. $PROJECT include {"tclZipfs.h"} ::practcl::cputs zvfsboot " if(!Tclzipfs_Mount(NULL, archive, \"%vfsroot%\", NULL)) \x7B " ::practcl::cputs zvfsboot { Tcl_Obj *vfsinitscript; vfsinitscript=Tcl_NewStringObj("%vfs_main%",-1); Tcl_IncrRefCount(vfsinitscript); if(Tcl_FSAccess(vfsinitscript,F_OK)==0) { /* Startup script should be set before calling Tcl_AppInit */ |
︙ | ︙ | |||
1272 1273 1274 1275 1276 1277 1278 | } } }])\;" ::practcl::cputs zvfsboot " \x7D" ::practcl::cputs zvfsboot " return TCL_OK;" | | | | | | | | 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 | } } }])\;" ::practcl::cputs zvfsboot " \x7D" ::practcl::cputs zvfsboot " return TCL_OK;" if {[$PROJECT define get os] eq "windows"} { set header {int %mainhook%(int *argc, TCHAR ***argv)} } else { set header {int %mainhook%(int *argc, char ***argv)} } $PROJECT c_function [string map $map $header] [string map $map $zvfsboot] practcl::cputs appinit "int %mainfunc%(Tcl_Interp *interp) \x7B" # Build AppInit() set appinit {} practcl::cputs appinit { if ((Tcl_Init)(interp) == TCL_ERROR) { return TCL_ERROR; } } set main_init_script {} foreach {statpkg info} $statpkglist { set initfunc {} if {[dict exists $info initfunc]} { set initfunc [dict get $info initfunc] } if {$initfunc eq {}} { set initfunc [string totitle ${statpkg}]_Init } # We employ a NULL to prevent the package system from thinking the # package is actually loaded into the interpreter $PROJECT code header "extern Tcl_PackageInitProc $initfunc\;\n" set script [list package ifneeded $statpkg [dict get $info version] [list ::load {} $statpkg]] append main_init_script \n [list set ::kitpkg(${statpkg}) $script] if {[dict get $info autoload]} { ::practcl::cputs appinit " if(${initfunc}(interp)) return TCL_ERROR\;" ::practcl::cputs appinit " Tcl_StaticPackage(interp,\"$statpkg\",$initfunc,NULL)\;" } else { ::practcl::cputs appinit "\n Tcl_StaticPackage(NULL,\"$statpkg\",$initfunc,NULL)\;" append main_init_script \n $script } } append main_init_script \n { |
︙ | ︙ | |||
1431 1432 1433 1434 1435 1436 1437 | } } set map {} lappend map {${PKG_OBJECTS}} %LIBRARY_OBJECTS% lappend map {$(PKG_OBJECTS)} %LIBRARY_OBJECTS% lappend map {${PKG_STUB_OBJECTS}} %LIBRARY_STUB_OBJECTS% lappend map {$(PKG_STUB_OBJECTS)} %LIBRARY_STUB_OBJECTS% | | | | 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 | } } set map {} lappend map {${PKG_OBJECTS}} %LIBRARY_OBJECTS% lappend map {$(PKG_OBJECTS)} %LIBRARY_OBJECTS% lappend map {${PKG_STUB_OBJECTS}} %LIBRARY_STUB_OBJECTS% lappend map {$(PKG_STUB_OBJECTS)} %LIBRARY_STUB_OBJECTS% lappend map %LIBRARY_NAME% [dict get $data name] lappend map %LIBRARY_VERSION% [dict get $data version] lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} [dict get $data version]] if {[dict exists $data libprefix]} { lappend map %LIBRARY_PREFIX% [dict get $data libprefix] } else { lappend map %LIBRARY_PREFIX% [dict get $data prefix] } |
︙ | ︙ | |||
1514 1515 1516 1517 1518 1519 1520 | append cmd " [dict get $info extra]" } append cmd " -c [dict get $info cfile] -o \$@\n\t" ::practcl::cputs result $cmd } set map {} | | | | 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 | append cmd " [dict get $info extra]" } append cmd " -c [dict get $info cfile] -o \$@\n\t" ::practcl::cputs result $cmd } set map {} lappend map %LIBRARY_NAME% $proj(name) lappend map %LIBRARY_VERSION% $proj(version) lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} $proj(version)] lappend map %LIBRARY_PREFIX% [$PROJECT define getnull libprefix] if {[string is true [$PROJECT define get SHARED_BUILD]]} { set outfile [$PROJECT define get libfile] } else { set outfile [$PROJECT shared_library] } $PROJECT define set shared_library $outfile ::practcl::cputs result " ${NAME}_SHLIB = $outfile ${NAME}_OBJS = [dict keys $products] " #lappend map %OUTFILE% {\[$]@} lappend map %OUTFILE% $outfile lappend map %LIBRARY_OBJECTS% "\$(${NAME}_OBJS)" ::practcl::cputs result "$outfile: \$(${NAME}_OBJS)" ::practcl::cputs result "\t[string map $map [$PROJECT define get PRACTCL_SHARED_LIB]]" if {[$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL] ni {: {}}} { ::practcl::cputs result "\t[string map $map [$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL]]" } ::practcl::cputs result {} if {[string is true [$PROJECT define get SHARED_BUILD]]} { #set outfile [$PROJECT static_library] |
︙ | ︙ | |||
1591 1592 1593 1594 1595 1596 1597 | $proj(CFLAGS_WARNING) $INCLUDES $defs" if {[info exists proc(CXX)]} { set COMPILECPP "$proj(CXX) $defs $INCLUDES $proj(CFLAGS_DEBUG) -ggdb \ $proj(DEFS) $proj(CFLAGS_WARNING)" } else { set COMPILECPP $COMPILE | | | | | | | 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 | $proj(CFLAGS_WARNING) $INCLUDES $defs" if {[info exists proc(CXX)]} { set COMPILECPP "$proj(CXX) $defs $INCLUDES $proj(CFLAGS_DEBUG) -ggdb \ $proj(DEFS) $proj(CFLAGS_WARNING)" } else { set COMPILECPP $COMPILE } } else { set COMPILE "$proj(CC) $proj(CFLAGS) $defs $INCLUDES " if {[info exists proc(CXX)]} { set COMPILECPP "$proj(CXX) $defs $INCLUDES $proj(CFLAGS) $proj(DEFS)" } else { set COMPILECPP $COMPILE } } set products [compile-sources $PROJECT $COMPILE $COMPILECPP] set map {} lappend map %LIBRARY_NAME% $proj(name) lappend map %LIBRARY_VERSION% $proj(version) lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} $proj(version)] lappend map %OUTFILE% $outfile lappend map %LIBRARY_OBJECTS% $products lappend map {${CFLAGS}} "$proj(CFLAGS_DEFAULT) $proj(CFLAGS_WARNING)" if {[string is true [$PROJECT define get SHARED_BUILD 1]]} { set cmd [$PROJECT define get PRACTCL_SHARED_LIB] append cmd " [$PROJECT define get PRACTCL_LIBS]" set cmd [string map $map $cmd] puts $cmd exec {*}$cmd >&@ stdout if {[$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL] ni {: {}}} { set cmd [string map $map [$PROJECT define get PRACTCL_VC_MANIFEST_EMBED_DLL]] puts $cmd exec {*}$cmd >&@ stdout } } else { set cmd [string map $map [$PROJECT define get PRACTCL_STATIC_LIB]] puts $cmd exec {*}$cmd >&@ stdout } } ### # Produce a static executable ### proc ::practcl::build::static-tclsh {outfile PROJECT} { |
︙ | ︙ | |||
1685 1686 1687 1688 1689 1690 1691 | lappend includedir [::practcl::file_relative $path [file normalize ../tcl/compat/zlib]] foreach include [$PROJECT generate-include-directory] { set cpath [::practcl::file_relative $path [file normalize $include]] if {$cpath ni $includedir} { lappend includedir $cpath } } | | | | | | 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 | lappend includedir [::practcl::file_relative $path [file normalize ../tcl/compat/zlib]] foreach include [$PROJECT generate-include-directory] { set cpath [::practcl::file_relative $path [file normalize $include]] if {$cpath ni $includedir} { lappend includedir $cpath } } set INCLUDES "-I[join $includedir " -I"]" if {$debug} { set COMPILE "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_debug) -ggdb \ $TCL(cflags_warning) $TCL(extra_cflags) $INCLUDES" } else { set COMPILE "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_optimize) \ $TCL(cflags_warning) $TCL(extra_cflags) $INCLUDES" } append COMPILE " " $defs lappend OBJECTS {*}[compile-sources $PROJECT $COMPILE $COMPILE] if {[${PROJECT} define get platform] eq "windows"} { set RSOBJ [file join $path build tclkit.res.o] set RCSRC [${PROJECT} define get kit_resource_file] if {$RCSRC eq {} || ![file exists $RCSRC]} { set RCSRC [file join $TKSRCDIR win rc wish.rc] } set cmd [list windres -o $RSOBJ -DSTATIC_BUILD] set TCLSRC [file normalize $TCLSRCDIR] set TKSRC [file normalize $TKSRCDIR] lappend cmd --include [::practcl::file_relative $path [file join $TCLSRC generic]] \ --include [::practcl::file_relative $path [file join $TKSRC generic]] \ |
︙ | ︙ | |||
1732 1733 1734 1735 1736 1737 1738 | if {$debug} { set cmd "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_debug) \ $TCL(cflags_warning) $TCL(extra_cflags) $INCLUDES" } else { set cmd "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_optimize) \ $TCL(cflags_warning) $TCL(extra_cflags) $INCLUDES" } | | | | | | | 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 | if {$debug} { set cmd "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_debug) \ $TCL(cflags_warning) $TCL(extra_cflags) $INCLUDES" } else { set cmd "$TCL(cc) $TCL(shlib_cflags) $TCL(cflags_optimize) \ $TCL(cflags_warning) $TCL(extra_cflags) $INCLUDES" } append cmd " $OBJECTS" append cmd " $EXTERN_OBJS " # On OSX it is impossibly to generate a completely static # executable if {[$PROJECT define get TEACUP_OS] ne "macosx"} { append cmd " -static " } parray TCL if {$debug} { if {$os eq "windows"} { append cmd " -L${TCL(src_dir)}/win -ltcl86g" append cmd " -L${TK(src_dir)}/win -ltk86g" } else { append cmd " -L${TCL(src_dir)}/unix -ltcl86g" append cmd " -L${TK(src_dir)}/unix -ltk86g" } } else { append cmd " $TCL(build_lib_spec) $TK(build_lib_spec)" } foreach obj $PKG_OBJS { append cmd " [$obj linker-products $config($obj)]" } append cmd " $TCL(libs) $TK(libs)" foreach obj $PKG_OBJS { append cmd " [$obj linker-external $config($obj)]" } if {$debug} { if {$os eq "windows"} { append cmd " -L${TCL(src_dir)}/win ${TCL(stub_lib_flag)}" append cmd " -L${TK(src_dir)}/win ${TK(stub_lib_flag)}" } else { append cmd " -L${TCL(src_dir)}/unix ${TCL(stub_lib_flag)}" append cmd " -L${TK(src_dir)}/unix ${TK(stub_lib_flag)}" } } else { append cmd " $TCL(build_stub_lib_spec)" append cmd " $TK(build_stub_lib_spec)" } append cmd " -o $outfile $LDFLAGS_CONSOLE" puts "LINK: $cmd" |
︙ | ︙ | |||
1788 1789 1790 1791 1792 1793 1794 | set domake 0 set define(name) $name set data [uplevel 2 [list subst $info]] array set define $data my select my initialize } | | | | 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 | set domake 0 set define(name) $name set data [uplevel 2 [list subst $info]] array set define $data my select my initialize } method do {} { my variable domake return $domake } method check {} { my variable needs_make domake if {$domake} { return 1 } if {[info exists needs_make]} { return $needs_make |
︙ | ︙ | |||
1822 1823 1824 1825 1826 1827 1828 | set filename [my define get filename] if {$filename ne {} && ![file exists $filename]} { set needs_make 1 } } return $needs_make } | | | 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 | set filename [my define get filename] if {$filename ne {} && ![file exists $filename]} { set needs_make 1 } } return $needs_make } method triggers {} { my variable triggered domake define if {$triggered} { return $domake } set triggered 1 foreach item [my define get depends] { |
︙ | ︙ | |||
1885 1886 1887 1888 1889 1890 1891 | } } method include_dir args { my define add include_dir {*}$args } | | | | | 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 | } } method include_dir args { my define add include_dir {*}$args } method include_directory args { my define add include_dir {*}$args } method Collate_Source CWD {} method child {method} { return {} } method InitializeSourceFile filename { my define set filename $filename set class {} switch [file extension $filename] { .tcl { set class ::practcl::dynamic } |
︙ | ︙ | |||
1932 1933 1934 1935 1936 1937 1938 | } } if {$class ne {}} { oo::objdefine [self] class $class my initialize } } | | | | | | | | | 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 | } } if {$class ne {}} { oo::objdefine [self] class $class my initialize } } method add args { my variable links set object [::practcl::object new [self] {*}$args] foreach linktype [$object linktype] { lappend links($linktype) $object } return $object } method go {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable links foreach {linktype objs} [array get links] { foreach obj $objs { $obj go } } debug [list /[self] [self method] [self class]] } method code {section body} { my variable code ::practcl::cputs code($section) $body } method Ofile filename { set lpath [my <module> define get localpath] if {$lpath eq {}} { set lpath [my <module> define get name] } return ${lpath}_[file rootname [file tail $filename]].o } method compile-products {} { set filename [my define get filename] set result {} if {$filename ne {}} { if {[my define exists ofile]} { set ofile [my define get ofile] } else { set ofile [my Ofile $filename] my define set ofile $ofile } lappend result $ofile [list cfile $filename extra [my define get extra] external [string is true -strict [my define get external]] object [self]] } foreach item [my link list subordinate] { lappend result {*}[$item compile-products] } return $result } method generate-include-directory {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set result [my define get include_dir] foreach obj [my link list product] { foreach path [$obj generate-include-directory] { lappend result $path } } return $result } method generate-debug {{spaces {}}} { set result {} ::practcl::cputs result "$spaces[list [self] [list class [info object class [self]] filename [my define get filename]] links [my link list]]" foreach item [my link list subordinate] { practcl::cputs result [$item generate-debug "$spaces "] } return $result |
︙ | ︙ | |||
2051 2052 2053 2054 2055 2056 2057 | } } # Add the initializer wrapper for the class ::practcl::cputs result "static int ${thisclass}_OO_Init(Tcl_Interp *interp)\;" } return $result } | | | | | 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 | } } # Add the initializer wrapper for the class ::practcl::cputs result "static int ${thisclass}_OO_Init(Tcl_Interp *interp)\;" } return $result } method generate-public-define {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code set result {} if {[info exists code(public-define)]} { ::practcl::cputs result $code(public-define) } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-define] } return $result } method generate-public-macro {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code set result {} if {[info exists code(public-macro)]} { ::practcl::cputs result $code(public-macro) } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-macro] } return $result } method generate-public-typedef {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cstruct set result {} if {[info exists code(public-typedef)]} { ::practcl::cputs result $code(public-typedef) } |
︙ | ︙ | |||
2105 2106 2107 2108 2109 2110 2111 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-typedef] } return $result } | | | 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-typedef] } return $result } method generate-private-typedef {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cstruct set result {} if {[info exists code(private-typedef)]} { ::practcl::cputs result $code(private-typedef) } |
︙ | ︙ | |||
2131 2132 2133 2134 2135 2136 2137 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-private-typedef] } return $result } | | | 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-private-typedef] } return $result } method generate-public-structure {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cstruct set result {} if {[info exists code(public-structure)]} { ::practcl::cputs result $code(public-structure) } |
︙ | ︙ | |||
2154 2155 2156 2157 2158 2159 2160 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-structure] } return $result } | | | | 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-structure] } return $result } method generate-private-structure {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cstruct set result {} if {[info exists code(private-structure)]} { ::practcl::cputs result $code(private-structure) } |
︙ | ︙ | |||
2178 2179 2180 2181 2182 2183 2184 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-private-structure] } return $result } | | | 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-private-structure] } return $result } method generate-public-headers {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code tcltype set result {} if {[info exists code(public-header)]} { ::practcl::cputs result $code(public-header) } |
︙ | ︙ | |||
2206 2207 2208 2209 2210 2211 2212 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-headers] } return $result } | | | | | | | | | | 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 | } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-headers] } return $result } method generate-stub-function {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cfunct tcltype set result {} foreach mod [my link list product] { foreach {funct def} [$mod generate-stub-function] { dict set result $funct $def } } if {[info exists cfunct]} { foreach {funcname info} $cfunct { if {![dict get $info export]} continue dict set result $funcname [dict get $info header] } } return $result } method generate-public-function {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cfunct tcltype set result {} if {[my define get initfunc] ne {}} { ::practcl::cputs result "int [my define get initfunc](Tcl_Interp *interp);" } if {[info exists cfunct]} { foreach {funcname info} $cfunct { if {![dict get $info public]} continue ::practcl::cputs result "[dict get $info header]\;" } } set result [::practcl::_tagblock $result c [my define get filename]] foreach mod [my link list product] { ::practcl::cputs result [$mod generate-public-function] } return $result } method generate-public-includes {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set includes {} foreach item [my define get public-include] { if {$item ni $includes} { lappend includes $item } } foreach mod [my link list product] { |
︙ | ︙ | |||
2292 2293 2294 2295 2296 2297 2298 | debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set result {} set includes [my generate-public-includes] foreach inc $includes { if {[string index $inc 0] ni {< \"}} { ::practcl::cputs result "#include \"$inc\"" } else { | | | | | | | | | 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 | debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set result {} set includes [my generate-public-includes] foreach inc $includes { if {[string index $inc 0] ni {< \"}} { ::practcl::cputs result "#include \"$inc\"" } else { ::practcl::cputs result "#include $inc" } } foreach method { generate-public-define generate-public-macro generate-public-typedef generate-public-structure } { ::practcl::cputs result "/* BEGIN SECTION $method */" ::practcl::cputs result [my $method] ::practcl::cputs result "/* END SECTION $method */" } foreach file [my generate-public-verbatim] { ::practcl::cputs result "/* BEGIN $file */" ::practcl::cputs result [::practcl::cat $file] ::practcl::cputs result "/* END $file */" } foreach method { generate-public-headers generate-public-function } { ::practcl::cputs result "/* BEGIN SECTION $method */" ::practcl::cputs result [my $method] ::practcl::cputs result "/* END SECTION $method */" } return $result } method IncludeAdd {headervar args} { upvar 1 $headervar headers foreach inc $args { if {[string index $inc 0] ni {< \"}} { set inc "\"$inc\"" } if {$inc ni $headers} { lappend headers $inc } } } ### # This methods generates the contents of an amalgamated .c file # which implements the loader for a batch of tools ### method generate-c {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set result { /* This file was generated by practcl */ } set includes {} foreach mod [my link list product] { # Signal modules to formulate final implementation $mod go } set headers {} my IncludeAdd headers <tcl.h> <tclOO.h> if {[my define get tk 0]} { my IncludeAdd headers <tk.h> } if {[my define get output_h] ne {}} { my IncludeAdd headers [my define get output_h] } |
︙ | ︙ | |||
2376 2377 2378 2379 2380 2381 2382 | foreach {method} { generate-cheader generate-private-typedef generate-private-structure generate-cstruct generate-constant generate-cfunct | | | 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 | foreach {method} { generate-cheader generate-private-typedef generate-private-structure generate-cstruct generate-constant generate-cfunct generate-cmethod } { set dat [my $method] if {[string length [string trim $dat]]} { ::practcl::cputs result "/* BEGIN $method [my define get filename] */" ::practcl::cputs result $dat ::practcl::cputs result "/* END $method [my define get filename] */" } |
︙ | ︙ | |||
2427 2428 2429 2430 2431 2432 2433 | } if {[my define exists pkg_name]} { ::practcl::cputs result " if (Tcl_PkgProvide(interp, \"[my define get pkg_name [my define get name]]\" , \"[my define get pkg_vers [my define get version]]\" )) return TCL_ERROR\;" } ::practcl::cputs result " return TCL_OK\;\n\}\n" return $result } | | | 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 | } if {[my define exists pkg_name]} { ::practcl::cputs result " if (Tcl_PkgProvide(interp, \"[my define get pkg_name [my define get name]]\" , \"[my define get pkg_vers [my define get version]]\" )) return TCL_ERROR\;" } ::practcl::cputs result " return TCL_OK\;\n\}\n" return $result } ### # This methods generates any Tcl script file # which is required to pre-initialize the C library ### method generate-tcl-pre {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set result {} |
︙ | ︙ | |||
2460 2461 2462 2463 2464 2465 2466 | set result [::practcl::_tagblock $code(tcl-post) tcl [my define get filename]] } foreach mod [my link list product] { ::practcl::cputs result [$mod generate-tcl-post] } return $result } | | | | | | | | | 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 | set result [::practcl::_tagblock $code(tcl-post) tcl [my define get filename]] } foreach mod [my link list product] { ::practcl::cputs result [$mod generate-tcl-post] } return $result } method static-packages {} { set result [my define get static_packages] set statpkg [my define get static_pkg] set initfunc [my define get initfunc] if {$initfunc ne {}} { set pkg_name [my define get pkg_name] if {$pkg_name ne {}} { dict set result $pkg_name initfunc $initfunc dict set result $pkg_name version [my define get version [my define get pkg_vers]] dict set result $pkg_name autoload [my define get autoload 0] } } foreach item [my link list subordinate] { foreach {pkg info} [$item static-packages] { dict set result $pkg $info } } return $result } method target {method args} { switch $method { is_unix { return [expr {$::tcl_platform(platform) eq "unix"}] } } } } ::oo::class create ::practcl::product { superclass ::practcl::object method linktype {} { return {subordinate product} } method include header { my define add include $header } method cstructure {name definition {argdat {}}} { my variable cstruct dict set cstruct $name body $definition foreach {f v} $argdat { dict set cstruct $name $f $v } if {![dict exists $cstruct $name public]} { dict set cstruct $name public 1 } } method generate-cinit {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code set result {} if {[info exists code(cinit)]} { ::practcl::cputs result $code(cinit) } |
︙ | ︙ | |||
2536 2537 2538 2539 2540 2541 2542 | ### # Dynamic blocks do not generate their own .c files, # instead the contribute to the amalgamation # of the main library file ### ::oo::class create ::practcl::dynamic { superclass ::practcl::product | | | | 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 | ### # Dynamic blocks do not generate their own .c files, # instead the contribute to the amalgamation # of the main library file ### ::oo::class create ::practcl::dynamic { superclass ::practcl::product # Retrieve any additional source files required method compile-products {} { set filename [my define get output_c] set result {} if {$filename ne {}} { if {[my define exists ofile]} { set ofile [my define get ofile] } else { |
︙ | ︙ | |||
2567 2568 2569 2570 2571 2572 2573 | } } foreach item [my link list subordinate] { lappend result {*}[$item compile-products] } return $result } | | | | | | | 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 | } } foreach item [my link list subordinate] { lappend result {*}[$item compile-products] } return $result } method implement path { my go my Collate_Source $path if {[my define get output_c] eq {}} return set filename [file join $path [my define get output_c]] my define set cfile $filename set fout [open $filename w] puts $fout [my generate-c] if {[my define get initfunc] ne {}} { puts $fout "extern int DLLEXPORT [my define get initfunc]( Tcl_Interp *interp ) \x7B" puts $fout [my generate-cinit] if {[my define get pkg_name] ne {}} { puts $fout " Tcl_PkgProvide(interp, \"[my define get pkg_name]\", \"[my define get pkg_vers]\");" } puts $fout " return TCL_OK\;" puts $fout "\x7D" } close $fout } method initialize {} { set filename [my define get filename] if {$filename eq {}} { return } if {[my define get name] eq {}} { my define set name [file tail [file rootname $filename]] } if {[my define get localpath] eq {}} { my define set localpath [my <module> define get localpath]_[my define get name] } ::source $filename } method linktype {} { return {subordinate product dynamic} } ### # Populate const static data structures ### method generate-cstruct {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cstruct methods tcltype set result {} if {[info exists code(struct)]} { ::practcl::cputs result $code(struct) } foreach obj [my link list dynamic] { # Exclude products that will generate their own C files if {[$obj define get output_c] ne {}} continue ::practcl::cputs result [$obj generate-cstruct] } return $result } method generate-constant {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set result {} my variable code cstruct methods tcltype if {[info exists code(constant)]} { ::practcl::cputs result "/* [my define get filename] CONSTANT */" ::practcl::cputs result $code(constant) |
︙ | ︙ | |||
2664 2665 2666 2667 2668 2669 2670 | } } if {[info exists tcltype]} { foreach {type info} $tcltype { dict with info {} ::practcl::cputs result "const Tcl_ObjType $cname = \{\n .freeIntRepProc = &${freeproc},\n .dupIntRepProc = &${dupproc},\n .updateStringProc = &${updatestringproc},\n .setFromAnyProc = &${setfromanyproc}\n\}\;" } | | | | 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 | } } if {[info exists tcltype]} { foreach {type info} $tcltype { dict with info {} ::practcl::cputs result "const Tcl_ObjType $cname = \{\n .freeIntRepProc = &${freeproc},\n .dupIntRepProc = &${dupproc},\n .updateStringProc = &${updatestringproc},\n .setFromAnyProc = &${setfromanyproc}\n\}\;" } } if {[info exists methods]} { set mtypes {} foreach {name info} $methods { set callproc [dict get $info callproc] set methodtype [dict get $info methodtype] if {$methodtype in $mtypes} continue lappend mtypes $methodtype ### # Build the data struct for this method ### |
︙ | ︙ | |||
2708 2709 2710 2711 2712 2713 2714 | foreach obj [my link list dynamic] { # Exclude products that will generate their own C files if {[$obj define get output_c] ne {}} continue ::practcl::cputs result [$obj generate-constant] } return $result } | | | 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 | foreach obj [my link list dynamic] { # Exclude products that will generate their own C files if {[$obj define get output_c] ne {}} continue ::practcl::cputs result [$obj generate-constant] } return $result } ### # Generate code that provides subroutines called by # Tcl API methods ### method generate-cfunct {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code cfunct |
︙ | ︙ | |||
2747 2748 2749 2750 2751 2752 2753 | method generate-cmethod {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code methods tclprocs set result {} if {[info exists code(method)]} { ::practcl::cputs result $code(method) } | | | | 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 | method generate-cmethod {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] my variable code methods tclprocs set result {} if {[info exists code(method)]} { ::practcl::cputs result $code(method) } if {[info exists tclprocs]} { foreach {name info} $tclprocs { if {![dict exists $info body]} continue set callproc [dict get $info callproc] set header [dict get $info header] set body [dict get $info body] ::practcl::cputs result "/* Tcl Proc $name */" ::practcl::cputs result "${header} \{${body}\}" } } if {[info exists methods]} { set thisclass [my define get cclass] foreach {name info} $methods { if {![dict exists $info body]} continue set callproc [dict get $info callproc] set header [dict get $info header] set body [dict get $info body] |
︙ | ︙ | |||
2781 2782 2783 2784 2785 2786 2787 | /* ** Build the "@TCLCLASS@" class */ Tcl_Obj* nameObj; /* Name of a class or method being looked up */ Tcl_Object curClassObject; /* Tcl_Object representing the current class */ Tcl_Class curClass; /* Tcl_Class representing the current class */ | | | 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 | /* ** Build the "@TCLCLASS@" class */ Tcl_Obj* nameObj; /* Name of a class or method being looked up */ Tcl_Object curClassObject; /* Tcl_Object representing the current class */ Tcl_Class curClass; /* Tcl_Class representing the current class */ /* * Find the "@TCLCLASS@" class, and attach an 'init' method to it. */ nameObj = Tcl_NewStringObj("@TCLCLASS@", -1); Tcl_IncrRefCount(nameObj); if ((curClassObject = Tcl_GetObjectFromObj(interp, nameObj)) == NULL) { Tcl_DecrRefCount(nameObj); |
︙ | ︙ | |||
2820 2821 2822 2823 2824 2825 2826 | nameObj=Tcl_NewStringObj("@NAME@",-1); Tcl_NewMethod(interp, curClass, nameObj, 1, &@MTYPE@, (ClientData) NULL); Tcl_DecrRefCount(nameObj); }] } } } | | | | | 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 | nameObj=Tcl_NewStringObj("@NAME@",-1); Tcl_NewMethod(interp, curClass, nameObj, 1, &@MTYPE@, (ClientData) NULL); Tcl_DecrRefCount(nameObj); }] } } } ::practcl::cputs result " return TCL_OK\;\n\}\n" } foreach obj [my link list dynamic] { # Exclude products that will generate their own C files if {[$obj define get output_c] ne {}} continue ::practcl::cputs result [$obj generate-cmethod] } return $result } method generate-cinit-external {} { if {[my define get initfunc] eq {}} { return "/* [my define get filename] declared not initfunc */" } return " if([my define get initfunc](interp)) return TCL_ERROR\;" } ### # Generate code that runs when the package/module is # initialized into the interpreter ### method generate-cinit {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set result {} my variable code methods tclprocs if {[info exists code(nspace)]} { ::practcl::cputs result " \{\n Tcl_Namespace *modPtr;" foreach nspace $code(nspace) { ::practcl::cputs result [string map [list @NSPACE@ $nspace] { modPtr=Tcl_FindNamespace(interp,"@NSPACE@",NULL,TCL_NAMESPACE_ONLY); if(!modPtr) { modPtr = Tcl_CreateNamespace(interp, "@NSPACE@", NULL, NULL); } }] } ::practcl::cputs result " \}" } if {[info exists code(tclinit)]} { ::practcl::cputs result $code(tclinit) } if {[info exists code(cinit)]} { ::practcl::cputs result $code(cinit) } |
︙ | ︙ | |||
2880 2881 2882 2883 2884 2885 2886 | foreach alias [dict get $info aliases] { set map [list @NAME@ $alias @CALLPROC@ [dict get $info callproc]] ::practcl::cputs result [string map $map { Tcl_CreateObjCommand(interp,"@NAME@",(Tcl_ObjCmdProc *)@CALLPROC@,NULL,NULL);}] } } } } | | | 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 | foreach alias [dict get $info aliases] { set map [list @NAME@ $alias @CALLPROC@ [dict get $info callproc]] ::practcl::cputs result [string map $map { Tcl_CreateObjCommand(interp,"@NAME@",(Tcl_ObjCmdProc *)@CALLPROC@,NULL,NULL);}] } } } } if {[info exists code(nspace)]} { ::practcl::cputs result " \{\n Tcl_Namespace *modPtr;" foreach nspace $code(nspace) { ::practcl::cputs result [string map [list @NSPACE@ $nspace] { modPtr=Tcl_FindNamespace(interp,"@NSPACE@",NULL,TCL_NAMESPACE_ONLY); Tcl_CreateEnsemble(interp, modPtr->fullName, modPtr, TCL_ENSEMBLE_PREFIX); Tcl_Export(interp, modPtr, "[a-z]*", 1); |
︙ | ︙ | |||
2943 2944 2945 2946 2947 2948 2949 | } ::practcl::cputs code(header) "$header\;" # Could not parse that block as a function # append it verbatim to our c_implementation ::practcl::cputs code(funct) "$header [list $body]" } | | | | | | 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 | } ::practcl::cputs code(header) "$header\;" # Could not parse that block as a function # append it verbatim to our c_implementation ::practcl::cputs code(funct) "$header [list $body]" } method cmethod {name body {arginfo {}}} { my variable methods code foreach {f v} $arginfo { dict set methods $name $f $v } dict set methods $name body "Tcl_Object thisObject = Tcl_ObjectContextObject(objectContext); /* The current connection object */ $body" } method c_tclproc_nspace nspace { my variable code if {![info exists code(nspace)]} { set code(nspace) {} } if {$nspace ni $code(nspace)} { lappend code(nspace) $nspace } } method c_tclproc_raw {name body {arginfo {}}} { my variable tclprocs code foreach {f v} $arginfo { dict set tclprocs $name $f $v } dict set tclprocs $name body $body } method go {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] next my variable methods code cstruct tclprocs if {[info exists methods]} { debug [self] methods [my define get cclass] set thisclass [my define get cclass] foreach {name info} $methods { # Provide a callproc if {![dict exists $info callproc]} { set callproc [string map {____ _ ___ _ __ _} [string map {{ } _ : _} OOMethod_${thisclass}_${name}]] dict set methods $name callproc $callproc } else { set callproc [dict get $info callproc] } |
︙ | ︙ | |||
3009 3010 3011 3012 3013 3014 3015 | debug [self] tclprocs [dict keys $tclprocs] foreach {name info} $tclprocs { if {![dict exists $info callproc]} { set callproc [string map {____ _ ___ _ __ _} [string map {{ } _ : _} TclCmd_${thisnspace}_${name}]] dict set tclprocs $name callproc $callproc } else { set callproc [dict get $info callproc] | | | | 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 | debug [self] tclprocs [dict keys $tclprocs] foreach {name info} $tclprocs { if {![dict exists $info callproc]} { set callproc [string map {____ _ ___ _ __ _} [string map {{ } _ : _} TclCmd_${thisnspace}_${name}]] dict set tclprocs $name callproc $callproc } else { set callproc [dict get $info callproc] } if {[dict exists $info body] && ![dict exists $info header]} { dict set tclprocs $name header "static int ${callproc}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv\[\])" } } } debug [list /[self] [self method] [self class]] } # Once an object marks itself as some # flavor of dynamic, stop trying to morph # it into something else method select {} {} method tcltype {name argdat} { my variable tcltype foreach {f v} $argdat { dict set tcltype $name $f $v } if {![dict exists tcltype $name cname]} { dict set tcltype $name cname [string tolower $name]_tclobjtype |
︙ | ︙ | |||
3069 3070 3071 3072 3073 3074 3075 | ::oo::class create ::practcl::csource { superclass ::practcl::product } ::oo::class create ::practcl::clibrary { superclass ::practcl::product | | | | | | | 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 | ::oo::class create ::practcl::csource { superclass ::practcl::product } ::oo::class create ::practcl::clibrary { superclass ::practcl::product method linker-products {configdict} { return [my define get filename] } } ### # In the end, all C code must be loaded into a module # This will either be a dynamically loaded library implementing # a tcl extension, or a compiled in segment of a custom shell/app ### ::oo::class create ::practcl::module { superclass ::practcl::dynamic method child which { switch $which { organs { return [list project [my define get project] module [self]] } } } method initialize {} { set filename [my define get filename] if {$filename eq {}} { return } if {[my define get name] eq {}} { my define set name [file tail [file dirname $filename]] } if {[my define get localpath] eq {}} { my define set localpath [my <project> define get name]_[my define get name] } debug [self] SOURCE $filename my source $filename } method implement path { my go my Collate_Source $path foreach item [my link list dynamic] { if {[catch {$item implement $path} err]} { puts "Skipped $item: $err" } |
︙ | ︙ | |||
3139 3140 3141 3142 3143 3144 3145 | puts $cout [my generate-loader] close $cout debug [list /[self] [self method] [self class]] } method linktype {} { return {subordinate product dynamic module} | | | 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 | puts $cout [my generate-loader] close $cout debug [list /[self] [self method] [self class]] } method linktype {} { return {subordinate product dynamic module} } } ::oo::class create ::practcl::autoconf { ### # find or fake a key/value list describing this project ### |
︙ | ︙ | |||
3219 3220 3221 3222 3223 3224 3225 | set contents $args } } array set define $contents my select my initialize } | | | 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 | set contents $args } } array set define $contents my select my initialize } method add_project {pkg info {oodefine {}}} { set os [my define get os] if {$os eq {}} { set os [::practcl::os] my define set os $os } |
︙ | ︙ | |||
3248 3249 3250 3251 3252 3253 3254 | } my link object $obj oo::objdefine $obj $oodefine $obj define set masterpath $::CWD $obj go return $obj } | | | | | | | 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 | } my link object $obj oo::objdefine $obj $oodefine $obj define set masterpath $::CWD $obj go return $obj } method child which { switch $which { organs { # A library can be a project, it can be a module. Any # subordinate modules will indicate their existance return [list project [self] module [self]] } } } method linktype {} { return project } # Exercise the methods of a sub-object method project {pkg args} { set obj [namespace current]::PROJECT.$pkg if {[llength $args]==0} { return $obj } tailcall ${obj} {*}$args } } ::oo::class create ::practcl::library { superclass ::practcl::project method compile-products {} { set result {} foreach item [my link list subordinate] { lappend result {*}[$item compile-products] } set filename [my define get output_c] if {$filename ne {}} { set ofile [file rootname [file tail $filename]]_main.o lappend result $ofile [list cfile $filename extra [my define get extra] external [string is true -strict [my define get external]]] } return $result } method generate-tcl-loader {} { set result {} set PKGINIT [my define get pkginit] set PKG_NAME [my define get name [my define get pkg_name]] set PKG_VERSION [my define get pkg_vers [my define get version]] if {[string is true [my define get SHARED_BUILD 0]]} { set LIBFILE [my define get libfile] |
︙ | ︙ | |||
3312 3313 3314 3315 3316 3317 3318 | # Tclkit Style load {} @PKGINIT@ package provide @PKG_NAME@ @PKG_VERSION@ }] } return $result } | | | 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 | # Tclkit Style load {} @PKGINIT@ package provide @PKG_NAME@ @PKG_VERSION@ }] } return $result } method go {} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set name [my define getnull name] if {$name eq {}} { set name generic my define name generic } |
︙ | ︙ | |||
3383 3384 3385 3386 3387 3388 3389 | puts $cout [subst {/* ** This file is generated by the [info script] script ** any changes will be overwritten the next time it is run */}] puts $cout [my generate-c] puts $cout [my generate-loader] close $cout | | | | | | | | | 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 | puts $cout [subst {/* ** This file is generated by the [info script] script ** any changes will be overwritten the next time it is run */}] puts $cout [my generate-c] puts $cout [my generate-loader] close $cout set macro HAVE_[string toupper [file rootname [my define get output_h]]]_H set hout [open [file join $path [my define get output_h]] w] puts $hout [subst {/* ** This file is generated by the [info script] script ** any changes will be overwritten the next time it is run */}] puts $hout "#ifndef ${macro}" puts $hout "#define ${macro}" puts $hout [my generate-h] puts $hout "#endif" close $hout set output_tcl [my define get output_tcl] if {$output_tcl ne {}} { set tclout [open [file join $path [my define get output_tcl]] w] puts $tclout "### # This file is generated by the [info script] script # any changes will be overwritten the next time it is run ###" puts $tclout [my generate-tcl-pre] puts $tclout [my generate-tcl-loader] puts $tclout [my generate-tcl-post] close $tclout } } method generate-decls {pkgname path} { debug [list [self] [self method] [self class] -- [my define get filename] [info object class [self]]] set outfile [file join $path/$pkgname.decls] ### # Build the decls file ### set fout [open $outfile w] puts $fout [subst {### # $outfile # # This file was generated by [info script] ### library $pkgname interface $pkgname }] ### # Generate list of functions ### set stubfuncts [my generate-stub-function] set thisline {} set functcount 0 foreach {func header} $stubfuncts { puts $fout [list declare [incr functcount] $header] } puts $fout [list export "int [my define get initfunc](Tcl_Inter *interp)"] puts $fout [list export "char *[string totitle [my define get name]]_InitStubs(Tcl_Inter *interp, char *version, int exact)"] close $fout ### # Build [package]Decls.h ### set hout [open [file join $path ${pkgname}Decls.h] w] close $hout set cout [open [file join $path ${pkgname}StubInit.c] w] puts $cout [string map [list %pkgname% $pkgname %PkgName% [string totitle $pkgname]] { #ifndef USE_TCL_STUBS #define USE_TCL_STUBS #endif |
︙ | ︙ | |||
3506 3507 3508 3509 3510 3511 3512 | return actualVersion; } }] close $cout } # Backward compadible call | | | | | 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 | return actualVersion; } }] close $cout } # Backward compadible call method generate-make path { ::practcl::build::Makefile $path [self] } method install-headers {} { set result {} return $result } method linktype {} { return library } # Create a "package ifneeded" # Args are a list of aliases for which this package will answer to method package-ifneeded {args} { set result {} set name [my define get pkg_name [my define get name]] set version [my define get pkg_vers [my define get version]] if {$version eq {}} { |
︙ | ︙ | |||
3544 3545 3546 3547 3548 3549 3550 | set result "package ifneeded [list $name] [list $version] $script" foreach alias $args { set script "package require $name $version \; package provide $alias $version" append result \n\n [list package ifneeded $alias $version $script] } return $result } | | | | | | | | 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 | set result "package ifneeded [list $name] [list $version] $script" foreach alias $args { set script "package require $name $version \; package provide $alias $version" append result \n\n [list package ifneeded $alias $version $script] } return $result } method shared_library {} { set name [string tolower [my define get name [my define get pkg_name]]] set NAME [string toupper $name] set version [my define get version [my define get pkg_vers]] set map {} lappend map %LIBRARY_NAME% $name lappend map %LIBRARY_VERSION% $version lappend map %LIBRARY_VERSION_NODOTS% [string map {. {}} $version] lappend map %LIBRARY_PREFIX% [my define getnull libprefix] set outfile [string map $map [my define get PRACTCL_NAME_LIBRARY]][my define get SHLIB_SUFFIX] return $outfile } } ::oo::class create ::practcl::tclkit { superclass ::practcl::library method Collate_Source CWD { my define set SHARED_BUILD 0 set name [my define get name] if {![my define exists TCL_LOCAL_APPINIT]} { my define set TCL_LOCAL_APPINIT Tclkit_AppInit } if {![my define exists TCL_LOCAL_MAIN_HOOK]} { my define set TCL_LOCAL_MAIN_HOOK Tclkit_MainHook } set PROJECT [self] set os [$PROJECT define get os] set TCLOBJ [$PROJECT project TCLCORE] set TKOBJ [$PROJECT project TKCORE] set ODIEOBJ [$PROJECT project odie] set TCLSRCDIR [$TCLOBJ define get srcroot] set TKSRCDIR [$TKOBJ define get srcroot] set PKG_OBJS {} foreach item [$PROJECT link list package] { if {[string is true [$item define get static]]} { lappend PKG_OBJS $item } |
︙ | ︙ | |||
3630 3631 3632 3633 3634 3635 3636 | } my project odie unpack set ODIESRCROOT [my project odie define get srcroot] set cdir [file join $ODIESRCROOT compat zipfs] my define add include_dir $cdir set zipfs [file join $cdir zvfs.c] } | | | | 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 | } my project odie unpack set ODIESRCROOT [my project odie define get srcroot] set cdir [file join $ODIESRCROOT compat zipfs] my define add include_dir $cdir set zipfs [file join $cdir zvfs.c] } my add class csource filename $zipfs initfunc Tclzipfs_Init pkg_name zipfs pkg_vers 1.0 autoload 1 my define add include_dir [file join $TKSRCDIR generic] my define add include_dir [file join $TKSRCDIR $PLATFORM_SRC_DIR] my define add include_dir [file join $TKSRCDIR bitmaps] my define add include_dir [file join $TKSRCDIR xlib] my define add include_dir [file join $TCLSRCDIR generic] my define add include_dir [file join $TCLSRCDIR $PLATFORM_SRC_DIR] my define add include_dir [file join $TCLSRCDIR compat zlib] # This file will implement TCL_LOCAL_APPINIT and TCL_LOCAL_MAIN_HOOK ::practcl::build::tclkit_main $PROJECT $PKG_OBJS } ## Wrap an executable # method wrap {PWD exename vfspath args} { cd $PWD if {![file exists $vfspath]} { file mkdir $vfspath } |
︙ | ︙ | |||
3674 3675 3676 3677 3678 3679 3680 | set ::PKGIDXFILE [info script] set dir [file dirname $::PKGIDXFILE] } #set BASEVFS [my define get BASEVFS] set EXEEXT [my define get EXEEXT] set tclkit_bare [my define get tclkit_bare] | | | 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 | set ::PKGIDXFILE [info script] set dir [file dirname $::PKGIDXFILE] } #set BASEVFS [my define get BASEVFS] set EXEEXT [my define get EXEEXT] set tclkit_bare [my define get tclkit_bare] set buffer [::practcl::pkgindex_path $vfspath] puts $fout $buffer puts $fout { # Advertise statically linked packages foreach {pkg script} [array get ::kitpkg] { eval $script } |
︙ | ︙ | |||
3698 3699 3700 3701 3702 3703 3704 | ### # Meta repository # The default is an inert source code block ### oo::class create ::practcl::subproject { superclass ::practcl::object | | | | | | | | | | | 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 | ### # Meta repository # The default is an inert source code block ### oo::class create ::practcl::subproject { superclass ::practcl::object method compile {} {} method go {} { set platform [my <project> define get platform] my define get USEMSVC [my <project> define get USEMSVC] set name [my define get name] if {![my define exists srcroot]} { my define set srcroot [file join [my <project> define get sandbox] $name] } set srcroot [my define get srcroot] my define set localsrcdir $srcroot my define add include_dir [file join $srcroot generic] my sources } # Install project into the local build system method install-local {} { my unpack } # Install project into the virtual file system method install-vfs {} {} method linktype {} { return {subordinate package} } method linker-products {configdict} {} method linker-external {configdict} { if {[dict exists $configdict PRACTCL_LIBS]} { return [dict get $configdict PRACTCL_LIBS] } } method sources {} {} method unpack {} { set name [my define get name] puts [list $name [self] UNPACK] my define set [::practcl::fossil_sandbox $name [my define dump]] } method update {} { set name [my define get name] my define set [::practcl::fossil_sandbox $name [dict merge [my define dump] {update 1}]] } } ### # A project which the kit compiles and integrates # the source for itself ### oo::class create ::practcl::subproject.source { superclass ::practcl::subproject ::practcl::library method linktype {} { return {subordinate package source} } } # a copy from the teapot oo::class create ::practcl::subproject.teapot { superclass ::practcl::subproject method install-local {} { |
︙ | ︙ | |||
3829 3830 3831 3832 3833 3834 3835 | } if {[my <project> define get HOST] != [my <project> define get TARGET]} { lappend opts --host=[my <project> define get TARGET] } if {[my <project> define exists tclsrcdir]} { set TCLSRCDIR [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tclsrcdir]]]] set TCLGENERIC [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tclsrcdir] .. generic]]] | | | | | | 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 | } if {[my <project> define get HOST] != [my <project> define get TARGET]} { lappend opts --host=[my <project> define get TARGET] } if {[my <project> define exists tclsrcdir]} { set TCLSRCDIR [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tclsrcdir]]]] set TCLGENERIC [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tclsrcdir] .. generic]]] lappend opts --with-tcl=$TCLSRCDIR --with-tclinclude=$TCLGENERIC } if {[my <project> define exists tksrcdir]} { set TKSRCDIR [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tksrcdir]]]] set TKGENERIC [::practcl::file_relative [file normalize $builddir] [file normalize [file join $::CWD [my <project> define get tksrcdir] .. generic]]] lappend opts --with-tk=$TKSRCDIR --with-tkinclude=$TKGENERIC } lappend opts {*}[my define get config_opts] lappend opts --prefix=$PREFIX #--exec_prefix=$PREFIX #if {$::tcl_platform(platform) eq "windows"} { # lappend opts --disable-64bit #} if {[my define get static 1]} { lappend opts --disable-shared --disable-stubs # } else { lappend opts --enable-shared } return $opts } method go {} { next my define set builddir [my BuildDir [my define get masterpath]] } method linker-products {configdict} { if {![my define get static 0]} { return {} } set srcdir [my define get builddir] if {[dict exists $configdict libfile]} { return " [file join $srcdir [dict get $configdict libfile]]" } } method static-packages {} { if {![my define get static 0]} { return {} } set result [my define get static_packages] set statpkg [my define get static_pkg] set initfunc [my define get initfunc] |
︙ | ︙ | |||
3904 3905 3906 3907 3908 3909 3910 | return $result } method BuildDir {PWD} { set name [my define get name] return [my define get builddir [file join $PWD pkg.$name]] } | | | 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 | return $result } method BuildDir {PWD} { set name [my define get name] return [my define get builddir [file join $PWD pkg.$name]] } method compile {} { set name [my define get name] set PWD $::CWD cd $PWD my go set srcroot [file normalize [my define get srcroot]] my Collate_Source $PWD |
︙ | ︙ | |||
3941 3942 3943 3944 3945 3946 3947 | } else { domake $builddir all } } cd $PWD } | | | | 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 | } else { domake $builddir all } } cd $PWD } method Configure {} { cd $::CWD my unpack my TeaConfig set builddir [file normalize [my define get builddir]] file mkdir $builddir set srcroot [file normalize [my define get srcroot]] if {[my define get USEMSVC 0]} { return } set opts [my ConfigureOpts] puts [list [self] CONFIGURE] puts [list PWD [pwd]] puts [list LOCALSRC $srcroot] puts [list BUILDDIR $builddir] puts [list CONFIGURE {*}$opts] cd $builddir exec sh [file join $srcroot configure] {*}$opts >& [file join $builddir practcl.log] cd $::CWD } method install-vfs {} { set PWD [pwd] set PKGROOT [my <project> define get installdir] set PREFIX [my <project> define get prefix] ### # Handle teapot installs |
︙ | ︙ | |||
4015 4016 4017 4018 4019 4020 4021 | domake $builddir $install ::practcl::copyDir $BROKENROOT [file join $PKGROOT [string trimleft $PREFIX /]] file delete -force $BROKENROOT } } cd $PWD } | | | 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 | domake $builddir $install ::practcl::copyDir $BROKENROOT [file join $PKGROOT [string trimleft $PREFIX /]] file delete -force $BROKENROOT } } cd $PWD } method TeaConfig {} { set srcroot [file normalize [my define get srcroot]] set copytea 0 if {![file exists [file join $srcroot tclconfig]]} { set copytea 1 } else { if {![file exists [file join $srcroot tclconfig practcl.tcl]] || ![file exists [file join $srcroot tclconfig config.tcl.in]]} { |
︙ | ︙ | |||
4057 4058 4059 4060 4061 4062 4063 | superclass ::practcl::subproject.binary # On the windows platform MinGW must build # from the platform directory in the source repo method BuildDir {PWD} { return [my define get localsrcdir] } | | | 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 | superclass ::practcl::subproject.binary # On the windows platform MinGW must build # from the platform directory in the source repo method BuildDir {PWD} { return [my define get localsrcdir] } method Configure {} { if {[my define get USEMSVC 0]} { return } set opts [my ConfigureOpts] puts [list PWD [pwd]] puts [list [self] CONFIGURE] |
︙ | ︙ | |||
4087 4088 4089 4090 4091 4092 4093 | } lappend opts {*}[my define get config_opts] lappend opts --prefix=$PREFIX #--exec_prefix=$PREFIX lappend opts --disable-shared return $opts } | | | | 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 | } lappend opts {*}[my define get config_opts] lappend opts --prefix=$PREFIX #--exec_prefix=$PREFIX lappend opts --disable-shared return $opts } method go {} { set name [my define get name] set platform [my <project> define get platform] if {![my define exists srcroot]} { my define set srcroot [file join [my <project> define get sandbox] $name] } set srcroot [my define get srcroot] my define add include_dir [file join $srcroot generic] switch $platform { windows { my define set localsrcdir [file join $srcroot win] my define add include_dir [file join $srcroot win] } default { my define set localsrcdir [file join $srcroot unix] my define add include_dir [file join $srcroot $name unix] } } my define set builddir [my BuildDir [my define get masterpath]] } method linktype {} { return {subordinate core.library} } } package provide practcl 0.5 |