Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch autosetup
Excluding Merge-Ins
This is equivalent to a diff from
a3004dc1d2
to 6b5f67f98b
|
2015-05-19
| | |
| 15:35 |
|
check-in: 80e134d2db user: hypnotoad tags: trunk
|
|
2015-05-14
| | |
| 09:58 |
|
Closed-Leaf
check-in: 6b5f67f98b user: hypnotoad tags: autosetup
|
|
2015-05-06
| | |
| 02:42 |
|
check-in: ac26e907d3 user: hypnotoad tags: autosetup
|
|
2015-03-10
| | |
| 13:51 |
|
check-in: ecb74409b0 user: seandeelywoods tags: autosetup
|
|
2015-03-09
| | |
| 16:42 |
|
Leaf
check-in: a3004dc1d2 user: seandeelywoods tags: independent-sherpa
|
| 13:58 |
|
check-in: b36cd8cf85 user: seandeelywoods tags: independent-sherpa
|
| | |
Changes to Makefile.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
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
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
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
|
+
+
+
+
+
+
+
-
+
+
-
-
-
-
+
+
+
+
+
-
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
-
+
-
-
-
+
+
+
+
-
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
|
# Makefile.in --
#
include odieConfig.sh
all: install
core: install
reconfig:
rm -f autosetup/jimsh0.exe autosetup/jimsh0
ODIE_BUILD_TCLSH=`autosetup/find-tclsh`
${ODIE_BUILD_TCLSH} autosetup/autosetup $(ODIE_RECONFIG_OPTS)
cp -a ${ODIE_SRC_DIR}/odieConfig.tcl ${LOCAL_REPO}/lib/odieConfig.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.sh ${LOCAL_REPO}/lib/odieConfig.sh
install:
install: sherpa
$(SHELL) scripts/make_skel.sh
$(SHELL) scripts/make_tcl.sh
ODIE_BUILD_TCLSH=`autosetup/find-tclsh`
${ODIE_TCLSH} scripts/make_core.tcl
${ODIE_TCLSH} scripts/make_basekit.tcl
$(ODIE_TCLSH) scripts/make_sqlite.tcl
$(ODIE_TCLSH) scripts/make_sherpa.tcl
$(ODIE_BUILD_TCLSH) scripts/make_sherpa.tcl
$(SHERPA) upgrade sqlite odielib tcllib
${ODIE_BUILD_TCLSH} scripts/make_basekit.tcl
packages: sherpa
cp -a ${ODIE_SRC_DIR}/odieConfig.tcl ${LOCAL_REPO}/lib/odieConfig.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.sh ${LOCAL_REPO}/lib/odieConfig.sh
$(SHERPA) install sqlite odielib tcllib
upgrade:
fossil update
$(FOSSIL) update
./config.status
${ODIE_TCLSH} scripts/upgrade.tcl
${ODIE_TCLSH} scripts/make_core.tcl
${ODIE_TCLSH} scripts/make_basekit.tcl
${ODIE_BUILD_TCLSH} scripts/upgrade.tcl
$(ODIE_BUILD_TCLSH) scripts/make_sherpa.tcl
$(SHERPA) upgrade sqlite odielib tcllib
${ODIE_BUILD_TCLSH} scripts/make_basekit.tcl
$(ODIE_TCLSH) scripts/make_sqlite.tcl
$(ODIE_TCLSH) scripts/make_sherpa.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.tcl ${LOCAL_REPO}/lib/odieConfig.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.sh ${LOCAL_REPO}/lib/odieConfig.sh
upgrade-tcl:
fossil update
$(FOSSIL) update
./config.status
$(SHELL) scripts/make_tcl.sh
ODIE_BUILD_TCLSH=`autosetup/find-tclsh`
${ODIE_TCLSH} scripts/upgrade.tcl
${ODIE_TCLSH} scripts/make_core.tcl
${ODIE_TCLSH} scripts/make_basekit.tcl
${ODIE_BUILD_TCLSH} scripts/upgrade.tcl
$(ODIE_BUILD_TCLSH) scripts/make_sherpa.tcl
$(SHERPA) upgrade sqlite odielib tcllib
${ODIE_BUILD_TCLSH} scripts/make_basekit.tcl
$(ODIE_TCLSH) scripts/make_sqlite.tcl
$(ODIE_TCLSH) scripts/make_sherpa.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.tcl ${LOCAL_REPO}/lib/odieConfig.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.sh ${LOCAL_REPO}/lib/odieConfig.sh
tcl:
$(SHELL) scripts/make_tcl.sh
rebuild:
$(SHELL) scripts/make_distclean.sh
fossil update
$(FOSSIL) update
./config.status
$(SHELL) scripts/make_tcl.sh
${ODIE_TCLSH} scripts/make_core.tcl
${ODIE_TCLSH} scripts/make_basekit.tcl
$(ODIE_BUILD_TCLSH) scripts/make_sherpa.tcl
$(SHERPA) upgrade sqlite odielib tcllib
${ODIE_BUILD_TCLSH} scripts/make_basekit.tcl
$(ODIE_TCLSH) scripts/make_sqlite.tcl
$(ODIE_TCLSH) scripts/make_sherpa.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.tcl ${LOCAL_REPO}/lib/odieConfig.tcl
cp -a ${ODIE_SRC_DIR}/odieConfig.sh ${LOCAL_REPO}/lib/odieConfig.sh
distclean:
$(SHELL) scripts/make_distclean.sh
basekit:
${ODIE_TCLSH} scripts/make_basekit.tcl
${ODIE_BUILD_TCLSH} scripts/make_basekit.tcl
odielib-rebuild:
make -C src/odielib distclean
${ODIE_TCLSH} scripts/make_core.tcl
sherpa: $ODIE_DOWNLOAD/sherpa/sherpa.tcl
odielib:
${ODIE_TCLSH} scripts/make_core.tcl
$ODIE_DOWNLOAD/sherpa/sherpa.tcl:
$(ODIE_BUILD_TCLSH) scripts/make_sherpa.tcl
sqlite:
${ODIE_TCLSH} scripts/make_sqlite.tcl
$(ODIE_MKHDR):
$(CC) -o mkhdr.o scripts/mkhdr.c
$(CC) mkhdr.o -o mkhdr${EXE_SUFFIX}
sherpa: basekit sqlite odielib
$(ODIE_TCLSH) scripts/make_sherpa.tcl
cp -f mkhdr@EXE@ $(ODIE_MKHDR)
mkhdr: $(ODIE_MKHDR)
mkdoc:
$(TCLSH) scripts/mkdoc.tcl
.PHONY: all binaries clean depend distclean doc install libraries test upgrade upgrade-tcl
.PHONY: core sherpa basekit odielib toadkit sqlite
.PHONY: core sherpa basekit odielib toadkit sqlite reconfig mkhdr packages
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
|
Changes to apps/sherpa/Makefile.
| ︙ | | |
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
-
+
+
+
+
|
gather-src:
eval ${ODIE_RM} ${APPNAME}.vfs manifest.txt plugin.zip
mkdir -p ${APPNAME}.vfs
mkdir -p ${APPNAME}.vfs/apps
cp -a src/* ${APPNAME}.vfs/
cp -a $(project-base)/modules ${APPNAME}.vfs/lib
cp -a $(project-base)/../odielib/modules ${APPNAME}.vfs/lib
cp -a $(project-base)/../sherpa/modules ${APPNAME}.vfs/lib
cp -a $(project-base)/../sherpa/recipes ${APPNAME}.vfs
cp -a ../../../odie/odieConfig.tcl ${APPNAME}.vfs/
cp -a ../../../odie/odieConfig.sh ${APPNAME}.vfs/
cp ${ODIE_SRC_DIR}/apps/e.tcl ${APPNAME}.vfs/apps/edit.tcl
cp ${ODIE_SRC_DIR}/apps/tkdiff.tcl ${APPNAME}.vfs/apps/diff.tcl
cp ${ODIE_SRC_DIR}/scripts/rmdir.tcl ${APPNAME}.vfs/apps/rm.tcl
cp -a ../../recipes/ ${APPNAME}.vfs/recipes/
${ODIE_TCLSH} ../sherpa.tcl vfs_install ${APPNAME}.vfs ${PACKAGES}
${ODIE_TCLSH} ../sherpa.tcl vfs_mkIndex ${APPNAME}.vfs
install: ${APPNAME}${EXE}
cp -f ${APPNAME}${EXE} ${LOCAL_REPO}/bin/${APPNAME}${EXE}
|
| ︙ | | |
Changes to apps/sherpa/src/main.tcl.
| ︙ | | |
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
-
-
+
+
+
+
+
+
|
###
# topic: d433b7cb5066412cd1b6e065129e91da
# description:
# Find package attempts to load packages live from source, and failing that
# use an internal version
###
proc ::find_package package {
if {[file exists [file join $::odie(odie_src_dir) modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(odie_src_dir) modules $package index.tcl]
if {[file exists [file join $::odie(src_dir) modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(src_dir) modules $package index.tcl]
} elseif {[file exists [file join $::odie(sandbox) odielib modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) odielib modules $package index.tcl]
} elseif {[file exists [file join $::odie(sandbox) sherpa modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) sherpa modules $package index.tcl]
} elseif {[file exists [file join $::odie(sandbox) taolib modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) taolib modules $package index.tcl]
} else {
uplevel #0 [list package require $package]
}
}
|
| ︙ | | |
Changes to apps/temple/src/main.tcl.
| ︙ | | |
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
-
-
-
-
-
-
+
+
+
+
+
+
+
+
|
# use an internal version
###
proc ::find_package package {
if {[file exists [file join $::odie(sandbox) tcllib modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) tcllib modules $package index.tcl]
} elseif {[file exists [file join $::odie(sandbox) tcllib modules $package $package.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) tcllib modules $package $package.tcl]
} elseif {[file exists [file join $::odie(odie_src_dir) modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(odie_src_dir) modules $package index.tcl]
} elseif {[file exists [file join $::odie(odie_src_dir) modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(odie_src_dir) modules $package $package.tcl]
} elseif {[file exists [file join $::odie(sandbox) taolib modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) taolib modules $package index.tcl]
} elseif {[file exists [file join $::odie(src_dir) modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(src_dir) modules $package index.tcl]
} elseif {[file exists [file join $::odie(sandbox) taolib modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) taolib modules $package index.tcl]
} elseif {[file exists [file join $::odie(sandbox) odielib modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) odielib modules $package index.tcl]
} elseif {[file exists [file join $::odie(sandbox) sherpa modules $package index.tcl]]} {
uplevel #0 source [file join $::odie(sandbox) sherpa modules $package index.tcl]
} else {
uplevel #0 [list package require $package]
}
}
package require teapotclient
find_package odie
|
| ︙ | | |
Added auto.def.