[pgadmin-hackers] SVN Commit by dpage: r4179 - branches/REL-1_2_0_PATCHES/pgadmin3/src/include
Author: dpage Date: 2005-05-13 08:28:38 +0100 (Fri, 13 May 2005) New Revision: 4179 Modified: branches/REL-1_2_0_PATCHES/pgadmin3/src/include/postgres.h Log: Cleanup missing newline [Raphael Enrici] Modified: branches/REL-1_2_0_PATCHES/pgadmin3/src/include/postgres.h === --- branches/REL-1_2_0_PATCHES/pgadmin3/src/include/postgres.h 2005-05-11 16:12:22 UTC (rev 4178) +++ branches/REL-1_2_0_PATCHES/pgadmin3/src/include/postgres.h 2005-05-13 07:28:38 UTC (rev 4179) @@ -22,4 +22,4 @@ #define YYSTYPE -#define NAMEDATALEN 32 \ No newline at end of file +#define NAMEDATALEN 32 ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
[pgadmin-hackers] [PATCH] Repair OSX Port after i18n reorganization
Hi
This patch makes the osx build work again, by doing the following
.) Change i18n/Makefile.am to install i18n-files into
$(datadir)i18n instead of $(datadir)/pgadmin3/i18n when
building an appbundle.
.) Put the files listed in TMP_ui in i18n/Makefile.am
into EXTRA_DIST instead. I guess this was an error,
since TMP_ui is never used in this Makefile...
.) Support DESTDIR in i18n/Makefile.am
.) Moves the path-hint support for windows from
pgAdmin3.cpp to base/appbase.cpp,
because this saves some conditionals and is cleaner
.) Make path a global variable, like loadPath, ...
Now all path-related setups are done in InitPaths in AppBase
I didn't test the win32 build... I hope I didn't break anything..
greetings, Florian Pflug
Index: i18n/Makefile.am
===
--- i18n/Makefile.am(revision 4179)
+++ i18n/Makefile.am(working copy)
@@ -19,25 +19,27 @@
EXTRA_DIST = \
$(srcdir)/wxstd.pot \
- $(srcdir)/??_??/pgadmin3.po
-
-TMP_ui = \
+ $(srcdir)/??_??/pgadmin3.po \
$(srcdir)/wxstd.mo \
$(srcdir)/pgadmin3.lng \
$(srcdir)/pg_settings.csv \
$(srcdir)/??_??/pgadmin3.mo \
$(srcdir)/??_??/wxstd.mo
+if !APPBUNDLE
+i18ndir = $(pkgdatadir)/i18n
+else
+i18ndir = $(datadir)/i18n
+endif
install-data-local:
- $(mkinstalldirs) $(datadir)/pgadmin3/i18n
+ $(mkinstalldirs) $(PREFIX)$(i18ndir)
@pub_tx='$(PUB_TX)'; \
for DIR in $$pub_tx; do \
- $(mkinstalldirs) $(datadir)/pgadmin3/i18n/$$DIR; \
+ $(mkinstalldirs) $(PREFIX)$(i18ndir)/$$DIR; \
for FILE in `ls $$DIR/*.mo`; do \
- $(install_sh) -c -m 644 $$FILE
$(datadir)/pgadmin3/i18n/$$DIR/; \
+ $(install_sh) -c -m 644 $$FILE
$(PREFIX)$(i18ndir)/$$DIR/; \
done \
done
- $(install_sh) -c -m 644 pgadmin3.lng $(datadir)/pgadmin3/i18n/$$DIR
- $(install_sh) -c -m 644 wxstd.mo $(datadir)/pgadmin3/i18n/$$DIR
-
+ $(install_sh) -c -m 644 pgadmin3.lng $(PREFIX)$(i18ndir)/$$DIR
+ $(install_sh) -c -m 644 wxstd.mo $(PREFIX)$(i18ndir)/$$DIR
Index: src/pgAdmin3.cpp
===
--- src/pgAdmin3.cpp(revision 4179)
+++ src/pgAdmin3.cpp(working copy)
@@ -147,31 +147,6 @@
}
}
-
-wxPathList path;
-
-path.Add(loadPath);
-
-#ifdef __WXMSW__
-
- // Look for a path 'hint' on Windows. This registry setting may
- // be set by the Win32 PostgreSQL installer which will generally
- // install pg_dump et al. in the PostgreSQL bindir rather than
- // the pgAdmin directory.
-
-wxRegKey hintKey(wxT(HKEY_LOCAL_MACHINE\\Software\\) APPNAME_L);
-
- if (hintKey.HasValue(wxT(Helper Path)))
- {
- wxString hintPath;
- hintKey.QueryValue(wxT(Helper Path), hintPath);
- path.Add(hintPath);
- }
-
-#endif
-
-path.AddEnvList(wxT(PATH));
-
// evaluate all working paths
#if defined(__WXMSW__)
Index: src/include/base/appbase.h
===
--- src/include/base/appbase.h (revision 4179)
+++ src/include/base/appbase.h (working copy)
@@ -9,6 +9,7 @@
//
//
+extern wxPathList path; // The search path
extern wxString loadPath; // Where the program is loaded from
extern wxString docPath; // Where docs are stored
extern wxString uiPath;// Where ui data is stored
Index: src/base/appbase.cpp
===
--- src/base/appbase.cpp(revision 4179)
+++ src/base/appbase.cpp(working copy)
@@ -24,6 +24,7 @@
#include base/pgConnBase.h
#include base/sysLogger.h
+wxPathList path;// The search path
wxString loadPath; // Where the program is loaded from
wxString docPath; // Where docs are stored
wxString uiPath;// Where ui data is stored
@@ -60,6 +61,18 @@
docPath = loadPath + DOC_DIR;
else
docPath = loadPath + wxT(/../..) DOC_DIR;
+
+// Look for a path 'hint' on Windows. This registry setting may
+// be set by the Win32 PostgreSQL installer which will generally
+// install pg_dump et al. in the PostgreSQL bindir rather than
+// the pgAdmin directory.
+wxRegKey hintKey(wxT(HKEY_LOCAL_MACHINE\\Software\\) APPNAME_L);
+if (hintKey.HasValue(wxT(Helper Path)))
+{
+wxString hintPath;
+hintKey.QueryValue(wxT(Helper Path), hintPath);
+path.Add(hintPath);
+}
#else
wxString dataDir;
@@ -123,6 +136,8 @@
docPath = loadPath + wxT(/..) DOC_DIR ;
}
#endif
+
+
[pgadmin-hackers] [PATCH] Appbundle-Support for 1.2
Hi
Here is the appbundle-support for 1.2
Attach is a patch against the current 1.2 branch.
It works the same as the trunk-appbundle-support did
before the Big Reorganization.
At www.phlo.org/pgadmin3-1.2-appbundle.tar.bz2
you'll find a tar.bz which contains pkg/Makefile.am and
pkg/mac/*. Please extract this into the src_root,
and apply the patch there too..
This additionally contains a few fixed for wx 2.6 detection,
because it didn't compile sucessfully - at least on osx.
greetings, Florian Pflug
Index: src/pgAdmin3.cpp
===
--- src/pgAdmin3.cpp(revision 4178)
+++ src/pgAdmin3.cpp(working copy)
@@ -20,6 +20,7 @@
#include wx/imagjpeg.h
#include wx/imaggif.h
#include wx/imagpng.h
+#include wx/stdpaths.h
// Windows headers
@@ -75,6 +76,8 @@
#define DOC_DIR wxT(/docs)
#define UI_DIR wxT(/ui)
#define COMMON_DIR wxT(/common)
+#define SCRIPT_DIR wxT(/scripts)
+#define HELPER_DIR wxT(/helper)
#define LANG_FILE wxT(pgadmin3.lng)
@@ -133,7 +136,7 @@
// evaluate all working paths
-#ifdef __WIN32__
+#if defined(__WIN32__)
backupExecutable = path.FindValidPath(wxT(pg_dump.exe));
restoreExecutable = path.FindValidPath(wxT(pg_restore.exe));
@@ -148,6 +151,33 @@
else
docPath = loadPath + wxT(/../..) DOC_DIR;
+#elif defined(__WXMAC__)
+
+//When using wxStandardPaths on OSX, wx defaults to the unix,
+//not to the mac variants. Therefor, we request wxStandardPathsCF
+//directly.
+wxStandardPathsCF stdPaths ;
+wxString dataDir = stdPaths.GetDataDir() ;
+if (dataDir) {
+wxFprintf(stderr, wxT(DataDir: ) + dataDir + wxT(\n)) ;
+ if (wxDir::Exists(dataDir + HELPER_DIR))
+path.Add(dataDir + HELPER_DIR) ;
+if (wxDir::Exists(dataDir + SCRIPT_DIR))
+path.Add(dataDir + SCRIPT_DIR) ;
+if (wxDir::Exists(dataDir + UI_DIR))
+ uiPath = dataDir + UI_DIR ;
+if (wxDir::Exists(dataDir + DOC_DIR))
+ docPath = dataDir + DOC_DIR ;
+}
+
+if (uiPath.IsEmpty())
+uiPath = loadPath + UI_DIR ;
+if (docPath.IsEmpty())
+docPath = loadPath + wxT(/..) DOC_DIR ;
+
+backupExecutable = path.FindValidPath(wxT(pg_dump));
+restoreExecutable = path.FindValidPath(wxT(pg_restore));
+
#else
backupExecutable = path.FindValidPath(wxT(pg_dump));
@@ -162,6 +192,7 @@
docPath = DATA_DIR DOC_DIR;
else
docPath = loadPath + wxT(/..) DOC_DIR;
+
#endif
Index: src/Makefile.am
===
--- src/Makefile.am (revision 4178)
+++ src/Makefile.am (working copy)
@@ -130,7 +130,7 @@
#
##
-nobase_dist_pkgdata_DATA = ui/common/*.xrc \
+TMP_ui = ui/common/*.xrc \
ui/wxstd.mo \
ui/pgadmin3.lng \
ui/af_ZA/pgadmin3.mo \
@@ -177,6 +177,30 @@
ui/zh_CN/wxstd.mo \
ui/zh_TW/wxstd.mo
+if !APPBUNDLE
+
+nobase_dist_pkgdata_DATA = $(TMP_ui)
AM_CXXFLAGS = -DDATA_DIR=\$(pkgdatadir)/\ -Wall -g
-I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
AM_CPPFLAGS = -DDATA_DIR=\$(pkgdatadir)/\ -Wall -g
-I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
AM_CFLAGS = -DDATA_DIR=\$(pkgdatadir)/\ -Wall -g -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include
+
+# Automake trys to execute install-exec-hook if it appears anywhere in the
file, so we need a dummy
+# for non-APPBUNDLE cases.
+install-exec-hook:
+
+else
+
+nobase_dist_data_DATA = $(TMP_ui)
+AM_CXXFLAGS = -Wall -g -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include
+AM_CPPFLAGS = -Wall -g -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include
+AM_CFLAGS = -Wall -g -I$(top_srcdir)/src/include
-I$(top_srcdir)/src/agent/include
+
+install-exec-hook:
+ cd $(bindir) ;\
+ mv pgadmin3 tmp ;\
+ mv tmp pgAdmin3 ;\
+ if test $(pg_debug_build) = no; then \
+ strip pgAdmin3 ;\
+ fi
+
+endif
Index: src/ui/frmMain.cpp
===
--- src/ui/frmMain.cpp (revision 4178)
+++ src/ui/frmMain.cpp (working copy)
@@ -164,6 +164,9 @@
#endif
fileMenu-AppendSeparator();
fileMenu-Append(MNU_EXIT, _(Exit\tAlt-F4),_(Quit this
program.));
+#ifdef __WXMAC__
+wxApp::s_macExitMenuItemId = MNU_EXIT;
+#endif
menuBar-Append(fileMenu, _(File));
// Edit Menu
Index: configure.ac
===
--- configure.ac(revision 4178)
+++ configure.ac(working copy)
@@ -30,6 +30,8 @@
AC_CHECK_FUNCS([gethostbyname inet_ntoa memmove memset strchr])
# Custom checks
+ENABLE_APPBUNDLE
+AM_CONDITIONAL([APPBUNDLE], [test x$pg_appbundle = xyes])
CHECK_WX_CONFIG_BINARY
CHECK_PGSQL_INCLUDE
ENABLE_DEBUG
@@ -38,5 +40,7 @@
CHECK_WXWINDOWS
AC_CONFIG_FILES([Makefile
-
[pgadmin-hackers] SVN Commit by dpage: r4181 - in trunk/pgadmin3: i18n src src/agent src/base src/ctl src/include/base src/include/ctl
Author: dpage
Date: 2005-05-13 12:12:03 +0100 (Fri, 13 May 2005)
New Revision: 4181
Modified:
trunk/pgadmin3/i18n/Makefile.am
trunk/pgadmin3/src/agent/dlgSchedule.cpp
trunk/pgadmin3/src/base/appbase.cpp
trunk/pgadmin3/src/ctl/ctlListView.cpp
trunk/pgadmin3/src/include/base/appbase.h
trunk/pgadmin3/src/include/ctl/ctlListView.h
trunk/pgadmin3/src/pgAdmin3.cpp
Log:
This patch makes the osx build work again, by doing the following
.) Change i18n/Makefile.am to install i18n-files into
$(datadir)i18n instead of $(datadir)/pgadmin3/i18n when
building an appbundle.
.) Put the files listed in TMP_ui in i18n/Makefile.am
into EXTRA_DIST instead. I guess this was an error,
since TMP_ui is never used in this Makefile...
.) Support DESTDIR in i18n/Makefile.am
.) Moves the path-hint support for windows from
pgAdmin3.cpp to base/appbase.cpp,
because this saves some conditionals and is cleaner
.) Make path a global variable, like loadPath, ...
Now all path-related setups are done in InitPaths in AppBase
[Florian G. Pflug]
Modified: trunk/pgadmin3/i18n/Makefile.am
===
--- trunk/pgadmin3/i18n/Makefile.am 2005-05-13 10:01:01 UTC (rev 4180)
+++ trunk/pgadmin3/i18n/Makefile.am 2005-05-13 11:12:03 UTC (rev 4181)
@@ -19,25 +19,27 @@
EXTRA_DIST = \
$(srcdir)/wxstd.pot \
- $(srcdir)/??_??/pgadmin3.po
-
-TMP_ui = \
+ $(srcdir)/??_??/pgadmin3.po \
$(srcdir)/wxstd.mo \
$(srcdir)/pgadmin3.lng \
$(srcdir)/pg_settings.csv \
$(srcdir)/??_??/pgadmin3.mo \
$(srcdir)/??_??/wxstd.mo
+if !APPBUNDLE
+i18ndir = $(pkgdatadir)/i18n
+else
+i18ndir = $(datadir)/i18n
+endif
install-data-local:
- $(mkinstalldirs) $(datadir)/pgadmin3/i18n
+ $(mkinstalldirs) $(PREFIX)$(i18ndir)
@pub_tx='$(PUB_TX)'; \
for DIR in $$pub_tx; do \
- $(mkinstalldirs) $(datadir)/pgadmin3/i18n/$$DIR; \
+ $(mkinstalldirs) $(PREFIX)$(i18ndir)/$$DIR; \
for FILE in `ls $$DIR/*.mo`; do \
- $(install_sh) -c -m 644 $$FILE
$(datadir)/pgadmin3/i18n/$$DIR/; \
+ $(install_sh) -c -m 644 $$FILE
$(PREFIX)$(i18ndir)/$$DIR/; \
done \
done
- $(install_sh) -c -m 644 pgadmin3.lng $(datadir)/pgadmin3/i18n/$$DIR
- $(install_sh) -c -m 644 wxstd.mo $(datadir)/pgadmin3/i18n/$$DIR
-
+ $(install_sh) -c -m 644 pgadmin3.lng $(PREFIX)$(i18ndir)/$$DIR
+ $(install_sh) -c -m 644 wxstd.mo $(PREFIX)$(i18ndir)/$$DIR
Modified: trunk/pgadmin3/src/agent/dlgSchedule.cpp
===
--- trunk/pgadmin3/src/agent/dlgSchedule.cpp2005-05-13 10:01:01 UTC (rev
4180)
+++ trunk/pgadmin3/src/agent/dlgSchedule.cpp2005-05-13 11:12:03 UTC (rev
4181)
@@ -277,6 +277,56 @@
void dlgSchedule::OnChangeException(wxCommandEvent ev)
{
+ if (!calException-GetValue().IsValid()
timException-GetValue().IsNull())
+ {
+ wxMessageBox(_(You must enter a valid date and/or time!),
_(Add exception), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+
+ wxString exDate, exTime;
+
+ if (calException-GetValue().IsValid())
+ exDate = calException-GetValue().FormatDate();
+ else
+ exDate = _(any);
+
+ if (!timException-GetValue().IsNull())
+ exTime = timException-GetValue().Format();
+ else
+ exTime = _(any);
+
+ for (int pos=0; pos lstExceptions-GetItemCount(); pos++)
+ {
+ if (lstExceptions-GetFocusedItem() != pos)
+ {
+ if (lstExceptions-GetText(pos, 0) == exDate
+ lstExceptions-GetText(pos, 1) == exTime)
+ {
+ wxMessageBox(_(The specified exception already
exists!), _(Add exception), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+
+ if (lstExceptions-GetText(pos, 0) == exDate
+ lstExceptions-GetText(pos, 1) == _(any))
+ {
+ wxMessageBox(_(An exception already exists for
any time on this date!), _(Add exception), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+
+ if (lstExceptions-GetText(pos, 1) == exTime
+ lstExceptions-GetText(pos, 0) == _(any))
+ {
+ wxMessageBox(_(An exception already exists for
this time on any date!), _(Add exception), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+ }
+ }
+
+
Re: [pgadmin-hackers] [PATCH] Repair OSX Port after i18n reorganization
-Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Florian G. Pflug Sent: 13 May 2005 10:36 To: pgadmin-hackers Subject: [pgadmin-hackers] [PATCH] Repair OSX Port after i18n reorganization Hi This patch makes the osx build work again, by doing the following .) Change i18n/Makefile.am to install i18n-files into $(datadir)i18n instead of $(datadir)/pgadmin3/i18n when building an appbundle. .) Put the files listed in TMP_ui in i18n/Makefile.am into EXTRA_DIST instead. I guess this was an error, since TMP_ui is never used in this Makefile... .) Support DESTDIR in i18n/Makefile.am .) Moves the path-hint support for windows from pgAdmin3.cpp to base/appbase.cpp, because this saves some conditionals and is cleaner .) Make path a global variable, like loadPath, ... Now all path-related setups are done in InitPaths in AppBase Thanks - patch applied. I didn't test the win32 build... I hope I didn't break anything.. Nothing another #include didn't fix :-) Regards, Dave ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2
Thanks Florian - patch applied. Can you test and confirm the committed version works OK please? I'll probably need you to do so again following any changes that Raph submits for Debian if that's OK. Regards, Dave. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Florian G. Pflug Sent: 13 May 2005 10:49 To: pgadmin-hackers Subject: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2 Hi Here is the appbundle-support for 1.2 Attach is a patch against the current 1.2 branch. It works the same as the trunk-appbundle-support did before the Big Reorganization. At www.phlo.org/pgadmin3-1.2-appbundle.tar.bz2 you'll find a tar.bz which contains pkg/Makefile.am and pkg/mac/*. Please extract this into the src_root, and apply the patch there too.. This additionally contains a few fixed for wx 2.6 detection, because it didn't compile sucessfully - at least on osx. greetings, Florian Pflug ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
Re: [pgadmin-hackers] Pg 1.3 snapshot 5-12 on open error
No error message on pgadmin3-trunk-20050513.tar.bz2 snapshot. Patrick Hatcher Macys.Com Legacy Integration Developer Dave Page [EMAIL PROTECTED] ng.co.uk To Raphaël Enrici 05/13/05 02:57 AM [EMAIL PROTECTED], Patrick Hatcher [EMAIL PROTECTED], Andreas Pflug [EMAIL PROTECTED] cc pgadmin-hackers@postgresql.org Subject RE: [pgadmin-hackers] Pg 1.3 snapshot 5-12 on open error -Original Message- From: Raphaël Enrici [mailto:[EMAIL PROTECTED] Sent: 12 May 2005 23:19 To: Patrick Hatcher; Dave Page; Andreas Pflug Cc: pgadmin-hackers@postgresql.org Subject: Re: [pgadmin-hackers] Pg 1.3 snapshot 5-12 on open error Hi Patrick, Patrick Hatcher wrote: snapshot: pgadmin3-trunk-20050512.tar.bz2 Receive the following error message when opening app: can't open file '/Application/pgAdmin3.app/Contents/MacOS/../i18n/pgadmin3.lng '(error 2: No such file or directory) Once the error message is dismissed the app opens. I have a similar problem under Debian (build from a fresh svn checkout): --- An error has occured: can't open file './../i18n/pgadmin3.lng' (error 2: Aucun fichier ou répertoire de ce type) --- Can you test again after I apply Florian's patch please? @Dave,Andreas: maybe nothing to do with it but src/pgAdmin3.dsp has still a line SOURCE=.\ui\pgadmin3.lng Shouldn't it be something like: SOURCE=.\i18n\pgadmin3.lng Yeah - but that only stops us VC++ users editting the file in VC++. It won't break the build. Thanks though :-) /D ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2
Dave Page wrote: -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: 13 May 2005 16:49 To: Dave Page; [EMAIL PROTECTED]; pgadmin-hackers@postgresql.org Subject: Re: Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2 Hi Dave, Florian, Message d'origine Sujet: Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2 Date: Fri, 13 May 2005 12:55:32 +0100 De: Dave Page dpage@vale-housing.co.uk A: Florian G. Pflug [EMAIL PROTECTED], Thanks Florian - patch applied. Can you test and confirm the committed version works OK please? I'll probably need you to do so again following any changes that Raph submits for Debian if that's OK. I just took a quick look to the patch provided by Florian. I didn't try the build yet and I may be wrong, but to me it does not handle the DESTDIR problem and refers to PREFIX, not DESTDIR. However, I'll try that tonight. Florian, can you confirm you were referring to DESTDIR and not PREFIX ? Is there some magic that make PREFIX take DESTDIR as a parameter ? Gmake/automake/autoconf is all black magic for me, hence why I'd rather tackle one problem on on OS (that I don't have) at a time :-) So, let's continue the twist :) attached is the patch that works for me and keeps what was added by Florian. As I understand it, $(PREFIX) is the equivalent to my $(DESTDIR). Is it specific to Mac OS X ? If not and if it can be replaced by DESTDIR, I'd suggest removing $(PREFIX) ref from Makefile.am. Florian, what do you think about it? Regards, Raphaël Index: i18n/Makefile.am === --- i18n/Makefile.am (revision 4182) +++ i18n/Makefile.am (working copy) @@ -33,13 +33,13 @@ endif install-data-local: - $(mkinstalldirs) $(PREFIX)$(i18ndir) + $(mkinstalldirs) $(DESTDIR)$(PREFIX)$(i18ndir) @pub_tx='$(PUB_TX)'; \ for DIR in $$pub_tx; do \ - $(mkinstalldirs) $(PREFIX)$(i18ndir)/$$DIR; \ + $(mkinstalldirs) $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR; \ for FILE in `ls $$DIR/*.mo`; do \ - $(install_sh) -c -m 644 $$FILE $(PREFIX)$(i18ndir)/$$DIR/; \ + $(install_sh) -c -m 644 $$FILE $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR/; \ done \ done - $(install_sh) -c -m 644 pgadmin3.lng $(PREFIX)$(i18ndir)/$$DIR - $(install_sh) -c -m 644 wxstd.mo $(PREFIX)$(i18ndir)/$$DIR + $(install_sh) -c -m 644 pgadmin3.lng $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR + $(install_sh) -c -m 644 wxstd.mo $(DESTDIR)$(PREFIX)$(i18ndir)/$$DIR ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
Re: [pgadmin-hackers] Pg 1.3 snapshot 5-12 on open error
Patrick Hatcher wrote: No error message on pgadmin3-trunk-20050513.tar.bz2 snapshot. Confirmed, no problem at all. On Debian, it was a packaging error on my side...:'( Dave, can we still wait a bit for 1.2.2, I'd like to clear things a bit... I still can't build the things straight (surely something to do with --flavour=pga3 while building wx) and would like to be sure I won't need to patch things separately. Regards, Raphaël Patrick Hatcher Macys.Com Legacy Integration Developer Dave Page [EMAIL PROTECTED] ng.co.uk To Raphaël Enrici 05/13/05 02:57 AM [EMAIL PROTECTED], Patrick Hatcher [EMAIL PROTECTED], Andreas Pflug [EMAIL PROTECTED] cc pgadmin-hackers@postgresql.org Subject RE: [pgadmin-hackers] Pg 1.3 snapshot 5-12 on open error -Original Message- From: Raphaël Enrici [mailto:[EMAIL PROTECTED] Sent: 12 May 2005 23:19 To: Patrick Hatcher; Dave Page; Andreas Pflug Cc: pgadmin-hackers@postgresql.org Subject: Re: [pgadmin-hackers] Pg 1.3 snapshot 5-12 on open error Hi Patrick, Patrick Hatcher wrote: snapshot: pgadmin3-trunk-20050512.tar.bz2 Receive the following error message when opening app: can't open file '/Application/pgAdmin3.app/Contents/MacOS/../i18n/pgadmin3.lng '(error 2: No such file or directory) Once the error message is dismissed the app opens. I have a similar problem under Debian (build from a fresh svn checkout): --- An error has occured: can't open file './../i18n/pgadmin3.lng' (error 2: Aucun fichier ou répertoire de ce type) --- Can you test again after I apply Florian's patch please? @Dave,Andreas: maybe nothing to do with it but src/pgAdmin3.dsp has still a line SOURCE=.\ui\pgadmin3.lng Shouldn't it be something like: SOURCE=.\i18n\pgadmin3.lng Yeah - but that only stops us VC++ users editting the file in VC++. It won't break the build. Thanks though :-) /D ---(end of broadcast)--- TIP 2: you can get off all lists at once with the unregister command (send unregister YourEmailAddressHere to [EMAIL PROTECTED])
Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2
Dave Page wrote: Thanks Florian - patch applied. I believe that you forgot svn add pkg/Makefile.am ;-) Can you test and confirm the committed version works OK please? I'll probably need you to do so again following any changes that Raph submits for Debian if that's OK. No problem greetings, Florian Pflug PS: Ignore my other forgot to svn add... message - I replied to the wrong message - the one about the trunk-patch, not the 1.2-patch ;-) smime.p7s Description: S/MIME Cryptographic Signature
Re: [pgadmin-hackers] [PATCH] Repair OSX Port after i18n reorganization
Dave Page wrote: Thanks - patch applied. I think you forgot to svn add pkg/Makefile.am ;-) I didn't test the win32 build... I hope I didn't break anything.. Nothing another #include didn't fix :-) Ups.. ;-) greetings, Florian Pflug smime.p7s Description: S/MIME Cryptographic Signature
[pgadmin-hackers] [PATCH] acinclude.m4
Hi Adam,
attached is the patch I use under Debian to detect correctly and
automatically a wxWidgets version using a flavour. Note that I believe
it relies on a previous patch from Florian.
I don't propose it for inclusion now as I think it may break some other
builds but maybe it can help, who knows? ;)
If others want to try it on other systems, that would be great too.
Regards,
Raphaël
Index: acinclude.m4
===
--- acinclude.m4 (revision 4182)
+++ acinclude.m4 (working copy)
@@ -264,16 +264,23 @@
WX_OLD_CPPFLAGS=$CPPFLAGS
if test $pg_static_build = yes
then
-WX_NEW_LDFLAGS=`${WX_CONFIG} --static --libs`
+ # we need, std,stc and ogl
+WX_NEW_LDFLAGS=`${WX_CONFIG} --static --libs std,stc,ogl`
else
-WX_NEW_LDFLAGS=`${WX_CONFIG} --libs`
+ # we need, std,stc and ogl
+WX_NEW_LDFLAGS=`${WX_CONFIG} --libs std,stc,ogl`
fi
# Which version of wxWindows is this?
WX_VERSION=`${WX_CONFIG} --version`
+WX_FLAVOUR=
case ${WX_VERSION} in
2.6*)
WX_VERSION=2.6
+ # since 2.6.0, wx-config --libs is verbose enough to suite
+ # our needs
+LIBS=$LIBS $WX_NEW_LDFLAGS
+ WX_FLAVOUR=`grep this_flavour ${WX_CONFIG} | sed 's/.*\([[^]]*\)/\1/'`
;;
2.5*)
WX_VERSION=2.5
@@ -510,16 +517,16 @@
;;
esac
wx_wx_h=yes
-if test ! -f ${WX_HOME}/include/wx-${WX_VERSION}/wx/version.h
+if test ! -f ${WX_HOME}/include/wx-${WX_VERSION}${WX_FLAVOUR}/wx/version.h
then
wx_wx_h=no
fi
-if test ! -f ${WX_HOME}/include/wx-${WX_VERSION}/wx/stc/stc.h
+if test ! -f ${WX_HOME}/include/wx-${WX_VERSION}${WX_FLAVOUR}/wx/stc/stc.h
then
AC_MSG_ERROR([you need to install the stc package from wxWindows/contrib/src/stc])
wx_wx_h=no
fi
-if test ! -f ${WX_HOME}/include/wx-${WX_VERSION}/wx/ogl/ogl.h
+if test ! -f ${WX_HOME}/include/wx-${WX_VERSION}${WX_FLAVOUR}/wx/ogl/ogl.h
then
AC_MSG_ERROR([you need to install the ogl package from wxWindows/contrib/src/ogl with wxUSE_DEPRECATED=0])
wx_wx_h=no
---(end of broadcast)---
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
Re: [pgadmin-hackers] [PATCH] Appbundle-Support for 1.2
Raphaël Enrici wrote: Dave Page wrote: From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Hi Dave, Florian, I just took a quick look to the patch provided by Florian. I didn't try the build yet and I may be wrong, but to me it does not handle the DESTDIR problem and refers to PREFIX, not DESTDIR. However, I'll try that tonight. Florian, can you confirm you were referring to DESTDIR and not PREFIX ? Is there some magic that make PREFIX take DESTDIR as a parameter ? Gmake/automake/autoconf is all black magic for me, hence why I'd rather tackle one problem on on OS (that I don't have) at a time :-) So, let's continue the twist :) attached is the patch that works for me and keeps what was added by Florian. As I understand it, $(PREFIX) is the equivalent to my $(DESTDIR). Is it specific to Mac OS X ? If not and if it can be replaced by DESTDIR, I'd suggest removing $(PREFIX) ref from Makefile.am. Florian, what do you think about it? Dave, please apply Rapahels correction of my patch - I was just being brain-dead ;-) I meant to write $(DESTDIR) - but somehow I ended up typing $(PREFIX), and didn't notice because $(PREFIX) is undefined, and this empty. Sorry for the confusion greetings, Florian Pflug ---(end of broadcast)--- TIP 6: Have you searched our list archives? http://archives.postgresql.org
