Rework pjlib++

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

5 files changed, 164 insertions, 73 deletions

diff --git a/pjlib/build/pjlib++-test.dsp b/pjlib/build/pjlib++-test.dsp
new file mode 100644
index 00000000..88ae04a1
--- /dev/null
+++ b/pjlib/build/pjlib++-test.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="pjlib++_test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=pjlib++_test - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "pjlib++-test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "pjlib++-test.mak" CFG="pjlib++_test - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "pjlib++_test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "pjlib++_test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "pjlib++_test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "./output/pjlib++-test-i386-win32-vc6-release"

+# PROP BASE Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "./output/pjlib++-test-i386-win32-vc6-release"

+# PROP Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../pjlib-util/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D PJ_WIN32=1 /D PJ_M_I386=1 /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjlib++-test-i386-win32-vc6-release.exe"

+

+!ELSEIF  "$(CFG)" == "pjlib++_test - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "./output/pjlib++-test-i386-win32-vc6-debug"

+# PROP BASE Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "./output/pjlib++-test-i386-win32-vc6-debug"

+# PROP Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib-util/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /YX /FD /GZ /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjlib++-test-i386-win32-vc6-debug.exe" /pdbtype:sept

+

+!ENDIF 

+

+# Begin Target

+

+# Name "pjlib++_test - Win32 Release"

+# Name "pjlib++_test - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE="..\src\pjlib++-test\main.cpp"

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/pjlib/build/pjlibpp.dsp b/pjlib/build/pjlib++.dsp
index 34b31a81..77057fbf 100644
--- a/pjlib/build/pjlibpp.dsp
+++ b/pjlib/build/pjlib++.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="pjlibpp" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="pjlib++" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=pjlibpp - Win32 Debug

+CFG=pjlib++ - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "pjlibpp.mak".

+!MESSAGE NMAKE /f "pjlib++.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "pjlibpp.mak" CFG="pjlibpp - Win32 Debug"

+!MESSAGE NMAKE /f "pjlib++.mak" CFG="pjlib++ - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "pjlibpp - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "pjlibpp - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "pjlib++ - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "pjlib++ - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -28,20 +28,20 @@ CFG=pjlibpp - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "pjlibpp - Win32 Release"

+!IF  "$(CFG)" == "pjlib++ - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\output\pjlibpp-i386-win32-vc6-release"

-# PROP BASE Intermediate_Dir ".\output\pjlibpp-i386-win32-vc6-release"

+# PROP BASE Output_Dir ".\output\pjlib++-i386-win32-vc6-release"

+# PROP BASE Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjlibpp-i386-win32-vc6-release"

-# PROP Intermediate_Dir ".\output\pjlibpp-i386-win32-vc6-release"

+# PROP Output_Dir ".\output\pjlib++-i386-win32-vc6-release"

+# PROP Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../src" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PJ_WIN32" /D "PJ_M_I386" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../pjlib-util/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -52,20 +52,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo /out:"../lib/pjlibp_vc6s.lib"

 

-!ELSEIF  "$(CFG)" == "pjlibpp - Win32 Debug"

+!ELSEIF  "$(CFG)" == "pjlib++ - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\output\pjlibpp-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir ".\output\pjlibpp-i386-win32-vc6-debug"

+# PROP BASE Output_Dir ".\output\pjlib++-i386-win32-vc6-debug"

+# PROP BASE Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjlibpp-i386-win32-vc6-debug"

-# PROP Intermediate_Dir ".\output\pjlibpp-i386-win32-vc6-debug"

+# PROP Output_Dir ".\output\pjlib++-i386-win32-vc6-debug"

+# PROP Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../src" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PJ_WIN32" /D "PJ_M_I386" /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib-util/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FD /GZ /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -80,78 +80,62 @@ LIB32=link.exe -lib
 

 # Begin Target

 

-# Name "pjlibpp - Win32 Release"

-# Name "pjlibpp - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE="..\src\pj++\compiletest.cpp"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pj++\pj++.cpp"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pj++\proactor.cpp"

