GNOME.org
 

[java-libglom] Port to libglom-1.22

commit d42907ba0563161c1f2f7a8278cc55b271cc77be
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 6 17:51:24 2012 +0100

    Port to libglom-1.22
    
    * README:
    * configure.ac: Change mentions of libglom 1.20 to 1.22
    * Makefile.am: Mention ChoiceValue.java and ChoiceValueList.java
    generated files.
    * src/glom.i: generate ChoiceValue and ChoiceValueList classes
    and make a minor other adjustment to fix the build.
    
    This is the master branch, targetting unstable Glom 1.21/22.
    See also the libglom-1-20 branch.

 ChangeLog    |   14 ++++++++++++++
 Makefile.am  |    6 ++++--
 README       |   10 +++++-----
 configure.ac |   10 +++++-----
 src/glom.i   |    8 +++++++-
 5 files changed, 35 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6bfac29..5e44367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-06  Murray Cumming  <murrayc murrayc com>
+
+	Port to libglom-1.22
+
+	* README:
+	* configure.ac: Change mentions of libglom 1.20 to 1.22
+	* Makefile.am: Mention ChoiceValue.java and ChoiceValueList.java 
+	generated files.
+	* src/glom.i: generate ChoiceValue and ChoiceValueList classes
+	and make a minor other adjustment to fix the build. 
+
+This is the master branch, targetting unstable Glom 1.21/22.
+See also the libglom-1-20 branch.
+
 1.19.2:
 
 2011-12-22  Murray Cumming  <murrayc murrayc com>
diff --git a/Makefile.am b/Makefile.am
index 7ce6a98..6535b65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009 - 2011 Openismus GmbH
+## Copyright (c) 2009 - 2012 Openismus GmbH
 ##
 ## java_libglom is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -31,6 +31,8 @@ jardir = $(datadir)/java
 
 generated_java_sources = src/main/java/org/glom/libglom/BakeryDocument.java \
                          src/main/java/org/glom/libglom/BakeryDocumentXML.java \
+                         src/main/java/org/glom/libglom/ChoiceValue.java \
+                         src/main/java/org/glom/libglom/ChoiceValueList.java \
                          src/main/java/org/glom/libglom/CustomTitle.java \
                          src/main/java/org/glom/libglom/DoubleVector.java \
                          src/main/java/org/glom/libglom/Document.java \
@@ -123,7 +125,7 @@ AM_CPPFLAGS =  -I$(top_builddir) $(LIBGLOM_CFLAGS) $(JAVA_LIBGLOM_WARNING_FLAGS)
 src/glom_wrap.cc: $(swig_dependencies)
 	$(MKDIR_P) $(top_builddir)/src/main/java/org/glom/libglom
 	$(SWIG) -Wall -java -package org.glom.libglom \
-	  -I$(LIBGLOM_INCLUDE_DIR)/glom-1.20 \
+	  -I$(LIBGLOM_INCLUDE_DIR)/glom-1.22 \
 	  -I$(LIBGDAMM_INCLUDE_DIR)/libgdamm-5.0 \
 	  -I$(GLIBMM_INCLUDE_DIR)/glibmm-2.4 \
 	  -outdir $(top_builddir)/src/main/java/org/glom/libglom \
diff --git a/README b/README
index 09e1e7e..2bee422 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 Dependencies
 ============
 
-* libglom-1.20 from Glom
+* libglom-1.22 from Glom
 * JDK, for jni.h
   For example:
   -> the openjdk-6-jdk package on Ubuntu
@@ -31,10 +31,10 @@ Version Numbers
 
 Java libglom currently uses version string 1.19.x to indicate that it is still
 in development. Once things stabilize a bit, the version number will match the
-version of libglom that is being wrapped. For example, Java libglom 1.20.x will
-wrap libglom 1.20.x.
+version of libglom that is being wrapped. For example, Java libglom 1.22.x will
+wrap libglom 1.22.x.
 
-The third number in the version string (the x in 1.20.x) will be incremented as
+The third number in the version string (the x in 1.22.x) will be incremented as
 new methods and classes are added. This third number will not correspond to the
 third number in the version string of libglom. For example, Java libglom
-1.20.3 would wrap libglom from the 1.20 series of releases.
+1.22.3 would wrap libglom from the 1.22 series of releases.
diff --git a/configure.ac b/configure.ac
index 94a6880..491b36b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-## Copyright (c) 2009 - 2011  Openismus GmbH
+## Copyright (c) 2009 - 2012  Openismus GmbH
 ##
 ## java-libglom is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 ## along with java-libglom; if not, write to the Free Software Foundation, Inc.,
 ## 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AC_INIT([Java libglom], [1.19.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=Glom],
+AC_INIT([Java libglom], [1.21.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=Glom],
         [java-libglom], [http://www.glom.org])
 AC_CANONICAL_HOST
 AC_PREREQ([2.58])
@@ -42,11 +42,11 @@ PKG_PROG_PKG_CONFIG
 # gmodule-export-2.0 adds -Wl,--export-dynamic to the linker flags
 # so that libglade can get at the custom widget creation functions.
 PKG_CHECK_MODULES([LIBGLOM],
-                  [glom-1.20 >= 1.20.1]
+                  [glom-1.22 >= 1.21.1]
                   [libgdamm-5.0 >= 4.99.6]
                   [glibmm-2.4 >= 2.27.93])
 
-LIBGLOM_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir glom-1.20`
+LIBGLOM_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir glom-1.22`
 AC_SUBST([LIBGLOM_INCLUDE_DIR])
 
 LIBGDAMM_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir libgdamm-5.0`
@@ -56,7 +56,7 @@ GLIBMM_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir glibmm-2.4`
 AC_SUBST([GLIBMM_INCLUDE_DIR])
 
 # FIXME: need to get the glom example dir from glom pkg-config file instead of guessing here
-GLOM_EXAMPLE_DIR=`$PKG_CONFIG --variable=prefix glom-1.20`/share/doc/glom/examples
+GLOM_EXAMPLE_DIR=`$PKG_CONFIG --variable=prefix glom-1.22`/share/doc/glom/examples
 AC_SUBST([GLOM_EXAMPLE_DIR])
 
 if test "x$USE_MAINTAINER_MODE" = "xyes"; then
diff --git a/src/glom.i b/src/glom.i
index 02ae1c5..be50048 100644
--- a/src/glom.i
+++ b/src/glom.i
@@ -131,6 +131,7 @@ using namespace Glom;
 %glom_sharedptr(Glom::LayoutItem_Field);
 %glom_sharedptr(Glom::LayoutItem_Text);
 %glom_sharedptr(Glom::CustomTitle);
+%glom_sharedptr(Glom::ChoiceValue);
 
 
 /*
@@ -151,11 +152,14 @@ using namespace Glom;
 %rename(_alt_foreground_color_for_negatives) Glom::NumericFormat::m_alt_foreground_color_for_negatives;
 %include <libglom/data_structure/numeric_format.h>
 
+// Wrap ChoiceValue, used by FieldFormatting:
+%include <libglom/data_structure/choicevalue.h>
+
 /*
  * Ignore method overloads that differ only by constness of the parameters,
  * because Java doesn't have const, so it would just generate a duplicate method.
  */
-%ignore Glom::FieldFormatting::get_choices_related(sharedptr<const Relationship>& relationship, sharedptr<const LayoutItem_Field>& field, sharedptr<const LayoutGroup>& extra_layout, bool& show_all) const;
+%ignore Glom::FieldFormatting::get_choices_related(sharedptr<const Relationship>& relationship, sharedptr<const LayoutItem_Field>& field, sharedptr<const LayoutGroup>& extra_layout, type_list_sort_fields& sort_fields, bool& show_all) const;
 
 // the %rename makes the getter and setter look better
 %rename(_numeric_format) Glom::FieldFormatting::m_numeric_format;
@@ -429,6 +433,7 @@ sharedptr<const LayoutItem_Field> get_navigation_relationship_specific()
  * Wrap classes required to setup a sort clause.
  */
 %template(SortFieldPair) std::pair< Glom::sharedptr<const LayoutItem_Field>, bool>;
+
 // Include our custom interface file for std::list. It's incomplete but it works for what we need.
 %include std_list.i
 %template(SortClause) std::list<std::pair< Glom::sharedptr<const LayoutItem_Field>, bool> >;
@@ -440,6 +445,7 @@ sharedptr<const LayoutItem_Field> get_navigation_relationship_specific()
 %template(StringList) std::list< Glib::ustring >;
 %template(TranslatableItemList) std::list< Glom::sharedptr<TranslatableItem> >;
 %template(TableInfoList) std::list< Glom::sharedptr<TableInfo> >;
+%template(ChoiceValueList) std::list< Glom::sharedptr<ChoiceValue> >;
 
 
 /*
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]