Merge pull request #17 from RussWhitehead/newGUID

ODBC-21 32 and 64 bit connectors cannot be jointly installed Reviewed-by: Gavin Halliday <[email protected]>
hpcc-systems · Mar 17, 2015 · 5855cb6 · 5855cb6
2 parents 98332f9 + 813e1a2
commit 5855cb6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/progress/32bit/custom.ini b/progress/32bit/custom.ini
@@ -28,15 +28,15 @@ ProductUpdateURL=http://hpccsystems.com/download
 ;----------------------------------------------------------
 ;Specific Installation information
 ;----------------------------------------------------------
-FolderName=HPCC Systems\HPCC-ODBC32 Connector
-AppBasePath=${Program Files}\HPCCSystems\HPCC-ODBC32 Connector
+FolderName=HPCC Systems\ODBC Connector
+AppBasePath=${Program Files}\HPCCSystems\ODBC Connector
 ;UnInstallLocation=
 
 ;----------------------------------------------------------
 ;ODBC driver information
 ;----------------------------------------------------------
 ODBCDriverDLLName=HSoal25.dll
-ODBCDriverName=HPCC-ODBC Connector
+ODBCDriverName=HPCC-ODBC32 Connector
 ODBCSetupDLLName=HSoals25.dll
 ODBCDialogDLLName=HSoald25.dll
 ODBCMessageDLLName=ivoal25m.dll

diff --git a/progress/32bit/setup.ini b/progress/32bit/setup.ini
diff --git a/progress/64bit/custom.ini b/progress/64bit/custom.ini
@@ -28,15 +28,15 @@ ProductUpdateURL=http://hpccsystems.com/download
 ;----------------------------------------------------------
 ;Specific Installation information
 ;----------------------------------------------------------
-FolderName=HPCC Systems\HPCC-ODBC64 Connector
-AppBasePath=${Program Files}\HPCCSystems\HPCC-ODBC64 Connector
+FolderName=HPCC Systems\ODBC Connector (x64)
+AppBasePath=${Program Files}\HPCCSystems\ODBC Connector
 ;UnInstallLocation=
 
 ;----------------------------------------------------------
 ;ODBC driver information
 ;----------------------------------------------------------
 ODBCDriverDLLName=HSoal25.dll
-ODBCDriverName=HPCC-ODBC Connector
+ODBCDriverName=HPCC-ODBC64 Connector
 ODBCSetupDLLName=HSoals25.dll
 ODBCDialogDLLName=HSoald25.dll
 ODBCMessageDLLName=ivoal25m.dll

diff --git a/progress/64bit/setup.ini b/progress/64bit/setup.ini