Re: wxWidgets alert at start

Florian G. Pflug wrote:
>
> Think I found the foobarization...

Agreed.

> So I least at that point I was aware that we are walking on thin ice with
> how we integrate pg_dump and friends into the bundle. Seems that using a
> version of libpq that doesn't link to the system provided libssl, but to
> a custom version instead (and thereby breaking that "doesn't have
> dependencies
> that live inside the pgadmin bundle" assumtion)is enough to let the ice
> break.

Or any library not directly linked to the executable itself.

> The only really correct fix would be to use @loader_path instead of
> @executable_path when referencing shared libraries (@loader_path is the
> path of the image *requireing* the lib, instead of the top-level
> executable) -
> but that means dropping support for 10.3 :-(.

Yeah, I'm not sure we should do that just yet.

> One alternative that I can
> see is
> to put pg_dump and friends into Contents/SharedSupport directly - that way,
> the relative path from pg_dump to Contents/Frameworks is that same as for
> main pgAdmin executeable (which lives in Contents/MacOS). Not exactly
> pretty,
> but hey, who looks into the bundle anyway?

:-)

Jyrki; the attached patch should implement what Florian is suggesting -
can you test it please? Make sure you run the bootstrap script, and to
be on the safe side, remove your preferences file as well.

Thanks, Dave
Index: pgadmin/pgAdmin3.cpp
===================================================================
--- pgadmin/pgAdmin3.cpp    (revision 6520)
+++ pgadmin/pgAdmin3.cpp    (working copy)
@@ -70,7 +70,7 @@
 #define I18N_DIR     wxT("/i18n")
 #define BRANDING_DIR wxT("/branding")

-#define HELPER_DIR  wxT("/helper")
+#define HELPER_DIR  wxT("")

 // Globals
 frmMain *winMain=0;
Index: pkg/mac/Makefile.am
===================================================================
--- pkg/mac/Makefile.am    (revision 6520)
+++ pkg/mac/Makefile.am    (working copy)
@@ -28,8 +28,8 @@
     $(install_sh_DATA) "sql.icns" "$(bundledir)/Contents/Resources/sql.icns"
     $$($(WX_CONFIG) --rescomp | sed 's/-t[[:space:]]*APPL//') \
          "$(bundledir)/Contents/Resources/pgAdmin3.rsrc" -useDF
-    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_dump" "$(bundledir)/Contents/SharedSupport/helper/pg_dump"
-    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_dumpall"
"$(bundledir)/Contents/SharedSupport/helper/pg_dumpall"
-    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_restore"
"$(bundledir)/Contents/SharedSupport/helper/pg_restore"
+    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_dump" "$(bundledir)/Contents/SharedSupport/pg_dump"
+    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_dumpall" "$(bundledir)/Contents/SharedSupport/pg_dumpall"
+    $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_restore" "$(bundledir)/Contents/SharedSupport/pg_restore"
     ./complete-bundle.sh "$(bundledir)"
 endif