SVN Commit by dpage: r4518 - in trunk/pgadmin3: pkg/win32/src src - Mailing list pgadmin-hackers

Author: dpage
Date: 2005-10-07 10:52:43 +0100 (Fri, 07 Oct 2005)
New Revision: 4518

Modified:
   trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs
   trunk/pgadmin3/src/pgAdmin3.dsp
Log:
Update Windows build/installer to use 8.1 libpq with kerberos support.

Modified: trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs
===================================================================
--- trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs    2005-10-07 08:27:23 UTC (rev 4517)
+++ trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs    2005-10-07 09:52:43 UTC (rev 4518)
@@ -30,11 +30,13 @@
                     <Directory Id="VERSIONDIR" Name="$(var.VERSION)">

                         <Component Id="core_libs" Guid="AFEC279C-29A4-402D-8BDD-DC544312579F">
-                            <File Id="core_libs.libeay32.dll" Name="libeay32.dll" DiskId="1"
src="$(var.SYSTEM32DIR)/libeay32.dll"/> 
-                            <File Id="core_libs.libiconv-2.dll" Name="libico~1.dll" LongName="libiconv-2.dll"
DiskId="1"src="$(var.SYSTEM32DIR)/libiconv-2.dll" /> 
-                            <File Id="core_libs.libintl-2.dll" Name="libint~1.dll" LongName="libintl-2.dll" DiskId="1"
src="$(var.SYSTEM32DIR)/libintl-2.dll"/> 
-                            <File Id="core_libs.libpq.dll" Name="libpq.dll" DiskId="1"
src="$(var.SYSTEM32DIR)/libpq.dll"/> 
-                            <File Id="core_libs.ssleay32.dll" Name="ssleay32.dll" DiskId="1"
src="$(var.SYSTEM32DIR)/ssleay32.dll"/> 
+                            <File Id="core_libs.libpq.dll" Name="libpq.dll" DiskId="1" src="c:/program
files/postgresql/8.1/bin/libpq.dll"/> 
+                            <File Id="core_libs.libiconv-2.dll" Name="libico~1.dll" LongName="libiconv-2.dll"
DiskId="1"src="c:/program files/postgresql/8.1/bin/libiconv-2.dll" /> 
+                            <File Id="core_libs.libintl-2.dll" Name="libint~1.dll" LongName="libintl-2.dll" DiskId="1"
src="c:/programfiles/postgresql/8.1/bin/libintl-2.dll" /> 
+                            <File Id="core_libs.libeay32.dll" Name="libeay32.dll" DiskId="1" src="c:/program
files/postgresql/8.1/bin/libeay32.dll"/> 
+                            <File Id="core_libs.ssleay32.dll" Name="ssleay32.dll" DiskId="1" src="c:/program
files/postgresql/8.1/bin/ssleay32.dll"/> 
+                            <File Id="core_libs.comerr32.dll" Name="comerr32.dll" DiskId="1" src="c:/program
files/postgresql/8.1/bin/comerr32.dll"/> 
+                            <File Id="core_libs.krb5_32.dll" Name="krb5_32.dll" DiskId="1" src="c:/program
files/postgresql/8.1/bin/krb5_32.dll"/> 
                         </Component>

                         <Component Id="pgadmin_exes" Guid="3F617C40-4FAF-4C46-BEDE-AE7A16E24F61">

Modified: trunk/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- trunk/pgadmin3/src/pgAdmin3.dsp    2005-10-07 08:27:23 UTC (rev 4517)
+++ trunk/pgadmin3/src/pgAdmin3.dsp    2005-10-07 09:52:43 UTC (rev 4518)
@@ -43,8 +43,8 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6.1/include" /I
"c:/wxWidgets-2.6.1/contrib/include"/I "c:/program files/postgresql/8.0/include" /I "include/" /I "agent/include" /I
"slony/include"/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D
"__WIN95__"/D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Fr
/Yu"pgadmin3.h"/FD /c 
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/include" /I "slony/include" /D "WIN32" /D "_DEBUG" /D
"_WINDOWS"/D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D
"STRICT"/D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Fr /Yu"pgadmin3.h" /FD /c 
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6.1/include" /I
"c:/wxWidgets-2.6.1/contrib/include"/I "c:/program files/postgresql/8.1/include" /I "include/" /I "agent/include" /I
"slony/include"/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D
"__WIN95__"/D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Fr
/Yu"pgadmin3.h"/FD /c 
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include" /I
"c:/programfiles/postgresql/8.1/include" /I "include/" /I "agent/include" /I "slony/include" /D "WIN32" /D "_DEBUG" /D
"_WINDOWS"/D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D
"STRICT"/D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Fr /Yu"pgadmin3.h" /FD /c 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6.1/include" /d "_DEBUG"
@@ -53,9 +53,9 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib
wxmsw26ud_html.libwxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib
wxmsw26ud_xrc.libwxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.0/lib/ms" 
+# ADD BASE LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib
wxmsw26ud_html.libwxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib
wxmsw26ud_xrc.libwxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.1/lib/ms" 
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib
wxmsw26ud_html.libwxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib
wxmsw26ud_xrc.libwxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.0/lib/ms" 
+# ADD LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib
wxmsw26ud_html.libwxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib
wxmsw26ud_xrc.libwxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.1/lib/ms" 
 # SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "pgAdmin3 - Win32 Release"
@@ -72,8 +72,8 @@
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include"
/I"c:/program files/postgresql/8.0/include" /I "include/" /I "agent/include" /I "slony/include" /D "NDEBUG" /D "WIN32"
/D"_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D
"_UNICODE"/D "UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c 
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/include" /I "slony/include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS"/D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE"
/D"UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c 
+# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include"
/I"c:/program files/postgresql/8.1/include" /I "include/" /I "agent/include" /I "slony/include" /D "NDEBUG" /D "WIN32"
/D"_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D
"_UNICODE"/D "UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c 
+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include" /I
"c:/programfiles/postgresql/8.1/include" /I "include/" /I "agent/include" /I "slony/include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS"/D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE"
/D"UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6.1/include" /d "NDEBUG"
@@ -82,9 +82,9 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib
wxmsw26u_html.libwxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib
wxmsw26u_xrc.libwxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.0/lib/ms" 
+# ADD BASE LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib
wxmsw26u_html.libwxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib
wxmsw26u_xrc.libwxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.1/lib/ms" 
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib
wxmsw26u_html.libwxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib
wxmsw26u_xrc.libwxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.0/lib/ms" 
+# ADD LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib
wxmsw26u_html.libwxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib
wxmsw26u_xrc.libwxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.libcomctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map
/machine:I386/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.1/lib/ms" 
 # SUBTRACT LINK32 /pdb:none

 !ENDIF