Re: [Inkscape-devel] [Branch ~inkscape.dev/inkscape/trunk] Rev 13946: Isolate components of libgc

25 Feb 2015

Just a few notes:
1. This change is asking for trouble. "gc" is already used as the
library name of Boehm GC, which we are linking to, so these internal
GC components should be called "libinkgc" instead to avoid possible
naming conflicts.
2. The convention so far was that "lib*" directories in the source
tree are for in-tree forks/copies of third party libraries (except
"libnrtype").
Regards, Krzysztof
2015-02-25 23:25 GMT+01:00  <noreply@...1881...>:
...

revno: 13946
committer: Liam P. White <inkscapebrony@...400...>
branch nick: inkscape
timestamp: Wed 2015-02-25 17:24:47 -0500
message:
  Isolate components of libgc
removed:
  src/gc-allocator.h
added:
  src/libgc/
  src/libgc/CMakeLists.txt
  src/libgc/Makefile_insert
renamed:
  src/gc-alloc.h => src/libgc/gc-alloc.h
  src/gc-core.h => src/libgc/gc-core.h
  src/gc-managed.h => src/libgc/gc-managed.h
  src/gc-soft-ptr.h => src/libgc/gc-soft-ptr.h
  src/gc.cpp => src/libgc/gc.cpp
modified:
  src/CMakeLists.txt
  src/Makefile.am
  src/Makefile_insert
  src/composite-undo-stack-observer.h
  src/debug/demangle.cpp
  src/debug/gc-heap.h
  src/debug/heap.cpp
  src/debug/logger.cpp
  src/debug/simple-event.h
  src/display/nr-filter.h
  src/document-subset.h
  src/document.h
  src/gc-anchored.h
  src/gc-finalized.h
  src/inkview.cpp
  src/layer-manager.cpp
  src/layer-manager.h
  src/main.cpp
  src/message-stack.h
  src/selection.h
  src/ui/clipboard.cpp
  src/ui/dialog/filedialog.cpp
  src/ui/dialog/filedialogimpl-win32.h
  src/ui/dialog/memory.cpp
  src/ui/dialog/ocaldialogs.cpp
  src/ui/view/view.h
  src/undo-stack-observer.h
  src/util/list.h
  src/util/share.h
  src/xml/attribute-record.h
  src/xml/composite-node-observer.h
  src/xml/event.h
  src/xml/log-builder.h
  src/xml/subtree.h
  src/libgc/gc-alloc.h
  src/libgc/gc-managed.h
  src/libgc/gc-soft-ptr.h
  src/libgc/gc.cpp
--
lp:inkscape
https://code.launchpad.net/~inkscape.dev/inkscape/trunk
You are subscribed to branch lp:inkscape.
To unsubscribe from this branch go to https://code.launchpad.net/~inkscape.dev/inkscape/trunk/+edit-subscription
=== modified file 'src/CMakeLists.txt'

--- src/CMakeLists.txt  2015-02-25 19:22:23 +0000
+++ src/CMakeLists.txt  2015-02-25 22:24:47 +0000
@@ -491,6 +491,7 @@
 add_subdirectory(libavoid)
 add_subdirectory(libcola)
 add_subdirectory(libcroco)
+add_subdirectory(libgc)
 add_subdirectory(libgdl)
 add_subdirectory(libuemf)
 add_subdirectory(libvpsc)
=== modified file 'src/Makefile.am'
--- src/Makefile.am     2015-02-25 01:14:01 +0000
+++ src/Makefile.am     2015-02-25 22:24:47 +0000
@@ -29,6 +29,7 @@
        $(internal_GDL)                 \
        libuemf/libuemf.a               \
        libcola/libcola.a               \

   libgc/libgc.a                  \
  libvpsc/libvpsc.a               \
  livarot/libvarot.a              \
  2geom/lib2geom.a                \



@@ -115,6 +116,7 @@
 include helper/Makefile_insert
 include io/Makefile_insert
 include libcroco/Makefile_insert
+include libgc/Makefile_insert
 include libgdl/Makefile_insert
 include libnrtype/Makefile_insert
 include libavoid/Makefile_insert
