mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix update-unicode target

Browse Source 
The normalization-check target needs to be run last, after moving the
newly generated files into place.  Also, we need an additional
dependency so that unicode_norm.o is rebuilt first.  Otherwise,
norm_test will still test the old files but against the new expected
results, which will probably fail.
This commit is contained in:
Peter Eisentraut 2020-04-19 14:59:29 +02:00
parent 00f4aba46d
commit 73afabcdc2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/unicode/Makefile
View File

@ -19,8 +19,8 @@ LIBS += $(PTHREAD_LIBS)
all: all:
update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_normprops_table.h update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_normprops_table.h
$(MAKE) normalization-check
mv $^ ../../../src/include/common/ mv $^ ../../../src/include/common/
$(MAKE) normalization-check
# These files are part of the Unicode Character Database. Download # These files are part of the Unicode Character Database. Download
# them on demand. The dependency on Makefile.global is for # them on demand. The dependency on Makefile.global is for
@ -43,10 +43,15 @@ unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizat
normalization-check: norm_test normalization-check: norm_test
./norm_test ./norm_test
norm_test: norm_test.o ../unicode_norm.o norm_test: norm_test.o ../unicode_norm.o | submake-common
norm_test.o: norm_test_table.h norm_test.o: norm_test_table.h
.PHONY: submake-common
submake-common:
$(MAKE) -C .. all
norm_test_table.h: generate-norm_test_table.pl NormalizationTest.txt norm_test_table.h: generate-norm_test_table.pl NormalizationTest.txt
perl generate-norm_test_table.pl NormalizationTest.txt $@ perl generate-norm_test_table.pl NormalizationTest.txt $@