Updates for 07.03.0100

diff --git a/psqlodbc.reg b/psqlodbc.reg
index b2d2aeddd09bb1c53f8b48857a3d33d41a355fb4..1cedce0943316179ab097644913dc9e9e54ccc40 100644 (file)
--- a/psqlodbc.reg
+++ b/psqlodbc.reg
@@ -3,14 +3,14 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"PostgreSQL Legacy"="Installed"
+"PostgreSQL"="Installed"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Legacy]
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL]
 "APILevel"="1"
 "ConnectFunctions"="YYN"
 "Driver"="PSQLODBC.DLL"
-"DriverODBCVer"="02.50"
+"DriverODBCVer"="03.00"
 "FileUsage"="0"
 "Setup"="PSQLODBC.DLL"
 "SQLLevel"="1"
-"UsageCount"=dword:00000001
+"UsageCount"=dword:00000001
\ No newline at end of file

diff --git a/psqlodbc30.reg b/psqlodbc25.reg
similarity index 55%
rename from psqlodbc30.reg
rename to psqlodbc25.reg
index ae2b9f00da642033e6232094470a575fb22ae29d..c1c64ad4cb199c69cdcbbb4be7fd4dff0db1b3ae 100644 (file)
--- a/psqlodbc30.reg
+++ b/psqlodbc25.reg
@@ -3,14 +3,14 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"PostgreSQL"="Installed"
+"PostgreSQL Legacy"="Installed"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL]
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Legacy]
 "APILevel"="1"
 "ConnectFunctions"="YYN"
-"Driver"="PSQLODBC30.DLL"
-"DriverODBCVer"="03.00"
+"Driver"="PSQLODBC25.DLL"
+"DriverODBCVer"="02.50"
 "FileUsage"="0"
-"Setup"="PSQLODBC30.DLL"
+"Setup"="PSQLODBC25.DLL"
 "SQLLevel"="1"
 "UsageCount"=dword:00000001

diff --git a/win32.mak b/win32.mak
index b5c7953b390bd7d7bf1a36b21b2b3e08d096ce1e..50a2fd8209c55f9beffde4950b445bd2499d1d34 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -54,7 +54,7 @@ OUTDIRBIN=.\Release
 INTDIR=.\Release
 !ENDIF
 
-ALL : "$(OUTDIRBIN)\psqlodbc.dll"
+ALL : "$(OUTDIRBIN)\psqlodbc25.dll"
 
 
 CLEAN :
@@ -88,7 +88,7 @@ CLEAN :
    -@erase "$(INTDIR)\tuplelist.obj"
    -@erase "$(INTDIR)\odbcapi.obj"
    -@erase "$(INTDIR)\vc60.idb"
-   -@erase "$(OUTDIR)\psqlodbc.dll"
+   -@erase "$(OUTDIR)\psqlodbc25.dll"
    -@erase "$(OUTDIR)\psqlodbc.exp"
    -@erase "$(OUTDIR)\psqlodbc.lib"
    -@erase "$(OUTDIR)\psqlodbc.pch"
@@ -142,7 +142,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc"
 BSC32_SBRS= \
    
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIRBIN)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIRBIN)\psqlodbc25.dll" /implib:"$(OUTDIR)\psqlodbc.lib" 
 DEF_FILE= "psqlodbc_win32.def"
 LINK32_OBJS= \
    "$(INTDIR)\bind.obj" \
@@ -175,7 +175,7 @@ LINK32_OBJS= \
    "$(INTDIR)\odbcapi.obj" \
    "$(INTDIR)\psqlodbc.res"
 
-"$(OUTDIRBIN)\psqlodbc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIRBIN)\psqlodbc25.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -190,7 +190,7 @@ OUTDIR=.\Debug
 INTDIR=.\Debug
 !ENDIF
 
-ALL : "$(OUTDIR)\psqlodbc.dll"
+ALL : "$(OUTDIR)\psqlodbc25.dll"
 
 
 CLEAN :
@@ -225,7 +225,7 @@ CLEAN :
    -@erase "$(INTDIR)\odbcapi.obj"
    -@erase "$(INTDIR)\vc60.idb"
    -@erase "$(INTDIR)\vc60.pdb"
