SVN Commit by dpage: r4200 - in trunk/pgadmin3: . src xtra xtra/pgagent xtra/pgagent/pgaevent

Author: dpage
Date: 2005-05-18 11:06:29 +0100 (Wed, 18 May 2005)
New Revision: 4200

Added:
trunk/pgadmin3/xtra/pgagent/pgaevent/
trunk/pgadmin3/xtra/pgagent/pgaevent/Debug/
trunk/pgadmin3/xtra/pgagent/pgaevent/MSG00001.bin
trunk/pgadmin3/xtra/pgagent/pgaevent/Makefile.am
trunk/pgadmin3/xtra/pgagent/pgaevent/README
trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.c
trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.def
trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsp
trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsw
trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.h
trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.mc
trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.rc
Modified:
trunk/pgadmin3/configure.ac
trunk/pgadmin3/src/pgAdmin3.dsp
trunk/pgadmin3/src/pgAdmin3.dsw
trunk/pgadmin3/xtra/Makefile.am
trunk/pgadmin3/xtra/pgagent/Makefile.am
trunk/pgadmin3/xtra/pgagent/pgAgent.rc
Log:
Add pgaevent subproject (Win32 event log message format DLL)
Cleanup main pgAdmin VC++ workspace.

Modified: trunk/pgadmin3/configure.ac
===================================================================
--- trunk/pgadmin3/configure.ac 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/configure.ac 2005-05-18 10:06:29 UTC (rev 4200)
@@ -41,7 +41,7 @@

AC_CONFIG_FILES([Makefile
i18n/Makefile
- src/Makefile
+ src/Makefile
pkg/Makefile
pkg/debian/Makefile
pkg/fc1/Makefile
@@ -52,5 +52,6 @@
pkg/src/Makefile
pkg/win32/Makefile
xtra/Makefile
- xtra/pgagent/Makefile])
+ xtra/pgagent/Makefile
+ xtra/pgagent/pgaevent/Makefile])
AC_OUTPUT

Modified: trunk/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- trunk/pgadmin3/src/pgAdmin3.dsp 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/src/pgAdmin3.dsp 2005-05-18 10:06:29 UTC (rev 4200)
@@ -4,7 +4,7 @@

# TARGTYPE "Win32 (x86) Application" 0x0101

-CFG=pgAdmin3 - Win32 Unicode SSL Release
+CFG=pgAdmin3 - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@
!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 "pgAdmin3.mak" CFG="pgAdmin3 - Win32 Unicode SSL Release"
+!MESSAGE NMAKE /f "pgAdmin3.mak" CFG="pgAdmin3 - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "pgAdmin3 - Win32 Unicode SSL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "pgAdmin3 - Win32 Unicode SSL Release" (based on "Win32 (x86) Application")
+!MESSAGE "pgAdmin3 - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "pgAdmin3 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE

# Begin Project
@@ -29,60 +29,60 @@
MTL=midl.exe
RSC=rc.exe

-!IF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Debug"
+!IF "$(CFG)" == "pgAdmin3 - Win32 Debug"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pgAdmin3___Win32_Unicode_SSL_Debug"
-# PROP BASE Intermediate_Dir "pgAdmin3___Win32_Unicode_SSL_Debug"
+# PROP BASE Output_Dir "pgAdmin3___Win32_Debug"
+# PROP BASE Intermediate_Dir "pgAdmin3___Win32_Debug"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Unicode_SSL_Debug"
-# PROP Intermediate_Dir "Unicode_SSL_Debug"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I "c:/wxWidgets-2.6/lib/mswd" /I "c:/postgresql/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" /FAcs /FR /FD /c
-# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/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/include" /I "c:/wxWidgets-2.6/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 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/include" /i "c:/wxWidgets-2.6/contrib/include" /d "_DEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /d "_DEBUG"
# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib libpq.lib wxxrcd.lib regexd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib" /libpath:"c:/wxWidgets-2.6/contrib/lib" /libpath:"c:/postgresql/lib"
+# ADD BASE LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib wxmsw26ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.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/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/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.lib wxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib wxmsw26ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.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/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
# SUBTRACT LINK32 /pdb:none

-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
+!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Release"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pgAdmin3___Win32_Unicode_SSL_Release"
-# PROP BASE Intermediate_Dir "pgAdmin3___Win32_Unicode_SSL_Release"
+# PROP BASE Output_Dir "pgAdmin3___Win32_Release"
+# PROP BASE Intermediate_Dir "pgAdmin3___Win32_Release"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Unicode_SSL_Release"
-# PROP Intermediate_Dir "Unicode_SSL_Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I "c:/wxWidgets-2.6/lib/mswd" /I "c:/postgresql/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" /FAcs /FR /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/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 /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/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 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/include" /i "c:/wxWidgets-2.6/contrib/include" /d "NDEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /d "NDEBUG"
# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib libpq.lib wxxrc.lib regex.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib" /libpath:"c:/wxWidgets-2.6/contrib/lib" /libpath:"c:/postgresql/lib"
+# ADD BASE LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxmsw26u_html.lib wxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib wxmsw26u_xrc.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.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/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/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.lib wxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib wxmsw26u_xrc.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.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/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
# SUBTRACT LINK32 /pdb:none
@@ -91,8 +91,8 @@

