GNOME.org
 

[valadoc] libhtmlhelpers -> libvaladoc

commit 8baf3067844e4db9c798fae27944f20f0b87de30
Author: Florian Brosch <flo brosch gmail com>
Date:   Thu Oct 22 02:41:17 2009 +0200

    libhtmlhelpers -> libvaladoc

 Makefile.am                                        |    8 ++-
 configure.in                                       |    6 +--
 .../doclets/htmlhelpers/deps => icons}/Makefile.am |    0
 .../htmlhelpers/deps => icons}/abstractclass.png   |  Bin 693 -> 693 bytes
 .../htmlhelpers/deps => icons}/abstractmethod.png  |  Bin 482 -> 482 bytes
 .../deps => icons}/abstractproperty.png            |  Bin 776 -> 776 bytes
 {src/doclets/htmlhelpers/deps => icons}/class.png  |  Bin 624 -> 624 bytes
 .../htmlhelpers/deps => icons}/constant.png        |  Bin 489 -> 489 bytes
 .../htmlhelpers/deps => icons}/constructor.png     |  Bin 418 -> 418 bytes
 .../htmlhelpers/deps => icons}/delegate.png        |  Bin 688 -> 688 bytes
 {src/doclets/htmlhelpers/deps => icons}/enum.png   |  Bin 634 -> 634 bytes
 .../htmlhelpers/deps => icons}/errordomain.png     |  Bin 618 -> 618 bytes
 {src/doclets/htmlhelpers/deps => icons}/field.png  |  Bin 560 -> 560 bytes
 .../htmlhelpers/deps => icons}/interface.png       |  Bin 544 -> 544 bytes
 {src/doclets/htmlhelpers/deps => icons}/method.png |  Bin 559 -> 559 bytes
 .../htmlhelpers/deps => icons}/namespace.png       |  Bin 390 -> 390 bytes
 .../doclets/htmlhelpers/deps => icons}/package.png |  Bin 633 -> 633 bytes
 .../htmlhelpers/deps => icons}/packages.png        |  Bin 618 -> 618 bytes
 .../htmlhelpers/deps => icons}/property.png        |  Bin 884 -> 884 bytes
 {src/doclets/htmlhelpers/deps => icons}/signal.png |  Bin 536 -> 536 bytes
 .../htmlhelpers/deps => icons}/staticmethod.png    |  Bin 580 -> 580 bytes
 {src/doclets/htmlhelpers/deps => icons}/struct.png |  Bin 329 -> 329 bytes
 {src/doclets/htmlhelpers/deps => icons}/style.css  |    0
 .../htmlhelpers/deps => icons}/virtualmethod.png   |  Bin 608 -> 608 bytes
 .../htmlhelpers/deps => icons}/virtualproperty.png |  Bin 765 -> 765 bytes
 .../doclets/htmlhelpers/deps => icons}/warning.png |  Bin 2959 -> 2959 bytes
 .../htmlhelpers/deps => icons}/wikistyle.css       |    0
 src/doclets/Makefile.am                            |    3 +-
 src/doclets/devhelp/Makefile.am                    |   11 +---
 src/doclets/devhelp/doclet.vala                    |    6 +--
 src/doclets/htm/Makefile.am                        |    9 +--
 src/doclets/htm/doclet.vala                        |    6 +--
 src/doclets/htmlhelpers/Makefile.am                |    7 --
 src/doclets/htmlhelpers/doclet/Makefile.am         |   71 --------------------
 src/doclets/valadoc.org/Makefile.am                |    5 +-
 src/libvaladoc/Makefile.am                         |   19 +++--
 src/libvaladoc/filehelper.vala                     |    3 +
 .../html-doclet/html-doclet.vala}                  |    1 -
 .../html-doclet/html-globals.vala}                 |    0
 .../html-doclet/html-markupwriter.vala}            |    0
 .../html-doclet/html-renderer.vala}                |    0
 41 files changed, 32 insertions(+), 123 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2a455c3..e2bce75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,8 @@
 # Makefile.am