=== modified file 'src/Makefile_insert'
--- src/Makefile_insert 2015-02-25 19:22:23 +0000
+++ src/Makefile_insert 2015-02-25 22:24:47 +0000
@@ -43,13 +43,8 @@
        fill-or-stroke.h                                                \
        filter-chemistry.cpp filter-chemistry.h                         \
        filter-enums.cpp filter-enums.h                                 \

  gc-alloc.h                                                      \


  gc-anchored.h gc-anchored.cpp                                   \


  gc-core.h                                                       \


  gc.cpp                                                          \


  gc-finalized.h gc-finalized.cpp                                 \


  gc-managed.h                                                    \


  gc-soft-ptr.h                                                   \




  gc-anchored.cpp gc-anchored.h                                   \


  gc-finalized.cpp gc-finalized.h                                 \
  gradient-chemistry.cpp gradient-chemistry.h                     \
  gradient-drag.cpp gradient-drag.h                               \
  graphlayout.cpp graphlayout.h                                   \




=== modified file 'src/composite-undo-stack-observer.h'
--- src/composite-undo-stack-observer.h 2014-03-30 22:08:13 +0000
+++ src/composite-undo-stack-observer.h 2015-02-25 22:24:47 +0000
@@ -10,7 +10,7 @@
 #ifndef SEEN_COMPOSITE_UNDO_COMMIT_OBSERVER_H
 #define SEEN_COMPOSITE_UNDO_COMMIT_OBSERVER_H
-#include "gc-alloc.h"
+#include "libgc/gc-alloc.h"
 #include "undo-stack-observer.h"
#include <list>
=== modified file 'src/debug/demangle.cpp'
--- src/debug/demangle.cpp      2010-11-17 02:12:56 +0000
+++ src/debug/demangle.cpp      2015-02-25 22:24:47 +0000
@@ -14,7 +14,7 @@
 #include <map>
 #include "debug/demangle.h"
 #include "util/format.h"
