From e7451ff9c19fb2e6a693604a34da8fcb1bb60bed Mon Sep 17 00:00:00 2001
From: jez_higgins <>
Date: Fri, 5 Aug 2005 08:48:17 +0000
Subject: [PATCH] *** empty log message ***

---
 Makefile             |  2 ++
 Makefile.header      | 18 ++++++++++------
 examples/SAX/pyx.bpr | 40 ++++++++++++++++++++++++++++++++----
 test/XPath/Makefile  | 49 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 test/XPath/Makefile

diff --git a/Makefile b/Makefile
index 84e1bd02..2d324b56 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,12 @@
 # High level rules
 all : 
 	cd SAX; ${MAKE}
+	cd test; ${MAKE}
 	cd examples; ${MAKE}
 
 clean :
 	cd SAX; ${MAKE} clean
+	cd test; ${MAKE} clean
 	cd examples; ${MAKE} clean
 	rm -f arabica.tar.gz
 	rm -f arabica.zip
diff --git a/Makefile.header b/Makefile.header
index 9c117d2e..a859a138 100644
--- a/Makefile.header
+++ b/Makefile.header
@@ -9,13 +9,17 @@ PARSER_CONFIG = -DUSE_LIBXML2 -DARABICA_NO_WCHAR_T
 #####
 MAKE = make
 # C++ compiler
-CXX = /home/jez/gcc-3.4.2/bin/gcc 
+#CXX = /home/jez/gcc-3.4.2/bin/gcc 
+CXX = gcc 
 # preprocessor
-CPP = /home/jez/gcc-3.4.2/bin/gcc -E
+#CPP = /home/jez/gcc-3.4.2/bin/gcc -E
+CPP = gcc -E
 # linker
-LD =  /home/jez/gcc-3.4.2/bin/gcc 
+#LD =  /home/jez/gcc-3.4.2/bin/gcc 
+LD = gcc 
 # archiver
-AR = /home/jez/gcc-3.4.2/bin/ar r
+#AR = /home/jez/gcc-3.4.2/bin/ar r
+AR = ar r
 
 ###########
 # Utilities
@@ -33,8 +37,10 @@ CXXFLAGS = -Wall
 LDFLAGS = 
 
 # Includes and library directories 
-INCS_DIRS = -I.. -I/home/jez/gcc-3.4.2/include -I/usr/include/libxml2
-LIBS_DIRS = -I/home/jez/gcc-3.4.2/lib 
+#INCS_DIRS = -I.. -I/home/jez/gcc-3.4.2/include -I/usr/include/libxml2
+INCS_DIRS = -I.. -I/usr/include/libxml2
+#LIBS_DIRS = -I/home/jez/gcc-3.4.2/lib 
+LIBS_DIRS = 
 
 STATIC_LIBS =
 DYNAMIC_LIBS =  -lxml2 -lstdc++
diff --git a/examples/SAX/pyx.bpr b/examples/SAX/pyx.bpr
index d20d3a0a..9b4ee6d2 100644
--- a/examples/SAX/pyx.bpr
+++ b/examples/SAX/pyx.bpr
@@ -2,42 +2,58 @@
 <!-- C++Builder XML Project -->
 <PROJECT>
   <MACROS>
-    <VERSION value="BCB.05.03"/>
+    <VERSION value="BCB.06.00"/>
     <PROJECT value="..\bin\pyx.exe"/>
     <OBJFILES value="pyx.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
     <LIBFILES value="..\bin\sax.lib ..\..\..\lib\bcb\expat_bcb.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
-    <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi dclocx50.bpi bcb97axserver50.bpi"/>
+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi dclocx.bpi bcb97axserver.bpi"/>
     <PATHCPP value=".;"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
-    <LINKER value="tlink32"/>
+    <LINKER value="ilink32"/>
     <USERDEFINES value="_DEBUG"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="pyx.bpf"/>
     <INCLUDEPATH value="..;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
     <LIBPATH value="..\bin;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
