[gtksourceviewmm] Transition to mm-common: gtksourceview.

From: Krzesimir Nowak <krnowak src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gtksourceviewmm] Transition to mm-common: gtksourceview.
Date: Wed, 9 Dec 2009 14:44:53 +0000 (UTC)
commit 1360855e19ae121c04b0a45f95468261e201d757
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Wed Dec 9 12:04:08 2009 +0100

    Transition to mm-common: gtksourceview.
    
    * gtksourceview/gtksourceviewmm-2.0.pc.in: Renamed to
    gtksourceviewmm.pc.in.
    * gtksourceview/gtksourceviewmm-uninstalled.pc.in: New pc.in file.
    * gtksourceview/gtksourceviewmmconfig.h.in: Removed useless macros,
    they were not used anyway. So only version and deprecation macros
    left.
    * gtksourceview/src/Makefile.am:
    * gtksourceview/gtksourceviewmm/Makefile.am: Modified to mm-common.
    * gtksourceview/src/Makefile_list_of_hg.am_fragment: Modified and
    renamed to filelist.am.
    * gtksourceview/gtksourceviewmm/filelist.am: New file listing.
    * gtksourceview/gtksourceviewmm/.gitignore:
    * gtksourceview/gtksourceviewmm/private/.gitignore: Added to ignore
    pesky files.
    * gtksourceview/gtksourceviemm/private/Makefile.am: Removed useless
    file.

 gtksourceview/gtksourceviewmm-2.0.pc.in           |   11 ---
 gtksourceview/gtksourceviewmm-uninstalled.pc.in   |   10 +++
 gtksourceview/gtksourceviewmm.pc.in               |   19 +++++
 gtksourceview/gtksourceviewmm/.gitignore          |   10 +++
 gtksourceview/gtksourceviewmm/Makefile.am         |   36 ++-------
 gtksourceview/gtksourceviewmm/filelist.am         |    6 ++
 gtksourceview/gtksourceviewmm/private/.gitignore  |    1 +
 gtksourceview/gtksourceviewmm/private/Makefile.am |   14 ----
 gtksourceview/gtksourceviewmmconfig.h.in          |   85 +++------------------
 gtksourceview/src/Makefile.am                     |   21 +----
 gtksourceview/src/Makefile_list_of_hg.am_fragment |   20 -----
 gtksourceview/src/filelist.am                     |   21 +++++
 12 files changed, 91 insertions(+), 163 deletions(-)
