Eskil

Check-in [0318c08ca1]
Login

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

Overview
Comment:Handle version tagging outside source file.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0318c08ca175b84ba9400f9539076e2fc743d256
User & Date: peter 2016-06-09 22:18:16.886
Context
2016-06-10
00:01
Reorganised code for option descriptions. check-in: d0b1cd8fb0 user: peter tags: trunk
2016-06-09
22:18
Handle version tagging outside source file. check-in: 0318c08ca1 user: peter tags: trunk
22:00
Use new DiffUtil check-in: 03a453b899 user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile. 
1
2
3
4

5


6
7
8
9
10
11
12

#----------------------------------------------------------------------
# Make file for Eskil
#----------------------------------------------------------------------


VERSION = 271



# Path to the TclKits used for creating StarPacks.
TCLKIT = /home/peter/tclkit/v85
TCLKIT_LINUX   = $(TCLKIT)/tclkit-linux
TCLKIT_SOLARIS = $(TCLKIT)/tclkit-solaris-sparc
TCLKIT_WIN     = $(TCLKIT)/tclkit-win32.upx.exe
TCLKIT_MAC     = $(TCLKIT)/tclkit-mac-865





>

>
>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

#----------------------------------------------------------------------
# Make file for Eskil
#----------------------------------------------------------------------

# This string is used to generate release file names
VERSION = 271
# This string is used to tag the version shown in Eskil
DOTVERSION = 2.7.1+

# Path to the TclKits used for creating StarPacks.
TCLKIT = /home/peter/tclkit/v85
TCLKIT_LINUX   = $(TCLKIT)/tclkit-linux
TCLKIT_SOLARIS = $(TCLKIT)/tclkit-solaris-sparc
TCLKIT_WIN     = $(TCLKIT)/tclkit-win32.upx.exe
TCLKIT_MAC     = $(TCLKIT)/tclkit-mac-865
︙︙
188
189
190
191
192
193
194



195
196
197
198
199
200
201
202
203
204
205

clean:
	@rm -f $(LOGFILES) $(IFILES) $(MFILES)

#----------------------------------------------------------------
# Packaging/Releasing
#----------------------------------------------------------------




wrap:
	sdx wrap eskil.kit

wrapexe:
	@\rm -f eskil.linux eskil.exe eskil.solaris
	sdx wrap eskil.linux   -runtime $(TCLKIT_LINUX)
	sdx wrap eskil.mac     -runtime $(TCLKIT_MAC)
#	sdx wrap eskil.solaris -runtime $(TCLKIT_SOLARIS)
	cd eskil.vfs/lib ; ln -s $(TWAPI) twapi
	sdx wrap eskil.exe     -runtime $(TCLKIT_WIN)
	rm eskil.vfs/lib/twapi








>
>
>
|


|








191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211

clean:
	@rm -f $(LOGFILES) $(IFILES) $(MFILES)

#----------------------------------------------------------------
# Packaging/Releasing
#----------------------------------------------------------------

tagversion:
	echo "Version $(DOTVERSION) `date --iso-8601`" > eskil.vfs/version.txt

wrap: tagversion
	sdx wrap eskil.kit

wrapexe: tagversion
	@\rm -f eskil.linux eskil.exe eskil.solaris
	sdx wrap eskil.linux   -runtime $(TCLKIT_LINUX)
	sdx wrap eskil.mac     -runtime $(TCLKIT_MAC)
#	sdx wrap eskil.solaris -runtime $(TCLKIT_SOLARIS)
	cd eskil.vfs/lib ; ln -s $(TWAPI) twapi
	sdx wrap eskil.exe     -runtime $(TCLKIT_WIN)
	rm eskil.vfs/lib/twapi
︙︙
Changes to bumprev.txt. 
1
2
3
4
5
6
7
8
9
10
11

These files need to be changed when bumping revisions:

src/eskil.tcl (eskil(diffver))
Makefile (VERSION)
eskil.vfs/tclkit.inf (fileversion/productversion)

Also, mark it in:
Changes

File release affect these too:
htdocs/changes.wiki



<
|








1
2

3
4
5
6
7
8
9
10

These files need to be changed when bumping revisions:


Makefile (VERSION and DOTVERSION)
eskil.vfs/tclkit.inf (fileversion/productversion)

Also, mark it in:
Changes

File release affect these too:
htdocs/changes.wiki
︙︙
Changes to src/eskil.tcl.
︙︙
33
34
35
36
37
38
39

40
41
42
43
44
45
46
47

# Stop Tk from meddling with the command line by copying it first.
set ::eskil(argv) $::argv
set ::eskil(argc) $::argc
set ::argv {}
set ::argc 0

set ::eskil(debug) 0

set ::eskil(diffver) "Version 2.7.1+ 2016-04-13"
set ::eskil(thisScript) [file join [pwd] [info script]]

namespace import tcl::mathop::+
namespace import tcl::mathop::-
namespace import tcl::mathop::*
namespace import tcl::mathop::/









>
|








33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

# Stop Tk from meddling with the command line by copying it first.
set ::eskil(argv) $::argv
set ::eskil(argc) $::argc
set ::argv {}
set ::argc 0

set ::eskil(debug) 0
# Version string is loaded from version.txt
set ::eskil(diffver) "Version Unknown"
set ::eskil(thisScript) [file join [pwd] [info script]]

namespace import tcl::mathop::+
namespace import tcl::mathop::-
namespace import tcl::mathop::*
namespace import tcl::mathop::/
︙︙
70
71
72
73
74
75
76






77
78
79
80
81
82
83

    # Follow any link
    set tmplink $::eskil(thisScript)
    while {[file type $tmplink] eq "link"} {
        set tmplink [file readlink $tmplink]
        set tmplink [file normalize [file join $::eskil(thisDir) $tmplink]]
        set ::eskil(thisDir) [file dirname $tmplink]
    }







    # Get all other source files
    InitReSource

    # Diff functionality is in the DiffUtil package.
    package require DiffUtil
    # Help DiffUtil to find a diff executable, if needed








>
>
>
>
>
>








71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

    # Follow any link
    set tmplink $::eskil(thisScript)
    while {[file type $tmplink] eq "link"} {
        set tmplink [file readlink $tmplink]
        set tmplink [file normalize [file join $::eskil(thisDir) $tmplink]]
        set ::eskil(thisDir) [file dirname $tmplink]
    }

    if {[file exists $::eskil(thisDir)/../version.txt]} {
        set ch [open $::eskil(thisDir)/../version.txt]
        set ::eskil(diffver) [string trim [read $ch 100]]
        close $ch
    }

    # Get all other source files
    InitReSource

    # Diff functionality is in the DiffUtil package.
    package require DiffUtil
    # Help DiffUtil to find a diff executable, if needed
︙︙