-SUBDIRS = src 
+
+NULL = 
+
+
+SUBDIRS = src \
+          icons \
+          $(NULL)
diff --git a/configure.in b/configure.in
index 482fd65..8f37d37 100644
--- a/configure.in
+++ b/configure.in
@@ -64,16 +64,12 @@ AC_SUBST(LIBGDKPIXBUF_LIBS)
 AC_CONFIG_FILES([Makefile
                  src/libvaladoc/valadoc-1.0.pc
                  src/Makefile
+                 icons/Makefile
                  src/libvaladoc/Makefile
                  src/doclets/Makefile
-                 src/doclets/htmlhelpers/Makefile
-                 src/doclets/htmlhelpers/deps/Makefile
-                 src/doclets/htmlhelpers/doclet/Makefile
                  src/doclets/htm/Makefile
-                 src/doclets/htm/doclet/Makefile
                  src/doclets/valadoc.org/Makefile
                  src/doclets/devhelp/Makefile
-                 src/doclets/devhelp/doclet/Makefile
                  src/valadoc/Makefile])
 
 AC_OUTPUT
diff --git a/src/doclets/htmlhelpers/deps/Makefile.am b/icons/Makefile.am
similarity index 100%
rename from src/doclets/htmlhelpers/deps/Makefile.am
rename to icons/Makefile.am
diff --git a/src/doclets/htmlhelpers/deps/abstractclass.png b/icons/abstractclass.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/abstractclass.png
rename to icons/abstractclass.png
diff --git a/src/doclets/htmlhelpers/deps/abstractmethod.png b/icons/abstractmethod.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/abstractmethod.png
rename to icons/abstractmethod.png
diff --git a/src/doclets/htmlhelpers/deps/abstractproperty.png b/icons/abstractproperty.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/abstractproperty.png
rename to icons/abstractproperty.png
diff --git a/src/doclets/htmlhelpers/deps/class.png b/icons/class.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/class.png
rename to icons/class.png
diff --git a/src/doclets/htmlhelpers/deps/constant.png b/icons/constant.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/constant.png
rename to icons/constant.png
diff --git a/src/doclets/htmlhelpers/deps/constructor.png b/icons/constructor.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/constructor.png
rename to icons/constructor.png
diff --git a/src/doclets/htmlhelpers/deps/delegate.png b/icons/delegate.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/delegate.png
rename to icons/delegate.png
diff --git a/src/doclets/htmlhelpers/deps/enum.png b/icons/enum.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/enum.png
rename to icons/enum.png
diff --git a/src/doclets/htmlhelpers/deps/errordomain.png b/icons/errordomain.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/errordomain.png
rename to icons/errordomain.png
diff --git a/src/doclets/htmlhelpers/deps/field.png b/icons/field.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/field.png
rename to icons/field.png
diff --git a/src/doclets/htmlhelpers/deps/interface.png b/icons/interface.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/interface.png
rename to icons/interface.png
diff --git a/src/doclets/htmlhelpers/deps/method.png b/icons/method.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/method.png
rename to icons/method.png
diff --git a/src/doclets/htmlhelpers/deps/namespace.png b/icons/namespace.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/namespace.png
rename to icons/namespace.png
diff --git a/src/doclets/htmlhelpers/deps/package.png b/icons/package.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/package.png
rename to icons/package.png
diff --git a/src/doclets/htmlhelpers/deps/packages.png b/icons/packages.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/packages.png
rename to icons/packages.png
diff --git a/src/doclets/htmlhelpers/deps/property.png b/icons/property.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/property.png
rename to icons/property.png
diff --git a/src/doclets/htmlhelpers/deps/signal.png b/icons/signal.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/signal.png
rename to icons/signal.png
diff --git a/src/doclets/htmlhelpers/deps/staticmethod.png b/icons/staticmethod.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/staticmethod.png
rename to icons/staticmethod.png
diff --git a/src/doclets/htmlhelpers/deps/struct.png b/icons/struct.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/struct.png
rename to icons/struct.png
diff --git a/src/doclets/htmlhelpers/deps/style.css b/icons/style.css
similarity index 100%
rename from src/doclets/htmlhelpers/deps/style.css
rename to icons/style.css
diff --git a/src/doclets/htmlhelpers/deps/virtualmethod.png b/icons/virtualmethod.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/virtualmethod.png
rename to icons/virtualmethod.png
diff --git a/src/doclets/htmlhelpers/deps/virtualproperty.png b/icons/virtualproperty.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/virtualproperty.png
rename to icons/virtualproperty.png
diff --git a/src/doclets/htmlhelpers/deps/warning.png b/icons/warning.png
similarity index 100%
rename from src/doclets/htmlhelpers/deps/warning.png
rename to icons/warning.png
diff --git a/src/doclets/htmlhelpers/deps/wikistyle.css b/icons/wikistyle.css
similarity index 100%
rename from src/doclets/htmlhelpers/deps/wikistyle.css
rename to icons/wikistyle.css
diff --git a/src/doclets/Makefile.am b/src/doclets/Makefile.am
index 126e927..758d35e 100644
--- a/src/doclets/Makefile.am
+++ b/src/doclets/Makefile.am
@@ -3,8 +3,7 @@
 NULL =
 
 