---
diff --git a/gtksourceview/gtksourceviewmm-uninstalled.pc.in b/gtksourceview/gtksourceviewmm-uninstalled.pc.in
new file mode 100644
index 0000000..ffc6681
--- /dev/null
+++ b/gtksourceview/gtksourceviewmm-uninstalled.pc.in
@@ -0,0 +1,10 @@
+doxytagfile=${docdir}/reference/@GTKSOURCEVIEWMM_MODULE_NAME  tag
+htmlrefpub=http://library.gnome.org/devel/@PACKAGE_TARNAME@/unstable/
+
+Name: gtksourceviewmm
+Description: C++ binding for gtksourceview, not installed
+Version: @PACKAGE_VERSION@
+URL: http://projects.gnome.org/gtksourceviewmm/
+Requires: @GTKSOURCEVIEWMM_MODULES@
+Libs: ${pc_top_builddir}/${pcfiledir}/gtksourceviewmm/libgtksourceviewmm- GTKSOURCEVIEWMM_API_VERSION@.la
+Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/gtksourceview/gtksourceviewmm.pc.in b/gtksourceview/gtksourceviewmm.pc.in
new file mode 100644
index 0000000..1826f82
--- /dev/null
+++ b/gtksourceview/gtksourceviewmm.pc.in
@@ -0,0 +1,19 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+datarootdir= datarootdir@
+datadir= datadir@
+includedir= includedir@
+
+docdir=${datarootdir}/doc/@GTKSOURCEVIEWMM_MODULE_NAME@
+doxytagfile=${docdir}/reference/@GTKSOURCEVIEWMM_MODULE_NAME  tag
+htmlrefdir=${docdir}/reference/html
+htmlrefpub=http://library.gnome.org/devel/@PACKAGE_TARNAME@/unstable/
+
+Name: gtksourceviewmm
+Description: C++ binding for gtksourceview
+Version: @PACKAGE_VERSION@
+URL: http://projects.gnome.org/gtksourceviewmm/
+Requires: @GTKSOURCEVIEWMM_MODULES@
+Libs: -L${libdir} -lgtksourceviewmm- GTKSOURCEVIEWMM_API_VERSION@
+Cflags: -I${includedir}/@GTKSOURCEVIEWMM_MODULE_NAME@ -I${libdir}/@GTKSOURCEVIEWMM_MODULE_NAME@/include
diff --git a/gtksourceview/gtksourceviewmm/.gitignore b/gtksourceview/gtksourceviewmm/.gitignore
new file mode 100644
index 0000000..2074512
--- /dev/null
+++ b/gtksourceview/gtksourceviewmm/.gitignore
@@ -0,0 +1,10 @@
+/sourcebuffer.*
+/sourceiter.*
+/sourcelanguage.*
+/sourcelanguagemanager.*
+/sourcemark.*
+/sourcestyle.*
+/sourcestylescheme.*
+/sourcestyleschememanager.*
+/sourceview.*
+/wrap_init.cc
diff --git a/gtksourceview/gtksourceviewmm/Makefile.am b/gtksourceview/gtksourceviewmm/Makefile.am
index 0341705..5c23047 100644
--- a/gtksourceview/gtksourceviewmm/Makefile.am
+++ b/gtksourceview/gtksourceviewmm/Makefile.am
@@ -1,30 +1,12 @@
-## Copyright (c) 2001
-## The gtkmm development team.
+lib_LTLIBRARIES = gtksourceviewmm- GTKSOURCEVIEWMM_API_VERSION@.la
 
-SUBDIRS                 = private
+include $(srcdir)/../src/filelist.am
+include $(srcdir)/filelist.am
+include $(top_srcdir)/build/compile-binding.am
 
-sublib_name             = gtksourceviewmm
-sublib_libname          = gtksourceviewmm-2.0
-sublib_libversion       = $(LIBGTKSOURCEVIEWMM_SO_VERSION)
-sublib_namespace        = Gtk
-sublib_cflags           = $(GTKSOURCEVIEWMM_CFLAGS)
-sublib_topdir           = gtksourceview
-sublib_win32_dlls_libs	=
-
-sublib_files_extra_posix_cc = 
-sublib_files_extra_win32_cc =
-sublib_files_extra_general_cc =  init.cc
-sublib_files_extra_general_deprecated_cc = 
-
-sublib_files_extra_posix_h = 
-sublib_files_extra_win32_h =
-sublib_files_extra_general_h = init.h
-sublib_files_extra_general_deprecated_h = 
-
-include $(top_srcdir)/build_shared/Makefile_build.am_fragment
-
-lib_LTLIBRARIES	                  = libgtksourceviewmm-2.0.la
-libgtksourceviewmm_2_0_la_SOURCES = $(files_built_cc) $(files_extra_cc)
-libgtksourceviewmm_2_0_la_LDFLAGS = $(common_ldflags)
-libgtksourceviewmm_2_0_la_LIBADD  = $(GTKSOURCEVIEWMM_LIBS)
+AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(GTKSOURCEVIEWMM_CFLAGS)
+AM_CXXFLAGS = $(GTKSOURCEVIEWMM_WXXFLAGS)
 
