Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b1Cig-0001Mb-AF for pgadmin-hackers@arkaria.postgresql.org; Fri, 13 May 2016 13:01:30 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1b1Cif-00054y-T2 for pgadmin-hackers@arkaria.postgresql.org; Fri, 13 May 2016 13:01:29 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1b1Cif-00054r-4J for pgadmin-hackers@postgresql.org; Fri, 13 May 2016 13:01:29 +0000 Received: from mail-qg0-x22c.google.com ([2607:f8b0:400d:c04::22c]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1b1CiX-0004R3-7o for pgadmin-hackers@postgresql.org; Fri, 13 May 2016 13:01:28 +0000 Received: by mail-qg0-x22c.google.com with SMTP id f92so56982014qgf.0 for ; Fri, 13 May 2016 06:01:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=yiPuYK2W3XNT05rTQMPTL4qcTFXCcbq0+yk0aiTmuUM=; b=s5OLWIsT0aZc5SWqQ2atX5VMAF7pBFO5T3K+WnkDMvnZYEa6G005JTnkEiZVjAAQYB ahsDqvsCpQpxv0WOtYvrxZg0kiaK2OdmN3RO2DcJ1+u1uQp9yCn+r+xJjbLZuKaPcSzP 4Xhpf5YSyHuSx0A9C4HnRcut9PekWFCng73b/mreBmfI5dCqtx0BwQ8tfpVrNiHmZB3v Ura4AG3ydFC1PU3zFT+MUuLRnbAgSuqz+ojEaRtNMM+qqLqeeUf451F27clqZ9lHAp90 JE+O1AnL1DV3P29/UO3GpfmR05kjJ9mF6PxUyDlFK+zMFPNzO60uTIvOZnJhvUoXx1J6 nxIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=yiPuYK2W3XNT05rTQMPTL4qcTFXCcbq0+yk0aiTmuUM=; b=QlIrBDHrewoJ8eDlEotVi15R4StutRFsvXPTR093+YoEz3HpJR/maa1kiT/ETPq3Kj rPvjCLCNNnMq5zuWo6St8tfju6giBEsCpB/Z6WWtfvJLHYpT8an7IKz+B/0HZm25lhuY 3pltd0UHzGjjCTcvSmaAW586jYdUBMOODVvSX4k79KAl4IUmvUadhmcJ7XoSiipnpqvY HM3ADfz4iUPVnu0/sjmtbVp7ZIOgN48rNRDLlSjImxSIhbh/JzDtn3Lyzv8Y661Cjzza Eh2ilussaQHS+F6LSRTRKwocBm4WRjWPXrnvrxJhEG9Or2BogG1RxbEWsvTQpDmGZSbr e75Q== X-Gm-Message-State: AOPr4FXoSd5N39JCJZut2dIoa9JclYLRx53FTY+V60a+5r0pwTf8qhv8gN0sLNwCaWZeFugwfZc/MeXej/rwG5xS MIME-Version: 1.0 X-Received: by 10.140.19.4 with SMTP id 4mr15121172qgg.80.1463144479430; Fri, 13 May 2016 06:01:19 -0700 (PDT) Received: by 10.140.99.43 with HTTP; Fri, 13 May 2016 06:01:19 -0700 (PDT) In-Reply-To: References: Date: Fri, 13 May 2016 18:31:19 +0530 Message-ID: Subject: Re: Patch for pgAdmin4 package on Mac OS X From: Sandeep Thakkar To: Dave Page Cc: pgadmin-hackers , Hamid Quddus Content-Type: multipart/alternative; boundary=001a11355814f4203c0532b8dea7 X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a11355814f4203c0532b8dea7 Content-Type: text/plain; charset=UTF-8 Thanks Dave. Please see inline. On Fri, May 6, 2016 at 9:03 PM, Dave Page wrote: > Hi > > Thanks. I've applied the path fix patch. The second one needs a little > work - I've attached an updated version to work from: > > - I've updated the README, and some of the default values. > > OK. The default values of PGDIR and QTDIR set by you is different than mine. I installed them through macports. > - I've removed the file type registration for .sql files. OK. > > - Should we note that the user may need to run in a virtualenv? No, we bundle private environment, right? > > - Please move build-mac.sh to pkg/build.sh, and create a target in > /Makefile to > execute it, e.g. "make appbundle" > Sure. You mean move to pkg/*mac*/build.sh, right? > > - Extend the Makefile to add a "clean-appbundle" target, which should also > be > called by the "clean" target. > > OK. > - At present, it is bundling my pre-existing configuration database. It > *must* > create a new one and bundle that, without touching the existing one (I > guess > that may require a new command line option for setup.py). > No, it's not bundling the pgadmin4.db at all, I skipped it :). Paresh is working on this. > > - The online help is broken (are you building it)? I suggest adding a > top-level > Makefile target to do so. > > Sorry, which online help? > - Working directories should be added to /.gitignore. Please ensure they > don't > clash with those used by pip (and ideally are in one place, e.g. > mac-build/). > > OK. > - I saw various errors in the build output, though the resulting DMG > seemed to > work fine; > > Yeah, because I had libpq.dylib present in $PGDIR/ and may be yours present in $PGDIR/lib/. I will be using the default values suggested by you and fix this. Thanks! ... > cp: /usr/local/pgsql/libpq.5.dylib: No such file or directory > libpq.5.dylib not found in /usr/local/pgsql > Completing app: /Users/dpage/git/pgadmin4/pgAdmin4.app > ... > > ... > App: pgAdmin4.app: Post-processing: .//Contents/MacOS/pgAdmin4 > App: pgAdmin4.app: Adding symlink: QtWebKitWidgets (because of: > .//Contents/MacOS/pgAdmin4) > cp: > @rpath/QtWebKitWidgets.framework/Versions/5/../../../QtWebKitWidgets.framework: > No such file or directory > chmod: > Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets: > No such file or directory > Rewriting ID in > Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets > to QtWebKitWidgets > error: > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool: > can't open file: > Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets > (No such file or directory) > Cleaning up > ... > > > On Mon, Apr 18, 2016 at 1:25 PM, Sandeep Thakkar > wrote: > > Hi Team, Dave, > > > > Attached herewith are two patches. > > > > pgadmin4-mac-bundle.patch - This includes scripts to build Mac app bundle > > and DMG for pgAdmin4. This is the tree of the generated app bundle: > > > > ---- > > $ find pgAdmin4.app/ -maxdepth 3 -type d > > pgAdmin4.app/ > > pgAdmin4.app//ContentspgAdmin4.app//Contents/Frameworks > > pgAdmin4.app//Contents/Frameworks/Python.framework > > pgAdmin4.app//Contents/Frameworks/QtCore.framework > > pgAdmin4.app//Contents/Frameworks/QtDBus.framework > > pgAdmin4.app//Contents/Frameworks/QtGui.framework > > pgAdmin4.app//Contents/Frameworks/QtMultimedia.framework > > pgAdmin4.app//Contents/Frameworks/QtMultimediaWidgets.framework > > pgAdmin4.app//Contents/Frameworks/QtNetwork.framework > > pgAdmin4.app//Contents/Frameworks/QtOpenGL.framework > > pgAdmin4.app//Contents/Frameworks/QtPositioning.framework > > pgAdmin4.app//Contents/Frameworks/QtPrintSupport.framework > > pgAdmin4.app//Contents/Frameworks/QtQml.framework > > pgAdmin4.app//Contents/Frameworks/QtQuick.framework > > pgAdmin4.app//Contents/Frameworks/QtSensors.framework > > pgAdmin4.app//Contents/Frameworks/QtSql.framework > > pgAdmin4.app//Contents/Frameworks/QtWebChannel.framework > > pgAdmin4.app//Contents/Frameworks/QtWebKit.framework > > pgAdmin4.app//Contents/Frameworks/QtWebKitWidgets.framework > > pgAdmin4.app//Contents/Frameworks/QtWidgets.framework > > pgAdmin4.app//Contents/MacOS > > pgAdmin4.app//Contents/PlugIns > > pgAdmin4.app//Contents/PlugIns/platforms > > pgAdmin4.app//Contents/Resources > > pgAdmin4.app//Contents/Resources/venv > > pgAdmin4.app//Contents/Resources/web > > --- > > > > pgadmin4-fixpath-mac.patch - This is for runtime/Server.cpp to fix the > path > > where the runtime looks for web application path in app bundle. > > > > > > Kindly review and suggest the changes required. Thanks. > > > > -- > > Sandeep Thakkar > > > > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > -- Sandeep Thakkar --001a11355814f4203c0532b8dea7 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Thanks Dave.=C2=A0

Please see inline.

On Fri, May 6, = 2016 at 9:03 PM, Dave Page <dpage@pgadmin.org> wrote:
Hi

Thanks. I've applied the path fix patch. The second one needs a little<= br> work - I've attached an updated version to work from:

- I've updated the README, and some of the default values.

OK. The default values of PGDIR and QTDIR set by you is differ= ent than mine. I installed them through macports.
=C2=A0
- I've removed the file type registration for .sql files.<= div>
OK.=C2=A0
=C2=A0
=C2=A0

- Should we note that the user may need to run in a virtualenv?

No, we bundle private environment, right?=C2=A0
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">=C2=A0

- Please move build-mac.sh to pkg/build.sh, and create a target in /Makefil= e to
=C2=A0 execute it, e.g. "make appbundle"
Sure. You mean move to pkg/mac/build.sh, right?=C2=A0

- Extend the Makefile to add a "clean-appbundle" target, which sh= ould also be
=C2=A0 called by the "clean" target.

OK.=C2=A0
- At present, it is bundling my pre-existing configuration database. It *mu= st*
=C2=A0 create a new one and bundle that, without touching the existing one = (I guess
=C2=A0 that may require a new command line option for setup.py).

No, it's not bundling the pgadmin4.db at all,= I skipped it :). Paresh is working on this.=C2=A0

- The online help is broken (are you building it)? I suggest adding a top-l= evel
=C2=A0 Makefile target to do so.

Sorry, which online help?
=C2=A0
- Working directories should be added to /.gitignore. Please ensure they do= n't
=C2=A0 clash with those used by pip (and ideally are in one place, e.g. mac= -build/).

OK.
=C2=A0
- I saw various errors in the build output, though the resulting DMG seemed= to
=C2=A0 work fine;

Yeah, because I had libpq.dylib present in $PGDIR/ an= d may be yours present in $PGDIR/lib/. I will be using the default values s= uggested by you and fix this. Thanks!

...
cp: /usr/local/pgsql/libpq.5.dylib: No such file or directory
libpq.5.dylib not found in /usr/local/pgsql
Completing app: /Users/dpage/git/pgadmin4/pgAdmin4.app
...

...
App: pgAdmin4.app: Post-processing: .//Contents/MacOS/pgAdmin4
App: pgAdmin4.app: Adding symlink: QtWebKitWidgets (because of:
.//Contents/MacOS/pgAdmin4)
cp: @rpath/QtWebKitWidgets.framework/Versions/5/../../../QtWebKitWidgets.fr= amework:
No such file or directory
chmod: Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWid= gets:
No such file or directory
Rewriting ID in
Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets to QtWebKitWidgets
error: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.x= ctoolchain/usr/bin/install_name_tool:
can't open file:
Contents/Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets (No such file or directory)
Cleaning up
...


On Mon, Apr 18, 2016 at 1:25 PM, Sandeep Thakkar
<sandeep.thakkar@ent= erprisedb.com> wrote:
> Hi Team, Dave,
>
> Attached herewith are two patches.
>
> pgadmin4-mac-bundle.patch - This includes scripts to build Mac app bun= dle
> and DMG for pgAdmin4. This is the tree of the generated app bundle: >
> ----
> $ find pgAdmin4.app/ -maxdepth 3 -type d
> pgAdmin4.app/
> pgAdmin4.app//ContentspgAdmin4.app//Contents/Frameworks
> pgAdmin4.app//Contents/Frameworks/Python.framework
> pgAdmin4.app//Contents/Frameworks/QtCore.framework
> pgAdmin4.app//Contents/Frameworks/QtDBus.framework
> pgAdmin4.app//Contents/Frameworks/QtGui.framework
> pgAdmin4.app//Contents/Frameworks/QtMultimedia.framework
> pgAdmin4.app//Contents/Frameworks/QtMultimediaWidgets.framework
> pgAdmin4.app//Contents/Frameworks/QtNetwork.framework
> pgAdmin4.app//Contents/Frameworks/QtOpenGL.framework
> pgAdmin4.app//Contents/Frameworks/QtPositioning.framework
> pgAdmin4.app//Contents/Frameworks/QtPrintSupport.framework
> pgAdmin4.app//Contents/Frameworks/QtQml.framework
> pgAdmin4.app//Contents/Frameworks/QtQuick.framework
> pgAdmin4.app//Contents/Frameworks/QtSensors.framework
> pgAdmin4.app//Contents/Frameworks/QtSql.framework
> pgAdmin4.app//Contents/Frameworks/QtWebChannel.framework
> pgAdmin4.app//Contents/Frameworks/QtWebKit.framework
> pgAdmin4.app//Contents/Frameworks/QtWebKitWidgets.framework
> pgAdmin4.app//Contents/Frameworks/QtWidgets.framework
> pgAdmin4.app//Contents/MacOS
> pgAdmin4.app//Contents/PlugIns
> pgAdmin4.app//Contents/PlugIns/platforms
> pgAdmin4.app//Contents/Resources
> pgAdmin4.app//Contents/Resources/venv
> pgAdmin4.app//Contents/Resources/web
> ---
>
> pgadmin4-fixpath-mac.patch - This is for runtime/Server.cpp to fix the= path
> where the runtime looks for web application path in app bundle.
>
>
> Kindly review and suggest the changes required.=C2=A0 Thanks.
>
> --
> Sandeep Thakkar
>



--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company



--
Sandeep = Thakkar

--001a11355814f4203c0532b8dea7--