From af236f4844f3d6118c390c425eb349614d4d6f80 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 16 Feb 2013 14:19:10 +0100 Subject: [PATCH] Aggiunte le librerie necessarie. --- .anjuta/default.profile | 10 +++++ .anjuta/session/anjuta.session | 10 ++--- .anjuta/session/dock-layout.xml | 4 +- .anjuta_sym_db.db | Bin 34816 -> 34816 bytes autogen.sh | 2 +- configure.ac | 10 ++++- data/messi/form/Makefile.am | 2 +- data/messi/gui/Makefile.am | 2 +- src/Makefile.am | 14 ++++++- src/commons.c | 21 ++++++++++ src/commons.h | 67 ++++++++++++++++++++++++++++++++ src/main.c | 2 +- 12 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 src/commons.c create mode 100644 src/commons.h diff --git a/.anjuta/default.profile b/.anjuta/default.profile index 054294f..cf999f6 100644 --- a/.anjuta/default.profile +++ b/.anjuta/default.profile @@ -1,5 +1,15 @@ + + + + + + \n\n -[Project Manager] -Shortcut=messi//src//messi -Expand=messi - [Execution] Run in terminal=2 Working directories=../../../messi diff --git a/.anjuta/session/dock-layout.xml b/.anjuta/session/dock-layout.xml index 85247fc..9989967 100644 --- a/.anjuta/session/dock-layout.xml +++ b/.anjuta/session/dock-layout.xml @@ -1,4 +1,2 @@ - - - + diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db index 80bd4c91bc55c02b946d42d629e26c8941108ae0..c8c1ba921b26ec541169bce0a2106d985fca2b6d 100644 GIT binary patch delta 357 zcmZpez|=5-X@WGP!bBNoMum+DOSnZin0pzRKQTXJzR7%nc|P+_=A+ELn*~`)nS}&6 znAJJr<4bZ2;)_yq^UG3GHqYmeWnrdR(n3pk^ zGdnRoVDe?+-q^UBk-E6EPeOi52I`Tt*+ z1*l0DnG%K4F%m&-%d*#ez|FxP+ys8A8AP!a6(lI)~Xpfgg7WRXpFf{1PY IXUr4=04A1cu>b%7 delta 325 zcmZpez|=5-X@WGP_(U0JM)8daOSpyDnddVwe`0>de3SVC^L*x=%ttp1vUD8U0E|Ld>- z^~hq=qku)VDl*(6S|khCP?GHg5&HjM el@X{x9I8PatRW>awL%)MHYL%uV)H*^rVs#5>0I{! diff --git a/autogen.sh b/autogen.sh index 68983f8..f6026b6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="opengov" +PKG_NAME="messi" (test -f $srcdir/configure.ac \ && test -d $srcdir/src \ diff --git a/configure.ac b/configure.ac index 1822f63..8145220 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,15 @@ AC_PROG_CC # Checks for libraries. PKG_CHECK_MODULES([MESSI], [gtk+-2.0 >= 2.12.0 - libgtkform >= 0.1.0]) + libgtkform >= 0.4.0 + libgtkformui >= 0.4.0 + libaute >= 0.0.2 + libautoz >= 0.0.1 + libautozgui >= 0.0.1 + libsolipa >= 0.3.1 + liborganigramma >= 0.0.1 + libzakaudit >= 0.0.2 + libreptool >= 0.2.2]) AC_SUBST(MESSI_CFLAGS) AC_SUBST(MESSI_LIBS) diff --git a/data/messi/form/Makefile.am b/data/messi/form/Makefile.am index e4a6cf1..8d770f4 100644 --- a/data/messi/form/Makefile.am +++ b/data/messi/form/Makefile.am @@ -1,4 +1,4 @@ -formdir = $(datadir)/messi/form +formdir = $(datadir)/$(PACKAGE)/form form_DATA = diff --git a/data/messi/gui/Makefile.am b/data/messi/gui/Makefile.am index ca67b3d..1ecdc05 100644 --- a/data/messi/gui/Makefile.am +++ b/data/messi/gui/Makefile.am @@ -1,4 +1,4 @@ -guidir = $(datadir)/messi/gui +guidir = $(datadir)/$(PACKAGE)/gui gui_DATA = messi.gui diff --git a/src/Makefile.am b/src/Makefile.am index 222a59a..c44443c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -guidir = $(datadir)/messi/gui -formdir = $(datadir)/messi/form +guidir = $(datadir)/$(PACKAGE)/gui +formdir = $(datadir)/$(PACKAGE)/form AM_CPPFLAGS = $(MESSI_CFLAGS) \ -DGUIDIR=\""$(guidir)"\" \ @@ -8,7 +8,17 @@ AM_CPPFLAGS = $(MESSI_CFLAGS) \ LIBS = $(MESSI_LIBS) \ -export-dynamic +if PLATFORM_WIN32 +AM_CPPFLAGS += -I/programmi/PostgreSQL/8.4/include +LIBS += -L/programmi/PostgreSQL/8.4/lib -lpq +else +AM_CPPFLAGS += -I`pg_config --includedir` +LIBS += -L`pg_config --libdir` -lpq +endif + bin_PROGRAMS = messi messi_SOURCES = \ + commons.c \ + commons.h \ main.c diff --git a/src/commons.c b/src/commons.c new file mode 100644 index 0000000..aa97a6e --- /dev/null +++ b/src/commons.c @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2013 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "commons.h" + diff --git a/src/commons.h b/src/commons.h new file mode 100644 index 0000000..b5b6114 --- /dev/null +++ b/src/commons.h @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2013 Andrea Zagli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#ifndef __COMMONS_H__ +#define __COMMONS_H__ + +#include + +#include + +#include +#include +#include +#include + +#include +#include +#include + +typedef struct + { + gchar *guidir; + gchar *formdir; + + GtkBuilder *gtkbuilder; + + GdaEx *gdaex; + GdaEx *gdaex_autozgui; + + PGconn *pgcon; + + const gchar *guifile; + + const gchar *utente; + Autoz *autoz; + AutozIRole *role_utente; + + Solipa *solipa; + + TerritorioCommons *territorio_commons; + OrganigrammaCommons *organigramma_commons; + AutozGuiCommons *autozgui_commons; + + guint pr_cod_prat; + } Commons; + + +#endif /* __COMMONS_H__ */ diff --git a/src/main.c b/src/main.c index 126f024..0a24a91 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Andrea Zagli + * Copyright (C) 2009-2013 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- 2.49.0