+gtksourceviewmm_ GTKSOURCEVIEWMM_API_VERSION@_la_SOURCES = $(binding_sources)
+gtksourceviewmm_ GTKSOURCEVIEWMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(GTKSOURCEVIEWMM_SO_VERSION)
+gtksourceviewmm_ GTKSOURCEVIEWMM_API_VERSION@_la_LIBADD  = $(GTKSOURCEVIEWMM_LIBS)
diff --git a/gtksourceview/gtksourceviewmm/filelist.am b/gtksourceview/gtksourceviewmm/filelist.am
new file mode 100644
index 0000000..cc60c08
--- /dev/null
+++ b/gtksourceview/gtksourceviewmm/filelist.am
@@ -0,0 +1,6 @@
+files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc
+files_built_h  = $(files_hg:.hg=.h)
+files_built_ph = $(patsubst %.hg,private/%_p.h,$(files_hg))
+files_extra_cc = init.cc
+files_extra_h  = init.h wrap_init.h
+files_extra_ph =
diff --git a/gtksourceview/gtksourceviewmm/private/.gitignore b/gtksourceview/gtksourceviewmm/private/.gitignore
new file mode 100644
index 0000000..c3d1f64
--- /dev/null
+++ b/gtksourceview/gtksourceviewmm/private/.gitignore
@@ -0,0 +1 @@
+*_p.h
diff --git a/gtksourceview/gtksourceviewmmconfig.h.in b/gtksourceview/gtksourceviewmmconfig.h.in
index 1d46e54..d428e4d 100644
--- a/gtksourceview/gtksourceviewmmconfig.h.in
+++ b/gtksourceview/gtksourceviewmmconfig.h.in
@@ -1,84 +1,19 @@
 #ifndef _GTKSOURCEVIEWMM_CONFIG_H
-#define _GTKSOURCEVIEWMM_CONFIG_H 1
+#define _GTKSOURCEVIEWMM_CONFIG_H
 
-/* version numbers */
-#undef GTKSOURCEVIEWMM_MAJOR_VERSION
-#undef GTKSOURCEVIEWMM_MINOR_VERSION
-#undef GTKSOURCEVIEWMM_MICRO_VERSION
-
-// detect common platforms
-#if defined(_WIN32)
-// Win32 compilers have a lot of varation
-#if defined(_MSC_VER)
-#define GTKSOURCEVIEWMM_MSC
-#define GTKSOURCEVIEWMM_WIN32
-#define GTKSOURCEVIEWMM_DLL
-#elif defined(__CYGWIN__)
-#define GTKSOURCEVIEWMM_CONFIGURE
-#elif defined(__MINGW32__)
-#define GTKSOURCEVIEWMM_WIN32
-#define GTKSOURCEVIEWMM_CONFIGURE
-#else
-//AIX clR compiler complains about this even though it doesn't get this far:
-//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)"
-#endif
-#else
-#define GTKSOURCEVIEWMM_CONFIGURE
-#endif /* _WIN32 */
+#include <gtkmmconfig.h>
 
-#ifdef GTKSOURCEVIEWMM_CONFIGURE
-/* compiler feature tests that are used during compile time and run-time
-   by gtk-- only. tests used by gdk-- and gtk-- should go into
-   gdk--config.h.in */
-#undef GTKSOURCEVIEWMM_CXX_HAVE_MUTABLE
-#undef GTKSOURCEVIEWMM_CXX_HAVE_NAMESPACES
-//#undef GTKSOURCEVIEWMM_CXX_GAUB
-//#undef GTKSOURCEVIEWMM_CXX_AMBIGUOUS_TEMPLATES
-#undef GTKSOURCEVIEWMM_HAVE_NAMESPACE_STD
-#undef GTKSOURCEVIEWMM_HAVE_STD_ITERATOR_TRAITS
-#undef GTKSOURCEVIEWMM_HAVE_SUN_REVERSE_ITERATOR
-#undef GTKSOURCEVIEWMM_HAVE_TEMPLATE_SEQUENCE_CTORS
-#undef GTKSOURCEVIEWMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
-#undef GTKSOURCEVIEWMM_COMPILER_SUN_FORTE
-#undef GTKSOURCEVIEWMM_DEBUG_REFCOUNTING
-#undef GTKSOURCEVIEWMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION
-#undef GTKSOURCEVIEWMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
-#undef GTKSOURCEVIEWMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC
-#undef GTKSOURCEVIEWMM_HAVE_ALLOWS_STATIC_INLINE_NPOS
-#endif
+/* Define to omit deprecated API from gtksourceviewmm. */
+#undef GTKSOURCEVIEWMM_DISABLE_DEPRECATED
 
