Skip to content

Commit dfe3804

Browse files
ChenPi11ChenPi11
committed
Move lib/gen*.c to tools/gen*.cpp
修改： .gitignore 修改： ChangeLog 修改： Makefile.devel 删除： lib/genaliases.c 删除： lib/genaliases2.c 修改： lib/generated/flags.h 删除： lib/genflags.c 新文件： tools/genaliases.cpp 新文件： tools/genaliases2.cpp 新文件： tools/genflags.cpp
1 parent cd5e246 commit dfe3804

File tree

10 files changed

+391
-375
lines changed

10 files changed

+391
-375
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ Testing
2323
*.log
2424
*.dSYM
2525

26+
# Makefile.devel temp files
27+
genaliases
28+
genflags
29+
tmp.h
30+
2631
# Test suite runable
2732
tests/cmp
2833
tests/cmp.exe

‎ChangeLog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Update C++ standard of the project.
44
Remove unused canonical files and codes.
5+
Move 'lib/gen*.c' to 'tools/gen*.cpp'.
56

67
2023-09-09 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
78

‎Makefile.devel‎

Lines changed: 28 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ GPERF = gperf
1414
MKDIR = mkdir -p
1515
RM = rm -f
1616

17+
CFLAGS := $(CFLAGS) -Ilib
18+
1719
all : lib/generated \
1820
lib/generated/aliases.h lib/generated/aliases_sysaix.h lib/generated/aliases_syshpux.h lib/generated/aliases_sysosf1.h lib/generated/aliases_syssolaris.h \
1921
lib/generated/aliases_aix.h lib/generated/aliases_aix_sysaix.h \
@@ -26,86 +28,67 @@ all : lib/generated \
2628
lib/generated :
2729
$(MKDIR) lib/generated
2830

29-
lib/generated/aliases.h : lib/encodings.def lib/genaliases.c
30-
$(CC) $(CFLAGS) lib/genaliases.c -o genaliases
31+
lib/generated/aliases.h : lib/encodings.def tools/genaliases.cpp
32+
$(CXX) $(CFLAGS) tools/genaliases.cpp -o genaliases
3133
./genaliases lib/generated/aliases.gperf
32-
$(RM) genaliases
3334
$(GPERF) -m 10 lib/generated/aliases.gperf > tmp.h
3435
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases.h
35-
$(RM) tmp.h
3636

37-
lib/generated/aliases_sysaix.h : lib/encodings.def lib/genaliases.c
38-
$(CC) $(CFLAGS) -DUSE_AIX_ALIASES lib/genaliases.c -o genaliases
37+
lib/generated/aliases_sysaix.h : lib/encodings.def tools/genaliases.cpp
38+
$(CXX) $(CFLAGS) -DUSE_AIX_ALIASES tools/genaliases.cpp -o genaliases
3939
./genaliases lib/generated/aliases_sysaix.gperf
40-
$(RM) genaliases
4140
$(GPERF) -m 10 lib/generated/aliases_sysaix.gperf > tmp.h
4241
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_sysaix.h
43-
$(RM) tmp.h
4442

45-
lib/generated/aliases_syshpux.h : lib/encodings.def lib/genaliases.c
46-
$(CC) $(CFLAGS) -DUSE_HPUX_ALIASES lib/genaliases.c -o genaliases
43+
lib/generated/aliases_syshpux.h : lib/encodings.def tools/genaliases.cpp
44+
$(CXX) $(CFLAGS) -DUSE_HPUX_ALIASES tools/genaliases.cpp -o genaliases
4745
./genaliases lib/generated/aliases_syshpux.gperf
48-
$(RM) genaliases
4946
$(GPERF) -m 10 lib/generated/aliases_syshpux.gperf > tmp.h
5047
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_syshpux.h
51-
$(RM) tmp.h
5248

53-
lib/generated/aliases_sysosf1.h : lib/encodings.def lib/genaliases.c
54-
$(CC) $(CFLAGS) -DUSE_OSF1_ALIASES lib/genaliases.c -o genaliases
49+
lib/generated/aliases_sysosf1.h : lib/encodings.def tools/genaliases.cpp
50+
$(CXX) $(CFLAGS) -DUSE_OSF1_ALIASES tools/genaliases.cpp -o genaliases
5551
./genaliases lib/generated/aliases_sysosf1.gperf
56-
$(RM) genaliases
5752
$(GPERF) -m 10 lib/generated/aliases_sysosf1.gperf > tmp.h
5853
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_sysosf1.h
59-
$(RM) tmp.h
6054

