Skip to content

Commit c56e671

Browse files
author
jan.nijtmans
committed
Fix bug in "make dist" when system-encoding is UTF-8: eolFix will then translate some windows-specific files to UTF-8 too.
Solution: commit those files with CRLF line-ending, which eliminates the need for eolFix altgether. See als: [495120] for the reason why eolFix was introduced in the first place. No longer needed with fossil.
2 parents 50ccb92 + 14f9ede commit c56e671

19 files changed

+4357
-4335
lines changed

‎.fossil-settings/crnl-glob

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
tools/tcl.hpj.in
2+
tools/tcl.wse.in
3+
win/buildall.vc.bat
4+
win/coffbase.txt
5+
win/makefile.bc
6+
win/makefile.vc
7+
win/rules.vc
8+
win/tcl.dsp
9+
win/tcl.dsw
10+
win/tcl.hpj.in

‎.fossil-settings/encoding-glob

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
tools/tcl.hpj.in
2+
tools/tcl.wse.in
3+
win/buildall.vc.bat
4+
win/coffbase.txt
5+
win/makefile.bc
6+
win/makefile.vc
7+
win/rules.vc
8+
win/tcl.dsp
9+
win/tcl.dsw
10+
win/tcl.hpj.in

‎.settings/org.eclipse.core.resources.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
eclipse.preferences.version=1
2-
encoding/<project>=UTF-8
2+
encoding/<project>=ISO-8859-1

‎library/encoding/jis0208.enc

+6-6
Original file line numberDiff line numberDiff line change
@@ -1311,9 +1311,9 @@ FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5A00000000000000000000
13111311
0000000000000000000000000000000000000000000000000000000000000000
13121312
0000000000000000000000000000000000000000000000000000000000000000
13131313
R
1314-
2141 301C FF5E
1315-
2142 2016 2225
1316-
215D 2212 FF0D
1317-
2171 00A2 FFE0
1318-
2172 00A3 FFE1
1319-
224C 00AC FFE2
1314+
2141 301C FF5E
1315+
2142 2016 2225
1316+
215D 2212 FF0D
1317+
2171 00A2 FFE0
1318+
2172 00A3 FFE1
1319+
224C 00AC FFE2

‎macosx/Tcl.xcode/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,6 @@
770770
F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = checkLibraryDoc.tcl; sourceTree = "<group>"; };
771771
F96D43D208F272B8004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
772772
F96D43D308F272B8004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
773-
F96D442208F272B8004A47F5 /* eolFix.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = eolFix.tcl; sourceTree = "<group>"; };
774773
F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fix_tommath_h.tcl; sourceTree = "<group>"; };
775774
F96D442508F272B8004A47F5 /* genStubs.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = genStubs.tcl; sourceTree = "<group>"; };
776775
F96D442708F272B8004A47F5 /* index.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = index.tcl; sourceTree = "<group>"; };
@@ -1668,7 +1667,6 @@
16681667
F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */,
16691668
F96D43D208F272B8004A47F5 /* configure */,
16701669
F96D43D308F272B8004A47F5 /* configure.in */,
1671-
F96D442208F272B8004A47F5 /* eolFix.tcl */,
16721670
F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */,
16731671
F96D442508F272B8004A47F5 /* genStubs.tcl */,
16741672
F96D442708F272B8004A47F5 /* index.tcl */,

‎macosx/Tcl.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,6 @@
770770
F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = checkLibraryDoc.tcl; sourceTree = "<group>"; };
771771
F96D43D208F272B8004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
772772
F96D43D308F272B8004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
773-
F96D442208F272B8004A47F5 /* eolFix.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = eolFix.tcl; sourceTree = "<group>"; };
774773
F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fix_tommath_h.tcl; sourceTree = "<group>"; };
775774
F96D442508F272B8004A47F5 /* genStubs.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = genStubs.tcl; sourceTree = "<group>"; };
776775
F96D442708F272B8004A47F5 /* index.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = index.tcl; sourceTree = "<group>"; };
@@ -1668,7 +1667,6 @@
16681667
F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */,
16691668
F96D43D208F272B8004A47F5 /* configure */,
16701669
F96D43D308F272B8004A47F5 /* configure.in */,
1671-
F96D442208F272B8004A47F5 /* eolFix.tcl */,
16721670
F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */,
16731671
F96D442508F272B8004A47F5 /* genStubs.tcl */,
16741672
F96D442708F272B8004A47F5 /* index.tcl */,

‎tools/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ ITCL_DOCS = \
3232

3333
# $(ITCL_SOURCE)/iwidgets3.0.0/doc/*.[13n]
3434

35-
COREDOCS = $(TCL_DOCS) $(TK_DOCS)
35+
COREDOCS = $(TCL_DOCS) $(TK_DOCS)
3636
#PRODOCS = $(COREDOCS) $(PRO_DOCS) $(ITCL_DOCS)
37-
PRODOCS = $(COREDOCS) $(PRO_DOCS)
37+
PRODOCS = $(COREDOCS) $(PRO_DOCS)
3838
TCLSH = $(TCL_BIN_DIR)/tclsh
3939
CC = @CC@
4040