+    <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
+    <IDLCFLAGS value="-src_suffix cpp -D_DEBUG -I.. -I..\..\..\include -I$(BCB)\include 
+      -I$(BCB)\include\vcl -boa"/>
     <CFLAG1 value="-Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c"/>
-    <PFLAGS value="-$YD -$W -$O- -v -JPHNE -M"/>
+    <PFLAGS value="-$YD -$W -$O- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
     <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
     <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32i.lib"/>
+    <OTHERFILES value=""/>
   </LINKER>
+  <FILELIST>
+      <FILE FILENAME="pyx.bpf" FORMNAME="" UNITNAME="pyx" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="pyx.cpp" FORMNAME="" UNITNAME="pyx" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\bin\sax.lib" FORMNAME="" UNITNAME="sax" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\lib\bcb\expat_bcb.lib" FORMNAME="" UNITNAME="expat_bcb" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+  </FILELIST>
+  <BUILDTOOLS>
+  </BUILDTOOLS>
+
   <IDEOPTIONS>
 [Version Info]
 IncludeVerInfo=0
@@ -99,13 +115,29 @@ DebugSourceDirs=$(BCB)\source\vcl
 
 [Parameters]
 RunParams=
+Launcher=
+UseLauncher=0
+DebugCWD=
 HostApplication=
 RemoteHost=
 RemotePath=
+RemoteLauncher=
+RemoteCWD=
 RemoteDebug=0
 
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
+LinkCGLIB=0
+
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
   </IDEOPTIONS>
 </PROJECT>
\ No newline at end of file
diff --git a/test/XPath/Makefile b/test/XPath/Makefile
new file mode 100644
index 00000000..d28f09a3
--- /dev/null
+++ b/test/XPath/Makefile
@@ -0,0 +1,49 @@
+-include ../../Makefile.header
+
+######################################
+# ADDITIONAL BUILD FLAGS
+INCS_DIRS += -I../.. 
+LIBS_DIRS += -L../../bin 
+
+STATIC_LIBS +=
+DYNAMIC_LIBS += -lArabica
+
+######################################
+# SOURCE FILES
+XPATH_SRCS = main.cpp arithmetic_test.cpp axis_enumerator_test.cpp execute_test.cpp logical_test.cpp node_test_test.cpp parse_test.cpp relational_test.cpp step_test.cpp value_test
+XPATH_HDRS = $(patsubst %.cpp,%.h,$(XPATH_SRCS))
+XPATH_OBJS = $(patsubst %.cpp,%.o,$(XPATH_SRCS))
+
+CPPUNIT_DIR = ../CppUnit
+
+CPPUNITFW_FILES = TestCase.cpp TestFailure.cpp TestResult.cpp TestSuite.cpp
+CPPUNITFW_SRCS = $(patsubst Test%,$(CPPUNIT_DIR)/framework/Test%,$(CPPUNITFW_FILES))
+CPPUNITFW_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITFW_SRCS))
+
+CPPUNITUI_FILES = TextTestResult.cpp
+CPPUNITUI_SRCS = $(patsubst Text%,$(CPPUNIT_DIR)/textui/Text%,$(CPPUNITUI_FILES))
+CPPUNITUI_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITUI_SRCS))
+
+######################################
+# High level rules
+all : xpath_test 
+
+xpath_test : $(XPATH_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
+	$(COPY) xpath_test$(EXESUFFIX) ../../bin
+
+######################
+# Compile rules
+####
+-include ../../Makefile.rules
+
+######################
+# Cleaning up
+clean :
+	$(REMOVE) $(CPPUNITUI_OBJS) \
+		$(CPPUNITFW_OBJS) \
+		$(XPATH_OBJS) \
+		xpath_test$(EXESUFFIX) \
+		 ../../bin/xpath_test$(EXESUFFIX) 
+
+# End of File