-#include "gc-alloc.h"
+#include "libgc/gc-alloc.h"
namespace Inkscape {
=== modified file 'src/debug/gc-heap.h'
--- src/debug/gc-heap.h 2010-11-17 02:12:56 +0000
+++ src/debug/gc-heap.h 2015-02-25 22:24:47 +0000
@@ -12,7 +12,7 @@
 #ifndef SEEN_INKSCAPE_DEBUG_GC_HEAP_H
 #define SEEN_INKSCAPE_DEBUG_GC_HEAP_H
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include "debug/heap.h"
namespace Inkscape {
=== modified file 'src/debug/heap.cpp'
--- src/debug/heap.cpp  2010-11-17 02:12:56 +0000
+++ src/debug/heap.cpp  2015-02-25 22:24:47 +0000
@@ -13,7 +13,7 @@
 # include "config.h"
 #endif
-#include "gc-alloc.h"
+#include "libgc/gc-alloc.h"
 #include "debug/gc-heap.h"
 #include "debug/sysv-heap.h"
 #include <vector>
=== modified file 'src/debug/logger.cpp'
--- src/debug/logger.cpp        2011-12-08 11:53:54 +0000
+++ src/debug/logger.cpp        2015-02-25 22:24:47 +0000
@@ -15,7 +15,7 @@
 #include "inkscape-version.h"
 #include "debug/logger.h"
 #include "debug/simple-event.h"
-#include "gc-alloc.h"
+#include "libgc/gc-alloc.h"
namespace Inkscape {
=== modified file 'src/debug/simple-event.h'
--- src/debug/simple-event.h    2011-12-08 11:53:54 +0000
+++ src/debug/simple-event.h    2015-02-25 22:24:47 +0000
@@ -16,7 +16,7 @@
 #include <vector>
 #include <glib.h> // g_assert()
-#include "gc-alloc.h"
+#include "libgc/gc-alloc.h"
 #include "debug/event.h"
namespace Inkscape {
=== modified file 'src/display/nr-filter.h'
--- src/display/nr-filter.h     2014-10-08 02:22:03 +0000
+++ src/display/nr-filter.h     2015-02-25 22:24:47 +0000
@@ -18,7 +18,7 @@
 #include "display/nr-filter-types.h"
 #include "svg/svg-length.h"
 #include "sp-filter-units.h"
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
namespace Inkscape {
 class DrawingContext;
=== modified file 'src/document-subset.h'
--- src/document-subset.h       2014-03-30 22:08:13 +0000
+++ src/document-subset.h       2015-02-25 22:24:47 +0000
@@ -14,7 +14,7 @@
 #include <sigc++/connection.h>
 #include <sigc++/functors/slot.h>
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "gc-anchored.h"
class SPObject;
=== modified file 'src/document.h'
--- src/document.h      2015-01-06 12:37:55 +0000
+++ src/document.h      2015-02-25 22:24:47 +0000
@@ -21,7 +21,7 @@
 #include <sigc++/sigc++.h>
 #include "libcroco/cr-cascade.h"
 #include <2geom/forward.h>
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
 #include <glibmm/ustring.h>
=== removed file 'src/gc-allocator.h'
=== modified file 'src/gc-anchored.h'
--- src/gc-anchored.h   2014-10-08 02:22:03 +0000
+++ src/gc-anchored.h   2015-02-25 22:24:47 +0000
@@ -9,7 +9,7 @@
 #ifndef SEEN_INKSCAPE_GC_ANCHORED_H
 #define SEEN_INKSCAPE_GC_ANCHORED_H
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
namespace Inkscape {
=== modified file 'src/gc-finalized.h'
--- src/gc-finalized.h  2011-02-27 20:48:16 +0000
+++ src/gc-finalized.h  2015-02-25 22:24:47 +0000
@@ -18,7 +18,7 @@
#include <new>
 #include <cstddef>
-#include "gc-core.h"
+#include "libgc/gc-core.h"
namespace Inkscape {
=== modified file 'src/inkview.cpp'
--- src/inkview.cpp     2014-10-08 02:22:03 +0000
+++ src/inkview.cpp     2015-02-25 22:24:47 +0000
@@ -47,7 +47,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include "preferences.h"
#include <glibmm/i18n.h>
=== modified file 'src/layer-manager.cpp'
--- src/layer-manager.cpp       2014-12-21 21:58:32 +0000
+++ src/layer-manager.cpp       2015-02-25 22:24:47 +0000
@@ -11,7 +11,7 @@
 #include <set>
 #include <sigc++/functors/mem_fun.h>
 #include <sigc++/adaptors/hide.h>
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "gc-finalized.h"
 #include "document.h"
 #include "desktop.h"
=== modified file 'src/layer-manager.h'
--- src/layer-manager.h 2014-10-08 02:22:03 +0000
+++ src/layer-manager.h 2015-02-25 22:24:47 +0000
@@ -15,7 +15,7 @@
#include "document-subset.h"
 #include "gc-finalized.h"
-#include "gc-soft-ptr.h"
+#include "libgc/gc-soft-ptr.h"
class SPDesktop;
 class SPDocument;
=== added directory 'src/libgc'
=== added file 'src/libgc/CMakeLists.txt'
--- src/libgc/CMakeLists.txt    1970-01-01 00:00:00 +0000
+++ src/libgc/CMakeLists.txt    2015-02-25 22:24:47 +0000
@@ -0,0 +1,15 @@



+set(libgc_SRC

  gc.cpp



  # -------


  # Headers


  gc-alloc.h


  gc-anchored.h


  gc-core.h


  gc-managed.h


  gc-soft-ptr.h



+)



+add_inkscape_lib(gc_LIB "${libgc_SRC}")
+# add_inkscape_source("${libgc_SRC}")
=== added file 'src/libgc/Makefile_insert'
--- src/libgc/Makefile_insert   1970-01-01 00:00:00 +0000
+++ src/libgc/Makefile_insert   2015-02-25 22:24:47 +0000
@@ -0,0 +1,13 @@
+## Makefile.am fragment sourced by src/Makefile.am.



+libgc/all: libgc/libgc.a



+libgc/clean:

  rm -f libgc/libgc.a $(libgc_libgc_a_OBJECTS)




+libgc_libgc_a_SOURCES =         \

  libgc/gc.cpp            \


  libgc/gc-alloc.h        \


  libgc/gc-core.h         \


  libgc/gc-managed.h      \


