Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b3OLv-0006xJ-H2 for pgadmin-hackers@arkaria.postgresql.org; Thu, 19 May 2016 13:51:03 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1b3OLv-0000Dr-3p for pgadmin-hackers@arkaria.postgresql.org; Thu, 19 May 2016 13:51:03 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1b3OLh-0008Qx-J6 for pgadmin-hackers@postgresql.org; Thu, 19 May 2016 13:50:49 +0000 Received: from mail-io0-x22d.google.com ([2607:f8b0:4001:c06::22d]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1b3OLd-0002pi-CE for pgadmin-hackers@postgresql.org; Thu, 19 May 2016 13:50:48 +0000 Received: by mail-io0-x22d.google.com with SMTP id i75so107633481ioa.3 for ; Thu, 19 May 2016 06:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pgadmin-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=o6gNziEdd4XWEBWFv0rV2xBN2Wa0IaYCDVhLY/ighig=; b=yQLu4BFVYb7mU1LyED/yUPRvMw1L5uiurqfrwcqqW2+n4sSmR8lSL82ZMlc4p/Tphu uBb7XwDdA8FFlQAMcyduYd4HHwGaBhca9nke3I+jO2ZPHaXwgMK0g+giGIWIcUGyhEuF 0oTJj8/HknKnrSAKrh1zhN0brRsU5r8FOcTPAG49VTScPPwpyPCDZf2/9Xx/fIK4iSpv /gLdE0l1dpO06I++uAq2wO35yGC8sx62MADsz/UCMFl+o9Kf2yLQCVRcrIAvboGeY4wD tkTdV1kPWVtL/PEn1y6BP2TyulsUn46DS/pW6XSYHedEeteIwIO/+pbt9K4fzElvOcxt uCrQ== 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=o6gNziEdd4XWEBWFv0rV2xBN2Wa0IaYCDVhLY/ighig=; b=GjB0CSsCgzCIkt9nQHFYK83cJ9MSPgol5wdt75VvrnL2xAhygD4k3T6dqmWmngfe6r tVHQz/Qorur45SLisfFgEm2AS9LwDCpi4WNXxzGVohw5thvFTFBBuBsIh0FXtSpmG4T8 RR8KQCSkQb27jRs1DihELK4x0ihxsCFCED39qUU9yWEM01u8QGiRCgq8Sk+DoyKi1Chz tvq+aalt01MnEptL7KvtPNCauZwyCWGSpa6DJAu/Bj21ah6bz1cxnfAru0yczpXpOyK7 fVJoQ7To22jM8JrLTHDbBoW2q8RN90LWnLW5iOTnZdVkdQMzZeSpjTWBgx+0Z47sck7k V19Q== X-Gm-Message-State: AOPr4FUzf4KFyjQB4BjiuSQwq590nurMMAHCs7xHc73l8S+yYhERW0E6SCeuXwYTYtG4Slewk+WaPlGNoJ9DvQ== MIME-Version: 1.0 X-Received: by 10.107.148.8 with SMTP id w8mr9975109iod.63.1463665844382; Thu, 19 May 2016 06:50:44 -0700 (PDT) Received: by 10.64.34.236 with HTTP; Thu, 19 May 2016 06:50:44 -0700 (PDT) In-Reply-To: References: Date: Thu, 19 May 2016 09:50:44 -0400 Message-ID: Subject: Re: Patch for pgAdmin4 package on Mac OS X From: Dave Page To: Sandeep Thakkar Cc: Paresh More , pgadmin-hackers , Hamid Quddus Content-Type: text/plain; charset=UTF-8 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 Hi I see the following error when attempting to build. My configurable paths match the defaults in the README. 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) complete-bundle.sh failed make: *** [appbundle] Error 1 On Thu, May 19, 2016 at 6:34 AM, Sandeep Thakkar wrote: > Hi Dave > > I have added the 'docs' target in the /Makefile. This target is also called > by appbundle. pgAdmin4 versioning change is also taken care of. > > I have attached the updated patch here. Kindly review and let me know your > feedback. Thanks. > > On Tue, May 17, 2016 at 4:52 PM, Dave Page wrote: >> >> >> >> On Tuesday, May 17, 2016, Sandeep Thakkar >> wrote: >>> >>> Hi Dave >>> >>> I have fixed the issues. Attached is the updated patch. >>> >>> The docs are built as part of 'appbundle' target, there is no separate >>> target in Makefile for this. I observed that it requires the python modules >>> to get this built. We create virtual environment as a part of 'appbundle' >>> target because we do everything in a single script "build.sh". Hence, right >>> now I added doc build in the same build script. >> >> >> Right - I was suggesting you create the 'docs' target, then use it. >> >>> >>> >>> BTW, the online help returns me the following error now: >>> "The server encountered an internal error and was unable to complete your >>> request. Either the server is overloaded or there is an error in the >>> application." Since this is not 404, it means that it atleast got >>> index.html, right? May be this should be handled in the source code. >> >> >> It works fine for me on my dev machines. If there's a problem, we need to >> diagnose it. >> >>> >>> >>> Paresh is working on updating pgAdmin4.py to autocreate database >>> configuration if does not exist. He will share the patch. >>> >>> On Fri, May 13, 2016 at 6:41 PM, Dave Page wrote: >>>> >>>> On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar >>>> wrote: >>>> > 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. >>>> >>>> Right. I went with the default directories from the original projects. >>>> >>>> >> >>>> >> - 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? >>>> >>>> I meant "the user building the package", not the end user. >>>> >>>> >> - 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? >>>> >>>> Yes :-) >>>> >>>> >> - 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. >>>> >>>> Oh - in that case it used my existing one. Which of course, it should >>>> not overwrite if already present (which reminds me - adding a todo >>>> item to auto-upgrade the database if needed on first run). >>>> >>>> >> - The online help is broken (are you building it)? I suggest adding a >>>> >> top-level >>>> >> Makefile target to do so. >>>> >> >>>> > Sorry, which online help? >>>> >>>> That which can be found in $SRC/doc - currently only for en_US. At >>>> present it's built with "cd doc/en_US && make -f Makefile.sphinx >>>> html", but I think we should have a top-level target to call that for >>>> us. >>>> >>>> The help can then be accessed from Help -> Online Help within pgAdmin. >>>> Obviously the files need to be put in the right place in the app >>>> bundle. >>>> >>>> >> - 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! >>>> >>>> Right - please make sure the build fails in cases like this too. >>>> >>>> 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 >>>> > >>>> >>>> >>>> >>>> -- >>>> Dave Page >>>> Blog: http://pgsnake.blogspot.com >>>> Twitter: @pgsnake >>>> >>>> EnterpriseDB UK: http://www.enterprisedb.com >>>> The Enterprise PostgreSQL Company >>> >>> >>> >>> >>> -- >>> Sandeep Thakkar >>> >> >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > > > -- > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers