GNOME.org
 

[glom: 46/47] Rename libglom-1.14 to libglom-1.16 (parallel-installable)

commit c32a7a61a337e2f050852e042f5bfb19bbaa7520
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 27 12:36:15 2010 +0200

    Rename libglom-1.14 to libglom-1.16 (parallel-installable)
    
    * configure.ac: Change the GLOM_ABI_VERSION number.
    * Makefile.am:
    * Makefile_libglom.am:
    * docs/pyglom_reference/Makefile.am:
    * docs/pyglom_reference/index.rst.in:
    * glom/libglom/init.h:
    * glom/python_embed/python_module/py_glom_module.cc:
    * tests/test_load_python_library.cc:
    * win32/build-installer:
    * win32/glom.iss.in: Change mentions of 1.14 to 1.16.

 ChangeLog                                          |   15 +++++++++++++++
 Makefile.am                                        |   12 ++++++------
 Makefile_libglom.am                                |    8 ++++----
 configure.ac                                       |    4 ++--
 docs/pyglom_reference/Makefile.am                  |    2 +-
 docs/pyglom_reference/index.rst.in                 |    2 +-
 glom/libglom/connectionpool_backends/postgres.cc   |    2 +-
 glom/libglom/connectionpool_backends/postgres.h    |    2 +-
 .../connectionpool_backends/postgres_central.cc    |    4 ++--
 .../connectionpool_backends/postgres_self.cc       |    2 +-
 glom/libglom/{glom-1.14.pc.in => glom-1.16.pc.in}  |    0
 glom/libglom/init.h                                |    4 ++--
 glom/python_embed/python_module/py_glom_module.cc  |    2 +-
 tests/test_load_python_library.cc                  |    2 +-
 win32/build-installer                              |    2 +-
 win32/glom.iss.in                                  |    2 +-
 16 files changed, 40 insertions(+), 25 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 29414bb..ca4c7bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2010-07-27  Murray Cumming  <murrayc murrayc com>
 
+	Rename libglom-1.14 to libglom-1.16 (parallel-installable)
+
+	* configure.ac: Change the GLOM_ABI_VERSION number.
+	* Makefile.am:
+	* Makefile_libglom.am:
+	* docs/pyglom_reference/Makefile.am:
+	* docs/pyglom_reference/index.rst.in:
+	* glom/libglom/init.h:
+	* glom/python_embed/python_module/py_glom_module.cc:
+	* tests/test_load_python_library.cc:
+	* win32/build-installer:
+	* win32/glom.iss.in: Change mentions of 1.14 to 1.16.
+
+2010-07-27  Murray Cumming  <murrayc murrayc com>
+
 	Adapt to recent gtkmm-3.0 API changes.
 
 	* glom/bakery/app_withdoc_gtk.cc: Remove use of Gtk::RecentManager::set_limit().
diff --git a/Makefile.am b/Makefile.am
index 188bf0b..8655596 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,18 +55,18 @@ endif
 SUFFIXES = .rc .res
 
 bin_PROGRAMS = glom/glom
-lib_LTLIBRARIES = glom/libglom/libglom-1.14.la
-pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_1_14.la
+lib_LTLIBRARIES = glom/libglom/libglom-1.16.la
+pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_1_16.la
 
 include Makefile_libglom.am
 include Makefile_glom.am
 include Makefile_tests.am
 
-glom_python_embed_python_module_glom_1_14_la_SOURCES =		\
+glom_python_embed_python_module_glom_1_16_la_SOURCES =		\
 	glom/python_embed/python_module/py_glom_module.cc	\
 	glom/python_embed/python_module/py_glom_module.h
 
