Thread: [PATCH] Bugfix for for pkg/mac/complete-bundle.sh

[PATCH] Bugfix for for pkg/mac/complete-bundle.sh

From
"Florian G. Pflug"
Date:
Hi

The hardcoded "todo=../src/pgadmin3" in complete-bundle.sh is wrong.
complete-bundle.sh
adjusts the library path _inside_ the binary besides copying the lib
into the bundle.
If ../src/pgadmin3, instead of Contents/MacOS/pgAdmin3 is fixed up by
complete-bundle.sh,
the resulting bundle will not start on because it can't find the
dynamically linked libs.

Please apply the following patch - it's already used for the nighty
builds, and produces working
bundles.

Index: pkg/mac/complete-bundle.sh
===================================================================
--- pkg/mac/complete-bundle.sh  (revision 4597)
+++ pkg/mac/complete-bundle.sh  (working copy)
@@ -12,10 +12,10 @@
  cd "$bundle"
  fw_basepath=$(dirname $(pwd))
  todo=$(find ./ | \
-       xargs file | \
-       sed -n 's/^\([^:][^:]*\):[[:space:]]*Mach-O executable ppc$/\1/p' \
+       xargs --replace=line file 'line' | \
+       sed -n 's/^\([^:][^:]*\):[[:space:]]*Mach-O executable
ppc$/\1/p' | \
+       xargs echo -n \
  )
-todo=../src/pgadmin3

  echo "Found executables: $todo"
  while test "$todo" != ""; do





Re: [PATCH] Bugfix for for pkg/mac/complete-bundle.sh

From
"Dave Page"
Date:
Thanks Florian, patch applied.

Regards, Dave.

> -----Original Message-----
> From: pgadmin-hackers-owner@postgresql.org
> [mailto:pgadmin-hackers-owner@postgresql.org] On Behalf Of
> Florian G. Pflug
> Sent: 24 October 2005 02:35
> To: pgAdmin Hackers
> Subject: [pgadmin-hackers] [PATCH] Bugfix for for
> pkg/mac/complete-bundle.sh
>
> Hi
>
> The hardcoded "todo=../src/pgadmin3" in complete-bundle.sh is wrong.
> complete-bundle.sh
> adjusts the library path _inside_ the binary besides copying the lib
> into the bundle.
> If ../src/pgadmin3, instead of Contents/MacOS/pgAdmin3 is fixed up by
> complete-bundle.sh,
> the resulting bundle will not start on because it can't find the
> dynamically linked libs.
>
> Please apply the following patch - it's already used for the nighty
> builds, and produces working
> bundles.
>
> Index: pkg/mac/complete-bundle.sh
> ===================================================================
> --- pkg/mac/complete-bundle.sh  (revision 4597)
> +++ pkg/mac/complete-bundle.sh  (working copy)
> @@ -12,10 +12,10 @@
>   cd "$bundle"
>   fw_basepath=$(dirname $(pwd))
>   todo=$(find ./ | \
> -       xargs file | \
> -       sed -n 's/^\([^:][^:]*\):[[:space:]]*Mach-O
> executable ppc$/\1/p' \
> +       xargs --replace=line file 'line' | \
> +       sed -n 's/^\([^:][^:]*\):[[:space:]]*Mach-O executable
> ppc$/\1/p' | \
> +       xargs echo -n \
>   )
> -todo=../src/pgadmin3
>
>   echo "Found executables: $todo"
>   while test "$todo" != ""; do
>
>
>
>
>
> ---------------------------(end of
> broadcast)---------------------------
> TIP 5: don't forget to increase your free space map settings
>