Check-in [0646764e58]
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:Typo fixes
Timelines: family | ancestors | descendants | both | autosetup
Files: files | file ages | folders
SHA1: 0646764e5827883d4c3d3213a2fc80454db28774
User & Date: hypnotoad 2015-03-18 14:55:59
Context
2015-03-18
15:11
Fixes to the boot process for installed autosetup check-in: 4f8d078657 user: hypnotoad tags: autosetup
14:55
Typo fixes check-in: 0646764e58 user: hypnotoad tags: autosetup
09:13
Fixed the basekit and sherpa building process. Sherpa now builds directly out of the sanbox/sherpa directory. The basekit builds using sources from sandbox/odielib. Broke the core procs out of autosetup, and placed them in their own file to allow other Tcl applications to access them. check-in: 5617c7dc7d user: hypnotoad tags: autosetup
Changes
Unified Diff Ignore Whitespace Patch
Changes to auto.def.
43
44
45
46
47
48
49
50
51
52
53
54
55

56
57
58
59
60
61


62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
#--------------------------------------------------------------------
# Determines the correct executable file extension (.exe)
#--------------------------------------------------------------------
define EXE $::odie(exe_suffix)
define EXE_SUFFIX $::odie(exe_suffix)
define target [get-define target]

set ::odie(sandbox_path) [opt-val sandbox]
if {$::odie(sandbox_path) eq {}} {
  set ::odie(sandbox_path) [file join $::odie(prefix) sandbox]
} else {
  set ::odie_config(sandbox) $::odie(sandbox_path)
}

set ::odie(download_path) [opt-val download]
if {$::odie(download_path) eq {}} {
  set ::odie(download_path) [file join $::odie(prefix) download]
} else {
  set ::odie_config(download) $::odie(download_path)
}


set ::odie(fossil) [lindex [opt-val fossil] end]
if {$::odie(fossil) eq {}} {
  set ::odie(fossil) [lindex [find-an-executable -required fossil] 0]
} else {
  set ::odie_config(fossil) $::odie(fossil)
}
set ::odie_prog(fossil) $::odie(fossil)
define FOSSIL_PROG $::odie(fossil)

set ::odie(build_tclsh) [lindex [opt-val tclsh] end]
if {$::odie(build_tclsh) eq {}} {
  set ::odie(build_tclsh) [info nameofexecutable]
} else {
  set ::odie_config(tclsh) $::odie(build_tclsh)
}
set ::odie_prog(tclsh) $::odie(build_tclsh)
define ODIE_BUILD_TCLSH $::odie_config(tclsh)

