Thread: Patch for pgAdmin4 package on Mac OS X

Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
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

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
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.

- I've removed the file type registration for .sql files.

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

- Please move build-mac.sh to pkg/build.sh, and create a target in /Makefile to
  execute it, e.g. "make appbundle"

- Extend the Makefile to add a "clean-appbundle" target, which should also be
  called by the "clean" target.

- 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).

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

- 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/).

- I saw various errors in the build output, though the resulting DMG seemed to
  work fine;

...
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
<sandeep.thakkar@enterprisedb.com> 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

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Thanks Dave. 

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
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
<sandeep.thakkar@enterprisedb.com> 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

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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


Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
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.

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.

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 <dpage@pgadmin.org> wrote:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Paresh More
Date:
Hello Dave,

Attached is the patch for pgAdmin4.py to autocreate database configuration if does not exist. 




On Tue, May 17, 2016 at 4:24 PM, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> 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.

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.

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 <dpage@pgadmin.org> wrote:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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




--

Thanks & Regards

Paresh More

NEW-EDB-logo-4c

Pune, India.

Cell :  +919922000564 |  www.enterprisedb.com
Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:


On Tuesday, May 17, 2016, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> 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 <dpage@pgadmin.org> wrote:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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

Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:


On Tue, May 17, 2016 at 4:52 PM, Dave Page <dpage@pgadmin.org> wrote:


On Tuesday, May 17, 2016, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> 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.
 
Yes, I got that. I was talking from dependency perspective. Docs needs to be built in the virtual environment as it needs some python modules for building and App bundle should include the docs. So, docs will be built before the app bundle, but it needs venv which is a part of the same script (build.sh) that creates the bundle. So, I will have to split the build.sh accordingly.

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 <dpage@pgadmin.org> wrote:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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




--
Sandeep Thakkar

Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Okay, so the patch needs a little change because of the change in the versioning for pgAdmin. Will update it.

Paresh, please take a note of it. 

On Tue, May 17, 2016 at 4:24 PM, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> 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.

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.

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 <dpage@pgadmin.org> wrote:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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




--
Sandeep Thakkar

Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
So, this means, the installer name would be pgadmin4-1.0-dev.exe on Windows and so on for other platforms?

Also, the installation would go in $installdir/pgadmin4/1/ ? and the Revision change would update the installation? and the Release change will stay side-by-side?

On Wed, May 18, 2016 at 4:20 PM, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> wrote:
Okay, so the patch needs a little change because of the change in the versioning for pgAdmin. Will update it.

Paresh, please take a note of it. 

On Tue, May 17, 2016 at 4:24 PM, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> 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.

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.

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 <dpage@pgadmin.org> wrote:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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




--
Sandeep Thakkar




--
Sandeep Thakkar

Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
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 <dpage@pgadmin.org> wrote:


On Tuesday, May 17, 2016, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> 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 <dpage@pgadmin.org> wrote:
On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave.
>
> 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
>> 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
>> <sandeep.thakkar@enterprisedb.com> 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




--

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
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
<sandeep.thakkar@enterprisedb.com> 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 <dpage@pgadmin.org> wrote:
>>
>>
>>
>> On Tuesday, May 17, 2016, Sandeep Thakkar
>> <sandeep.thakkar@enterprisedb.com> 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 <dpage@pgadmin.org> wrote:
>>>>
>>>> On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
>>>> <sandeep.thakkar@enterprisedb.com> wrote:
>>>> > Thanks Dave.
>>>> >
>>>> > 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
>>>> >> 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
>>>> >> <sandeep.thakkar@enterprisedb.com> 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


Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Hmm.. looks like some difference in the QT installation.

Can you please provide me the otool -L output for pgAdmin4 from /mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4

and also the tree for $QTDIR/lib

Thanks.

On Thu, May 19, 2016 at 7:20 PM, Dave Page <dpage@pgadmin.org> wrote:
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
<sandeep.thakkar@enterprisedb.com> 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 <dpage@pgadmin.org> wrote:
>>
>>
>>
>> On Tuesday, May 17, 2016, Sandeep Thakkar
>> <sandeep.thakkar@enterprisedb.com> 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 <dpage@pgadmin.org> wrote:
>>>>
>>>> On Fri, May 13, 2016 at 2:01 PM, Sandeep Thakkar
>>>> <sandeep.thakkar@enterprisedb.com> wrote:
>>>> > Thanks Dave.
>>>> >
>>>> > 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
>>>> >> 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
>>>> >> <sandeep.thakkar@enterprisedb.com> 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



--

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
On Thu, May 19, 2016 at 10:05 AM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Hmm.. looks like some difference in the QT installation.
>
> Can you please provide me the otool -L output for pgAdmin4 from
> /mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4