-glom_python_embed_python_module_glom_1_14_la_LIBADD = \
+glom_python_embed_python_module_glom_1_16_la_LIBADD = \
 	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
 	$(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 
@@ -76,10 +76,10 @@ else
 pymod_ldflags = -module -avoid-version -no-undefined
 endif
 glom_pyexport = -export-symbols-regex '^_*initglom'
-glom_python_embed_python_module_glom_1_14_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
+glom_python_embed_python_module_glom_1_16_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glom/libglom/glom-1.14.pc
+pkgconfig_DATA = glom/libglom/glom-1.16.pc
 
 dist_pkgdata_DATA = glom/glom_document.dtd
 
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index 9f4b911..e0a0260 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -38,9 +38,9 @@ libglom_d_bakery_include_HEADERS = $(libglom_d_bakery_headers)
 libglom_d_b_view_includedir = $(libglom_d_bakery_includedir)/view
 libglom_d_b_view_include_HEADERS = $(libglom_d_b_view_headers)
 
-glom_libglom_libglom_1_14_la_SOURCES = $(libglom_sources)
-glom_libglom_libglom_1_14_la_LIBADD  = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
+glom_libglom_libglom_1_16_la_SOURCES = $(libglom_sources)
+glom_libglom_libglom_1_16_la_LIBADD  = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 if HOST_WIN32
-glom_libglom_libglom_1_14_la_LIBADD += -lws2_32
+glom_libglom_libglom_1_16_la_LIBADD += -lws2_32
 endif
-glom_libglom_libglom_1_14_la_LDFLAGS = -no-undefined
+glom_libglom_libglom_1_16_la_LDFLAGS = -no-undefined
diff --git a/configure.ac b/configure.ac
index c1d9b98..3875b03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ AC_DISABLE_STATIC
 # Used for the install directories for headers.  The same number is used in
 # the library name, which must be kept in sync, but variables can't be used
 # with that.
-AC_SUBST([GLOM_ABI_VERSION], [1.14])
+AC_SUBST([GLOM_ABI_VERSION], [1.16])
 AC_DEFINE_UNQUOTED([GLOM_ABI_VERSION], ["$GLOM_ABI_VERSION"],
 		   [Define to the Glom ABI version string.])
 
@@ -279,7 +279,7 @@ AC_CONFIG_FILES([Makefile
                  docs/user-guide/Makefile
                  po/Makefile.in
                  glom.desktop.in
-                 glom/libglom/glom-1.14.pc
+                 glom/libglom/glom-1.16.pc
                  docs/libglom_reference/Makefile
                  docs/libglom_reference/Doxyfile
                  docs/pyglom_reference/Makefile
diff --git a/docs/pyglom_reference/Makefile.am b/docs/pyglom_reference/Makefile.am
index 57b5ca0..dfe097b 100644
--- a/docs/pyglom_reference/Makefile.am
+++ b/docs/pyglom_reference/Makefile.am
@@ -6,7 +6,7 @@
 # html:
 #	pydoc -w $(top_builddir)/glom/python_embed/python_module/.libs/
 #	mkdir html
-#	mv glom_1_14.html html/index.html
+#	mv glom_1_16.html html/index.html
 
 book_name = pyglom_$(GLOM_ABI_VERSION_UNDERLINED)
 
diff --git a/docs/pyglom_reference/index.rst.in b/docs/pyglom_reference/index.rst.in
index 1fb6b02..4c63576 100644
--- a/docs/pyglom_reference/index.rst.in
+++ b/docs/pyglom_reference/index.rst.in
@@ -1,4 +1,4 @@
-.. glom_1_14 documentation master file, created by
+.. glom_1_16 documentation master file, created by
    sphinx-quickstart on Fri Apr 16 16:21:26 2010.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
diff --git a/glom/libglom/connectionpool_backends/postgres.cc b/glom/libglom/connectionpool_backends/postgres.cc
index 3e52ce8..cde731a 100644
--- a/glom/libglom/connectionpool_backends/postgres.cc
+++ b/glom/libglom/connectionpool_backends/postgres.cc
@@ -61,7 +61,7 @@ float Postgres::get_postgres_server_version() const
   return m_postgres_server_version;
 }
 
-Glib::RefPtr<Gnome::Gda::Connection> Postgres::attempt_connect(const Glib::ustring& host, const Glib::ustring& port, const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password)
+Glib::RefPtr<Gnome::Gda::Connection> Postgres::attempt_connect(const Glib::ustring& port, const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password)
 {
   //We must specify _some_ database even when we just want to create a database.
   //This _might_ be different on some systems. I hope not. murrayc
diff --git a/glom/libglom/connectionpool_backends/postgres.h b/glom/libglom/connectionpool_backends/postgres.h
index 8dd32e5..48a3661 100644
--- a/glom/libglom/connectionpool_backends/postgres.h
+++ b/glom/libglom/connectionpool_backends/postgres.h
@@ -76,7 +76,7 @@ protected:
   /** Attempt to connect to the database with the specified criteria.
    * @throws An ExceptionConnection if the correction failed.
    */ 
-  Glib::RefPtr<Gnome::Gda::Connection> attempt_connect(const Glib::ustring& host, const Glib::ustring& port, const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password);
+  Glib::RefPtr<Gnome::Gda::Connection> attempt_connect(const Glib::ustring& port, const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password);
 
  std::string get_self_hosting_path(bool create = false, const std::string& child_directory = std::string());
 
diff --git a/glom/libglom/connectionpool_backends/postgres_central.cc b/glom/libglom/connectionpool_backends/postgres_central.cc
index ca56275..ee64b57 100644
--- a/glom/libglom/connectionpool_backends/postgres_central.cc
+++ b/glom/libglom/connectionpool_backends/postgres_central.cc
@@ -96,7 +96,7 @@ Glib::RefPtr<Gnome::Gda::Connection> PostgresCentralHosted::connect(const Glib::
   bool connection_possible = false;
   try
   {
-    connection = attempt_connect(m_host, port, database, username, password);
+    connection = attempt_connect(port, database, username, password);
     connection_possible = true;
     m_port = atoi(port.c_str());
   }
@@ -120,7 +120,7 @@ Glib::RefPtr<Gnome::Gda::Connection> PostgresCentralHosted::connect(const Glib::
 
       try
       {
-        connection = attempt_connect(m_host, port, database, username, password);
+        connection = attempt_connect(port, database, username, password);
         connection_possible = true;
         m_port = atoi(port.c_str());
       }
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index 958414e..8055723 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -566,7 +566,7 @@ Glib::RefPtr<Gnome::Gda::Connection> PostgresSelfHosted::connect(const Glib::ust
   {
     try
     {
-      result = attempt_connect(m_host, port_as_string(m_port), database, username, password);
+      result = attempt_connect(port_as_string(m_port), database, username, password);
     }
     catch(const ExceptionConnection ex)
     {
diff --git a/glom/libglom/glom-1.14.pc.in b/glom/libglom/glom-1.16.pc.in
similarity index 100%
rename from glom/libglom/glom-1.14.pc.in
rename to glom/libglom/glom-1.16.pc.in
diff --git a/glom/libglom/init.h b/glom/libglom/init.h
index a9de801..0c59f62 100644
--- a/glom/libglom/init.h
+++ b/glom/libglom/init.h
@@ -59,12 +59,12 @@
  *
  * If your source file is @c program.cc, you can compile it with:
  * @code
- * g++ program.cc -o program  `pkg-config --cflags --libs glom-1.14`
+ * g++ program.cc -o program  `pkg-config --cflags --libs glom-1.16`
  * @endcode
  *
  * Alternatively, if using autoconf, use the following in @c configure.ac:
  * @code
- * PKG_CHECK_MODULES([DEPS], [glom-1.14])
+ * PKG_CHECK_MODULES([DEPS], [glom-1.16])
  * @endcode
  * Then use the generated @c DEPS_CFLAGS and @c DEPS_LIBS variables in the
  * project @c Makefile.am files. For example:
diff --git a/glom/python_embed/python_module/py_glom_module.cc b/glom/python_embed/python_module/py_glom_module.cc
index f595f37..2ec43e8 100644
--- a/glom/python_embed/python_module/py_glom_module.cc
+++ b/glom/python_embed/python_module/py_glom_module.cc
@@ -29,7 +29,7 @@
 
 using namespace Glom;
 
-BOOST_PYTHON_MODULE(glom_1_14)
+BOOST_PYTHON_MODULE(glom_1_16)
 {
   boost::python::docstring_options doc_options(
     true, // show the docstrings from here
diff --git a/tests/test_load_python_library.cc b/tests/test_load_python_library.cc
index 85ec613..a136336 100644
--- a/tests/test_load_python_library.cc
+++ b/tests/test_load_python_library.cc
@@ -6,7 +6,7 @@ int main()
 {
   // Attempt to dynamically load the python module, 
   // attempting to resolve all symbols immediately:
-  const char* path = "glom/python_embed/python_module/.libs/glom_1_14.so";
+  const char* path = "glom/python_embed/python_module/.libs/glom_1_16.so";
   void* lib = dlopen(path, RTLD_NOW);
 
   if(!lib)
diff --git a/win32/build-installer b/win32/build-installer
index 292a690..0484826 100755
--- a/win32/build-installer
+++ b/win32/build-installer
@@ -94,7 +94,7 @@ cp /local/bin/libgdamm-4.0-12.dll installer/bin || exit
 # TODO: Can we build boost so that mingwm10.dll is not required? Maybe try static C runtime linkage
 cp /mingw/bin/mingwm10.dll installer/bin || exit
 cp /boost/lib/boost_python-mgw34-mt-1_42.dll installer/bin || exit
-cp /local/bin/libglom-1.14-0.dll installer/bin || exit
+cp /local/bin/libglom-1.16-0.dll installer/bin || exit
 
 echo "Stripping DLL files..."
 strip installer/bin/*.dll || exit
diff --git a/win32/glom.iss.in b/win32/glom.iss.in
index 784c4e5..e485270 100644
--- a/win32/glom.iss.in
+++ b/win32/glom.iss.in
@@ -128,7 +128,7 @@ Source: "python/*.py"; DestDir: "{app}\bin"; Components: python; Flags: recurses
 Source: "python/*.pyd"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
 
 ; Glom executables
-Source: "bin\libglom-1.14-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libglom-1.16-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\Glom.exe"; DestDir: "{app}\bin"; Components: main
 
 ; Modules
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]