[sword-cvs] icu-sword/source/test/hdrtst Makefile,1.3,1.4 cxxfiles.txt,1.1,1.2

[sword@www.crosswire.org]

Update of /cvs/core/icu-sword/source/test/hdrtst
In directory www:/tmp/cvs-serv8911/source/test/hdrtst

Modified Files:
	Makefile cxxfiles.txt 
Log Message:
ICU 2.8 sync

Index: Makefile
===================================================================
RCS file: /cvs/core/icu-sword/source/test/hdrtst/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	10 Sep 2003 02:42:41 -0000	1.3
+++ Makefile	6 Apr 2004 10:09:34 -0000	1.4
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 1999-2002, International Business Machines Corporation and
+#  Copyright (c) 1999-2003, International Business Machines Corporation and
 #  others. All Rights Reserved.
 #
 #
@@ -26,16 +26,18 @@
 ifeq ($(USE_ICU_CONFIG),1)
 	include $(shell icu-config --incfile)
 	DIRS=$(shell icu-config --prefix)/include/unicode
+	LDIRS=$(shell icu-config --prefix)/include/layout
 else
 	include ../../config/Makefile.inc
 	DIRS=../../../common/unicode ../../../i18n/unicode ../../../extra/ustdio/unicode
+	LDIRS=../../../layout/layout ../../../layoutex/layout
 endif
 
 all: 
 	@echo Please read this Makefile for more information.
 	@echo run \'$(MAKE) check\' to run the test 
 
-check: hdrdir dtest ctest cpptest doclean
+check: hdrdir lodir dtest ctest cpptest lotest doclean
 	@echo "All header tests have finished. If deprecation #errors appeared, "
 	@echo "       add files to hdrtst/dfiles.txt"
 	@echo "#################################################################"
@@ -59,6 +61,16 @@
 	done
 	rm unicode/pwin32.h
 
+lodir:
+	@-$(RMV) ./layout
+	@mkdir ./layout
+	@echo Preparing layout/ directory ..
+	@cd ./layout ; \
+	for dir in $(LDIRS); do \
+	  echo "linking from " $$dir '(' `ls $$dir/*.h | wc -l` 'headers )' ; \
+	  ln -s $$dir/*.h . ; \
+	done
+
 cpptest:
 	@echo "C++ test #######################################################"
 	@rm -f Makefile.sub
@@ -70,8 +82,21 @@
 	  echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.cpp ; \
 	  echo 'void junk(){}' >> ht_$$incfile.cpp ; \
           $(COMPILE.cc) -c -I. ht_$$incfile.cpp ; \
-	  RES=$$? ; \
-	  echo $$RES ; \
+	  echo $$? ; \
+	done
+
+lotest:
+	@echo "Layout test #######################################################"
+	@rm -f Makefile.sub
+	@echo 'Testing all layout  files under C++'
+	@echo 'the number after the hyphen (-) refers to the exit code - should be zero!'
+	@for file in layout/*.h; do \
+	  incfile=`basename $$file .h` ; \
+	  echo -n "C++  layout/$$incfile.h 	- " ; \
+	  echo '#include "'layout/$$incfile'.h"' > ht_$$incfile.cpp ; \
+	  echo 'void junk(){}' >> ht_$$incfile.cpp ; \
+          $(COMPILE.cc) -c -I. ht_$$incfile.cpp ; \
+	  echo $$? ; \
 	done
 
 dtest:
@@ -114,4 +139,5 @@
 distclean clean:
 	-@rm -f *.h *.c *.cpp *.o *.junk
 	-@$(RMV) ./unicode
+	-@$(RMV) ./layout
 

Index: cxxfiles.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/test/hdrtst/cxxfiles.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cxxfiles.txt	10 Sep 2003 02:42:41 -0000	1.1
+++ cxxfiles.txt	6 Apr 2004 10:09:34 -0000	1.2
@@ -58,3 +58,14 @@
 loengine.h
 #the following are C++ also
 ustream.h
+symtable.h
+#layout, layoutex are C++ only
+LayoutEngine.h
+LEFontInstance.h
+LEGlyphFilter.h
+LELanguages.h
+LEScripts.h
+LESwaps.h
+LETypes.h
+ParagraphLayout.h
+RunArrays.h