Thread: pga3 website
Hi Jean-Michel, I've updated our main web server to mirror the new pgadmin3 site from snake. It can be seen at http://www.pgadmin.org/pgadmin3. The only bit that doesn't work yet is the translation status pages - can you change them such that only the appropriate bits are checked out of CVS, and that that bit is under the pgadmin3 directory so it get's correctly mirrored. Also, I have cleared out all of the www module in CVS, apart from the faq directory. Please checkin the new site (to www/pgadmin3) as soon as convenient. Cheers, Dave.
Dave Page wrote: >Hi Jean-Michel, > >I've updated our main web server to mirror the new pgadmin3 site from >snake. It can be seen at http://www.pgadmin.org/pgadmin3. > > Hi Dave, seems you're back from holiday. It's been much too short, I believe... How are the proceedings for the beta-1 release, that's already mentioned above? Let's get out that beast! How about win32 packaging? Regards, Andrea
On Monday 04 August 2003 12:59, Dave Page wrote: > The only bit that doesn't work yet is the translation status pages - can > you change them such that only the appropriate bits are checked out of > CVS, and that that bit is under the pgadmin3 directory so it get's > correctly mirrored. Done. The PHP classes have been modified. You need to checkout pgAdmin3 site in webroot/cvsroot/pgadmin3 on www.pgadmin.org as it is done on snake.pgadmin.org to display translations. Run a cron job every 5 minutes to update webroot/cvsroot/pgadmin3 Cheers, Jean-Michel Pouré
It's rumoured that Andreas Pflug once said: > Dave Page wrote: > >>Hi Jean-Michel, >> >>I've updated our main web server to mirror the new pgadmin3 site from >>snake. It can be seen at http://www.pgadmin.org/pgadmin3. >> >> > Hi Dave, > seems you're back from holiday. It's been much too short, I believe... > How are the proceedings for the beta-1 release, that's already > mentioned above? Let's get out that beast! Please give me a couple of days - I have bike & car repairs to get sorted... Officially my holiday is not over until Thursday, though I am at home now so can do some work in the evenings. > How about win32 packaging? Please see the demo I put on Snake some time ago: http://snake.pgadmin.org/snapshots/win32-installer/pgadmin3.msi I will try to update it this evening, as I think it is a pre-html help version. Regards, Dave.
On Monday 04 August 2003 12:59, Dave Page wrote: > The only bit that doesn't work yet is the translation status pages - can > you change them such that only the appropriate bits are checked out of > CVS, and that that bit is under the pgadmin3 directory so it get's > correctly mirrored. Done. The PHP classes have been modified. You need to checkout pgAdmin3 site in webroot/cvsroot/pgadmin3 on www.pgadmin.org as it is done on snake.pgadmin.org to display translations. Run a cron job every 5 minutes to update webroot/cvsroot/pgadmin3 Cheers, Jean-Michel Pouré
Dave Page wrote: > >Please give me a couple of days - I have bike & car repairs to get >sorted... > There's only one thing more costly than a bike... >Officially my holiday is not over until Thursday, though I am at >home now so can do some work in the evenings. > Can't imagine there's anything more important than pgAdmin :-) > > >>How about win32 packaging? >> >> > >Please see the demo I put on Snake some time ago: >http://snake.pgadmin.org/snapshots/win32-installer/pgadmin3.msi >I will try to update it this evening, as I think it is a pre-html help >version. > I saw it, and from CVS I think it's done with Wise. I'd love to upload my builds as MSI, but don't have Wise... Regards, Andreas
On Monday 04 August 2003 23:56, Andreas Pflug wrote: > I saw it, and from CVS I think it's done with Wise. I'd love to upload > my builds as MSI, but don't have Wise... There are open source installers. Did you check this: http://www.nullsoft.com/free/nsis/ Cheers, Jean-Michel
Jean-Michel POURE wrote: >On Monday 04 August 2003 23:56, Andreas Pflug wrote: > > >>I saw it, and from CVS I think it's done with Wise. I'd love to upload >>my builds as MSI, but don't have Wise... >> >> > >There are open source installers. Did you check this: >http://www.nullsoft.com/free/nsis/ > > I had a look at NSIS. While this is not the most comfortable one I've ever seen, it should be good enough for us. So I'd vote to use NSIS for all post-beta-1 distributions; I can contribute an initial script. Regards, Andreas
It's rumoured that Andreas Pflug once said: > Dave Page wrote: > >> >>Please give me a couple of days - I have bike & car repairs to get >>sorted... >> > There's only one thing more costly than a bike... Ahh, she's alright - I took her on holiday to Scotland!! > I saw it, and from CVS I think it's done with Wise. I'd love to upload > my builds as MSI, but don't have Wise... Yes, it is Wise. I don't think the snapshots need an installer anyway - we can keep that for official releases. Regards, Dave.
It's rumoured that Andreas Pflug once said: > Jean-Michel POURE wrote: > >>On Monday 04 August 2003 23:56, Andreas Pflug wrote: >> >> >>>I saw it, and from CVS I think it's done with Wise. I'd love to upload >>>my builds as MSI, but don't have Wise... >>> >>> >> >>There are open source installers. Did you check this: >>http://www.nullsoft.com/free/nsis/ >> >> > I had a look at NSIS. While this is not the most comfortable one I've > ever seen, it should be good enough for us. So I'd vote to use NSIS for > all post-beta-1 distributions; I can contribute an initial script. Not unless it does MSI now. Regards, Dave.
Dave Page wrote: >Yes, it is Wise. I don't think the snapshots need an installer anyway - we >can keep that for official releases. > Sure, snapshots don't need it. But betas and RCs should be packaged. Regards, Andreas
Dave Page wrote: >It's rumoured that Andreas Pflug once said: > > >>Jean-Michel POURE wrote: >> >> >> >>>On Monday 04 August 2003 23:56, Andreas Pflug wrote: >>> >>> >>> >>> >>>>I saw it, and from CVS I think it's done with Wise. I'd love to upload >>>>my builds as MSI, but don't have Wise... >>>> >>>> >>>> >>>> >>>There are open source installers. Did you check this: >>>http://www.nullsoft.com/free/nsis/ >>> >>> >>> >>> >>I had a look at NSIS. While this is not the most comfortable one I've >>ever seen, it should be good enough for us. So I'd vote to use NSIS for >> all post-beta-1 distributions; I can contribute an initial script. >> >> > >Not unless it does MSI now. > > It does not. Why do you insist on MSI? Only thing we need is an intelligent unzip... Regards, Andreas
> -----Original Message----- > From: Andreas Pflug [mailto:pgadmin@pse-consulting.de] > Sent: 05 August 2003 20:09 > To: Dave Page > Cc: jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org > Subject: Re: [pgadmin-hackers] pga3 website > > >Not unless it does MSI now. > > > > > It does not. Why do you insist on MSI? Only thing we need is an > intelligent unzip... Because it's a) Easily scriptable for any msi file for automated installation b) Allows use/creation of merge modules for easy bundling of software - something Jean-Michel is extremely keen on. c) The standard, preferred installation method in XP/2K/2003 d) Can use/create advertising shortcuts with central network installations e) Handles file conflicts/version issues properly f) Manages file reference counting centrally g) Supports rollback of partial/failed installations h) Supports application repair as well as complete reinstall Regards, Dave.
Dave Page wrote: > > >>-----Original Message----- >>From: Andreas Pflug [mailto:pgadmin@pse-consulting.de] >>Sent: 05 August 2003 20:09 >>To: Dave Page >>Cc: jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org >>Subject: Re: [pgadmin-hackers] pga3 website >> >> >> >>>Not unless it does MSI now. >>> >>> >>> >>> >>It does not. Why do you insist on MSI? Only thing we need is an >>intelligent unzip... >> >> > >Because it's > >a) Easily scriptable for any msi file for automated installation >b) Allows use/creation of merge modules for easy bundling of software - >something Jean-Michel is extremely keen on. >c) The standard, preferred installation method in XP/2K/2003 >d) Can use/create advertising shortcuts with central network >installations >e) Handles file conflicts/version issues properly >f) Manages file reference counting centrally >g) Supports rollback of partial/failed installations >h) Supports application repair as well as complete reinstall > Most of this stuff is necessary for this VB s**t, but not for pgAdmin3. We don't have referenced files, cleanup is simply delete, repair is install new, there are no conflicting files, ... But if you can suggest an open-source installation tool, this is certainly more "state of the art". Regards, Andreas
> -----Original Message----- > From: Andreas Pflug [mailto:pgadmin@pse-consulting.de] > Sent: 05 August 2003 21:10 > To: Dave Page > Cc: jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org > Subject: Re: [pgadmin-hackers] pga3 website > > > > Most of this stuff is necessary for this VB s**t, but not for > pgAdmin3. > We don't have referenced files, No? Have you looked at the .exe using dependency walker? There are quite a few dependencies, though thankfully we don't need to distribute them at the moment *unless* we release a debug build. If we ever move to a less static build the we may have things like libpq.dll and wx.dll. There was also talk at one point of using the Microsoft CHM viewer under Windows. > cleanup is simply delete, repair is > install new, there are no conflicting files, ... Yes, at the moment. > > But if you can suggest an open-source installation tool, this is > certainly more "state of the art". I'm not after state of the art for the sake of it. The major reasons I use MSI are: a) Easily scriptable for any msi file for automated installation b) Allows use/creation of merge modules for easy bundling of software - something Jean-Michel is extremely keen on. Regards, Dave.
Dave Page wrote: > > >I'm not after state of the art for the sake of it. The major reasons I >use MSI are: > >a) Easily scriptable for any msi file for automated installation > pgAdmin3 probably won't be distributed widely in a company, so I doubt pgAdmin3 will ever be distributed automatically. >b) Allows use/creation of merge modules for easy bundling of software - >something Jean-Michel is extremely keen on. > Bundle with what? So there's a monopolization for D.P. at the moment for compiling the releases... Regards, Andreas
> -----Original Message----- > From: Andreas Pflug [mailto:pgadmin@pse-consulting.de] > Sent: 05 August 2003 22:09 > To: Dave Page > Cc: jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org > Subject: Re: [pgadmin-hackers] pga3 website > > > Dave Page wrote: > > > > > > >I'm not after state of the art for the sake of it. The major > reasons I > >use MSI are: > > > >a) Easily scriptable for any msi file for automated installation > > > pgAdmin3 probably won't be distributed widely in a company, > so I doubt > pgAdmin3 will ever be distributed automatically. I know of at least one case where pgAdmin II is used in this way though I cannot go into details of that particular site. It also allows easy, seamless installation as a post intall step of other installers. > >b) Allows use/creation of merge modules for easy bundling of > software - > >something Jean-Michel is extremely keen on. > > > Bundle with what? PostgreSQL, psqlODBC, Npgsql, WinMaster... > So there's a monopolization for D.P. at the moment for compiling the > releases... Not really. You could get the Installer SDK from Microsoft (it's free), or Wise, Installshield or anything else that supports MSI. Most will open the MSI file directly, not requiring the Wise project file at all. Besides which, so what if I make the builds? I've done it for the last 6 years anyway, and as Jean-Michel said quite recently, the installers I build are of good quality. I really don't see the problem here anyway. MSI has some advantages which are useful to some, and we have a working installer already. Why must we change? Regards, Dave.
Dave Page wrote: > > >>-----Original Message----- >>From: Andreas Pflug [mailto:pgadmin@pse-consulting.de] >>Sent: 05 August 2003 22:09 >>To: Dave Page >>Cc: jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org >>Subject: Re: [pgadmin-hackers] pga3 website >> >> >>Dave Page wrote: >> >> >> >>>I'm not after state of the art for the sake of it. The major >>> >>> >>reasons I >> >> >>>use MSI are: >>> >>>a) Easily scriptable for any msi file for automated installation >>> >>> >>> >>pgAdmin3 probably won't be distributed widely in a company, >>so I doubt >>pgAdmin3 will ever be distributed automatically. >> >> > >I know of at least one case where pgAdmin II is used in this way though >I cannot go into details of that particular site. It also allows easy, >seamless installation as a post intall step of other installers. > > > >>>b) Allows use/creation of merge modules for easy bundling of >>> >>> >>software - >> >> >>>something Jean-Michel is extremely keen on. >>> >>> >>> >>Bundle with what? >> >> > >PostgreSQL, psqlODBC, Npgsql, WinMaster... > I don't believe it until I see it happening. > > >>So there's a monopolization for D.P. at the moment for compiling the >>releases... >> >> > >Not really. You could get the Installer SDK from Microsoft (it's free), >or Wise, Installshield or anything else that supports MSI. Most will >open the MSI file directly, not requiring the Wise project file at all. > The pkg\win32 is tied to Wise now. AFAICS MS Installer seems to be *not* free (I believed that too, until I tried to locate it today, it's free for "licensed customers of any VS6 Prof or Enterprise"), and VS6SP3 is a prerequisite either. While running in a MS-only development world is easy, we should provide non-MS ways too. Currently, using the MS Installer SDK would be consistent since we still need MS to compile. BTW, to anticipate Jean-Michel: a multi-language installation process would be nice :-) > >Besides which, so what if I make the builds? I've done it for the last 6 >years anyway, and as Jean-Michel said quite recently, the installers I >build are of good quality. > > There's no doubt about the quality, just do it.... Regards, Andreas
> -----Original Message----- > From: Jean-Michel POURE [mailto:jm.poure@freesurf.fr] > Sent: 04 August 2003 13:42 > To: Dave Page > Cc: pgadmin-hackers@postgresql.org > Subject: Re: pga3 website > > > On Monday 04 August 2003 12:59, Dave Page wrote: > > The only bit that doesn't work yet is the translation > status pages - > > can you change them such that only the appropriate bits are checked > > out of CVS, and that that bit is under the pgadmin3 directory so it > > get's correctly mirrored. > > Done. The PHP classes have been modified. You need to > checkout pgAdmin3 site > in webroot/cvsroot/pgadmin3 on www.pgadmin.org as it is done on > snake.pgadmin.org to display translations. > > Run a cron job every 5 minutes to update webroot/cvsroot/pgadmin3 OK, running hourly to minimise load. I have both the site, and the src updating from CVS, so snake is only used to mirror snapshots now. Regards, Dave.
On Wednesday 06 August 2003 00:18, Andreas Pflug wrote: > Dave Page wrote: > >>-----Original Message----- > >>From: Andreas Pflug [mailto:pgadmin@pse-consulting.de] > >>Sent: 05 August 2003 22:09 > >>To: Dave Page > >>Cc: jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org > >>Subject: Re: [pgadmin-hackers] pga3 website > >> > >>Dave Page wrote: > >>>I'm not after state of the art for the sake of it. The major > >> > >>reasons I > >> > >>>use MSI are: > >>> > >>>a) Easily scriptable for any msi file for automated installation > >> > >>pgAdmin3 probably won't be distributed widely in a company, > >>so I doubt > >>pgAdmin3 will ever be distributed automatically. > > > >I know of at least one case where pgAdmin II is used in this way though > >I cannot go into details of that particular site. It also allows easy, > >seamless installation as a post intall step of other installers. > > > >>>b) Allows use/creation of merge modules for easy bundling of > >> > >>software - > >> > >>>something Jean-Michel is extremely keen on. > >> > >>Bundle with what? > > > >PostgreSQL, psqlODBC, Npgsql, WinMaster... > > I don't believe it until I see it happening. > > >>So there's a monopolization for D.P. at the moment for compiling the > >>releases... > > > >Not really. You could get the Installer SDK from Microsoft (it's free), > >or Wise, Installshield or anything else that supports MSI. Most will > >open the MSI file directly, not requiring the Wise project file at all. > > The pkg\win32 is tied to Wise now. AFAICS MS Installer seems to be *not* > free (I believed that too, until I tried to locate it today, it's free > for "licensed customers of any VS6 Prof or Enterprise"), and VS6SP3 is a > prerequisite either. While running in a MS-only development world is > easy, we should provide non-MS ways too. Currently, using the MS > Installer SDK would be consistent since we still need MS to compile. No we don't - I compiled it under MinGW, but my patches and notes about it were ignored. Regards !
> -----Original Message----- > From: Darko Prenosil [mailto:darko.prenosil@finteh.hr] > Sent: 06 August 2003 08:30 > To: Andreas Pflug; Dave Page > Cc: jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org > Subject: Re: [pgadmin-hackers] pga3 website > > > No we don't - I compiled it under MinGW, but my patches and > notes about it > were ignored. Were they? :-( I thought Adam bundled them in with one of his updates after reviewing them. Please send them again and I will make sure they get applied. Regards, Dave.
Dave Page wrote:
ahp
I didn't mean to ignore them....:-) At the time I release my last acinclude patch, I didn't include the mingw patch because, the last that I heard, even *with* the patches it wasn't possible to get pgadmin3 to compile under mingw. I didn't think it should be included until we were sure it was going to work. If that's the case, then by all means, let's include it. Dave, if you want me to submit another patch I can do it tonight, since I'll be working on the Mac buld then.Were they? :-( I thought Adam bundled them in with one of his updates after reviewing them. Please send them again and I will make sure they get applied.
ahp
Yes please - if it's good let's have it :-)
Regards, Dave.
-----Original Message-----Dave Page wrote:
From: Adam H. Pendleton [mailto:fmonkey@fmonkey.net]
Sent: 07 August 2003 15:26
To: Dave Page
Cc: Darko Prenosil; Andreas Pflug; jm.poure@freesurf.fr; pgadmin-hackers@postgresql.org
Subject: Re: [pgadmin-hackers] pga3 websiteI didn't mean to ignore them....:-) At the time I release my last acinclude patch, I didn't include the mingw patch because, the last that I heard, even *with* the patches it wasn't possible to get pgadmin3 to compile under mingw. I didn't think it should be included until we were sure it was going to work. If that's the case, then by all means, let's include it. Dave, if you want me to submit another patch I can do it tonight, since I'll be working on the Mac buld then.Were they? :-( I thought Adam bundled them in with one of his updates after reviewing them. Please send them again and I will make sure they get applied.
ahp
On Thursday 07 August 2003 16:35, Dave Page wrote:
> Yes please - if it's good let's have it :-)
>
> Regards, Dave.
>
> -----Original Message-----
> From: Adam H. Pendleton [mailto:fmonkey@fmonkey.net]
> Sent: 07 August 2003 15:26
> To: Dave Page
> Cc: Darko Prenosil; Andreas Pflug; jm.poure@freesurf.fr;
> pgadmin-hackers@postgresql.org
> Subject: Re: [pgadmin-hackers] pga3 website
>
>
> Dave Page wrote:
>
>
>
> Were they? :-( I thought Adam bundled them in with one
> of his updates
> after reviewing them. Please send them again and I will
> make sure they
> get applied.
>
>
>
> I didn't mean to ignore them....:-) At the time I release my
> last acinclude patch, I didn't include the mingw patch because, the last
> that I heard, even *with* the patches it wasn't possible to get pgadmin3
> to compile under mingw. I didn't think it should be included until we
> were sure it was going to work. If that's the case, then by all means,
> let's include it. Dave, if you want me to submit another patch I can do
> it tonight, since I'll be working on the Mac buld then.
>
> ahp
It is working, but with precompilled libpq (there is no way to compile libpq
using MinGW jet).
I used wxWindows 2.5 from CVS also compiled using MinGW and precompilled libpq
downloaded with pgaccess. Everithing is working just fine, and I do not see
any differences in compare to downloaded pgadmin binary compilled with VC.
I'm repeating one of the above mentioned mails that describes all needed
changes:
******************************************************************************************
I see that msw is excluded. It was something like:
*libwx_mswud-*)
LIBS="$LIBS ${WX_HOME}/lib/libwx_mswud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_mswud_xrc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
...
for every of :
*libwx_mswu-*)
*libwx_mswud-*)
*libwx_mswd-*)
*libwx_msw-*)
Is that just forgotten, or something else ? My last mail did not make
through (I'm not shore why).
I explained needed changes for Makefile so the MinGW build can work.
Now I'm not shore any more is MinGW build will be supported ?
However the following lines are supposed to end up in the Makefile:
WINDRES = windres.exe
...
pgadmin3_OBJECTS = $(am_pgadmin3_OBJECTS) pgAdmin3.res
...
pgAdmin3.res: ui/pgAdmin3.rc
$(WINDRES) --include-dir=$(WX_HOME)/include --include-dir=ui -i
ui/pgAdmin3.rc -I rc -o pgAdmin3.res -O coff
MinGW build is working after those changes. Unfortunatelly I'm not that god
in autoconf/automake to make those changes myself.
******************************************************************************************
---------------------------(end of broadcast)---------------------------
TIP 7: don't forget to increase your free space map settings
> -----Original Message----- > From: Darko Prenosil [mailto:darko.prenosil@finteh.hr] > Sent: 07 August 2003 18:23 > To: Dave Page; Adam H. Pendleton > Cc: Andreas Pflug; jm.poure@freesurf.fr; > pgadmin-hackers@postgresql.org > Subject: Re: [pgadmin-hackers] pga3 website > > > > Dave, if you want me to submit another > > patch I can do it tonight, since I'll be working on the Mac > > buld then. > > > > ahp > > It is working, but with precompilled libpq (there is no way > to compile libpq > using MinGW jet). > I used wxWindows 2.5 from CVS also compiled using MinGW and > precompilled libpq > downloaded with pgaccess. Everithing is working just fine, > and I do not see > any differences in compare to downloaded pgadmin binary > compilled with VC. Just so we're clear on this - I am leaving this for Adam to handle as he offered seeing as he's the autoconf guru :-) Regards, Dave.
Attached is a patch for acinclude.m4 containing the msw fixes. It also
contains my fixes from the 7/21/03 acinclude patch that I submitted that
doesn't look like it ever got applied.
As for the Mac port....not only does wxWindows not build on Mac OS X,
but it doesn't contain Unicode support. I'm going to see if I can get a
working binary built against 2.4, then try to see if I can get a 2.5
version of wxWindows to build. Film at 11.
ahp
--- pgadmin3/acinclude.m4 2003-07-30 11:28:00.000000000 -0400
+++ pgadmin3.new/acinclude.m4 2003-08-08 09:28:35.000000000 -0400
@@ -186,7 +186,7 @@
WX_OLD_CPPFLAGS="$CPPFLAGS"
if test "$pg_static_build" = "yes"
then
- WX_NEW_LDFLAGS=`${WX_CONFIG} --libs --static`
+ WX_NEW_LDFLAGS=`${WX_CONFIG} --static --libs`
else
WX_NEW_LDFLAGS=`${WX_CONFIG} --libs`
fi
@@ -207,105 +207,117 @@
# Here we go!!
if test "$pg_static_build" = "yes"
then
- case "${host}" in
- *-apple-darwin*)
- case "${WX_NEW_LDFLAGS}" in
- *libwx_macud-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_macud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macud_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *libwx_macd-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_macd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macd_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *libwx_mac-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_mac_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_mac_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *)
- ;;
- esac
- ;;
- *) # This used to be just for Linux, but let's make it the default now as it should be appropriate for any
wxGTKbuild
- case "${WX_NEW_LDFLAGS}" in
- *libwx_gtk2ud-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2ud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2ud_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *libwx_gtk2d-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2d_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2d_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *libwx_gtk2u-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2u_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2u_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *libwx_gtkud-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkud_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *libwx_gtkd-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkd_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *libwx_gtk-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk_xrc-${WX_VERSION}.a"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *)
- ;;
- esac
+ case "${WX_NEW_LDFLAGS}" in
+ *libwx_mswud-*)
+ LIBS="$LIBS $(WX_HOME)/lib/libwx_mswud_stc-$(WX+VERSION).a
$(WX_HOME)/lib/libwx_mswud_xrc-$(WX_VERSION).a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *libwx_mswu-*)
+ LIBS="$LIBS $(WX_HOME)/lib/libwx_mswu_stc-$(WX+VERSION).a
$(WX_HOME)/lib/libwx_mswu_xrc-$(WX_VERSION).a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *libwx_mswd-*)
+ LIBS="$LIBS $(WX_HOME)/lib/libwx_mswd_stc-$(WX+VERSION).a
$(WX_HOME)/lib/libwx_mswd_xrc-$(WX_VERSION).a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *libwx_msw-*)
+ LIBS="$LIBS $(WX_HOME)/lib/libwx_msw_stc-$(WX+VERSION).a $(WX_HOME)/lib/libwx_msw_xrc-$(WX_VERSION).a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *libwx_macud-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_macud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_macd-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_macd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macd_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_mac-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_mac_stc-${WX_VERSION}.a ${WX_HOME}/lib/libwx_mac_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_gtk2ud-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2ud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2ud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_gtk2d-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2d_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2d_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_gtk2u-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2u_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2u_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_gtkud-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_gtkd-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkd_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *libwx_gtk-*)
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk_stc-${WX_VERSION}.a ${WX_HOME}/lib/libwx_gtk_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *)
;;
esac
else
- case "${host}" in
- *-apple-darwin*)
- case "${WX_NEW_LDFLAGS}" in
- *wx_macud-*)
- LIBS="$LIBS -lwx_macud_stc-${WX_VERSION} -lwx_macud_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *wx_macd-*)
- LIBS="$LIBS -lwx_macd_stc-${WX_VERSION} -lwx_macd_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *wx_mac-*)
- LIBS="$LIBS -lwx_mac_stc-${WX_VERSION} -lwx_mac_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *)
- ;;
- esac
- ;;
- *) # This used to be just for Linux, but let's make it the default now as it should be appropriate for
anywxGTK build
- case "${WX_NEW_LDFLAGS}" in
- *wx_gtk2ud-*)
- LIBS="$LIBS -lwx_gtk2ud_stc-${WX_VERSION} -lwx_gtk2ud_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *wx_gtk2d-*)
- LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION} -lwx_gtk2d_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *wx_gtk2u-*)
- LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION} -lwx_gtk2u_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *wx_gtkud-*)
- LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION} -lwx_gtkud_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *wx_gtkd-*)
- LIBS="$LIBS -lwx_gtkd_stc-${WX_VERSION} -lwx_gtkd_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *wx_gtk-*)
- LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION} -lwx_gtk_xrc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
- ;;
- *)
- ;;
- esac
+ case "${WX_NEW_LDFLAGS}" in
+ *libwx_mswud-*)
+ LIBS="$LIBS -lwx_mswud_stc-$(WX+VERSION) -lwx_mswud_xrc-$(WX_VERSION)"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *libwx_mswu-*)
+ LIBS="$LIBS -lwx_mswu_stc-$(WX+VERSION) -lwx_mswu_xrc-$(WX_VERSION)"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *libwx_mswd-*)
+ LIBS="$LIBS -lwx_mswd_stc-$(WX+VERSION) -lwx_mswd_xrc-$(WX_VERSION)"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *libwx_msw-*)
+ LIBS="$LIBS -lwx_msw_stc-$(WX+VERSION) -lwx_msw_xrc-$(WX_VERSION)"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
+ *wx_macud-*)
+ LIBS="$LIBS -lwx_macud_stc-${WX_VERSION} -lwx_macud_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_macd-*)
+ LIBS="$LIBS -lwx_macd_stc-${WX_VERSION} -lwx_macd_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_mac-*)
+ LIBS="$LIBS -lwx_mac_stc-${WX_VERSION} -lwx_mac_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtk2ud-*)
+ LIBS="$LIBS -lwx_gtk2ud_stc-${WX_VERSION} -lwx_gtk2ud_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtk2d-*)
+ LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION} -lwx_gtk2d_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtk2u-*)
+ LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION} -lwx_gtk2u_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtkud-*)
+ LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION} -lwx_gtkud_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtkd-*)
+ LIBS="$LIBS -lwx_gtkd_stc-${WX_VERSION} -lwx_gtkd_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtk-*)
+ LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION} -lwx_gtk_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *)
;;
esac
fi
Thanks Adam - patch applied along with a few extra ;'s :-) > -----Original Message----- > From: Adam H. Pendleton [mailto:fmonkey@fmonkey.net] > Sent: 08 August 2003 14:28 > To: Darko Prenosil > Cc: Dave Page; Andreas Pflug; jm.poure@freesurf.fr; > pgadmin-hackers@postgresql.org > Subject: Re: [pgadmin-hackers] pga3 website > > > Attached is a patch for acinclude.m4 containing the msw > fixes. It also > contains my fixes from the 7/21/03 acinclude patch that I > submitted that > doesn't look like it ever got applied. > > As for the Mac port....not only does wxWindows not build on Mac OS X, > but it doesn't contain Unicode support. I'm going to see if > I can get a > working binary built against 2.4, then try to see if I can get a 2.5 > version of wxWindows to build. Film at 11. > > ahp >