(pgadmin4)snake:pgadmin4 dpage$ otool -L
mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4
mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4:
/System/Library/Frameworks/Python.framework/Versions/2.7/Python
(compatibility version 2.7.0, current version 2.7.10)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current
version 1226.10.1)
/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
(compatibility version 150.0.0, current version 1258.1.0)
@rpath/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets
(compatibility version 5.5.0, current version 5.5.1)
@rpath/QtWidgets.framework/Versions/5/QtWidgets (compatibility version
5.5.0, current version 5.5.1)
@rpath/QtGui.framework/Versions/5/QtGui (compatibility version 5.5.0,
current version 5.5.1)
@rpath/QtCore.framework/Versions/5/QtCore (compatibility version
5.5.0, current version 5.5.1)
/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration
(compatibility version 1.0.0, current version 1.0.0)
/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit
(compatibility version 1.0.0, current version 275.0.0)
@rpath/QtWebKit.framework/Versions/5/QtWebKit (compatibility version
5.5.0, current version 5.5.1)
@rpath/QtNetwork.framework/Versions/5/QtNetwork (compatibility version
5.5.0, current version 5.5.1)
/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL
(compatibility version 1.0.0, current version 1.0.0)
/System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility
version 1.0.0, current version 1.0.0)
/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current
version 104.1.0)

>
> and also the tree for $QTDIR/lib

Attached.

Also, my config database now seems to be trashed since I ran "make
appbundle" :-(


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

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

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Hi Dave

I have fixed this issue. Instead of getting path from otool, script now uses QTDIR variable to copy the framework directory. Please find the updated patch attached.

Thanks.

On Thu, May 19, 2016 at 7:39 PM, Dave Page <dpage@pgadmin.org> wrote:
On Thu, May 19, 2016 at 10:05 AM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Hmm.. looks like some difference in the QT installation.
>
> Can you please provide me the otool -L output for pgAdmin4 from
> /mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4

(pgadmin4)snake:pgadmin4 dpage$ otool -L
mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4
mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4:
/System/Library/Frameworks/Python.framework/Versions/2.7/Python
(compatibility version 2.7.0, current version 2.7.10)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current
version 1226.10.1)
/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
(compatibility version 150.0.0, current version 1258.1.0)
@rpath/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets
(compatibility version 5.5.0, current version 5.5.1)
@rpath/QtWidgets.framework/Versions/5/QtWidgets (compatibility version
5.5.0, current version 5.5.1)
@rpath/QtGui.framework/Versions/5/QtGui (compatibility version 5.5.0,
current version 5.5.1)
@rpath/QtCore.framework/Versions/5/QtCore (compatibility version
5.5.0, current version 5.5.1)
/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration
(compatibility version 1.0.0, current version 1.0.0)
/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit
(compatibility version 1.0.0, current version 275.0.0)
@rpath/QtWebKit.framework/Versions/5/QtWebKit (compatibility version
5.5.0, current version 5.5.1)
@rpath/QtNetwork.framework/Versions/5/QtNetwork (compatibility version
5.5.0, current version 5.5.1)
/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL
(compatibility version 1.0.0, current version 1.0.0)
/System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility
version 1.0.0, current version 1.0.0)
/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current
version 104.1.0)

>
> and also the tree for $QTDIR/lib

Attached.

Also, my config database now seems to be trashed since I ran "make
appbundle" :-(


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

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



--
Sandeep Thakkar

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
Hi

Attached is an updated patch in which I made some minor changes, most
significantly, to stop the build script from over-writing my
configuration file (again)!

There are a couple of important issues to be resolved:

1) It doesn't work. When testing on Karen's machine (which is new, and
doesn't have any dev environment etc), it errors out because it looks
like it cannot find the virtual environment.

2) It's *huge* - like 650MB!! I believe we're bundling much of QT
which isn't required. Please only copy what is needed.

Thanks!

On Mon, May 23, 2016 at 7:22 AM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Hi Dave
>
> I have fixed this issue. Instead of getting path from otool, script now uses
> QTDIR variable to copy the framework directory. Please find the updated
> patch attached.
>
> Thanks.
>
> On Thu, May 19, 2016 at 7:39 PM, Dave Page <dpage@pgadmin.org> wrote:
>>
>> On Thu, May 19, 2016 at 10:05 AM, Sandeep Thakkar
>> <sandeep.thakkar@enterprisedb.com> wrote:
>> > Hmm.. looks like some difference in the QT installation.
>> >
>> > Can you please provide me the otool -L output for pgAdmin4 from
>> > /mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4
>>
>> (pgadmin4)snake:pgadmin4 dpage$ otool -L
>> mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4
>> mac-build/pgAdmin4.app/Contents/MacOS/pgAdmin4:
>> /System/Library/Frameworks/Python.framework/Versions/2.7/Python
>> (compatibility version 2.7.0, current version 2.7.10)
>> /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current
>> version 1226.10.1)
>>
>> /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
>> (compatibility version 150.0.0, current version 1258.1.0)
>> @rpath/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets
>> (compatibility version 5.5.0, current version 5.5.1)
>> @rpath/QtWidgets.framework/Versions/5/QtWidgets (compatibility version
>> 5.5.0, current version 5.5.1)
>> @rpath/QtGui.framework/Versions/5/QtGui (compatibility version 5.5.0,
>> current version 5.5.1)
>> @rpath/QtCore.framework/Versions/5/QtCore (compatibility version
>> 5.5.0, current version 5.5.1)
>>
>> /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration
>> (compatibility version 1.0.0, current version 1.0.0)
>> /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit
>> (compatibility version 1.0.0, current version 275.0.0)
>> @rpath/QtWebKit.framework/Versions/5/QtWebKit (compatibility version
>> 5.5.0, current version 5.5.1)
>> @rpath/QtNetwork.framework/Versions/5/QtNetwork (compatibility version
>> 5.5.0, current version 5.5.1)
>> /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL
>> (compatibility version 1.0.0, current version 1.0.0)
>> /System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility
>> version 1.0.0, current version 1.0.0)
>> /usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current
>> version 104.1.0)
>>
>> >
>> > and also the tree for $QTDIR/lib
>>
>> Attached.
>>
>> Also, my config database now seems to be trashed since I ran "make
>> appbundle" :-(
>>
>>
>> --
>> 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

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:


On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> wrote:
Sure. Thanks.

There is a typo in pkg/mac/build.sh. i.e

s/HTML_HELP/HELP_PATH/


On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org> wrote:
Not entirely - we definitely need to improve it. I'll review the code as it is now though.

OK, review time :-)

- The appbundle name should be created from APP_NAME.app in config.py, e.g. 'pgAdmin 4.app'

- The DMG name should be created from to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g. pgadmin4-1.0-dev.dmg

- Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's no need to define another macro.

- Please add "MINIFY_HTML = False" to config_local.py (and have Paresh do the same on his packages). This works around a code issue with the docs that I'll log a bug for.

- In testing, I found that running the app from within the DMG doesn't seem to work the first time - it prompts for the path, then exits. Once I save the path it offers, it's fine on subsequent runs.

- Once copied to my laptop, I saw the same issue as above.

Once these issues are resolved, I think we're good to commit.

Thanks!

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

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

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
On Fri, May 27, 2016 at 4:48 PM, Dave Page <dpage@pgadmin.org> wrote:
>
>
> On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar
> <sandeep.thakkar@enterprisedb.com> wrote:
>>
>> Sure. Thanks.
>>
>> There is a typo in pkg/mac/build.sh. i.e
>>
>> s/HTML_HELP/HELP_PATH/
>>
>>
>> On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org> wrote:
>>>
>>> Not entirely - we definitely need to improve it. I'll review the code as
>>> it is now though.
>
>
> OK, review time :-)
>
> - The appbundle name should be created from APP_NAME.app in config.py, e.g.
> 'pgAdmin 4.app'
>
> - The DMG name should be created from
> to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g.
> pgadmin4-1.0-dev.dmg
>
> - Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's no need
> to define another macro.
>
> - Please add "MINIFY_HTML = False" to config_local.py (and have Paresh do
> the same on his packages). This works around a code issue with the docs that
> I'll log a bug for.
>
> - In testing, I found that running the app from within the DMG doesn't seem
> to work the first time - it prompts for the path, then exits. Once I save
> the path it offers, it's fine on subsequent runs.
>
> - Once copied to my laptop, I saw the same issue as above.
>
> Once these issues are resolved, I think we're good to commit.

Oh, a couple more things:

- There should not be a copy of the app bundle in dist/ following the
build. Only the dmg should be there.

- I think mac-build/ should be removed following a successful build,
rather than waiting for make clean (please talk to Paresh - his code
should do the same).

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

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


Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Thanks. I have fixed all the issues.

Regarding the app not running from within the DMG for the first time, I was unable to reproduce it on Zilan's machine which didn't have the development env. On Murali's machine, it was reproducible for 1 time after couple of attempts.

So, I just added the sync statement after settings the pythonpath value in the settings. May be this will resolve the issue. Please confirm.
settings.sync();

Attached is the updated patch. Thanks. 

On Fri, May 27, 2016 at 9:28 PM, Dave Page <dpage@pgadmin.org> wrote:
On Fri, May 27, 2016 at 4:48 PM, Dave Page <dpage@pgadmin.org> wrote:
>
>
> On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar
> <sandeep.thakkar@enterprisedb.com> wrote:
>>
>> Sure. Thanks.
>>
>> There is a typo in pkg/mac/build.sh. i.e
>>
>> s/HTML_HELP/HELP_PATH/
>>
>>
>> On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org> wrote:
>>>
>>> Not entirely - we definitely need to improve it. I'll review the code as
>>> it is now though.
>
>
> OK, review time :-)
>
> - The appbundle name should be created from APP_NAME.app in config.py, e.g.
> 'pgAdmin 4.app'
>
> - The DMG name should be created from
> to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g.
> pgadmin4-1.0-dev.dmg
>
> - Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's no need
> to define another macro.
>
> - Please add "MINIFY_HTML = False" to config_local.py (and have Paresh do
> the same on his packages). This works around a code issue with the docs that
> I'll log a bug for.
>
> - In testing, I found that running the app from within the DMG doesn't seem
> to work the first time - it prompts for the path, then exits. Once I save
> the path it offers, it's fine on subsequent runs.
>
> - Once copied to my laptop, I saw the same issue as above.
>
> Once these issues are resolved, I think we're good to commit.