-   -@erase "$(OUTDIR)\psqlodbc.dll"
+   -@erase "$(OUTDIR)\psqlodbc25.dll"
    -@erase "$(OUTDIR)\psqlodbc.exp"
    -@erase "$(OUTDIR)\psqlodbc.ilk"
    -@erase "$(OUTDIR)\psqlodbc.lib"
@@ -281,7 +281,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc"
 BSC32_SBRS= \
    
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIR)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_win32.def" /out:"$(OUTDIR)\psqlodbc25.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept 
 DEF_FILE= "psqlodbc_win32.def"
 LINK32_OBJS= \
    "$(INTDIR)\bind.obj" \
@@ -314,7 +314,7 @@ LINK32_OBJS= \
    "$(INTDIR)\odbcapi.obj" \
    "$(INTDIR)\psqlodbc.res"
 
-"$(OUTDIR)\psqlodbc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\psqlodbc25.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<

diff --git a/win32_30.mak b/win32_30.mak
index 221475df09c9f7a2b40d80d6a9bfe649fbde064b..3faa6a7b3ddf37742bec4ac40f88ab5e4ebe67eb 100755 (executable)
--- a/win32_30.mak
+++ b/win32_30.mak
@@ -53,7 +53,7 @@ OUTDIRBIN=.\ODBC30
 INTDIR=.\ODBC30
 !ENDIF
 
-ALL : "$(OUTDIRBIN)\psqlodbc30.dll"
+ALL : "$(OUTDIRBIN)\psqlodbc.dll"
 
 
 CLEAN :
@@ -90,7 +90,7 @@ CLEAN :
    -@erase "$(INTDIR)\odbcapi30.obj"
    -@erase "$(INTDIR)\pgapi30.obj"
    -@erase "$(INTDIR)\vc60.idb"
-   -@erase "$(OUTDIR)\psqlodbc30.dll"
+   -@erase "$(OUTDIR)\psqlodbc.dll"
    -@erase "$(OUTDIR)\psqlodbc.exp"
    -@erase "$(OUTDIR)\psqlodbc.lib"
    -@erase "$(OUTDIR)\psqlodbc.pch"
@@ -144,7 +144,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc"
 BSC32_SBRS= \
    
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_api30.def" /out:"$(OUTDIRBIN)\psqlodbc30.dll" /implib:"$(OUTDIR)\psqlodbc.lib" 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_api30.def" /out:"$(OUTDIRBIN)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" 
 DEF_FILE= "psqlodbc_api30.def"
 LINK32_OBJS= \
    "$(INTDIR)\bind.obj" \
@@ -180,7 +180,7 @@ LINK32_OBJS= \
    "$(INTDIR)\pgapi30.obj" \
    "$(INTDIR)\psqlodbc.res"
 
-"$(OUTDIRBIN)\psqlodbc30.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIRBIN)\psqlodbc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -195,7 +195,7 @@ OUTDIR=.\ODBC30Debug
 INTDIR=.\ODBC30Debug
 !ENDIF
 
-ALL : "$(OUTDIR)\psqlodbc30.dll"
+ALL : "$(OUTDIR)\psqlodbc.dll"
 
 
 CLEAN :
@@ -233,7 +233,7 @@ CLEAN :
    -@erase "$(INTDIR)\pgapi30.obj"
    -@erase "$(INTDIR)\vc60.idb"
    -@erase "$(INTDIR)\vc60.pdb"
-   -@erase "$(OUTDIR)\psqlodbc30.dll"
+   -@erase "$(OUTDIR)\psqlodbc.dll"
    -@erase "$(OUTDIR)\psqlodbc.exp"
    -@erase "$(OUTDIR)\psqlodbc.ilk"
    -@erase "$(OUTDIR)\psqlodbc.lib"
@@ -289,7 +289,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc"
 BSC32_SBRS= \
    
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_api30.def" /out:"$(OUTDIR)\psqlodbc30.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_api30.def" /out:"$(OUTDIR)\psqlodbc.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept 
 DEF_FILE= "psqlodbc_api30.def"
 LINK32_OBJS= \
    "$(INTDIR)\bind.obj" \
@@ -325,7 +325,7 @@ LINK32_OBJS= \
    "$(INTDIR)\pgapi30.obj" \
    "$(INTDIR)\psqlodbc.res"
 
-"$(OUTDIR)\psqlodbc30.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\psqlodbc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<