Initial configuration for pjlib-util

git-svn-id: http://svn.pjsip.org/repos/pjproject/main@32 74dad513-b988-da41-8d7b-12977e46ad98

5 files changed, 82 insertions, 210 deletions

diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
index 4a0db783..595cce88 100644
--- a/pjlib/build/Makefile
+++ b/pjlib/build/Makefile
@@ -75,9 +75,9 @@ export PJLIB_SRCDIR = ../src/pj
 export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 	array.o config.o errno.o except.o fifobuf.o guid.o \
 	hash.o list.o lock.o log.o \
-	md5.o pool.o pool_caching.o rand.o \
-	rbtree.o scanner.o string.o stun.o stun_client.o timer.o \
-	types.o xml.o symbols.o
+	pool.o pool_caching.o rand.o \
+	rbtree.o string.o timer.o \
+	types.o symbols.o
 export PJLIB_CFLAGS += $(_CFLAGS)
 
 ###############################################################################
@@ -91,7 +91,7 @@ export TEST_OBJS += atomic.o echo_clt.o errno.o exception.o \
 		    select.o sleep.o sock.o sock_perf.o \
 		    string.o test.o thread.o timer.o timestamp.o \
 		    udp_echo_srv_sync.o udp_echo_srv_ioqueue.o \
-		    util.o xml.o
+		    util.o
 export TEST_CFLAGS += $(_CFLAGS)
 export TEST_LDFLAGS += $(_LDFLAGS)
 export TEST_EXE := ../bin/pjlib-test-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)
diff --git a/pjlib/build/pjlib.dsp b/pjlib/build/pjlib.dsp
index 69881e22..8b95515a 100644
--- a/pjlib/build/pjlib.dsp
+++ b/pjlib/build/pjlib.dsp
@@ -253,10 +253,6 @@ SOURCE=..\src\pj\log_writer_stdout.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\pj\md5.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\src\pj\os_core_win32.c

 # End Source File

 # Begin Source File

@@ -301,10 +297,6 @@ SOURCE=..\src\pj\rbtree.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\pj\scanner.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\src\pj\sock_bsd.c

 # End Source File

 # Begin Source File

@@ -317,24 +309,12 @@ SOURCE=..\src\pj\string.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\pj\stun.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pj\stun_client.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\src\pj\timer.c

 # End Source File

 # Begin Source File

 

 SOURCE=..\src\pj\types.c

 # End Source File

-# Begin Source File

-

-SOURCE=..\src\pj\xml.c

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -521,10 +501,6 @@ SOURCE=..\include\pj\log.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\include\pj\md5.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\include\pj\os.h

 # End Source File

 # Begin Source File

@@ -545,10 +521,6 @@ SOURCE=..\include\pj\rbtree.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\include\pj\scanner.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\include\pj\sock.h

 # End Source File

 # Begin Source File

@@ -561,20 +533,12 @@ SOURCE=..\include\pj\string.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\include\pj\stun.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\include\pj\timer.h

 # End Source File

 # Begin Source File

 

 SOURCE=..\include\pj\types.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\include\pj\xml.h

-# End Source File

 # End Group

 # Begin Group "Inline Files"

 

diff --git a/pjlib/build/pjlib.vcproj b/pjlib/build/pjlib.vcproj
index 9e06efef..3acfbf5f 100644
--- a/pjlib/build/pjlib.vcproj
+++ b/pjlib/build/pjlib.vcproj
@@ -278,6 +278,12 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pj\file_access_win32.c">

+			</File>

+			<File

+				RelativePath="..\src\pj\file_io_win32.c">

+			</File>

+			<File

 				RelativePath="..\src\pj\guid.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -344,6 +350,24 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pj\ioqueue_common_abs.c">

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="TRUE">

+					<Tool

+						Name="VCCLCompilerTool"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="TRUE">

+					<Tool

+						Name="VCCLCompilerTool"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\pj\ioqueue_common_abs.h">

+			</File>

+			<File

 				RelativePath="..\src\pj\ioqueue_select.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -478,28 +502,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\src\pj\md5.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\src\pj\os_core_win32.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -742,28 +744,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\src\pj\scanner.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\src\pj\sock_bsd.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -830,50 +810,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\src\pj\stun.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pj\stun_client.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\src\pj\timer.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -917,28 +853,6 @@
 						BrowseInformation="1"/>

 				</FileConfiguration>

 			</File>