Oh, a couple more things:

- There should not be a copy of the app bundle in dist/ following the
build. Only the dmg should be there.

- I think mac-build/ should be removed following a successful build,
rather than waiting for make clean (please talk to Paresh - his code
should do the same).

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

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



--
Sandeep Thakkar

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Somehow the patch skipped the Makefile changes. Attached is the updated patch.

On Mon, May 30, 2016 at 6:00 PM, Sandeep Thakkar <sandeep.thakkar@enterprisedb.com> wrote:
Thanks. I have fixed all the issues.

Regarding the app not running from within the DMG for the first time, I was unable to reproduce it on Zilan's machine which didn't have the development env. On Murali's machine, it was reproducible for 1 time after couple of attempts.

So, I just added the sync statement after settings the pythonpath value in the settings. May be this will resolve the issue. Please confirm.
settings.sync();

Attached is the updated patch. Thanks. 

On Fri, May 27, 2016 at 9:28 PM, Dave Page <dpage@pgadmin.org> wrote:
On Fri, May 27, 2016 at 4:48 PM, Dave Page <dpage@pgadmin.org> wrote:
>
>
> On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar
> <sandeep.thakkar@enterprisedb.com> wrote:
>>
>> Sure. Thanks.
>>
>> There is a typo in pkg/mac/build.sh. i.e
>>
>> s/HTML_HELP/HELP_PATH/
>>
>>
>> On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org> wrote:
>>>
>>> Not entirely - we definitely need to improve it. I'll review the code as
>>> it is now though.
>
>
> OK, review time :-)
>
> - The appbundle name should be created from APP_NAME.app in config.py, e.g.
> 'pgAdmin 4.app'
>
> - The DMG name should be created from
> to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g.
> pgadmin4-1.0-dev.dmg
>
> - Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's no need
> to define another macro.
>
> - Please add "MINIFY_HTML = False" to config_local.py (and have Paresh do
> the same on his packages). This works around a code issue with the docs that
> I'll log a bug for.
>
> - In testing, I found that running the app from within the DMG doesn't seem
> to work the first time - it prompts for the path, then exits. Once I save
> the path it offers, it's fine on subsequent runs.
>
> - Once copied to my laptop, I saw the same issue as above.
>
> Once these issues are resolved, I think we're good to commit.

Oh, a couple more things:

- There should not be a copy of the app bundle in dist/ following the
build. Only the dmg should be there.

- I think mac-build/ should be removed following a successful build,
rather than waiting for make clean (please talk to Paresh - his code
should do the same).

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

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



--
Sandeep Thakkar




--
Sandeep Thakkar

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
Hi,

On the first run, I get:

App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin 4.app
./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
Cleaning up
Copying data into temporary directory
cp: ./../mac-build/pgAdmin 4.app: No such file or directory
create-dmg.sh failed
make: *** [appbundle] Error 1

If I run it again, I get:

App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin 4.app
./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
Directory ./pgadmin4-1.0-dev.dmg.src already exists. Please delete it manually.
create-dmg.sh failed
make: *** [appbundle] Error 1

If I manually create $SRC/dist, it's much happier.

Other issues:

- Your changes to the runtime don't seem to help. I've been staring at
the code for an hour or so now, and I can't see the issue though. We
may need some fresh eyes.

- pkg/mac/create-dmg.sh is mixing upper and lower case variable names
and with/without _, e.g. $dmgname vs $DMG_NAME

