Check-in [faad732680]
Not logged in
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2018 Conference, Houston/TX, US, Oct 15-19
Send your abstracts to tclconference@googlegroups.com or submit via the online form
by Aug 20.

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

Overview
Comment:Removed chatty puts statements injected for debugging
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: faad732680869e4f9235c65461ff3881392b7ff3
User & Date: hypnotoad 2016-03-01 20:11:36
Context
2016-03-04
07:38
Fixed examples check-in: fd914c2a26 user: hypnotoad tags: trunk
2016-03-01
20:11
Removed chatty puts statements injected for debugging check-in: faad732680 user: hypnotoad tags: trunk
20:07
Macro'd out the source decrypt function. It's stupid to leave it in there Moved the loading of the VFS package manifest until after the interp has initialized. The problem is that windows needs the encodings for source to work on arbitrary files. Injected some puts statements to debug package loading. We now work on Windows, let's see if I broke Mac check-in: 2c40fcc696 user: hypnotoad tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to build.tcl.
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
      if {$path_indexed($path)} continue
      #set thisdir [::fileutil::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 \[file join \[lindex \$::PATHSTACK end\] $thisdir\]" \n
        append buffer "puts \"INDEXED \$dir\"" \n
        append buffer [string trimright $idxbuf] \n
      } 
    }
  }
  append buffer {
set dir [lindex $::PATHSTACK end]  
set ::PATHSTACK [lrange $::PATHSTACK 0 end-1]







<







174
175
176
177
178
179
180

181
182
183
184
185
186
187
      if {$path_indexed($path)} continue
      #set thisdir [::fileutil::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 \[file join \[lindex \$::PATHSTACK end\] $thisdir\]" \n

        append buffer [string trimright $idxbuf] \n
      } 
    }
  }
  append buffer {
set dir [lindex $::PATHSTACK end]  
set ::PATHSTACK [lrange $::PATHSTACK 0 end-1]
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
  if {![file exists $vfspath]} {
    file mkdir $vfspath
  }
  package ifneeded zipfile::mkzip 1.2 [list source [file join $::HERE scripts mkzip.tcl]]
  package require zipfile::mkzip

  set fout [open [file join $vfspath packages.tcl] w]
  puts $fout "puts {LOADING VFS PACKAGE MANIFEST}"
  puts $fout [list set dir $::KIT(PKGPREFIX)]
  set buffer [::practcl::pkgindex_path $::KIT(BASEVFS) $vfspath]
  puts $fout $buffer
  puts $fout "puts {/LOADING VFS PACKAGE MANIFEST}"

  close $fout
  copyDir $::KIT(BASEVFS) $vfspath
  copyDir $::KIT(PKGROOT)$::KIT(PKGPREFIX)/lib $vfspath/boot/pkgs
  foreach arg $args {
     copyDir $arg $vfspath
  }







<



<







259
260
261
262
263
264
265

266
267
268

269
270
271
272
273
274
275
  if {![file exists $vfspath]} {
    file mkdir $vfspath
  }
  package ifneeded zipfile::mkzip 1.2 [list source [file join $::HERE scripts mkzip.tcl]]
  package require zipfile::mkzip

  set fout [open [file join $vfspath packages.tcl] w]

  puts $fout [list set dir $::KIT(PKGPREFIX)]
  set buffer [::practcl::pkgindex_path $::KIT(BASEVFS) $vfspath]
  puts $fout $buffer


  close $fout
  copyDir $::KIT(BASEVFS) $vfspath
  copyDir $::KIT(PKGROOT)$::KIT(PKGPREFIX)/lib $vfspath/boot/pkgs
  foreach arg $args {
     copyDir $arg $vfspath
  }
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
set _search_paths {{$PWD} {$PWD ..}}
if {![file exists [file join $::HERE odieConfig.tcl]]} {
  # Build the local toolset
  cd $HERE
  exec [info nameofexecutable] [file join $HERE autosetup autosetup]
  cd $PWD
}
puts "AUTOPATH (276): $::auto_path"
source [file join $::HERE odieConfig.tcl]
set ::KIT(platform) ::odie(platform)
set ::KIT(ORIG_TCL_SRC_DIR) $::odie_tcl(src_dir)
set ::KIT(ORIG_TK_SRC_DIR) $::odie_tk(src_dir)
set ::KIT(TCL_BUILD_OPTS) $::odie_tcl(config_flags)
set ::KIT(TK_BUILD_OPTS) $::odie_tk(config_flags)
set ::KIT(HOST) $::odie(host)







<







302
303
304
305
306
307
308

309
310
311
312
313
314
315
set _search_paths {{$PWD} {$PWD ..}}
if {![file exists [file join $::HERE odieConfig.tcl]]} {
  # Build the local toolset
  cd $HERE
  exec [info nameofexecutable] [file join $HERE autosetup autosetup]
  cd $PWD
}

source [file join $::HERE odieConfig.tcl]
set ::KIT(platform) ::odie(platform)
set ::KIT(ORIG_TCL_SRC_DIR) $::odie_tcl(src_dir)
set ::KIT(ORIG_TK_SRC_DIR) $::odie_tk(src_dir)
set ::KIT(TCL_BUILD_OPTS) $::odie_tcl(config_flags)
set ::KIT(TK_BUILD_OPTS) $::odie_tk(config_flags)
set ::KIT(HOST) $::odie(host)
Changes to generic/tclkit_init.c.
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
  */
  Tclkit_Packages_Init(interp);
  /*
   * Call Tcl_CreateCommand for application-specific commands, if
   * they weren't already created by the init procedures called above.
   */
  Tcl_Eval(interp,
"puts {Hello World!}"
"\nif {[file exists [file join $::SRCDIR packages.tcl]]} {"         
"\n  #In a wrapped exe, we don't go out to the environment"
"\n  set dir $::SRCDIR"
"\n  source [file join $::SRCDIR packages.tcl]"
"\n}"
  );
   
  /*







<
|







47
48
49
50
51
52
53

54
55
56
57
58
59
60
61
  */
  Tclkit_Packages_Init(interp);
  /*
   * Call Tcl_CreateCommand for application-specific commands, if
   * they weren't already created by the init procedures called above.
   */
  Tcl_Eval(interp,

"if {[file exists [file join $::SRCDIR packages.tcl]]} {"         
"\n  #In a wrapped exe, we don't go out to the environment"
"\n  set dir $::SRCDIR"
"\n  source [file join $::SRCDIR packages.tcl]"
"\n}"
  );
   
  /*