-# End Source File

-# End Group

+# Name "pjlib++ - Win32 Release"

+# Name "pjlib++ - Win32 Debug"

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE="..\src\pj++\hash.hpp"

+SOURCE="..\include\pj++\file.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\ioqueue.hpp"

+SOURCE="..\include\pj++\hash.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\list.hpp"

+SOURCE="..\include\pj++\list.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\os.hpp"

+SOURCE="..\include\pj++\lock.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pjlib++.hpp"

+SOURCE="..\include\pj++\os.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\pool.hpp"

+SOURCE="..\include\pj++\pool.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\proactor.hpp"

+SOURCE="..\include\pj++\proactor.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\scanner.hpp"

+SOURCE="..\include\pj++\scanner.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\sock.hpp"

+SOURCE="..\include\pj++\sock.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\string.hpp"

+SOURCE="..\include\pj++\string.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\timer.hpp"

+SOURCE="..\include\pj++\timer.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\tree.hpp"

+SOURCE="..\include\pj++\tree.hpp"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\pj++\types.hpp"

+SOURCE="..\include\pj++\types.hpp"

 # End Source File

 # End Group

 # End Target

diff --git a/pjlib/build/pjlibpp.vcproj b/pjlib/build/pjlib++.vcproj
index 4c6967c9..4c6967c9 100644
--- a/pjlib/build/pjlibpp.vcproj
+++ b/pjlib/build/pjlib++.vcproj
diff --git a/pjlib/build/pjlib.dsp b/pjlib/build/pjlib.dsp
index 8b95515a..a4222ca2 100644
--- a/pjlib/build/pjlib.dsp
+++ b/pjlib/build/pjlib.dsp
@@ -234,6 +234,13 @@ SOURCE=..\src\pj\ioqueue_select.c
 # Begin Source File

 

 SOURCE=..\src\pj\ioqueue_winnt.c

+

+!IF  "$(CFG)" == "pjlib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "pjlib - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/pjlib/build/pjlib.dsw b/pjlib/build/pjlib.dsw
index 87ebf475..41d8c9e0 100644
--- a/pjlib/build/pjlib.dsw
+++ b/pjlib/build/pjlib.dsw
@@ -3,14 +3,10 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "pjlib"=".\pjlib.dsp" - Package Owner=<4>

+Project: "pjlib"=.\pjlib.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

-    begin source code control

-    "$/pjproject-0.3/pjlib/build", EJDAAAAA

-    .

-    end source code control

 }}}

 

 Package=<4>

@@ -19,14 +15,22 @@ Package=<4>
 

 ###############################################################################

 

-Project: "pjlib_samples"=".\pjlib_samples.dsp" - Package Owner=<4>

+Project: "pjlib++"=".\pjlib++.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "pjlib_samples"=.\pjlib_samples.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

-    begin source code control

-    "$/pjproject-0.3/pjlib/build", EJDAAAAA

-    .

-    end source code control

 }}}

 

 Package=<4>

@@ -38,14 +42,10 @@ Package=<4>
 

 ###############################################################################

 

-Project: "pjlib_test"=".\pjlib_test.dsp" - Package Owner=<4>

+Project: "pjlib_test"=.\pjlib_test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

-    begin source code control

-    "$/pjproject-0.3/pjlib/build", EJDAAAAA

-    .

-    end source code control

 }}}

 

 Package=<4>

@@ -57,18 +57,20 @@ Package=<4>
 

 ###############################################################################

 

-Project: "pjlibpp"=".\pjlibpp.dsp" - Package Owner=<4>

+Project: "pjlib++_test"=.\pjlib++-test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

-    begin source code control

-    "$/pjproject-0.3/pjlib/build", EJDAAAAA

-    .

-    end source code control

 }}}

 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name pjlib

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name pjlib++

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -77,10 +79,6 @@ Global:
 

 Package=<5>

 {{{

-    begin source code control

-    "$/pjproject-0.3/pjlib/build", EJDAAAAA

-    .

-    end source code control

 }}}

 

 Package=<3>