Thread: pgAdmin III commit: Modify the GNU build system so that it always rebui

Modify the GNU build system so that it always rebuilds xrcdialogs.cpp if
needed during a "make all". This also adds a "make xrc" target, and as
a side effect, allows use to call pgadmin/ui/embed-xrc from directories
other than pgadmin/ui.

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=5cbe791efec2d00a27d0a7ec90f2f41f25368dd8

Modified Files
--------------
Makefile.am          |    5 ++++-
pgadmin/ui/embed-xrc |   12 +++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)

if xrcDialogs.cpp now rebuilds it should be remove from source and gitignored


2014-06-11 2:11 GMT+06:00 Dave Page <dpage@pgadmin.org>:
> Modify the GNU build system so that it always rebuilds xrcdialogs.cpp if
> needed during a "make all". This also adds a "make xrc" target, and as
> a side effect, allows use to call pgadmin/ui/embed-xrc from directories
> other than pgadmin/ui.
>
> Branch
> ------
> master
>
> Details
> -------
> http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=5cbe791efec2d00a27d0a7ec90f2f41f25368dd8
>
> Modified Files
> --------------
> Makefile.am          |    5 ++++-
> pgadmin/ui/embed-xrc |   12 +++++++++++-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
>
> --
> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers



--
All bugs reserved

No, because these changes only apply to *nix. We still need the file
in source control for Windows.

On Mon, Jun 16, 2014 at 6:52 AM, Timon <timosha@gmail.com> wrote:
> if xrcDialogs.cpp now rebuilds it should be remove from source and gitignored
>
>
> 2014-06-11 2:11 GMT+06:00 Dave Page <dpage@pgadmin.org>:
>> Modify the GNU build system so that it always rebuilds xrcdialogs.cpp if
>> needed during a "make all". This also adds a "make xrc" target, and as
>> a side effect, allows use to call pgadmin/ui/embed-xrc from directories
>> other than pgadmin/ui.
>>
>> Branch
>> ------
>> master
>>
>> Details
>> -------
>> http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=5cbe791efec2d00a27d0a7ec90f2f41f25368dd8
>>
>> Modified Files
>> --------------
>> Makefile.am          |    5 ++++-
>> pgadmin/ui/embed-xrc |   12 +++++++++++-
>> 2 files changed, 15 insertions(+), 2 deletions(-)
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>
>
> --
> All bugs reserved



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

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

but after run "make" git shows pgadmin/ui/xrcDialogs.cpp as modified
and we must run "git chekcout pgadmin/ui/xrcDialogs.cpp" before each
rebase/commit/etc :(

2014-06-16 13:45 GMT+06:00 Dave Page <dpage@pgadmin.org>:
> No, because these changes only apply to *nix. We still need the file
> in source control for Windows.
>
> On Mon, Jun 16, 2014 at 6:52 AM, Timon <timosha@gmail.com> wrote:
>> if xrcDialogs.cpp now rebuilds it should be remove from source and gitignored
>>
>>
>> 2014-06-11 2:11 GMT+06:00 Dave Page <dpage@pgadmin.org>:
>>> Modify the GNU build system so that it always rebuilds xrcdialogs.cpp if
>>> needed during a "make all". This also adds a "make xrc" target, and as
>>> a side effect, allows use to call pgadmin/ui/embed-xrc from directories
>>> other than pgadmin/ui.
>>>
>>> Branch
>>> ------
>>> master
>>>
>>> Details
>>> -------
>>> http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=5cbe791efec2d00a27d0a7ec90f2f41f25368dd8
>>>
>>> Modified Files
>>> --------------
>>> Makefile.am          |    5 ++++-
>>> pgadmin/ui/embed-xrc |   12 +++++++++++-
>>> 2 files changed, 15 insertions(+), 2 deletions(-)
>>>
>>>
>>> --
>>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>>> To make changes to your subscription:
>>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>>
>>
>> --
>> All bugs reserved
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company



--
All bugs reserved

The code I committed only changes xrcDialogs.cpp if a change is
detected. It generates a new file with a temporary name, then diff's
that with the original, and only rewrites the original if diff returns
a non-zero value, otherwise it just deletes the temp file.

On Tue, Jun 17, 2014 at 7:05 AM, Timon <timosha@gmail.com> wrote:
> but after run "make" git shows pgadmin/ui/xrcDialogs.cpp as modified
> and we must run "git chekcout pgadmin/ui/xrcDialogs.cpp" before each
> rebase/commit/etc :(
>
> 2014-06-16 13:45 GMT+06:00 Dave Page <dpage@pgadmin.org>:
>> No, because these changes only apply to *nix. We still need the file
>> in source control for Windows.
>>
>> On Mon, Jun 16, 2014 at 6:52 AM, Timon <timosha@gmail.com> wrote:
>>> if xrcDialogs.cpp now rebuilds it should be remove from source and gitignored
>>>
>>>
>>> 2014-06-11 2:11 GMT+06:00 Dave Page <dpage@pgadmin.org>:
>>>> Modify the GNU build system so that it always rebuilds xrcdialogs.cpp if
>>>> needed during a "make all". This also adds a "make xrc" target, and as
>>>> a side effect, allows use to call pgadmin/ui/embed-xrc from directories
>>>> other than pgadmin/ui.
>>>>
>>>> Branch
>>>> ------
>>>> master
>>>>
>>>> Details
>>>> -------
>>>> http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=5cbe791efec2d00a27d0a7ec90f2f41f25368dd8
>>>>
>>>> Modified Files
>>>> --------------
>>>> Makefile.am          |    5 ++++-
>>>> pgadmin/ui/embed-xrc |   12 +++++++++++-
>>>> 2 files changed, 15 insertions(+), 2 deletions(-)
>>>>
>>>>
>>>> --
>>>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>>>> To make changes to your subscription:
>>>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>>
>>>
>>>
>>> --
>>> All bugs reserved
>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>
>
>
> --
> All bugs reserved



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

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