61-
lib/generated/aliases_syssolaris.h : lib/encodings.def lib/genaliases.c
62-
$(CC) $(CFLAGS) -DUSE_SOLARIS_ALIASES lib/genaliases.c -o genaliases
55+
lib/generated/aliases_syssolaris.h : lib/encodings.def tools/genaliases.cpp
56+
$(CXX) $(CFLAGS) -DUSE_SOLARIS_ALIASES tools/genaliases.cpp -o genaliases
6357
./genaliases lib/generated/aliases_syssolaris.gperf
64-
$(RM) genaliases
6558
$(GPERF) -m 10 lib/generated/aliases_syssolaris.gperf > tmp.h
6659
sed -e 's/^\(const struct alias \)/static \1/' < tmp.h > lib/generated/aliases_syssolaris.h
67-
$(RM) tmp.h
6860

69-
lib/generated/aliases_aix.h : lib/encodings_aix.def lib/genaliases2.c
70-
$(CC) $(CFLAGS) -DUSE_AIX lib/genaliases2.c -o genaliases
61+
lib/generated/aliases_aix.h : lib/encodings_aix.def tools/genaliases2.cpp
62+
$(CXX) $(CFLAGS) -DUSE_AIX tools/genaliases2.cpp -o genaliases
7163
./genaliases aix lib/generated/aliases_aix.h
72-
$(RM) genaliases
7364

74-
lib/generated/aliases_aix_sysaix.h : lib/encodings_aix.def lib/genaliases2.c
75-
$(CC) $(CFLAGS) -DUSE_AIX -DUSE_AIX_ALIASES lib/genaliases2.c -o genaliases
65+
lib/generated/aliases_aix_sysaix.h : lib/encodings_aix.def tools/genaliases2.cpp
66+
$(CXX) $(CFLAGS) -DUSE_AIX -DUSE_AIX_ALIASES tools/genaliases2.cpp -o genaliases
7667
./genaliases aix lib/generated/aliases_aix_sysaix.h
77-
$(RM) genaliases
7868

79-
lib/generated/aliases_osf1.h : lib/encodings_osf1.def lib/genaliases2.c
80-
$(CC) $(CFLAGS) -DUSE_OSF1 lib/genaliases2.c -o genaliases
69+
lib/generated/aliases_osf1.h : lib/encodings_osf1.def tools/genaliases2.cpp
70+
$(CXX) $(CFLAGS) -DUSE_OSF1 tools/genaliases2.cpp -o genaliases
8171
./genaliases osf1 lib/generated/aliases_osf1.h
82-
$(RM) genaliases
8372

84-
lib/generated/aliases_osf1_sysosf1.h : lib/encodings_osf1.def lib/genaliases2.c
85-
$(CC) $(CFLAGS) -DUSE_OSF1 -DUSE_OSF1_ALIASES lib/genaliases2.c -o genaliases
73+
lib/generated/aliases_osf1_sysosf1.h : lib/encodings_osf1.def tools/genaliases2.cpp
74+
$(CXX) $(CFLAGS) -DUSE_OSF1 -DUSE_OSF1_ALIASES tools/genaliases2.cpp -o genaliases
8675
./genaliases osf1 lib/generated/aliases_osf1_sysosf1.h
87-
$(RM) genaliases
8876

89-
lib/generated/aliases_dos.h : lib/encodings_dos.def lib/genaliases2.c
90-
$(CC) $(CFLAGS) -DUSE_DOS lib/genaliases2.c -o genaliases
77+
lib/generated/aliases_dos.h : lib/encodings_dos.def tools/genaliases2.cpp
78+
$(CXX) $(CFLAGS) -DUSE_DOS tools/genaliases2.cpp -o genaliases
9179
./genaliases dos lib/generated/aliases_dos.h
92-
$(RM) genaliases
9380