‎tools/tcl.hpj.in

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
; This file is maintained by HCW. Do not modify this file directly.
2-
3-
[OPTIONS]
4-
HCW=0
5-
LCID=0x409 0x0 0x0 ;English (United States)
6-
REPORT=Yes
7-
TITLE=Tcl/Tk Reference Manual
8-
CNT=tcl86.cnt
9-
COPYRIGHT=Copyright � 2000 Ajuba Solutions
10-
HLP=tcl86.hlp
11-
12-
[FILES]
13-
tcl.rtf
14-
15-
[WINDOWS]
16-
main="Tcl/Tk Reference Manual",,0
17-
18-
[CONFIG]
19-
BrowseButtons()
1+
; This file is maintained by HCW. Do not modify this file directly.
2+
3+
[OPTIONS]
4+
HCW=0
5+
LCID=0x409 0x0 0x0 ;English (United States)
6+
REPORT=Yes
7+
TITLE=Tcl/Tk Reference Manual
8+
CNT=tcl86.cnt
9+
COPYRIGHT=Copyright � 2000 Ajuba Solutions
10+
HLP=tcl86.hlp
11+
12+
[FILES]
13+
tcl.rtf
14+
15+
[WINDOWS]
16+
main="Tcl/Tk Reference Manual",,0
17+
18+
[CONFIG]
19+
BrowseButtons()

‎unix/Makefile.in

-8
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,6 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
19521952
$(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure
19531953
cd $(MAC_OSX_DIR); autoheader; touch $@
19541954

1955-
EOLFIX=$(NATIVE_TCLSH) $(TOOL_DIR)/eolFix.tcl
19561955
dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(MAC_OSX_DIR)/configure genstubs dist-packages ${NATIVE_TCLSH}
19571956
rm -rf $(DISTDIR)
19581957
mkdir -p $(DISTDIR)/unix
@@ -2019,17 +2018,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
20192018
cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \
20202019
$(DISTDIR)/win
20212020
cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
2022-
@$(EOLFIX) -crlf $(DISTDIR)/win/*.bat
20232021
cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
2024-
@$(EOLFIX) -crlf $(DISTDIR)/win/makefile.bc $(DISTDIR)/win/makefile.vc
20252022
cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
2026-
@$(EOLFIX) -crlf $(DISTDIR)/win/rules.vc
20272023
cp -p $(TOP_DIR)/win/coffbase.txt $(DISTDIR)/win
2028-
@$(EOLFIX) -crlf $(DISTDIR)/win/coffbase.txt
20292024
cp -p $(TOP_DIR)/win/tcl.hpj.in $(DISTDIR)/win
2030-
@$(EOLFIX) -crlf $(DISTDIR)/win/tcl.hpj.in
20312025
cp -p $(TOP_DIR)/win/tcl.ds* $(DISTDIR)/win
2032-
@$(EOLFIX) -crlf $(DISTDIR)/win/tcl.ds*
20332026
cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
20342027
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
20352028
@mkdir $(DISTDIR)/macosx
@@ -2055,7 +2048,6 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
20552048
$(TOOL_DIR)/*.tcl $(TOOL_DIR)/man2tcl.c \
20562049
$(TOOL_DIR)/*.bmp $(TOOL_DIR)/tcl.hpj.in \
20572050
$(DISTDIR)/tools
2058-
@$(EOLFIX) -crlf $(DISTDIR)/tools/tcl.hpj.in
20592051
@mkdir $(DISTDIR)/libtommath
20602052
cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h $(DISTDIR)/libtommath
20612053
@mkdir $(DISTDIR)/pkgs

‎unix/tclConfig.h.in

+20-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
#ifndef _TCLCONFIG
55
#define _TCLCONFIG
66

7+
/* Define if building universal (internal helper macro) */
8+
#undef AC_APPLE_UNIVERSAL_BUILD
9+
710
/* Is gettimeofday() actually declared in <sys/time.h>? */
811
#undef GETTOD_NOT_DECLARED
912

@@ -208,10 +211,10 @@
208211
/* Is 'struct stat64' in <sys/stat.h>? */
209212
#undef HAVE_STRUCT_STAT64
210213

211-
/* Define to 1 if `st_blksize' is member of `struct stat'. */
214+
/* Define to 1 if `st_blksize' is a member of `struct stat'. */
212215
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
213216

214-
/* Define to 1 if `st_blocks' is member of `struct stat'. */
217+
/* Define to 1 if `st_blocks' is a member of `struct stat'. */
215218
#undef HAVE_STRUCT_STAT_ST_BLOCKS
216219

217220
/* Define to 1 if you have the <sys/filio.h> header file. */
@@ -352,6 +355,9 @@
352355
/* Define to the one symbol short name of this package. */
353356
#undef PACKAGE_TARNAME
354357

358+
/* Define to the home page for this package. */
359+
#undef PACKAGE_URL
360+
355361
/* Define to the version of this package. */
356362
#undef PACKAGE_VERSION
357363

@@ -430,9 +436,17 @@
430436
/* Should we use vfork() instead of fork()? */
431437
#undef USE_VFORK
432438

433-
/* Define to 1 if your processor stores words with the most significant byte
434-
first (like Motorola and SPARC, unlike Intel and VAX). */
435-
#undef WORDS_BIGENDIAN
439+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
440+
significant byte first (like Motorola and SPARC, unlike Intel). */
441+
#if defined AC_APPLE_UNIVERSAL_BUILD
442+
# if defined __BIG_ENDIAN__
443+
# define WORDS_BIGENDIAN 1
444+
# endif
445+
#else
446+
# ifndef WORDS_BIGENDIAN
447+
# undef WORDS_BIGENDIAN
448+
# endif
449+
#endif
436450

437451
/* Are Darwin SUSv3 extensions available? */
438452
#undef _DARWIN_C_SOURCE
@@ -487,7 +501,7 @@
487501
/* Define to `int' if <sys/types.h> does not define. */
488502
#undef pid_t
489503

490-
/* Define to `unsigned' if <sys/types.h> does not define. */
504+
/* Define to `unsigned int' if <sys/types.h> does not define. */
491505
#undef size_t
492506

493507
/* Define as int if socklen_t is not available */

0 commit comments

Comments
 (0)