-#ifdef GTKSOURCEVIEWMM_MSC
-  #define GTKSOURCEVIEWMM_CXX_HAVE_MUTABLE 1
-  #define GTKSOURCEVIEWMM_CXX_HAVE_NAMESPACES 1
-  #define GTKSOURCEVIEWMM_HAVE_NAMESPACE_STD 1
-  #define GTKSOURCEVIEWMM_HAVE_STD_ITERATOR_TRAITS 1
-  #define GTKSOURCEVIEWMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
-  #define GTKSOURCEVIEWMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
-  #define GTKSOURCEVIEWMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
-  #define GTKSOURCEVIEWMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
-  #define GTKSOURCEVIEWMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
-  #pragma warning (disable: 4786 4355 4800 4181)
-#endif
+/* Major version number of gtksourceviewmm. */
+#undef GTKSOURCEVIEWMM_MAJOR_VERSION
 
-#ifndef GTKSOURCEVIEWMM_HAVE_NAMESPACE_STD
-#  define GTKSOURCEVIEWMM_USING_STD(Symbol) namespace std { using ::Symbol; }
-#else
-#  define GTKSOURCEVIEWMM_USING_STD(Symbol) /* empty */
-#endif
+/* Minor versino number of gtksourceviewmm. */
+#undef GTKSOURCEVIEWMM_MINOR_VERSION
 
-#ifdef GTKSOURCEVIEWMM_DLL
-  #if defined(GTKSOURCEVIEWMM_BUILD) && defined(_WINDLL)
-    /* Do not dllexport as it is handled by gendef on MSVC */
-    #define GTKSOURCEVIEWMM_API 
-  #elif !defined(GTKSOURCEVIEWMM_BUILD)
-    #define GTKSOURCEVIEWMM_API __declspec(dllimport)
-  #else
-    /* Build a static library */
-    #define GTKSOURCEVIEWMM_API
-  #endif /* GTKSOURCEVIEWMM_BUILD - _WINDLL */
-#else
-  #define GTKSOURCEVIEWMM_API
-#endif /* GTKSOURCEVIEWMM_DLL */
+/* Micro version number of gtksourceviewmm. */
+#undef GTKSOURCEVIEWMM_MICRO_VERSION
 
 #endif /* _GTKSOURCEVIEWMM_CONFIG_H */
 
diff --git a/gtksourceview/src/Makefile.am b/gtksourceview/src/Makefile.am
index 1c1ff31..c284013 100644
--- a/gtksourceview/src/Makefile.am
+++ b/gtksourceview/src/Makefile.am
@@ -1,18 +1,7 @@
-## Copyright (c) 2001
-## The gtkmm development team.
+binding_name = gtksourceviewmm
+wrap_init_flags = --namespace=gtksourceview --parent_dir=gtksourceviewmm
 
-sublib_name = gtksourceviewmm
-sublib_namespace = gtksourceview
-sublib_parentdir = gtksourceviewmm
-files_defs = \
-gtksourceview.defs \
-gtksourceview_signals.defs \
-gtksourceview_methods.defs \
-gtksourceview_others.defs \
-gtksourceview_enums.defs \
-gtksourceview_docs.xml \
-gtksourceview_docs_override.xml
-
-
-include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
+include $(srcdir)/filelist.am
+include $(top_srcdir)/codegen/m4/filelist.am
+include $(top_srcdir)/build/generate-binding.am
 
diff --git a/gtksourceview/src/filelist.am b/gtksourceview/src/filelist.am
new file mode 100644
index 0000000..1d749f3
--- /dev/null
+++ b/gtksourceview/src/filelist.am
@@ -0,0 +1,21 @@
+files_defs =				\
+	gtksourceview.defs		\
+	gtksourceview_signals.defs	\
+	gtksourceview_methods.defs	\
+	gtksourceview_others.defs	\
+	gtksourceview_enums.defs	\
+	gtksourceview_docs.xml		\
+	gtksourceview_docs_override.xml
+
+files_hg =				\
+	sourcestyle.hg			\
+	sourcestylescheme.hg		\
+	sourcelanguage.hg		\
+	sourcelanguagemanager.hg	\
+	sourceview.hg			\
+	sourcebuffer.hg			\
+	sourceiter.hg			\
+	sourcemark.hg			\
+	sourcestyleschememanager.hg
+
+files_ccg = $(files_hg:.hg=.ccg)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]