94-
lib/generated/aliases_zos.h : lib/encodings_zos.def lib/genaliases2.c
95-
$(CC) $(CFLAGS) -DUSE_ZOS lib/genaliases2.c -o genaliases
81+
lib/generated/aliases_zos.h : lib/encodings_zos.def tools/genaliases2.cpp
82+
$(CXX) $(CFLAGS) -DUSE_ZOS tools/genaliases2.cpp -o genaliases
9683
./genaliases zos lib/generated/aliases_zos.h
97-
$(RM) genaliases
9884

99-
lib/generated/aliases_extra.h : lib/encodings_extra.def lib/genaliases2.c
100-
$(CC) $(CFLAGS) -DUSE_EXTRA lib/genaliases2.c -o genaliases
85+
lib/generated/aliases_extra.h : lib/encodings_extra.def tools/genaliases2.cpp
86+
$(CXX) $(CFLAGS) -DUSE_EXTRA tools/genaliases2.cpp -o genaliases
10187
./genaliases extra lib/generated/aliases_extra.h
102-
$(RM) genaliases
103-
10488

105-
lib/generated/flags.h : lib/encodings.def lib/encodings_aix.def lib/encodings_osf1.def lib/encodings_dos.def lib/encodings_zos.def lib/encodings_extra.def lib/converters.h lib/genflags.c
106-
$(CC) $(CFLAGS) lib/genflags.c -o genflags
89+
lib/generated/flags.h : lib/encodings.def lib/encodings_aix.def lib/encodings_osf1.def lib/encodings_dos.def lib/encodings_zos.def lib/encodings_extra.def lib/converters.h tools/genflags.cpp
90+
$(CXX) $(CFLAGS) tools/genflags.cpp -o genflags
10791
./genflags > lib/generated/flags.h
108-
$(RM) genflags
10992

11093
clean :
11194
rm -f lib/generated/aliases.gperf lib/generated/aliases_sysaix.gperf lib/generated/aliases_syshpux.gperf lib/generated/aliases_sysosf1.gperf lib/generated/aliases_syssolaris.gperf

‎lib/genaliases.c‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎lib/genaliases2.c‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎lib/generated/flags.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@
133133
#define ei_cp1161_oflags (0)
134134
#define ei_cp1162_oflags (HAVE_QUOTATION_MARKS)
135135
#define ei_cp1163_oflags (0)
136-
#define ei_dec_kanji_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
137-
#define ei_dec_hanyu_oflags (HAVE_QUOTATION_MARKS)
138136
#define ei_cp437_oflags (0)
139137
#define ei_cp737_oflags (0)
140138
#define ei_cp775_oflags (0)
@@ -150,6 +148,15 @@
150148
#define ei_cp865_oflags (0)
151149
#define ei_cp869_oflags (HAVE_QUOTATION_MARKS)
152150
#define ei_cp1125_oflags (0)
151+
#define ei_euc_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
152+
#define ei_shift_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
153+
#define ei_iso2022_jp3_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
154+
#define ei_big5_2003_oflags (HAVE_QUOTATION_MARKS)
155+
#define ei_tds565_oflags (0)
156+
#define ei_atarist_oflags (HAVE_ACCENTS)
157+
#define ei_riscos1_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
158+
#define ei_dec_kanji_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
159+
#define ei_dec_hanyu_oflags (HAVE_QUOTATION_MARKS)
153160
#define ei_ebcdic037_oflags (HAVE_ACCENTS)
154161
#define ei_ebcdic273_oflags (HAVE_ACCENTS)
155162
#define ei_ebcdic277_oflags (HAVE_ACCENTS)
@@ -203,10 +210,3 @@
203210
#define ei_ebcdic4971_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
204211
#define ei_ebcdic12712_oflags (HAVE_ACCENTS)
205212
#define ei_ebcdic16804_oflags (0)
206-
#define ei_euc_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
207-
#define ei_shift_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
208-
#define ei_iso2022_jp3_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
209-
#define ei_big5_2003_oflags (HAVE_QUOTATION_MARKS)
210-
#define ei_tds565_oflags (0)
211-
#define ei_atarist_oflags (HAVE_ACCENTS)
212-
#define ei_riscos1_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)

0 commit comments

Comments
 (0)