-SUBDIRS = htmlhelpers \
-          htm \
+SUBDIRS = htm \
           devhelp \
           valadoc.org \
           $(NULL)
diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index 7e89413..9f3a90e 100644
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -2,9 +2,8 @@ NULL =
 
 
 AM_CFLAGS =  -g \
-	-DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
-	-I ../htmlhelpers/doclet/ \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBXML2_CFLAGS) \
@@ -36,13 +35,12 @@ libdoclet_la_SOURCES =      \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-	$(VALAC) -C --vapidir ../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg libxml-2.0 --pkg gee-1.0 --basedir . $^
+	$(VALAC) -C --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg libxml-2.0 --pkg gee-1.0 --basedir . $^
 	touch $@
 
 
 libdoclet_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
-	../htmlhelpers/doclet/libhtmlhelpers.la \
 	$(GLIB_LIBS) \
 	$(LIBXML2_LIBS) \
 	$(LIBVALA_LIBS) \
@@ -58,8 +56,3 @@ MAINTAINERCLEANFILES = \
 	$(NULL)
 
 
-install-data-hook:
-	cd $(libdir)/valadoc/plugins/devhelp/ && if test -d deps; then unlink deps; fi && ln -s ../htmlhelpers/deps 
-
-
-
diff --git a/src/doclets/devhelp/doclet.vala b/src/doclets/devhelp/doclet.vala
index feb054f..484f359 100755
--- a/src/doclets/devhelp/doclet.vala
+++ b/src/doclets/devhelp/doclet.vala
@@ -25,10 +25,6 @@ using Xml;
 using Gee;
 
 