foreach {program required domake} {
  zip 	 1 0
  unzip  1 0
  tar    1 0
  git    0 1
  strip  0 0







|
|
|

|

>
|
|
|

|

>
>
















|







43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
#--------------------------------------------------------------------
# Determines the correct executable file extension (.exe)
#--------------------------------------------------------------------
define EXE $::odie(exe_suffix)
define EXE_SUFFIX $::odie(exe_suffix)
define target [get-define target]

set ::odie(sandbox) [opt-val sandbox]
if {$::odie(sandbox) eq {}} {
  set ::odie(sandbox) [file join $::odie(prefix) sandbox]
} else {
  set ::odie_config(sandbox) $::odie(sandbox)
}
set ::odie(sandbox_path) $::odie(sandbox)
set ::odie(download) [opt-val download]
if {$::odie(download) eq {}} {
  set ::odie(download) [file join $::odie(prefix) download]
} else {
  set ::odie_config(download) $::odie(download)
}
set ::odie(download_path) $::odie(download)

set ::odie(fossil) [lindex [opt-val fossil] end]
if {$::odie(fossil) eq {}} {
  set ::odie(fossil) [lindex [find-an-executable -required fossil] 0]
} else {
  set ::odie_config(fossil) $::odie(fossil)
}
set ::odie_prog(fossil) $::odie(fossil)
define FOSSIL_PROG $::odie(fossil)

set ::odie(build_tclsh) [lindex [opt-val tclsh] end]
if {$::odie(build_tclsh) eq {}} {
  set ::odie(build_tclsh) [info nameofexecutable]
} else {
  set ::odie_config(tclsh) $::odie(build_tclsh)
}
set ::odie_prog(tclsh) $::odie(build_tclsh)
define ODIE_BUILD_TCLSH $::odie(build_tclsh)

foreach {program required domake} {
  zip 	 1 0
  unzip  1 0
  tar    1 0
  git    0 1
  strip  0 0
Changes to autosetup/autosetup.
196
197
198
199
200
201
202
203



204
205
206
207
208
209
210
set autosetup(start) [clock millis]
set autosetup(installed) 0
set autosetup(msg-checking) 0
set autosetup(msg-quiet) 0

# Embedded modules are inserted below here
##-- CUT HERE --##
source [file join [file dirname $::argv0] lib core.tcl]




##################################################################
#
# Entry/Exit
#
if {$autosetup(debug)} {
	main $argv







|
>
>
>







196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
set autosetup(start) [clock millis]
set autosetup(installed) 0
set autosetup(msg-checking) 0
set autosetup(msg-quiet) 0

# Embedded modules are inserted below here
##-- CUT HERE --##
set corefile [file join [file dirname $::argv0] lib core.tcl]
if {[file exist $corefile]} {
  source $corefile
}

##################################################################
#
# Entry/Exit
#
if {$autosetup(debug)} {
	main $argv
Changes to src/toadkit/configure.tcl.
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
###
cthulhu_add_csource [file join $::project(src) generic zvfs.c] {scan 0}
cthulhu_add_csource [file join $::project(src) generic zvfsboot.c] {scan 0}
foreach zfile {
  adler32.c compress.c crc32.c deflate.c infback.c inffast.c inflate.c inftrees.c
  trees.c uncompr.c zutil.c
} {
  cthulhu_add_csource [file join $::odie(sandbox_path) tcl compat zlib $zfile] {scan 0}
}

#cthulhu_include_directory [file join $::odie_build(sandbox) tcl compat zlib]
#cthulhu_include_directory [file join $::odie_build(sandbox) tcl generic]

cthulhu_add_csource [file join $::project(src) generic tclkit_init.c] {scan 0}
if {$::odie(windows)} {
  #cthulhu_include_directory [file join $::odie_build(sandbox) tcl win]
  cthulhu_add_csource [file join $::project(src) win tclsh_packages.c] {scan 0}
  cthulhu_add_csource [file join  $::odie(sandbox_path) tcl win tclAppInit.c] {scan 0 extra {-DTCL_LOCAL_APPINIT=Toadkit_AppInit -DTCL_LOCAL_MAIN_HOOK=Toadkit_MainHook}}
  #cthulhu_add_csource [file join $::odie_build(sandbox) tcl win tclWinDde.c]
  cthulhu_add_csource [file join $::odie(sandbox_path) tcl win tclWinReg.c]
} else {
  #cthulhu_include_directory [file join $::odie_build(sandbox) tcl unix]
  cthulhu_add_csource [file join $::project(src) unix tclsh_packages.c] {scan 0}
  cthulhu_add_csource [file join  $::odie(sandbox_path) tcl unix tclAppInit.c] {scan 0 extra {-DTCL_LOCAL_APPINIT=Toadkit_AppInit -DTCL_LOCAL_MAIN_HOOK=Toadkit_MainHook}}
}
if {$::odie(windows)} {
  if {![file exists [file join $::odie(sandbox) odielib cmodules odieutil password.c]]} {
    puts "BUILDING PASSWORD (toadkit)"
    source [file join $::odie(sandbox) cmodules odieutil mkPassword.tcl]
  }
  cthulhu_add_csource [file join $::odie(sandbox) odielib cmodules odieutil password.c]







|









|

|



|







76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
###
cthulhu_add_csource [file join $::project(src) generic zvfs.c] {scan 0}
cthulhu_add_csource [file join $::project(src) generic zvfsboot.c] {scan 0}
foreach zfile {
  adler32.c compress.c crc32.c deflate.c infback.c inffast.c inflate.c inftrees.c
  trees.c uncompr.c zutil.c
} {
  cthulhu_add_csource [file join $::odie(sandbox) tcl compat zlib $zfile] {scan 0}
}

#cthulhu_include_directory [file join $::odie_build(sandbox) tcl compat zlib]
#cthulhu_include_directory [file join $::odie_build(sandbox) tcl generic]

cthulhu_add_csource [file join $::project(src) generic tclkit_init.c] {scan 0}
if {$::odie(windows)} {
  #cthulhu_include_directory [file join $::odie_build(sandbox) tcl win]
  cthulhu_add_csource [file join $::project(src) win tclsh_packages.c] {scan 0}
  cthulhu_add_csource [file join  $::odie(sandbox) tcl win tclAppInit.c] {scan 0 extra {-DTCL_LOCAL_APPINIT=Toadkit_AppInit -DTCL_LOCAL_MAIN_HOOK=Toadkit_MainHook}}
  #cthulhu_add_csource [file join $::odie_build(sandbox) tcl win tclWinDde.c]
  cthulhu_add_csource [file join $::odie(sandbox) tcl win tclWinReg.c]
} else {
  #cthulhu_include_directory [file join $::odie_build(sandbox) tcl unix]
  cthulhu_add_csource [file join $::project(src) unix tclsh_packages.c] {scan 0}
  cthulhu_add_csource [file join  $::odie(sandbox) tcl unix tclAppInit.c] {scan 0 extra {-DTCL_LOCAL_APPINIT=Toadkit_AppInit -DTCL_LOCAL_MAIN_HOOK=Toadkit_MainHook}}
}
if {$::odie(windows)} {
  if {![file exists [file join $::odie(sandbox) odielib cmodules odieutil password.c]]} {
    puts "BUILDING PASSWORD (toadkit)"
    source [file join $::odie(sandbox) cmodules odieutil mkPassword.tcl]
  }
  cthulhu_add_csource [file join $::odie(sandbox) odielib cmodules odieutil password.c]