# Begin Target

-# Name "pgAdmin3 - Win32 Unicode SSL Debug"
-# Name "pgAdmin3 - Win32 Unicode SSL Release"
+# Name "pgAdmin3 - Win32 Debug"
+# Name "pgAdmin3 - Win32 Release"
# Begin Group "src"

# PROP Default_Filter ""
@@ -102,6 +102,7 @@
# Begin Source File

SOURCE=.\db\keywords.c
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
@@ -247,6 +248,7 @@
# Begin Source File

SOURCE=.\utils\precomp.cpp
+# ADD BASE CPP /Yc"pgAdmin3.h"
# ADD CPP /Yc"pgAdmin3.h"
# End Source File
# Begin Source File
@@ -264,6 +266,7 @@
# Begin Source File

SOURCE=.\utils\utffile.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
@@ -528,6 +531,7 @@
# Begin Source File

SOURCE=.\ui\xrcDialogs.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
@@ -661,16 +665,19 @@
# Begin Source File

SOURCE=.\ctl\calbox.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\ctl\ctlComboBox.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\ctl\ctlListView.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
@@ -684,6 +691,7 @@
# Begin Source File

SOURCE=.\ctl\ctlSQLResult.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
@@ -697,26 +705,31 @@
# Begin Source File

SOURCE=.\ctl\timespin.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\ctl\xh_calb.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\ctl\xh_ctlcombo.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\ctl\xh_sqlbox.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\ctl\xh_timespin.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
@@ -1931,26 +1944,31 @@
# Begin Source File

SOURCE=.\base\appbase.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\base\base.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\base\pgConnBase.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\base\pgSetBase.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File

SOURCE=.\base\sysLogger.cpp
+# SUBTRACT BASE CPP /YX /Yc /Yu
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group

Modified: trunk/pgadmin3/src/pgAdmin3.dsw
===================================================================
--- trunk/pgadmin3/src/pgAdmin3.dsw 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/src/pgAdmin3.dsw 2005-05-18 10:06:29 UTC (rev 4200)
@@ -27,6 +27,18 @@

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

+Project: "pgaevent"="..\xtra\pgagent\pgaevent\pgaevent.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:

Package=<5>

Modified: trunk/pgadmin3/xtra/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/Makefile.am 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/Makefile.am 2005-05-18 10:06:29 UTC (rev 4200)
@@ -1,4 +1,5 @@
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Modified: trunk/pgadmin3/xtra/pgagent/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-05-18 10:06:29 UTC (rev 4200)
@@ -1,9 +1,12 @@
# pgAdmin III - PostgreSQL Tools
+# $id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems

+SUBDIRS = pgaevent
+
bin_PROGRAMS = pgagent

pgagent_SOURCES = \

Modified: trunk/pgadmin3/xtra/pgagent/pgAgent.rc
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgAgent.rc 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgAgent.rc 2005-05-18 10:06:29 UTC (rev 4200)
@@ -1,6 +1,7 @@
//////////////////////////////////////////////////////////////////////////
//
// pgAgent - PostgreSQL Tools
+// $Id$
// Copyright (C) 2003 The pgAdmin Development Team
// This software is released under the Artistic Licence
//

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/MSG00001.bin
===================================================================
(Binary files differ)