- Shoudn't DMG_NAME be initialised to `grep "^APP_NAME" web/config.py
| cut -d"=" -f2 | sed "s/'//g"` ?



On Tue, May 31, 2016 at 1:19 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Somehow the patch skipped the Makefile changes. Attached is the updated
> patch.
>
> On Mon, May 30, 2016 at 6:00 PM, Sandeep Thakkar
> <sandeep.thakkar@enterprisedb.com> wrote:
>>
>> Thanks. I have fixed all the issues.
>>
>> Regarding the app not running from within the DMG for the first time, I
>> was unable to reproduce it on Zilan's machine which didn't have the
>> development env. On Murali's machine, it was reproducible for 1 time after
>> couple of attempts.
>>
>> So, I just added the sync statement after settings the pythonpath value in
>> the settings. May be this will resolve the issue. Please confirm.
>> settings.sync();
>>
>> Attached is the updated patch. Thanks.
>>
>> On Fri, May 27, 2016 at 9:28 PM, Dave Page <dpage@pgadmin.org> wrote:
>>>
>>> On Fri, May 27, 2016 at 4:48 PM, Dave Page <dpage@pgadmin.org> wrote:
>>> >
>>> >
>>> > On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar
>>> > <sandeep.thakkar@enterprisedb.com> wrote:
>>> >>
>>> >> Sure. Thanks.
>>> >>
>>> >> There is a typo in pkg/mac/build.sh. i.e
>>> >>
>>> >> s/HTML_HELP/HELP_PATH/
>>> >>
>>> >>
>>> >> On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org> wrote:
>>> >>>
>>> >>> Not entirely - we definitely need to improve it. I'll review the code
>>> >>> as
>>> >>> it is now though.
>>> >
>>> >
>>> > OK, review time :-)
>>> >
>>> > - The appbundle name should be created from APP_NAME.app in config.py,
>>> > e.g.
>>> > 'pgAdmin 4.app'
>>> >
>>> > - The DMG name should be created from
>>> > to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g.
>>> > pgadmin4-1.0-dev.dmg
>>> >
>>> > - Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's no
>>> > need
>>> > to define another macro.
>>> >
>>> > - Please add "MINIFY_HTML = False" to config_local.py (and have Paresh
>>> > do
>>> > the same on his packages). This works around a code issue with the docs
>>> > that
>>> > I'll log a bug for.
>>> >
>>> > - In testing, I found that running the app from within the DMG doesn't
>>> > seem
>>> > to work the first time - it prompts for the path, then exits. Once I
>>> > save
>>> > the path it offers, it's fine on subsequent runs.
>>> >
>>> > - Once copied to my laptop, I saw the same issue as above.
>>> >
>>> > Once these issues are resolved, I think we're good to commit.
>>>
>>> Oh, a couple more things:
>>>
>>> - There should not be a copy of the app bundle in dist/ following the
>>> build. Only the dmg should be there.
>>>
>>> - I think mac-build/ should be removed following a successful build,
>>> rather than waiting for make clean (please talk to Paresh - his code
>>> should do the same).
>>>
>>> --
>>> Dave Page
>>> Blog: http://pgsnake.blogspot.com
>>> Twitter: @pgsnake
>>>
>>> EnterpriseDB UK: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>
>>
>>
>>
>> --
>> Sandeep Thakkar
>>
>
>
>
> --
> Sandeep Thakkar
>



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

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


Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Hi Dave,


On Tue, May 31, 2016 at 9:29 PM, Dave Page <dpage@pgadmin.org> wrote:
Hi,

On the first run, I get:

App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin 4.app
./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
Cleaning up
Copying data into temporary directory
cp: ./../mac-build/pgAdmin 4.app: No such file or directory
create-dmg.sh failed
make: *** [appbundle] Error 1

If I run it again, I get:

App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin 4.app
./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
Directory ./pgadmin4-1.0-dev.dmg.src already exists. Please delete it manually.
create-dmg.sh failed
make: *** [appbundle] Error 1

If I manually create $SRC/dist, it's much happier.

I have used variable for dist. It will create the directory if doesn't exist. The clean-appbunde will also remove the .src directory in dist just in case it is present.

Other issues:

- Your changes to the runtime don't seem to help. I've been staring at
the code for an hour or so now, and I can't see the issue though. We
may need some fresh eyes.

yeah, I also spent more time to see the code and test it. Infact, I could hardly reproduce it 1 or 2 times.
 
- pkg/mac/create-dmg.sh is mixing upper and lower case variable names
and with/without _, e.g. $dmgname vs $DMG_NAME

not sure, why I used lower case, I prefer upper case always. I have made the changes now to use upper case for all variables.
 
- Shoudn't DMG_NAME be initialised to `grep "^APP_NAME" web/config.py
| cut -d"=" -f2 | sed "s/'//g"` ?

yes, I have used the couple of more variables that gives proper understanding.

Thanks! I have attached the updated patch. (runtime changes remains same).

On Tue, May 31, 2016 at 1:19 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Somehow the patch skipped the Makefile changes. Attached is the updated
> patch.
>
> On Mon, May 30, 2016 at 6:00 PM, Sandeep Thakkar
> <sandeep.thakkar@enterprisedb.com> wrote:
>>
>> Thanks. I have fixed all the issues.
>>
>> Regarding the app not running from within the DMG for the first time, I
>> was unable to reproduce it on Zilan's machine which didn't have the
>> development env. On Murali's machine, it was reproducible for 1 time after
>> couple of attempts.
>>
>> So, I just added the sync statement after settings the pythonpath value in
>> the settings. May be this will resolve the issue. Please confirm.
>> settings.sync();
>>
>> Attached is the updated patch. Thanks.
>>
>> On Fri, May 27, 2016 at 9:28 PM, Dave Page <dpage@pgadmin.org> wrote:
>>>
>>> On Fri, May 27, 2016 at 4:48 PM, Dave Page <dpage@pgadmin.org> wrote:
>>> >
>>> >
>>> > On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar
>>> > <sandeep.thakkar@enterprisedb.com> wrote:
>>> >>
>>> >> Sure. Thanks.
>>> >>
>>> >> There is a typo in pkg/mac/build.sh. i.e
>>> >>
>>> >> s/HTML_HELP/HELP_PATH/
>>> >>
>>> >>
>>> >> On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org> wrote:
>>> >>>
>>> >>> Not entirely - we definitely need to improve it. I'll review the code
>>> >>> as
>>> >>> it is now though.
>>> >
>>> >
>>> > OK, review time :-)
>>> >
>>> > - The appbundle name should be created from APP_NAME.app in config.py,
>>> > e.g.
>>> > 'pgAdmin 4.app'
>>> >
>>> > - The DMG name should be created from
>>> > to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g.
>>> > pgadmin4-1.0-dev.dmg
>>> >
>>> > - Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's no
>>> > need
>>> > to define another macro.
>>> >
>>> > - Please add "MINIFY_HTML = False" to config_local.py (and have Paresh
>>> > do
>>> > the same on his packages). This works around a code issue with the docs
>>> > that
>>> > I'll log a bug for.
>>> >
>>> > - In testing, I found that running the app from within the DMG doesn't
>>> > seem
>>> > to work the first time - it prompts for the path, then exits. Once I
>>> > save
>>> > the path it offers, it's fine on subsequent runs.
>>> >
>>> > - Once copied to my laptop, I saw the same issue as above.
>>> >
>>> > Once these issues are resolved, I think we're good to commit.
>>>
>>> Oh, a couple more things:
>>>
>>> - There should not be a copy of the app bundle in dist/ following the
>>> build. Only the dmg should be there.
>>>
>>> - I think mac-build/ should be removed following a successful build,
>>> rather than waiting for make clean (please talk to Paresh - his code
>>> should do the same).
>>>
>>> --
>>> Dave Page
>>> Blog: http://pgsnake.blogspot.com
>>> Twitter: @pgsnake
>>>
>>> EnterpriseDB UK: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>
>>
>>
>>
>> --
>> Sandeep Thakkar
>>
>
>
>
> --
> Sandeep Thakkar
>



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

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



--
Sandeep Thakkar

Attachment

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
Thanks - applied with some tweaks to the runtime code (i.e. not saving
the location of the venv in the appbundle).

On Tue, May 31, 2016 at 6:37 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Hi Dave,
>
>
> On Tue, May 31, 2016 at 9:29 PM, Dave Page <dpage@pgadmin.org> wrote:
>>
>> Hi,
>>
>> On the first run, I get:
>>
>> App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin
>> 4.app
>> ./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
>> Cleaning up
>> Copying data into temporary directory
>> cp: ./../mac-build/pgAdmin 4.app: No such file or directory
>> create-dmg.sh failed
>> make: *** [appbundle] Error 1
>>
>> If I run it again, I get:
>>
>> App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin
>> 4.app
>> ./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
>> Directory ./pgadmin4-1.0-dev.dmg.src already exists. Please delete it
>> manually.
>> create-dmg.sh failed
>> make: *** [appbundle] Error 1
>>
>> If I manually create $SRC/dist, it's much happier.
>>
> I have used variable for dist. It will create the directory if doesn't
> exist. The clean-appbunde will also remove the .src directory in dist just
> in case it is present.
>
>> Other issues:
>>
>> - Your changes to the runtime don't seem to help. I've been staring at
>> the code for an hour or so now, and I can't see the issue though. We
>> may need some fresh eyes.
>>
> yeah, I also spent more time to see the code and test it. Infact, I could
> hardly reproduce it 1 or 2 times.
>
>>
>> - pkg/mac/create-dmg.sh is mixing upper and lower case variable names
>> and with/without _, e.g. $dmgname vs $DMG_NAME
>>
> not sure, why I used lower case, I prefer upper case always. I have made the
> changes now to use upper case for all variables.
>
>>
>> - Shoudn't DMG_NAME be initialised to `grep "^APP_NAME" web/config.py
>> | cut -d"=" -f2 | sed "s/'//g"` ?
>>
> yes, I have used the couple of more variables that gives proper
> understanding.
>
> Thanks! I have attached the updated patch. (runtime changes remains same).
>>
>>
>> On Tue, May 31, 2016 at 1:19 PM, Sandeep Thakkar
>> <sandeep.thakkar@enterprisedb.com> wrote:
>> > Somehow the patch skipped the Makefile changes. Attached is the updated
>> > patch.
>> >
>> > On Mon, May 30, 2016 at 6:00 PM, Sandeep Thakkar
>> > <sandeep.thakkar@enterprisedb.com> wrote:
>> >>
>> >> Thanks. I have fixed all the issues.
>> >>
>> >> Regarding the app not running from within the DMG for the first time, I
>> >> was unable to reproduce it on Zilan's machine which didn't have the
>> >> development env. On Murali's machine, it was reproducible for 1 time
>> >> after
>> >> couple of attempts.
>> >>
>> >> So, I just added the sync statement after settings the pythonpath value
>> >> in
>> >> the settings. May be this will resolve the issue. Please confirm.
>> >> settings.sync();
>> >>
>> >> Attached is the updated patch. Thanks.
>> >>
>> >> On Fri, May 27, 2016 at 9:28 PM, Dave Page <dpage@pgadmin.org> wrote:
>> >>>
>> >>> On Fri, May 27, 2016 at 4:48 PM, Dave Page <dpage@pgadmin.org> wrote:
>> >>> >
>> >>> >
>> >>> > On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar
>> >>> > <sandeep.thakkar@enterprisedb.com> wrote:
>> >>> >>
>> >>> >> Sure. Thanks.
>> >>> >>
>> >>> >> There is a typo in pkg/mac/build.sh. i.e
>> >>> >>
>> >>> >> s/HTML_HELP/HELP_PATH/
>> >>> >>
>> >>> >>
>> >>> >> On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org>
>> >>> >> wrote:
>> >>> >>>
>> >>> >>> Not entirely - we definitely need to improve it. I'll review the
>> >>> >>> code
>> >>> >>> as
>> >>> >>> it is now though.
>> >>> >
>> >>> >
>> >>> > OK, review time :-)
>> >>> >
>> >>> > - The appbundle name should be created from APP_NAME.app in
>> >>> > config.py,
>> >>> > e.g.
>> >>> > 'pgAdmin 4.app'
>> >>> >
>> >>> > - The DMG name should be created from
>> >>> > to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g.
>> >>> > pgadmin4-1.0-dev.dmg
>> >>> >
>> >>> > - Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's
>> >>> > no
>> >>> > need
>> >>> > to define another macro.
>> >>> >
>> >>> > - Please add "MINIFY_HTML = False" to config_local.py (and have
>> >>> > Paresh
>> >>> > do
>> >>> > the same on his packages). This works around a code issue with the
>> >>> > docs
>> >>> > that
>> >>> > I'll log a bug for.
>> >>> >
>> >>> > - In testing, I found that running the app from within the DMG
>> >>> > doesn't
>> >>> > seem
>> >>> > to work the first time - it prompts for the path, then exits. Once I
>> >>> > save
>> >>> > the path it offers, it's fine on subsequent runs.
>> >>> >
>> >>> > - Once copied to my laptop, I saw the same issue as above.
>> >>> >
>> >>> > Once these issues are resolved, I think we're good to commit.
>> >>>
>> >>> Oh, a couple more things:
>> >>>
>> >>> - There should not be a copy of the app bundle in dist/ following the
>> >>> build. Only the dmg should be there.
>> >>>
>> >>> - I think mac-build/ should be removed following a successful build,
>> >>> rather than waiting for make clean (please talk to Paresh - his code
>> >>> should do the same).
>> >>>
>> >>> --
>> >>> Dave Page
>> >>> Blog: http://pgsnake.blogspot.com
>> >>> Twitter: @pgsnake
>> >>>
>> >>> EnterpriseDB UK: http://www.enterprisedb.com
>> >>> The Enterprise PostgreSQL Company
>> >>
>> >>
>> >>
>> >>
>> >> --
>> >> Sandeep Thakkar
>> >>
>> >
>> >
>> >
>> > --
>> > 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


Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
Thanks Dave!

I saw the runtime code and observed one change (prepend -> append) . Was it not saving the location because of this?

On Thu, Jun 2, 2016 at 6:27 PM, Dave Page <dpage@pgadmin.org> wrote:
Thanks - applied with some tweaks to the runtime code (i.e. not saving
the location of the venv in the appbundle).

On Tue, May 31, 2016 at 6:37 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Hi Dave,
>
>
> On Tue, May 31, 2016 at 9:29 PM, Dave Page <dpage@pgadmin.org> wrote:
>>
>> Hi,
>>
>> On the first run, I get:
>>
>> App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin
>> 4.app
>> ./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
>> Cleaning up
>> Copying data into temporary directory
>> cp: ./../mac-build/pgAdmin 4.app: No such file or directory
>> create-dmg.sh failed
>> make: *** [appbundle] Error 1
>>
>> If I run it again, I get:
>>
>> App completed: /Users/dpage/git/pgadmin4/pkg/mac/../../mac-build/pgAdmin
>> 4.app
>> ./pkg/mac/create-dmg.sh: line 6: cd: dist: No such file or directory
>> Directory ./pgadmin4-1.0-dev.dmg.src already exists. Please delete it
>> manually.
>> create-dmg.sh failed
>> make: *** [appbundle] Error 1
>>
>> If I manually create $SRC/dist, it's much happier.
>>
> I have used variable for dist. It will create the directory if doesn't
> exist. The clean-appbunde will also remove the .src directory in dist just
> in case it is present.
>
>> Other issues:
>>
>> - Your changes to the runtime don't seem to help. I've been staring at
>> the code for an hour or so now, and I can't see the issue though. We
>> may need some fresh eyes.
>>
> yeah, I also spent more time to see the code and test it. Infact, I could
> hardly reproduce it 1 or 2 times.
>
>>
>> - pkg/mac/create-dmg.sh is mixing upper and lower case variable names
>> and with/without _, e.g. $dmgname vs $DMG_NAME
>>
> not sure, why I used lower case, I prefer upper case always. I have made the
> changes now to use upper case for all variables.
>
>>
>> - Shoudn't DMG_NAME be initialised to `grep "^APP_NAME" web/config.py
>> | cut -d"=" -f2 | sed "s/'//g"` ?
>>
> yes, I have used the couple of more variables that gives proper
> understanding.
>
> Thanks! I have attached the updated patch. (runtime changes remains same).
>>
>>
>> On Tue, May 31, 2016 at 1:19 PM, Sandeep Thakkar
>> <sandeep.thakkar@enterprisedb.com> wrote:
>> > Somehow the patch skipped the Makefile changes. Attached is the updated
>> > patch.
>> >
>> > On Mon, May 30, 2016 at 6:00 PM, Sandeep Thakkar
>> > <sandeep.thakkar@enterprisedb.com> wrote:
>> >>
>> >> Thanks. I have fixed all the issues.
>> >>
>> >> Regarding the app not running from within the DMG for the first time, I
>> >> was unable to reproduce it on Zilan's machine which didn't have the
>> >> development env. On Murali's machine, it was reproducible for 1 time
>> >> after
>> >> couple of attempts.
>> >>
>> >> So, I just added the sync statement after settings the pythonpath value
>> >> in
>> >> the settings. May be this will resolve the issue. Please confirm.
>> >> settings.sync();
>> >>
>> >> Attached is the updated patch. Thanks.
>> >>
>> >> On Fri, May 27, 2016 at 9:28 PM, Dave Page <dpage@pgadmin.org> wrote:
>> >>>
>> >>> On Fri, May 27, 2016 at 4:48 PM, Dave Page <dpage@pgadmin.org> wrote:
>> >>> >
>> >>> >
>> >>> > On Fri, May 27, 2016 at 1:11 PM, Sandeep Thakkar
>> >>> > <sandeep.thakkar@enterprisedb.com> wrote:
>> >>> >>
>> >>> >> Sure. Thanks.
>> >>> >>
>> >>> >> There is a typo in pkg/mac/build.sh. i.e
>> >>> >>
>> >>> >> s/HTML_HELP/HELP_PATH/
>> >>> >>
>> >>> >>
>> >>> >> On Fri, May 27, 2016 at 5:26 PM, Dave Page <dpage@pgadmin.org>
>> >>> >> wrote:
>> >>> >>>
>> >>> >>> Not entirely - we definitely need to improve it. I'll review the
>> >>> >>> code
>> >>> >>> as
>> >>> >>> it is now though.
>> >>> >
>> >>> >
>> >>> > OK, review time :-)
>> >>> >
>> >>> > - The appbundle name should be created from APP_NAME.app in
>> >>> > config.py,
>> >>> > e.g.
>> >>> > 'pgAdmin 4.app'
>> >>> >
>> >>> > - The DMG name should be created from
>> >>> > to_lower(remove_spaces(APP_NAME-APP_VERSION)) in config.py, e.g.
>> >>> > pgadmin4-1.0-dev.dmg
>> >>> >
>> >>> > - Use #ifdef Q_OS_MAC in the QT code for Mac-specific code. There's
>> >>> > no
>> >>> > need
>> >>> > to define another macro.
>> >>> >
>> >>> > - Please add "MINIFY_HTML = False" to config_local.py (and have
>> >>> > Paresh
>> >>> > do
>> >>> > the same on his packages). This works around a code issue with the
>> >>> > docs
>> >>> > that
>> >>> > I'll log a bug for.
>> >>> >
>> >>> > - In testing, I found that running the app from within the DMG
>> >>> > doesn't
>> >>> > seem
>> >>> > to work the first time - it prompts for the path, then exits. Once I
>> >>> > save
>> >>> > the path it offers, it's fine on subsequent runs.
>> >>> >
>> >>> > - Once copied to my laptop, I saw the same issue as above.
>> >>> >
>> >>> > Once these issues are resolved, I think we're good to commit.
>> >>>
>> >>> Oh, a couple more things:
>> >>>
>> >>> - There should not be a copy of the app bundle in dist/ following the
>> >>> build. Only the dmg should be there.
>> >>>
>> >>> - I think mac-build/ should be removed following a successful build,
>> >>> rather than waiting for make clean (please talk to Paresh - his code
>> >>> should do the same).
>> >>>
>> >>> --
>> >>> Dave Page
>> >>> Blog: http://pgsnake.blogspot.com
>> >>> Twitter: @pgsnake
>> >>>
>> >>> EnterpriseDB UK: http://www.enterprisedb.com
>> >>> The Enterprise PostgreSQL Company
>> >>
>> >>
>> >>
>> >>
>> >> --
>> >> Sandeep Thakkar
>> >>
>> >
>> >
>> >
>> > --
>> > 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

Re: Patch for pgAdmin4 package on Mac OS X

From
Dave Page
Date:
On Thu, Jun 2, 2016 at 2:05 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave!
>
> I saw the runtime code and observed one change (prepend -> append) . Was it
> not saving the location because of this?

No - I changed that because if the value is prepended, the user cannot
override it. This way anything explicitly defined by the user will
take priority.

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

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


Re: Patch for pgAdmin4 package on Mac OS X

From
Sandeep Thakkar
Date:
okay. Thanks again!

On Thu, Jun 2, 2016 at 6:37 PM, Dave Page <dpage@pgadmin.org> wrote:
On Thu, Jun 2, 2016 at 2:05 PM, Sandeep Thakkar
<sandeep.thakkar@enterprisedb.com> wrote:
> Thanks Dave!
>
> I saw the runtime code and observed one change (prepend -> append) . Was it
> not saving the location because of this?

No - I changed that because if the value is prepended, the user cannot
override it. This way anything explicitly defined by the user will
take priority.

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

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



--
Sandeep Thakkar