Index: configure.ac
===================================================================
RCS file: /projects/pgadmin3/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.33 -r1.34
--- configure.ac
+++ configure.ac
@@ -30,6 +30,7 @@
AC_CHECK_FUNCS([gethostbyname inet_ntoa memmove memset strchr])
# Custom checks
+ENABLE_APPBUNDLE
CHECK_WX_CONFIG_BINARY
CHECK_PGSQL_INCLUDE
ENABLE_DEBUG
Index: acinclude.m4
===================================================================
RCS file: /projects/pgadmin3/acinclude.m4,v
retrieving revision 1.42
retrieving revision 1.43
diff -Lacinclude.m4 -Lacinclude.m4 -u -w -r1.42 -r1.43
--- acinclude.m4
+++ acinclude.m4
@@ -64,6 +64,18 @@
[pg_static_build=no])
])
+############################
+# Static build of pgAdmin3 #
+############################
+AC_DEFUN([ENABLE_APPBUNDLE],
+[AC_ARG_ENABLE(appbundle,
+[ --enable-appbundle Build PgAdminIII.app],
+[pg_appbundle=yes
+prefix=$(pwd)/tmp
+],
+[pg_appbundle=no])
+])
+
########################################
# Check for PostgreSQL library (libpq) #
########################################
@@ -486,3 +498,5 @@
fi
fi
])
+AC_SUBST(WX_CONFIG)
+
Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -LMakefile.am -LMakefile.am -u -w -r1.34 -r1.35
--- Makefile.am
+++ Makefile.am
@@ -27,4 +27,45 @@
$(top_srcdir)/docs/en_US/*.css $(top_srcdir)/docs/en_US/pgadmin3.hh* \
$(top_srcdir)/docs/en_US/tips.txt
-
+PgAdminIII.app:
+ @echo "Building Bundle PgAdminIII.app"
+ @test -d PgAdminIII.app || $(mkinstalldirs) PgAdminIII.app
+ @test -d PgAdminIII.app/Contents/MacOS || $(mkinstalldirs) PgAdminIII.app/Contents/MacOS
+ @test -d PgAdminIII.app/Contents/Resources || $(mkinstalldirs) PgAdminIII.app/Contents/Resources
+ @test -d PgAdminIII.app/Contents/SharedSupport || $(mkinstalldirs) PgAdminIII.app/Contents/SharedSupport
+ @test -d PgAdminIII.app/Contents/Frameworks || $(mkinstalldirs) PgAdminIII.app/Contents/Frameworks
+ @cp pkg/mac/PkgInfo PgAdminIII.app
+ @cp pkg/mac/Info.plist PgAdminIII.app/Contents
+ @cp pkg/mac/PgAdminIII.icns PgAdminIII.app/Contents/Resources
+ @$$(@WX_CONFIG@ --rezflags | sed 's/-t[[:space:]]*APPL//') \
+ PgAdminIII.app/Contents/Resources/PgAdminIII.rsrc \
+ -useDF
+ @cp -r $(pkgdatadir)/* PgAdminIII.app/Contents/SharedSupport
+ @cp -r $(bindir)/pgadmin3 PgAdminIII.app/Contents/MacOS/PgAdminIII
+ @echo "Adding all non-standard shared libraries to PgAdminIII.app" ; \
+ cd PgAdminIII.app/Contents ; \
+ todo=MacOS/PgAdminIII ; \
+ while test "$$todo" != ""; do \
+ todo_old=$$todo ; \
+ todo="" ; \
+ for todo_obj in $$todo_old; do \
+ for lib in $$( \
+ otool -L $$todo_obj | \
+ sed -n 's|^.*[[:space:]]\([^[:space:]]*\.dylib\).*$$|\1|p' | \
+ egrep -v '^(/usr/lib)|(/System)' \
+ ); do \
+ lib_bn="$$(basename "$$lib")" ;\
+ if ! test -f "Frameworks/$$lib_bn"; then \
+ cp "$$lib" "Frameworks/$$lib_bn" ; \
+ install_name_tool \
+ -id "@executable_path/../Frameworks/$$lib_bn" \
+ "Frameworks/$$lib_bn" ; \
+ todo="$$todo Frameworks/$$lib_bn" ; \
+ fi ; \
+ install_name_tool -change \
+ "$$lib" \
+ "@executable_path/../Frameworks/$$lib_bn" \
+ "$$todo_obj" ; \
+ done ; \
+ done ; \
+ done ;
Index: dlgUser.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgUser.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/include/dlgUser.h -Lsrc/include/dlgUser.h -u -w -r1.15 -r1.16
--- src/include/dlgUser.h
+++ src/include/dlgUser.h
@@ -47,7 +47,6 @@
void OnVarSelChange(wxListEvent &ev);
void OnVarnameSelChange(wxCommandEvent &ev);
- void OnChangePasswd(wxCommandEvent &ev);
wxArrayString groupsIn;
Index: dlgUser.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgUser.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lsrc/ui/dlgUser.cpp -Lsrc/ui/dlgUser.cpp -u -w -r1.37 -r1.38
--- src/ui/dlgUser.cpp
+++ src/ui/dlgUser.cpp
@@ -26,7 +26,6 @@
// pointer to controls
#define txtID CTRL_TEXT("txtID")
#define txtPasswd CTRL_TEXT("txtPasswd")
-#define txtRePasswd CTRL_TEXT("txtRePasswd")
#define datValidUntil CTRL_CALENDAR("datValidUntil")
#define timValidUntil CTRL_TIME("timValidUntil")
#define chkCreateDB CTRL_CHECKBOX("chkCreateDB")
@@ -51,8 +50,7 @@
EVT_LISTBOX_DCLICK(XRCID("lbGroupsNotIn"), dlgUser::OnGroupAdd)
EVT_LISTBOX_DCLICK(XRCID("lbGroupsIn"), dlgUser::OnGroupRemove)
- EVT_TEXT(XRCID("txtPasswd"), dlgUser::OnChangePasswd)
- EVT_TEXT(XRCID("txtRePasswd"), dlgUser::OnChangePasswd)
+ EVT_TEXT(XRCID("txtPasswd"), dlgUser::OnChange)
EVT_CHECKBOX(XRCID("chkCreateDB"), dlgUser::OnChange)
EVT_CHECKBOX(XRCID("chkCreateUser"), dlgUser::OnChangeSuperuser)
@@ -133,7 +131,6 @@
datValidUntil->Disable();
timValidUntil->Disable();
txtPasswd->Disable();
- txtRePasswd->Disable();
btnAddGroup->Disable();
btnDelGroup->Disable();
cbVarname->Disable();
@@ -212,17 +209,6 @@
CheckChange();
}
-void dlgUser::OnChangePasswd(wxCommandEvent &ev)
-{
- wxString passwd=txtPasswd->GetValue();
- wxString repasswd=txtRePasswd->GetValue();
- if ((!repasswd.IsEmpty())||(!repasswd.IsEmpty()))
- {
- bool enable=true;
- CheckValid(enable, !passwd.compare(repasswd), _("The passwords entered do not match!"));
- EnableOK(enable);
- }
-}
void dlgUser::CheckChange()
{
Index: dlgUser.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgUser.xrc,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/ui/common/dlgUser.xrc -Lsrc/ui/common/dlgUser.xrc -u -w -r1.20 -r1.21
--- src/ui/common/dlgUser.xrc
+++ src/ui/common/dlgUser.xrc
@@ -29,42 +29,32 @@
-
-