Minor installer fixes

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7460 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/pkg/win32/src/pgadmin3.wxs b/pkg/win32/src/pgadmin3.wxs
index 1bf9573e34075027a71035ee7f6061962ea7b502..b22783372f057d09b47e8c19dd85ba1cda9a346f 100644 (file)
--- a/pkg/win32/src/pgadmin3.wxs
+++ b/pkg/win32/src/pgadmin3.wxs
@@ -304,6 +304,7 @@
                         </Directory>\r
 \r
                         <Component Id="postgresql_exes" Guid="{3FD9C660-73B1-4A30-A53A-6E121CB83139}">\r
+                            <File Id="postgresql_exes.psql.exe" Name="psql.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/psql.exe" />\r
                             <File Id="postgresql_exes.pg_dump.exe" Name="pg_dump.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/pg_dump.exe" />\r
                             <File Id="postgresql_exes.pg_dumpall.exe" Name="pg_dumpall.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/pg_dumpall.exe" />\r
                             <File Id="postgresql_exes.pg_restore.exe" Name="pg_restore.exe" DiskId="1" Source="$(var.PGBUILD)/pgInst-8.3/pgsql/bin/pg_restore.exe" />\r
@@ -369,11 +370,6 @@
                     <ComponentRef Id="postgresql_exes" />\r
                 </Feature>\r
             </Feature>\r
-            \r
-            <Feature Id="pgagent" Title="pgAgent" Description="A job scheduler designed for centralised management of SQL and shell/batch jobs on one or more hosts." Level="1">\r
-                <ComponentRef Id="core_libs" />\r
-                <ComponentRef Id="core_runtimes" />\r
-            </Feature>\r
 \r
             <Feature Id="i18n" Title="Internationalisation" Description="Multi language support for $(var.APPNAME) applications." Level="1">\r
                 <?include i18nrefs.wxs ?>\r

diff --git a/pkg/win32/upgrade.bat b/pkg/win32/upgrade.bat
index 728e6035cb035ed4da7c4b3dd0c348cd7f5d249a..4b6489c8730e54cb0240b97f9a9f658f7f4493d4 100644 (file)
--- a/pkg/win32/upgrade.bat
+++ b/pkg/win32/upgrade.bat
@@ -2,7 +2,7 @@
 cls\r
 echo This file will upgrade your pgAdmin III installation.\r
 echo.\r
-echo You must have pgAdmin III v1.8.x installed \r
+echo You must have pgAdmin III v1.9.x installed \r
 echo from the official MSI installation to use this upgrade path.\r
 echo.\r
 echo If pgAdmin III or any of its components are in use\r