-[CCode (cname = "PACKAGE_PLUGINDIR")]
-public extern const string doclet_path;
-
-
 namespace Valadoc.Devhelp {
 	public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) {
 		if ( element is Visitable ) {
@@ -255,7 +251,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 
 		var rt = DirUtils.create (path, 0777);
 		rt = DirUtils.create (imgpath, 0777);
-		copy_directory (doclet_path + "deps/", path);
+		copy_directory (icons_dir, path);
 
 		this.devhelp = new DevhelpFormat (pkg_name, "");
 
diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 0578bb5..c5a17f3 100644
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -2,9 +2,8 @@ NULL =
 
 
 AM_CFLAGS =  -g \
-	-DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
-	-I ../htmlhelpers/doclet/ \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBVALA_CFLAGS) \
@@ -38,13 +37,12 @@ libdoclet_la_SOURCES =  \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-	$(VALAC) -C --vapidir ../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --basedir . $^
+	$(VALAC) -C --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --basedir . $^
 	touch $@
 
 
 libdoclet_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
-	../htmlhelpers/doclet/libhtmlhelpers.la \
 	$(GLIB_LIBS) \
 	$(LIBGEE_LIBS) \
 	$(LIBVALA_LIBS) \
@@ -59,6 +57,3 @@ MAINTAINERCLEANFILES = \
 	$(NULL)
 
 
-install-data-hook:
-	cd $(libdir)/valadoc/plugins/html/ && if test -d deps; then unlink deps; fi && ln -s ../htmlhelpers/deps 
-
diff --git a/src/doclets/htm/doclet.vala b/src/doclets/htm/doclet.vala
index b6da05f..552f335 100755
--- a/src/doclets/htm/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -24,10 +24,6 @@ using Valadoc.Html;
 using Gee;
 
 
-[CCode (cname = "PACKAGE_PLUGINDIR")]
-public extern const string doclet_path;
-
-
 namespace Valadoc {
 	public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) {
 		if ( element is Visitable ) {
@@ -122,7 +118,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 		this.settings = settings;
 
 		DirUtils.create (this.settings.path, 0777);
-		copy_directory (GLib.Path.build_filename (doclet_path, "deps"), settings.path);
+		copy_directory (icons_dir, settings.path);
 
 		write_wiki_pages (tree, css_path_wiki, Path.build_filename(settings.path, "content"));
 
diff --git a/src/doclets/valadoc.org/Makefile.am b/src/doclets/valadoc.org/Makefile.am
index c56d978..2d54836 100755
--- a/src/doclets/valadoc.org/Makefile.am
+++ b/src/doclets/valadoc.org/Makefile.am
@@ -11,7 +11,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 
 libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
-	$(VALAC) -C --vapidir ../htmlhelpers/doclet/ --pkg libhtmlhelpers-1.0 --vapidir ../../libvaladoc/ --vapidir ../../vapi/ --pkg valadoc-1.0 --pkg gee-1.0 --basedir . --save-temps $^
+	$(VALAC) -C --vapidir ../../libvaladoc/ --vapidir ../../vapi/ --pkg valadoc-1.0 --pkg gee-1.0 --basedir . --save-temps $^
 	touch $@
 
 
@@ -30,8 +30,8 @@ libdoclet_la_SOURCES = \
 
 
 AM_CFLAGS =  -g \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
-	-I ../htmlhelpers/doclet/ \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBVALA_CFLAGS) \
@@ -44,7 +44,6 @@ libdoclet_la_LDFLAGS = -module -avoid-version \
 
 libdoclet_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
-	../htmlhelpers/doclet/libhtmlhelpers.la \
 	$(GLIB_LIBS)  \
 	$(LIBGEE_LIBS) \
 	$(LIBVALA_LIBS) \
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 2764948..d6567ed 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -1,13 +1,14 @@
 NULL =
 
 
-AM_CFLAGS =             \
-	$(LIBGVC_CFLAGS)    \
-	$(LIBXML2_CFLAGS)   \
-	$(GLIB_CFLAGS)      \
-	$(LIBGEE_CFLAGS)    \
-	$(LIBVALA_CFLAGS)   \
-	$(GMODULE_CFLAGS)   \
+AM_CFLAGS = \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+	$(LIBGVC_CFLAGS) \
+	$(LIBXML2_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(LIBGEE_CFLAGS) \
+	$(LIBVALA_CFLAGS) \
+	$(GMODULE_CFLAGS) \
 	$(NULL)
 
 
@@ -113,6 +114,10 @@ libvaladoc_la_VALASOURCES = \
 	taglets/tagletsee.vala \
 	taglets/tagletsince.vala \
 	taglets/tagletthrows.vala \
+	html-doclet/html-doclet.vala \
+	html-doclet/html-globals.vala \
+	html-doclet/html-markupwriter.vala \
+	html-doclet/html-renderer.vala \
 	$(NULL)
 
 
diff --git a/src/libvaladoc/filehelper.vala b/src/libvaladoc/filehelper.vala
index 5efe9f7..a7b6f96 100755
--- a/src/libvaladoc/filehelper.vala
+++ b/src/libvaladoc/filehelper.vala
@@ -21,6 +21,9 @@ using Gee;
 
 
 namespace Valadoc {
+	[CCode (cprefix = "", cname = "PACKAGE_ICONDIR")]
+	public extern const string icons_dir;
+
 	public bool copy_file (string src, string dest) {
 		GLib.FileStream fsrc = GLib.FileStream.open (src, "rb");
 		if (fsrc == null) {
diff --git a/src/doclets/htmlhelpers/doclet/doclet.vala b/src/libvaladoc/html-doclet/html-doclet.vala
similarity index 99%
rename from src/doclets/htmlhelpers/doclet/doclet.vala
rename to src/libvaladoc/html-doclet/html-doclet.vala
index 262b68b..50a16d7 100755
--- a/src/doclets/htmlhelpers/doclet/doclet.vala
+++ b/src/libvaladoc/html-doclet/html-doclet.vala
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using GLib;
 using Valadoc.Content;
 using Valadoc.Api;
 
diff --git a/src/doclets/htmlhelpers/doclet/globals.vala b/src/libvaladoc/html-doclet/html-globals.vala
similarity index 100%
rename from src/doclets/htmlhelpers/doclet/globals.vala
rename to src/libvaladoc/html-doclet/html-globals.vala
diff --git a/src/doclets/htmlhelpers/doclet/markupwriter.vala b/src/libvaladoc/html-doclet/html-markupwriter.vala
similarity index 100%
rename from src/doclets/htmlhelpers/doclet/markupwriter.vala
rename to src/libvaladoc/html-doclet/html-markupwriter.vala
diff --git a/src/doclets/htmlhelpers/doclet/htmlrenderer.vala b/src/libvaladoc/html-doclet/html-renderer.vala
similarity index 100%
rename from src/doclets/htmlhelpers/doclet/htmlrenderer.vala
rename to src/libvaladoc/html-doclet/html-renderer.vala
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]