Property changes on: trunk/pgadmin3/xtra/pgagent/pgaevent/MSG00001.bin
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/Makefile.am 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/Makefile.am 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,17 @@
+# pgAdmin III - PostgreSQL Tools
+# $Id$
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+EXTRA_DIST = \
+ $(srcdir)/MSG00001.bin \
+ $(srcdir)/pgaevent.c \
+ $(srcdir)/pgaevent.def \
+ $(srcdir)/pgaevent.dsp \
+ $(srcdir)/pgaevent.dsw \
+ $(srcdir)/pgamsgevent.h \
+ $(srcdir)/pgamsgevent.mc \
+ $(srcdir)/pgamsgevent.rc \
+ $(srcdir)/README

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/README
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/README 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/README 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,17 @@
+This whole directory is shamelessly adapted from PostgreSQL's src/bin/pgevent
+
+Note that to get the version resources etc. into the DLL, the only file
+generated by MC that we actually use is MSG00001.bin.
+
+-------------------------------------------------------------------------------
+
+MSG000001.bin is a binary file, result of Microsoft MC compiler. MC compiler
+can be downloaded for free with MS Core SDK but it is not included with MSYS
+tools and I didn't find an alternative way to compile MC file.
+
+To summarize: the command "MC pgmsgevent.mc" generates pgmsgevent.h,
+pgmsgevent.rc, and MSG00001.bin files. In MC file, we declare a string
+with %s format, so we can write anything we want in the future without
+needing to change the definition of this string.
+
+Laurent Ballester

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.c
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.c 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.c 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,30 @@
+//////////////////////////////////////////////////////////////////////////
+//
+// pgAgent - PostgreSQL Tools
+// $Id$
+// Copyright (C) 2003 The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// pgaevent.c - win32 message format dll
+//
+//////////////////////////////////////////////////////////////////////////
+
+
+#include <windows.h>
+#include <olectl.h>
+#include <string.h>
+
+HANDLE g_module = NULL;
+
+BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved);
+
+//
+// DllMain --- is an optional entry point into a DLL.
+//
+BOOL WINAPI
+DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+ if (ul_reason_for_call == DLL_PROCESS_ATTACH)
+ g_module = hModule;
+ return TRUE;
+}

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.def
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.def 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.def 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,14 @@
+; ////////////////////////////////////////////////////////////////////////
+; //
+; // pgAgent - PostgreSQL Tools
+; // $Id$
+; // Copyright (C) 2003 The pgAdmin Development Team
+; // This software is released under the Artistic Licence
+; //
+; // pgaeventdef - pgaevent.dll exports
+; //
+; ////////////////////////////////////////////////////////////////////////
+
+; dlltool --output-def pgaevent.def pgaevent.o pgamsgevent.o
+EXPORTS
+

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsp
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsp 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsp 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,114 @@
+# Microsoft Developer Studio Project File - Name="pgaevent" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=pgaevent - 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 "pgaevent.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 "pgaevent.mak" CFG="pgaevent - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "pgaevent - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "pgaevent - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "pgaevent - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGAEVENT_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGAEVENT_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /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 /nologo /dll /machine:I386
+# ADD 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 /nologo /dll /machine:I386
+
+!ELSEIF "$(CFG)" == "pgaevent - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGAEVENT_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGAEVENT_EXPORTS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /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 /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "pgaevent - Win32 Release"
+# Name "pgaevent - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\pgaevent.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\pgamsgevent.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\pgamsgevent.rc
+# End Source File
+# End Group
+# End Target
+# End Project

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsw
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsw 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/pgaevent.dsw 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "pgaevent"=".\pgaevent.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.h
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.h 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.h 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,12 @@
+//////////////////////////////////////////////////////////////////////////
+//
+// pgAgent - PostgreSQL Tools
+// $Id$
+// Copyright (C) 2003 The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// pgamsgevent.h - Message id declarations
+//
+//////////////////////////////////////////////////////////////////////////
+
+#define PGADMIN_EVENTLOG_MSG 0x00000000L

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.mc
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.mc 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.mc 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,5 @@
+MessageId=0
+SymbolicName=PGADMIN_EVENTLOG_MSG
+Language=English
+%1
+.

Added: trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.rc
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.rc 2005-05-17 20:55:04 UTC (rev 4199)
+++ trunk/pgadmin3/xtra/pgagent/pgaevent/pgamsgevent.rc 2005-05-18 10:06:29 UTC (rev 4200)
@@ -0,0 +1,56 @@
+//////////////////////////////////////////////////////////////////////////
+//
+// pgAgent - PostgreSQL Tools
+// $Id$
+// Copyright (C) 2003 The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// pgaevent.rc - win32 Resources
+//
+//////////////////////////////////////////////////////////////////////////
+
+LANGUAGE 0x9,0x1
+1 11 MSG00001.bin
+
+#include <ver.h>
+#include "../../../src/include/version.h"
+#include "../../../src/include/copyright.h"
+
+// Icons
+PGADMIN3 ICON DISCARDABLE "../../../src/include/images/pgAdmin3.ico"
+
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION VERSION_NUM
+PRODUCTVERSION VERSION_NUM
+FILEFLAGSMASK VER_DEBUG|VER_PRERELEASE
+FILEFLAGS VER_DEBUG|VER_PRERELEASE
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "FileVersion", VERSION_STR, "\0"
+ VALUE "File Version", VERSION_STR, "\0"
+ VALUE "FileDescription", "pgaevent - pgAgent Event Log Message DLL", "\0"
+ VALUE "LegalCopyright", COPYRIGHT_WIN32, "\0"
+ VALUE "LegalTrademarks", LICENSE, "\0"
+ VALUE "InternalName", "pgaevent", "\0"
+ VALUE "OriginalFilename","pgaevent.dll", "\0"
+ VALUE "ProductName", APPNAME_L, "\0"
+ VALUE "ProductVersion", VERSION_STR, "\0"
+#ifdef BUILD
+ VALUE "Build", BUILD, "\0"
+#endif
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 0x04E4
+ END
+END
+
+
+