[gitg/wip/libmerge] Move files from libgitg-gtk to libgitg
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/wip/libmerge] Move files from libgitg-gtk to libgitg
- Date: Sun, 23 Jun 2013 15:07:04 +0000 (UTC)
commit 67ad044d60c83a636d2191be7028c12158ea0a40
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Sun Jun 23 14:40:04 2013 +0200
Move files from libgitg-gtk to libgitg
Makefile.am | 2 +-
configure.ac | 37 ++-----
gitg/Makefile.am | 6 +-
libgitg-gtk/Makefile.am | 114 --------------------
libgitg-gtk/libgitg-gtk-1.0.pc.in | 11 --
libgitg/Makefile.am | 61 ++++++++---
.../gitg-gtk-assembly-info.vala | 0
.../gitg-gtk-cell-renderer-lanes.vala | 0
.../gitg-gtk-commit-list-view.vala | 0
.../gitg-gtk-commit-model.vala | 0
{libgitg-gtk => libgitg}/gitg-gtk-dash-view.vala | 0
.../gitg-gtk-diff-view-request-diff.vala | 0
.../gitg-gtk-diff-view-request-resource.vala | 2 +-
.../gitg-gtk-diff-view-request.vala | 0
{libgitg-gtk => libgitg}/gitg-gtk-diff-view.vala | 0
.../gitg-gtk-label-renderer.vala | 0
.../gitg-gtk-progress-bin.vala | 0
{libgitg-gtk => libgitg}/gitg-gtk-when-mapped.vala | 0
libgitg/libgitg-1.0.pc.in | 2 +-
.../resources/diff-view-html-builder.js | 0
{libgitg-gtk => libgitg}/resources/diff-view.css | 0
{libgitg-gtk => libgitg}/resources/diff-view.html | 0
{libgitg-gtk => libgitg}/resources/diff-view.js | 0
.../resources/jquery-1.10.1.min.js | 0
{libgitg-gtk => libgitg}/resources/resources.xml | 0
tests/diff-view.vala | 2 +-
26 files changed, 65 insertions(+), 172 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 56974df..70d3bc2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-SUBDIRS = libgd libgitg libgitg-gtk libgitg-ext plugins gitg data po tests
+SUBDIRS = libgd libgitg libgitg-ext plugins gitg data po tests
DISTCLEANFILES = \
intltool-extract \
diff --git a/configure.ac b/configure.ac
index eb4426d..1a3fa4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ GLIB_REQUIRED_VERSION=2.32
GTK_REQUIRED_VERSION=3.9.0
GTKSOURCEVIEW_REQUIRED_VERSION=3.1.3
INTROSPECTION_REQUIRED=0.10.1
+WEBKITGTK_REQUIRED_VERSION=1.9.92
PKG_CHECK_MODULES(LIBGITG, [
gthread-2.0 >= $GLIB_REQUIRED_VERSION
@@ -100,6 +101,10 @@ PKG_CHECK_MODULES(LIBGITG, [
gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
gobject-introspection-1.0 >= $INTROSPECTION_REQUIRED
libgit2-glib-1.0
+ gtk+-3.0 >= $GTK_REQUIRED_VERSION
+ webkit2gtk-3.0 >= $WEBKITGTK_REQUIRED_VERSION
+ gee-0.8
+ json-glib-1.0
])
AC_ARG_ENABLE(docs,
@@ -149,28 +154,15 @@ if test "x$enable_debug" = "xyes"; then
AC_DEFINE([ENABLE_DEBUG],[1],[Whether debugging support is enabled])
fi
+LIBGITG_CFLAGS="$LIBGITG_CFLAGS -DLIBSOUP_USE_UNSTABLE_REQUEST_API"
+
AC_SUBST(LIBGITG_CFLAGS)
AC_SUBST(LIBGITG_LIBS)
AC_SUBST(GITG_VALAFLAGS)
-WEBKITGTK_REQUIRED_VERSION=1.9.92
-
-PKG_CHECK_MODULES(LIBGITG_GTK, [
- gtk+-3.0 >= $GTK_REQUIRED_VERSION
- webkit2gtk-3.0 >= $WEBKITGTK_REQUIRED_VERSION
- gee-0.8
- json-glib-1.0
-])
-
-LIBGITG_GTK_CFLAGS="$LIBGITG_CFLAGS $LIBGITG_GTK_CFLAGS -DLIBSOUP_USE_UNSTABLE_REQUEST_API"
-LIBGITG_GTK_LIBS="$LIBGITG_LIBS $LIBGITG_GTK_LIBS"
-
-AC_SUBST(LIBGITG_GTK_CFLAGS)
-AC_SUBST(LIBGITG_GTK_LIBS)
-
-LIBGITG_EXT_CFLAGS="$LIBGITG_GTK_CFLAGS"
-LIBGITG_EXT_LIBS="$LIBGITG_GTK_LIBS"
+LIBGITG_EXT_CFLAGS="$LIBGITG_CFLAGS"
+LIBGITG_EXT_LIBS="$LIBGITG_LIBS"
AC_SUBST(LIBGITG_EXT_CFLAGS)
AC_SUBST(LIBGITG_EXT_LIBS)
@@ -185,8 +177,8 @@ PKG_CHECK_MODULES(GITG, [
libpeas-gtk-1.0 >= $LIBPEAS_GTK_REQUIRED_VERSION
])
-GITG_CFLAGS="$LIBGITG_GTK_CFLAGS $GITG_CFLAGS"
-GITG_LIBS="$LIBGITG_GTK_LIBS $GITG_LIBS -lm"
+GITG_CFLAGS="$LIBGITG_CFLAGS $GITG_CFLAGS"
+GITG_LIBS="$LIBGITG_LIBS $GITG_LIBS -lm"
AC_SUBST(GITG_CFLAGS)
AC_SUBST(GITG_LIBS)
@@ -225,8 +217,7 @@ GITG_PLUGIN_CFLAGS="$GITG_CFLAGS"
GITG_PLUGIN_LIBS="$GITG_LIBS \
\$(top_builddir)/libgd/libgd.la \
\$(top_builddir)/libgitg/libgitg-1.0.la \
- \$(top_builddir)/libgitg-ext/libgitg-ext-1.0.la \
- \$(top_builddir)/libgitg-gtk/libgitg-gtk-1.0.la"
+ \$(top_builddir)/libgitg-ext/libgitg-ext-1.0.la"
AC_SUBST(GITG_PLUGIN_CFLAGS)
AC_SUBST(GITG_PLUGIN_LIBS)
@@ -238,7 +229,6 @@ GITG_PLUGIN_VALAFLAGS=" \
--pkg Ggit-1.0 \
--pkg libgitg-ext-1.0 \
--pkg libgitg-1.0 \
- --pkg libgitg-gtk-1.0 \
--pkg gio-2.0 \
--pkg gtk+-3.0 \
--pkg gtksourceview-3.0 \
@@ -252,7 +242,6 @@ GITG_PLUGIN_VALAFLAGS=" \
\$(GITG_VALAFLAGS) \
--vapidir \$(top_srcdir)/vapi \
--vapidir \$(top_builddir)/libgitg \
- --vapidir \$(top_builddir)/libgitg-gtk \
--vapidir \$(top_builddir)/libgitg-ext \
--vapidir \$(top_builddir)/libgd"
@@ -295,8 +284,6 @@ Makefile
libgd/Makefile
libgitg/Makefile
libgitg/libgitg-1.0.pc
-libgitg-gtk/Makefile
-libgitg-gtk/libgitg-gtk-1.0.pc
libgitg-ext/Makefile
libgitg-ext/libgitg-ext-1.0.pc
gitg/Makefile
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 9be0390..1c499ba 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -17,7 +17,6 @@ AM_VALAFLAGS = \
--pkg Ggit-1.0 \
--pkg libgitg-1.0 \
--pkg libgitg-ext-1.0 \
- --pkg libgitg-gtk-1.0 \
--pkg gtk+-3.0 \
--pkg gio-2.0 \
--pkg libpeas-1.0 \
@@ -28,12 +27,10 @@ AM_VALAFLAGS = \
--girdir "$(top_builddir)/libgd" \
--girdir "$(top_builddir)/libgitg" \
--girdir "$(top_builddir)/libgitg-ext" \
- --girdir "$(top_builddir)/libgitg-gtk" \
--vapidir "$(top_srcdir)/vapi" \
--vapidir "$(top_builddir)/libgd" \
--vapidir "$(top_builddir)/libgitg" \
--vapidir "$(top_builddir)/libgitg-ext" \
- --vapidir "$(top_builddir)/libgitg-gtk" \
--gresources "$(top_srcdir)/gitg/resources/gitg-resources.xml"
VALASOURCES = \
@@ -61,8 +58,7 @@ gitg_LDADD = \
$(PACKAGE_LIBS) \
$(top_builddir)/libgd/libgd.la \
$(top_builddir)/libgitg/libgitg-1.0.la \
- $(top_builddir)/libgitg-ext/libgitg-ext-1.0.la \
- $(top_builddir)/libgitg-gtk/libgitg-gtk-1.0.la
+ $(top_builddir)/libgitg-ext/libgitg-ext-1.0.la
gitg_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index b7e337d..54b2151 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -18,8 +18,14 @@ INST_H_FILES = \
AM_VALAFLAGS = \
--pkg Ggit-1.0 \
+ --pkg gtk+-3.0 \
--pkg gio-2.0 \
+ --pkg libsoup-2.4 \
+ --pkg webkit2gtk-3.0 \
+ --pkg gee-0.8 \
+ --pkg json-glib-1.0 \
$(GITG_VALAFLAGS) \
+ --vapidir $(top_srcdir)/vapi \
--header libgitg.h \
--includedir libgitg \
--basedir $(top_srcdir) \
@@ -29,24 +35,37 @@ AM_VALAFLAGS = \
Gitg-1.0.gir: libgitg-1.0.la
libgitg.h: libgitg-1.0.la
-VALA_FILES = \
- gitg-assembly-info.vala \
- gitg-branch.vala \
- gitg-branch-base.vala \
- gitg-repository.vala \
- gitg-ref.vala \
- gitg-ref-base.vala \
- gitg-lane.vala \
- gitg-lanes.vala \
- gitg-color.vala \
- gitg-init.vala \
- gitg-commit.vala
+VALA_FILES = \
+ gitg-assembly-info.vala \
+ gitg-branch.vala \
+ gitg-branch-base.vala \
+ gitg-repository.vala \
+ gitg-ref.vala \
+ gitg-ref-base.vala \
+ gitg-lane.vala \
+ gitg-lanes.vala \
+ gitg-color.vala \
+ gitg-init.vala \
+ gitg-commit.vala \
+ gitg-gtk-assembly-info.vala \
+ gitg-gtk-commit-model.vala \
+ gitg-gtk-label-renderer.vala \
+ gitg-gtk-cell-renderer-lanes.vala \
+ gitg-gtk-commit-list-view.vala \
+ gitg-gtk-diff-view.vala \
+ gitg-gtk-diff-view-request.vala \
+ gitg-gtk-diff-view-request-resource.vala \
+ gitg-gtk-diff-view-request-diff.vala \
+ gitg-gtk-dash-view.vala \
+ gitg-gtk-when-mapped.vala \
+ gitg-gtk-progress-bin.vala
# Ignore all warnings for vala code...
libgitg_1_0_la_CFLAGS = \
-w
libgitg_1_0_la_SOURCES = \
+ gitg-resources.c \
$(VALA_FILES)
headerdir = $(prefix)/include/libgitg-1.0/libgitg
@@ -67,14 +86,30 @@ typelib_DATA = Gitg-1.0.typelib
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgitg-1.0.pc
+gitg-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/resources.xml)
+ $(GLIB_COMPILE_RESOURCES) --generate-source \
+ --sourcedir $(srcdir)/resources \
+ --target "$@" "$<"
+
+gitg-resources.h: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/resources.xml)
+ $(GLIB_COMPILE_RESOURCES) --generate-header \
+ --sourcedir $(srcdir)/resources \
+ --target "$@" "$<"
+
BUILT_SOURCES = \
$(gir_DATA) \
$(vapi_DATA) \
$(typelib_DATA) \
libgitg_1_0_la_vala.stamp \
+ gitg-resources.c \
+ gitg-resources.h \
libgitg.h
-EXTRA_DIST = $(pkgconfig_DATA)
+EXTRA_DIST = \
+ $(pkgconfig_DATA) \
+ resources/resources.xml \
+ $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
resources/resources.xml)
+
CLEANFILES = $(VALA_FILES:.vala=.c)
dist-hook:
diff --git a/libgitg-gtk/gitg-gtk-assembly-info.vala b/libgitg/gitg-gtk-assembly-info.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-assembly-info.vala
rename to libgitg/gitg-gtk-assembly-info.vala
diff --git a/libgitg-gtk/gitg-gtk-cell-renderer-lanes.vala b/libgitg/gitg-gtk-cell-renderer-lanes.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-cell-renderer-lanes.vala
rename to libgitg/gitg-gtk-cell-renderer-lanes.vala
diff --git a/libgitg-gtk/gitg-gtk-commit-list-view.vala b/libgitg/gitg-gtk-commit-list-view.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-commit-list-view.vala
rename to libgitg/gitg-gtk-commit-list-view.vala
diff --git a/libgitg-gtk/gitg-gtk-commit-model.vala b/libgitg/gitg-gtk-commit-model.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-commit-model.vala
rename to libgitg/gitg-gtk-commit-model.vala
diff --git a/libgitg-gtk/gitg-gtk-dash-view.vala b/libgitg/gitg-gtk-dash-view.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-dash-view.vala
rename to libgitg/gitg-gtk-dash-view.vala
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request-diff.vala b/libgitg/gitg-gtk-diff-view-request-diff.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-diff-view-request-diff.vala
rename to libgitg/gitg-gtk-diff-view-request-diff.vala
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request-resource.vala
b/libgitg/gitg-gtk-diff-view-request-resource.vala
similarity index 97%
rename from libgitg-gtk/gitg-gtk-diff-view-request-resource.vala
rename to libgitg/gitg-gtk-diff-view-request-resource.vala
index f31c37e..6dc999e 100644
--- a/libgitg-gtk/gitg-gtk-diff-view-request-resource.vala
+++ b/libgitg/gitg-gtk-diff-view-request-resource.vala
@@ -63,7 +63,7 @@ namespace GitgGtk
if (repopath != null)
{
- d_resource =
File.new_for_path(Path.build_filename(repopath.get_path(), "..", "libgitg-gtk", "resources", path));
+ d_resource =
File.new_for_path(Path.build_filename(repopath.get_path(), "..", "libgitg", "resources", path));
}
else
{
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request.vala b/libgitg/gitg-gtk-diff-view-request.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-diff-view-request.vala
rename to libgitg/gitg-gtk-diff-view-request.vala
diff --git a/libgitg-gtk/gitg-gtk-diff-view.vala b/libgitg/gitg-gtk-diff-view.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-diff-view.vala
rename to libgitg/gitg-gtk-diff-view.vala
diff --git a/libgitg-gtk/gitg-gtk-label-renderer.vala b/libgitg/gitg-gtk-label-renderer.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-label-renderer.vala
rename to libgitg/gitg-gtk-label-renderer.vala
diff --git a/libgitg-gtk/gitg-gtk-progress-bin.vala b/libgitg/gitg-gtk-progress-bin.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-progress-bin.vala
rename to libgitg/gitg-gtk-progress-bin.vala
diff --git a/libgitg-gtk/gitg-gtk-when-mapped.vala b/libgitg/gitg-gtk-when-mapped.vala
similarity index 100%
rename from libgitg-gtk/gitg-gtk-when-mapped.vala
rename to libgitg/gitg-gtk-when-mapped.vala
diff --git a/libgitg/libgitg-1.0.pc.in b/libgitg/libgitg-1.0.pc.in
index 59ff1fe..2f1c599 100644
--- a/libgitg/libgitg-1.0.pc.in
+++ b/libgitg/libgitg-1.0.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
Name: @PACKAGE_NAME@
Description: gitg library
Version: @PACKAGE_VERSION@
-Requires: libgit2-glib-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 gio-unix-2.0 gthread-2.0
+Requires: libgit2-glib-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 gio-unix-2.0 gthread-2.0 gtk+-3.0
Libs: -L${libdir} -lgitg-1.0
Cflags: -I${includedir}/libgitg-1.0
diff --git a/libgitg-gtk/resources/diff-view-html-builder.js b/libgitg/resources/diff-view-html-builder.js
similarity index 100%
rename from libgitg-gtk/resources/diff-view-html-builder.js
rename to libgitg/resources/diff-view-html-builder.js
diff --git a/libgitg-gtk/resources/diff-view.css b/libgitg/resources/diff-view.css
similarity index 100%
rename from libgitg-gtk/resources/diff-view.css
rename to libgitg/resources/diff-view.css
diff --git a/libgitg-gtk/resources/diff-view.html b/libgitg/resources/diff-view.html
similarity index 100%
rename from libgitg-gtk/resources/diff-view.html
rename to libgitg/resources/diff-view.html
diff --git a/libgitg-gtk/resources/diff-view.js b/libgitg/resources/diff-view.js
similarity index 100%
rename from libgitg-gtk/resources/diff-view.js
rename to libgitg/resources/diff-view.js
diff --git a/libgitg-gtk/resources/jquery-1.10.1.min.js b/libgitg/resources/jquery-1.10.1.min.js
similarity index 100%
rename from libgitg-gtk/resources/jquery-1.10.1.min.js
rename to libgitg/resources/jquery-1.10.1.min.js
diff --git a/libgitg-gtk/resources/resources.xml b/libgitg/resources/resources.xml
similarity index 100%
rename from libgitg-gtk/resources/resources.xml
rename to libgitg/resources/resources.xml
diff --git a/tests/diff-view.vala b/tests/diff-view.vala
index a32742c..65496fe 100644
--- a/tests/diff-view.vala
+++ b/tests/diff-view.vala
@@ -9,7 +9,7 @@ class TestDiffView
{
// Launch in local mode
var path = File.new_for_path(args[0]);
- var gtk = path.get_parent().get_parent().get_parent().get_child("libgitg-gtk");
+ var gtk = path.get_parent().get_parent().get_parent().get_child("libgitg");
var rargs = args;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