-			<File

-				RelativePath="..\src\pj\xml.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

 			<Filter

 				Name="Other Targets"

 				Filter="">

@@ -967,6 +881,36 @@
 					</FileConfiguration>

 				</File>

 				<File

+					RelativePath="..\src\pj\file_access_unistd.c">

+					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="TRUE">

+						<Tool

+							Name="VCCLCompilerTool"/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						ExcludedFromBuild="TRUE">

+						<Tool

+							Name="VCCLCompilerTool"/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\src\pj\file_io_ansi.c">

+					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="TRUE">

+						<Tool

+							Name="VCCLCompilerTool"/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						ExcludedFromBuild="TRUE">

+						<Tool

+							Name="VCCLCompilerTool"/>

+					</FileConfiguration>

+				</File>

+				<File

 					RelativePath="..\src\pj\guid_simple.c">

 					<FileConfiguration

 						Name="Debug|Win32"

@@ -1039,6 +983,21 @@
 					</FileConfiguration>

 				</File>

 				<File

+					RelativePath="..\src\pj\ioqueue_linux_kernel.c">

+					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="TRUE">

+						<Tool

+							Name="VCCLCompilerTool"/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release|Win32"

+						ExcludedFromBuild="TRUE">

+						<Tool

+							Name="VCCLCompilerTool"/>

+					</FileConfiguration>

+				</File>

+				<File

 					RelativePath="..\src\pj\log_writer_printk.c">

 					<FileConfiguration

 						Name="Debug|Win32"

@@ -1341,6 +1300,12 @@
 				RelativePath="..\include\pj\fifobuf.h">

 			</File>

 			<File

+				RelativePath="..\include\pj\file_access.h">

+			</File>

+			<File

+				RelativePath="..\include\pj\file_io.h">

+			</File>

+			<File

 				RelativePath="..\include\pj\guid.h">

 			</File>

 			<File

@@ -1359,9 +1324,6 @@
 				RelativePath="..\include\pj\log.h">

 			</File>

 			<File

-				RelativePath="..\include\pj\md5.h">

-			</File>

-			<File

 				RelativePath="..\include\pj\os.h">

 			</File>

 			<File

@@ -1377,9 +1339,6 @@
 				RelativePath="..\include\pj\rbtree.h">

 			</File>

 			<File

-				RelativePath="..\include\pj\scanner.h">

-			</File>

-			<File

 				RelativePath="..\include\pj\sock.h">

 			</File>

 			<File

@@ -1389,17 +1348,11 @@
 				RelativePath="..\include\pj\string.h">

 			</File>

 			<File

-				RelativePath="..\include\pj\stun.h">

-			</File>

-			<File

 				RelativePath="..\include\pj\timer.h">

 			</File>

 			<File

 				RelativePath="..\include\pj\types.h">

 			</File>

-			<File

-				RelativePath="..\include\pj\xml.h">

-			</File>

 			<Filter

 				Name="compat"

 				Filter="">

diff --git a/pjlib/build/pjlib_test.dsp b/pjlib/build/pjlib_test.dsp
index c2dc04ab..ca88fb43 100644
--- a/pjlib/build/pjlib_test.dsp
+++ b/pjlib/build/pjlib_test.dsp
@@ -206,10 +206,6 @@ SOURCE="..\src\pjlib-test\udp_echo_srv_sync.c"
 

 SOURCE="..\src\pjlib-test\util.c"

 # End Source File

-# Begin Source File

-

-SOURCE="..\src\pjlib-test\xml.c"

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

diff --git a/pjlib/build/pjlib_test.vcproj b/pjlib/build/pjlib_test.vcproj
index 1cafa218..8fc0d8e8 100644
--- a/pjlib/build/pjlib_test.vcproj
+++ b/pjlib/build/pjlib_test.vcproj
@@ -190,28 +190,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\src\pjlib-test\echo_srv.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\src\pjlib-test\errno.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -278,6 +256,9 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjlib-test\file.c">

+			</File>

+			<File

 				RelativePath="..\src\pjlib-test\ioq_perf.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -785,28 +766,6 @@
 						BrowseInformation="1"/>

 				</FileConfiguration>

 			</File>

-			<File

-				RelativePath="..\src\pjlib-test\xml.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"