  libgc/gc-soft-ptr.h




=== renamed file 'src/gc-alloc.h' => 'src/libgc/gc-alloc.h'
--- src/gc-alloc.h      2011-02-27 20:48:16 +0000
+++ src/libgc/gc-alloc.h        2015-02-25 22:24:47 +0000
@@ -17,7 +17,7 @@
#include <limits>
 #include <cstddef>
-#include "gc-core.h"
+#include "libgc/gc-core.h"
namespace Inkscape {
=== renamed file 'src/gc-core.h' => 'src/libgc/gc-core.h'
=== renamed file 'src/gc-managed.h' => 'src/libgc/gc-managed.h'
--- src/gc-managed.h    2010-11-17 02:12:56 +0000
+++ src/libgc/gc-managed.h      2015-02-25 22:24:47 +0000
@@ -14,7 +14,7 @@
 #ifndef SEEN_INKSCAPE_GC_MANAGED_H
 #define SEEN_INKSCAPE_GC_MANAGED_H
-#include "gc-core.h"
+#include "libgc/gc-core.h"
namespace Inkscape {
=== renamed file 'src/gc-soft-ptr.h' => 'src/libgc/gc-soft-ptr.h'
--- src/gc-soft-ptr.h   2011-10-25 07:45:35 +0000
+++ src/libgc/gc-soft-ptr.h     2015-02-25 22:24:47 +0000
@@ -13,7 +13,7 @@
 #ifndef SEEN_INKSCAPE_GC_SOFT_PTR_H
 #define SEEN_INKSCAPE_GC_SOFT_PTR_H
-#include "gc-core.h"
+#include "libgc/gc-core.h"
namespace Inkscape {
=== renamed file 'src/gc.cpp' => 'src/libgc/gc.cpp'
--- src/gc.cpp  2014-03-27 01:33:44 +0000
+++ src/libgc/gc.cpp    2015-02-25 22:24:47 +0000
@@ -9,7 +9,7 @@

Released under GNU GPL, read the file 'COPYING' for more information

*/
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include <stdexcept>
 #include <cstring>
 #include <string>
=== modified file 'src/main.cpp'
--- src/main.cpp        2015-02-04 14:34:21 +0000
+++ src/main.cpp        2015-02-25 22:24:47 +0000
@@ -52,7 +52,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include "gc-core.h"
+#include "libgc/gc-core.h"
#ifdef AND
 #undef AND
=== modified file 'src/message-stack.h'
--- src/message-stack.h 2014-10-08 02:22:03 +0000
+++ src/message-stack.h 2015-02-25 22:24:47 +0000
@@ -22,7 +22,7 @@
 #include <glibmm/ustring.h>
 #include <sigc++/sigc++.h>
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
 #include "message.h"
=== modified file 'src/selection.h'
--- src/selection.h     2014-10-08 02:22:03 +0000
+++ src/selection.h     2015-02-25 22:24:47 +0000
@@ -19,10 +19,10 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
-#include "gc-soft-ptr.h"
+#include "libgc/gc-soft-ptr.h"
 #include "sp-item.h"
=== modified file 'src/ui/clipboard.cpp'
--- src/ui/clipboard.cpp        2015-02-21 01:06:20 +0000
+++ src/ui/clipboard.cpp        2015-02-25 22:24:47 +0000
@@ -32,7 +32,7 @@
 #include <glibmm/ustring.h>
 #include <glibmm/i18n.h>
 #include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include "xml/repr.h"
 #include "inkscape.h"
 #include "io/stringstream.h"
=== modified file 'src/ui/dialog/filedialog.cpp'
--- src/ui/dialog/filedialog.cpp        2014-10-08 02:22:03 +0000
+++ src/ui/dialog/filedialog.cpp        2015-02-25 22:24:47 +0000
@@ -19,7 +19,7 @@
 #include "filedialogimpl-gtkmm.h"
 #include "filedialog.h"
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include "ui/dialog-events.h"
 #include "extension/output.h"
 #include "preferences.h"
=== modified file 'src/ui/dialog/filedialogimpl-win32.h'
--- src/ui/dialog/filedialogimpl-win32.h        2014-06-25 21:05:33 +0000
+++ src/ui/dialog/filedialogimpl-win32.h        2015-02-25 22:24:47 +0000
@@ -24,7 +24,7 @@
#include "filedialogimpl-gtkmm.h"
-#include "gc-core.h"
+#include "libgc/gc-core.h"
  // define WINVER high enough so we get the correct OPENFILENAMEW size
 #ifndef WINVER
 #define WINVER 0x0500
=== modified file 'src/ui/dialog/memory.cpp'
--- src/ui/dialog/memory.cpp    2014-03-27 01:33:44 +0000
+++ src/ui/dialog/memory.cpp    2015-02-25 22:24:47 +0000
@@ -20,7 +20,7 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include "debug/heap.h"
 #include "verbs.h"
=== modified file 'src/ui/dialog/ocaldialogs.cpp'
--- src/ui/dialog/ocaldialogs.cpp       2014-10-08 02:22:03 +0000
+++ src/ui/dialog/ocaldialogs.cpp       2015-02-25 22:24:47 +0000
@@ -26,7 +26,7 @@
 #include "path-prefix.h"
 #include "filedialogimpl-gtkmm.h"
 #include "ui/interface.h"
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include "ui/dialog-events.h"
 #include "io/sys.h"
 #include "preferences.h"
=== modified file 'src/ui/view/view.h'
--- src/ui/view/view.h  2014-03-27 01:33:44 +0000
+++ src/ui/view/view.h  2015-02-25 22:24:47 +0000
@@ -15,7 +15,7 @@
 #include <stddef.h>
 #include <sigc++/connection.h>
 #include "message.h"
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
 #include <2geom/forward.h>
=== modified file 'src/undo-stack-observer.h'
--- src/undo-stack-observer.h   2014-03-30 22:08:13 +0000
+++ src/undo-stack-observer.h   2015-02-25 22:24:47 +0000
@@ -10,7 +10,7 @@
 #ifndef SEEN_UNDO_COMMIT_OBSERVER_H
 #define SEEN_UNDO_COMMIT_OBSERVER_H
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
namespace Inkscape {
=== modified file 'src/util/list.h'
--- src/util/list.h     2011-10-25 07:45:35 +0000
+++ src/util/list.h     2015-02-25 22:24:47 +0000
@@ -12,7 +12,7 @@
#include <cstddef>
 #include <iterator>
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "util/reference.h"
namespace Inkscape {
=== modified file 'src/util/share.h'
--- src/util/share.h    2011-02-27 20:48:16 +0000
+++ src/util/share.h    2015-02-25 22:24:47 +0000
@@ -12,7 +12,7 @@
 #ifndef SEEN_INKSCAPE_UTIL_SHARE_H
 #define SEEN_INKSCAPE_UTIL_SHARE_H
-#include "gc-core.h"
+#include "libgc/gc-core.h"
 #include <cstring>
 #include <cstddef>
=== modified file 'src/xml/attribute-record.h'
--- src/xml/attribute-record.h  2011-12-08 11:53:54 +0000
+++ src/xml/attribute-record.h  2015-02-25 22:24:47 +0000
@@ -6,7 +6,7 @@
 #define SEEN_XML_SP_REPR_ATTR_H
#include <glib.h>
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "util/share.h"
#define SP_REPR_ATTRIBUTE_KEY(a) g_quark_to_string((a)->key)
=== modified file 'src/xml/composite-node-observer.h'
--- src/xml/composite-node-observer.h   2014-03-30 22:08:13 +0000
+++ src/xml/composite-node-observer.h   2015-02-25 22:24:47 +0000
@@ -15,7 +15,7 @@
 #ifndef SEEN_INKSCAPE_XML_COMPOSITE_NODE_OBSERVER_H
 #define SEEN_INKSCAPE_XML_COMPOSITE_NODE_OBSERVER_H
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "xml/node-observer.h"
 #include "util/list-container.h"
=== modified file 'src/xml/event.h'
--- src/xml/event.h     2014-10-08 02:22:03 +0000
+++ src/xml/event.h     2015-02-25 22:24:47 +0000
@@ -24,7 +24,7 @@
 #include <iterator>
 #include "util/share.h"
 #include "util/forward-pointer-iterator.h"
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "xml/node.h"
namespace Inkscape {
=== modified file 'src/xml/log-builder.h'
--- src/xml/log-builder.h       2011-10-04 05:43:09 +0000
+++ src/xml/log-builder.h       2015-02-25 22:24:47 +0000
@@ -14,7 +14,7 @@
 #ifndef SEEN_INKSCAPE_XML_LOG_BUILDER_H
 #define SEEN_INKSCAPE_XML_LOG_BUILDER_H
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "xml/node-observer.h"
namespace Inkscape {
=== modified file 'src/xml/subtree.h'
--- src/xml/subtree.h   2011-10-04 05:43:09 +0000
+++ src/xml/subtree.h   2015-02-25 22:24:47 +0000
@@ -15,7 +15,7 @@
 #ifndef SEEN_INKSCAPE_XML_SUBTREE_H
 #define SEEN_INKSCAPE_XML_SUBTREE_H
-#include "gc-managed.h"
+#include "libgc/gc-managed.h"
 #include "xml/composite-node-observer.h"
namespace Inkscape {

    

Krzysztof Kosiński

tags (0)

participants (1)