[gtksourceview] Move glade/ and gtksourceview/language-specs to data/

From: Garrett Regier <gregier src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtksourceview] Move glade/ and gtksourceview/language-specs to data/
Date: Tue, 18 May 2010 10:52:52 +0000 (UTC)
commit 5820b23bd9b18c23b24cf535dba2605c9423459d
Author: Garrett Regier <alias301 gmail com>
Date:   Mon May 17 15:39:02 2010 -0700

    Move glade/ and gtksourceview/language-specs to data/
    
    This also moves the styles from language-specs/ to styles/

 Makefile.am                                        |    7 +-
 configure.ac                                       |   32 ++--
 data/Makefile.am                                   |    5 +
 {glade => data/glade}/Makefile.am                  |    2 +
 {glade => data/glade}/gtksourceview-glade.xml      |    0
 {gtksourceview => data}/language-specs/Makefile.am |   17 +--
 {gtksourceview => data}/language-specs/R.lang      |    0
 {gtksourceview => data}/language-specs/ada.lang    |    0
 {gtksourceview => data}/language-specs/asp.lang    |    0
 {gtksourceview => data}/language-specs/awk.lang    |    0
 {gtksourceview => data}/language-specs/bibtex.lang |    0
 {gtksourceview => data}/language-specs/boo.lang    |    0
 {gtksourceview => data}/language-specs/c.lang      |    0
 {gtksourceview => data}/language-specs/cg.lang     |    0
 .../language-specs/changelog.lang                  |    0
 {gtksourceview => data}/language-specs/chdr.lang   |    0
 data/language-specs/check-language.sh              |   36 ++++
 {gtksourceview => data}/language-specs/cmake.lang  |    0
 {gtksourceview => data}/language-specs/convert.py  |    0
 {gtksourceview => data}/language-specs/convert.sh  |    0
 {gtksourceview => data}/language-specs/cpp.lang    |    0
 {gtksourceview => data}/language-specs/csharp.lang |    0
 {gtksourceview => data}/language-specs/css.lang    |    0
 {gtksourceview => data}/language-specs/cuda.lang   |    0
 {gtksourceview => data}/language-specs/d.lang      |    0
 {gtksourceview => data}/language-specs/def.lang    |    0
 .../language-specs/desktop.lang                    |    0
 {gtksourceview => data}/language-specs/diff.lang   |    0
 .../language-specs/docbook.lang                    |    0
 .../language-specs/dosbatch.lang                   |    0
 {gtksourceview => data}/language-specs/dot.lang    |    0
 {gtksourceview => data}/language-specs/dpatch.lang |    0
 {gtksourceview => data}/language-specs/dtd.lang    |    0
 {gtksourceview => data}/language-specs/eiffel.lang |    0
 {gtksourceview => data}/language-specs/erlang.lang |    0
 {gtksourceview => data}/language-specs/fcl.lang    |    0
 {gtksourceview => data}/language-specs/forth.lang  |    0
 .../language-specs/fortran.lang                    |    0
 {gtksourceview => data}/language-specs/fsharp.lang |    0
 {gtksourceview => data}/language-specs/gap.lang    |    0
 {gtksourceview => data}/language-specs/glsl.lang   |    0
 .../language-specs/gtk-doc.lang                    |    0
 {gtksourceview => data}/language-specs/gtkrc.lang  |    0
 .../language-specs/haddock.lang                    |    0
 .../language-specs/haskell-literate.lang           |    0
 .../language-specs/haskell.lang                    |    0
 {gtksourceview => data}/language-specs/html.lang   |    0
 {gtksourceview => data}/language-specs/idl.lang    |    0
 {gtksourceview => data}/language-specs/ini.lang    |    0
 {gtksourceview => data}/language-specs/java.lang   |    0
 .../language-specs/javascript.lang                 |    0
 .../language-specs/lang_v1_to_v2.xslt              |    0
 .../language-specs/language.dtd                    |    0
 .../language-specs/language.rng                    |    0
 .../language-specs/language2.rng                   |    0
 {gtksourceview => data}/language-specs/latex.lang  |    0
 .../language-specs/libtool.lang                    |    0
 {gtksourceview => data}/language-specs/lua.lang    |    0
 {gtksourceview => data}/language-specs/m4.lang     |    0
 .../language-specs/makefile.lang                   |    0
 .../language-specs/mallard.lang                    |    0
 {gtksourceview => data}/language-specs/msil.lang   |    0
 .../language-specs/nemerle.lang                    |    0
 {gtksourceview => data}/language-specs/nsis.lang   |    0
 {gtksourceview => data}/language-specs/objc.lang   |    0
 {gtksourceview => data}/language-specs/ocaml.lang  |    0
 {gtksourceview => data}/language-specs/ocl.lang    |    0
 {gtksourceview => data}/language-specs/octave.lang |    0
 {gtksourceview => data}/language-specs/ooc.lang    |    0
 {gtksourceview => data}/language-specs/pascal.lang |    0
 {gtksourceview => data}/language-specs/perl.lang   |    0
 {gtksourceview => data}/language-specs/php.lang    |    0
 .../language-specs/pkgconfig.lang                  |    0
 {gtksourceview => data}/language-specs/po.lang     |    0
 {gtksourceview => data}/language-specs/prolog.lang |    0
 {gtksourceview => data}/language-specs/python.lang |    0
 .../language-specs/rpmspec.lang                    |    0
 {gtksourceview => data}/language-specs/ruby.lang   |    0
 {gtksourceview => data}/language-specs/scheme.lang |    0
 {gtksourceview => data}/language-specs/sh.lang     |    0
 {gtksourceview => data}/language-specs/sparql.lang |    0
 {gtksourceview => data}/language-specs/sql.lang    |    0
 {gtksourceview => data}/language-specs/t2t.lang    |    0
 {gtksourceview => data}/language-specs/tcl.lang    |    0
 .../language-specs/testfiles.sh                    |    0
 {gtksourceview => data}/language-specs/testv1.lang |    0
 .../language-specs/texinfo.lang                    |    0
 {gtksourceview => data}/language-specs/ue2gsv.pl   |    0
 {gtksourceview => data}/language-specs/vala.lang   |    0
 {gtksourceview => data}/language-specs/vbnet.lang  |    0
 .../language-specs/verilog.lang                    |    0
 {gtksourceview => data}/language-specs/vhdl.lang   |    0
 {gtksourceview => data}/language-specs/xml.lang    |    0
 {gtksourceview => data}/language-specs/xslt.lang   |    0
 {gtksourceview => data}/language-specs/yacc.lang   |    0
 data/styles/Makefile.am                            |   15 ++
 data/styles/check-style.sh                         |   20 +++
 .../language-specs => data/styles}/classic.xml     |    0
 .../language-specs => data/styles}/cobalt.xml      |    0
 .../language-specs => data/styles}/kate.xml        |    0
 .../language-specs => data/styles}/oblivion.xml    |    0
 .../language-specs => data/styles}/styles.rng      |    0
 .../language-specs => data/styles}/tango.xml       |    0
 .../language-specs => data/styles}/testdark.xml    |    0
 gtksourceview/Makefile.am                          |    4 +-
 gtksourceview/language-specs/check.sh              |   41 -----
 po/POTFILES.in                                     |  171 ++++++++++----------
 po/POTFILES.skip                                   |    2 +-
 108 files changed, 186 insertions(+), 166 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b420fc7..270ed4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,6 @@
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
 
-if GLADE_CATALOG
-glade_subdir = glade
-else
-glade_subdir =
-endif
-SUBDIRS = gtksourceview po docs tests $(glade_subdir)
+SUBDIRS = gtksourceview po data docs tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtksourceview-2.0.pc
diff --git a/configure.ac b/configure.ac
index e080732..3f52574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ AC_ARG_ENABLE(providers,
 	    		   [Enable building completion providers (words)]),,
 	    enable_providers=yes)
 
-AM_CONDITIONAL(ENABLE_PROVIDERS, test "x$enable_providers" = "xyes")
+AM_CONDITIONAL([ENABLE_PROVIDERS], [ test "$enable_providers" = "yes" ])
 
 dnl check for native osx
 AC_MSG_CHECKING([for native Mac OS X])
@@ -81,10 +81,10 @@ else
 	os_osx=no
 fi
 AC_MSG_RESULT([$os_osx])
-AM_CONDITIONAL(OS_OSX, test "$os_osx" = "yes")
+AM_CONDITIONAL([OS_OSX], [ test "$os_osx" = "yes" ])
 
 if test "$os_osx" = "yes"; then
-	AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX])
+	AC_DEFINE([OS_OSX], [1], [Defined if os is Mac OSX])
 
 	PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
 fi
@@ -96,9 +96,9 @@ AC_ARG_ENABLE([glade-catalog],
 	[glade_catalog=$enableval],
 	[glade_catalog=no])
 
-AM_CONDITIONAL([GLADE_CATALOG], [test "x$glade_catalog" = xyes])
+AM_CONDITIONAL([GLADE_CATALOG], [ test "$glade_catalog" = "yes" ])
 
-AS_IF([test "x$glade_catalog" = xyes],
+AS_IF([ test "$glade_catalog" = "yes" ],
 	[PKG_CHECK_EXISTS(GLADE, [gladeui-1.0 >= $GLADE_UI_REQUIRED])
 	 AC_MSG_CHECKING([for Glade catalog dir])
 	 GLADE_CATALOGDIR=`$PKG_CONFIG --variable=catalogdir gladeui-1.0 2>&AS_MESSAGE_LOG_FD`
@@ -114,26 +114,28 @@ AM_GLIB_GNU_GETTEXT
 AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
 
 # Documentation
-GTK_DOC_CHECK([1.11],[--flavour=no-tmpl])
+GTK_DOC_CHECK([1.11], [--flavour=no-tmpl])
 
-# test-widget uses this to find lang files and gtksourcebuffer.c 	 
-ABS_TOP_SRCDIR=`cd $srcdir && pwd` 	 
+# test-widget uses this to find lang files and gtksourcebuffer.c
+ABS_TOP_SRCDIR=`cd $srcdir && pwd`
 AC_SUBST(ABS_TOP_SRCDIR)
 
 # Output files
 AC_CONFIG_FILES([
 gtksourceview-2.0.pc
-Makefile
 gtksourceview-zip
-po/Makefile.in
-gtksourceview/Makefile
-gtksourceview/completion-providers/Makefile
-gtksourceview/completion-providers/words/Makefile
-gtksourceview/language-specs/Makefile
+Makefile
+data/Makefile
+data/glade/Makefile
+data/language-specs/Makefile
+data/styles/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
-glade/Makefile
+gtksourceview/Makefile
+gtksourceview/completion-providers/Makefile
+gtksourceview/completion-providers/words/Makefile
+po/Makefile.in
 tests/Makefile
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..cc87798
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = language-specs styles
+
+if GLADE_CATALOG
+SUBDIRS += glade
+endif
diff --git a/glade/Makefile.am b/data/glade/Makefile.am
similarity index 71%
rename from glade/Makefile.am
rename to data/glade/Makefile.am
index a68f773..cc48784 100644
--- a/glade/Makefile.am
+++ b/data/glade/Makefile.am
@@ -1,2 +1,4 @@
 catalogdir = $(GLADE_CATALOGDIR)
 dist_catalog_DATA = gtksourceview-glade.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/glade/gtksourceview-glade.xml b/data/glade/gtksourceview-glade.xml
similarity index 100%
rename from glade/gtksourceview-glade.xml
rename to data/glade/gtksourceview-glade.xml
diff --git a/gtksourceview/language-specs/Makefile.am b/data/language-specs/Makefile.am
similarity index 83%
rename from gtksourceview/language-specs/Makefile.am
rename to data/language-specs/Makefile.am
index 7b06c20..2c0de49 100644
--- a/gtksourceview/language-specs/Makefile.am
+++ b/data/language-specs/Makefile.am
@@ -1,4 +1,4 @@
-TESTS = check.sh
+TESTS = check-language.sh
 
 LANGUAGES =			\
 	ada.lang		\
@@ -70,7 +70,6 @@ LANGUAGES =			\
 	sh.lang			\
 	sparql.lang		\
 	sql.lang		\
-	styles.rng		\
 	t2t.lang		\
 	tcl.lang		\
 	texinfo.lang		\
@@ -82,20 +81,10 @@ LANGUAGES =			\
 	xslt.lang		\
 	yacc.lang
 
-STYLES =			\
-	classic.xml		\
-	cobalt.xml		\
-	kate.xml		\
-	oblivion.xml		\
-	tango.xml
-
 languagesdir = $(datadir)/gtksourceview-2.0/language-specs
 languages_DATA = $(LANGUAGES) language.rng language2.rng language.dtd \
-		 check.sh convert.py
-
-stylesdir = $(datadir)/gtksourceview-2.0/styles
-styles_DATA = $(STYLES) styles.rng
+		 check-language.sh convert.py
 
-EXTRA_DIST = $(languages_DATA) $(styles_DATA)
+EXTRA_DIST = $(languages_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/gtksourceview/language-specs/R.lang b/data/language-specs/R.lang
similarity index 100%
rename from gtksourceview/language-specs/R.lang
rename to data/language-specs/R.lang
diff --git a/gtksourceview/language-specs/ada.lang b/data/language-specs/ada.lang
similarity index 100%
rename from gtksourceview/language-specs/ada.lang
rename to data/language-specs/ada.lang
diff --git a/gtksourceview/language-specs/asp.lang b/data/language-specs/asp.lang
similarity index 100%
rename from gtksourceview/language-specs/asp.lang
rename to data/language-specs/asp.lang
diff --git a/gtksourceview/language-specs/awk.lang b/data/language-specs/awk.lang
similarity index 100%
rename from gtksourceview/language-specs/awk.lang
rename to data/language-specs/awk.lang
diff --git a/gtksourceview/language-specs/bibtex.lang b/data/language-specs/bibtex.lang
similarity index 100%
rename from gtksourceview/language-specs/bibtex.lang
rename to data/language-specs/bibtex.lang
diff --git a/gtksourceview/language-specs/boo.lang b/data/language-specs/boo.lang
similarity index 100%
rename from gtksourceview/language-specs/boo.lang
rename to data/language-specs/boo.lang
diff --git a/gtksourceview/language-specs/c.lang b/data/language-specs/c.lang
similarity index 100%
rename from gtksourceview/language-specs/c.lang
rename to data/language-specs/c.lang
diff --git a/gtksourceview/language-specs/cg.lang b/data/language-specs/cg.lang
similarity index 100%
rename from gtksourceview/language-specs/cg.lang
rename to data/language-specs/cg.lang
diff --git a/gtksourceview/language-specs/changelog.lang b/data/language-specs/changelog.lang
similarity index 100%
rename from gtksourceview/language-specs/changelog.lang
rename to data/language-specs/changelog.lang
diff --git a/gtksourceview/language-specs/chdr.lang b/data/language-specs/chdr.lang
similarity index 100%
rename from gtksourceview/language-specs/chdr.lang
rename to data/language-specs/chdr.lang
diff --git a/data/language-specs/check-language.sh b/data/language-specs/check-language.sh
new file mode 100755
index 0000000..a7f5889
--- /dev/null
+++ b/data/language-specs/check-language.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# "./check.sh files..." will validate files given on command line.
+# "./check.sh" without arguments will validate all language files
+# in the source directory
+
+check_file() {
+  case $1 in
+  testv1.lang) ;; # skip test file for old format
+  *)
+    xmllint --relaxng language2.rng --noout $1 || exit 1
+    ;;
+  esac
+}
+
+files=""
+
+if [ $1 ]; then
+  files=$@
+else
+  if [ "$srcdir" ]; then
+    cd $srcdir
+  fi
+
+  for lang in *.lang; do
+    case $lang in
+      msil.lang) ;;
+      *)
+        files="$files $lang"
+        ;;
+    esac
+  done
+fi
+
+for file in $files; do
+  check_file $file
+done
diff --git a/gtksourceview/language-specs/cmake.lang b/data/language-specs/cmake.lang
similarity index 100%
rename from gtksourceview/language-specs/cmake.lang
rename to data/language-specs/cmake.lang
diff --git a/gtksourceview/language-specs/convert.py b/data/language-specs/convert.py
similarity index 100%
rename from gtksourceview/language-specs/convert.py
rename to data/language-specs/convert.py
diff --git a/gtksourceview/language-specs/convert.sh b/data/language-specs/convert.sh
similarity index 100%
rename from gtksourceview/language-specs/convert.sh
rename to data/language-specs/convert.sh
diff --git a/gtksourceview/language-specs/cpp.lang b/data/language-specs/cpp.lang
similarity index 100%
rename from gtksourceview/language-specs/cpp.lang
rename to data/language-specs/cpp.lang
diff --git a/gtksourceview/language-specs/csharp.lang b/data/language-specs/csharp.lang
similarity index 100%
rename from gtksourceview/language-specs/csharp.lang
rename to data/language-specs/csharp.lang
diff --git a/gtksourceview/language-specs/css.lang b/data/language-specs/css.lang
similarity index 100%
rename from gtksourceview/language-specs/css.lang
rename to data/language-specs/css.lang
diff --git a/gtksourceview/language-specs/cuda.lang b/data/language-specs/cuda.lang
similarity index 100%
rename from gtksourceview/language-specs/cuda.lang
rename to data/language-specs/cuda.lang
diff --git a/gtksourceview/language-specs/d.lang b/data/language-specs/d.lang
similarity index 100%
rename from gtksourceview/language-specs/d.lang
rename to data/language-specs/d.lang
diff --git a/gtksourceview/language-specs/def.lang b/data/language-specs/def.lang
similarity index 100%
rename from gtksourceview/language-specs/def.lang
rename to data/language-specs/def.lang
diff --git a/gtksourceview/language-specs/desktop.lang b/data/language-specs/desktop.lang
similarity index 100%
rename from gtksourceview/language-specs/desktop.lang
rename to data/language-specs/desktop.lang
diff --git a/gtksourceview/language-specs/diff.lang b/data/language-specs/diff.lang
similarity index 100%
rename from gtksourceview/language-specs/diff.lang
rename to data/language-specs/diff.lang
diff --git a/gtksourceview/language-specs/docbook.lang b/data/language-specs/docbook.lang
similarity index 100%
rename from gtksourceview/language-specs/docbook.lang
rename to data/language-specs/docbook.lang
diff --git a/gtksourceview/language-specs/dosbatch.lang b/data/language-specs/dosbatch.lang
similarity index 100%
rename from gtksourceview/language-specs/dosbatch.lang
rename to data/language-specs/dosbatch.lang
diff --git a/gtksourceview/language-specs/dot.lang b/data/language-specs/dot.lang
similarity index 100%
rename from gtksourceview/language-specs/dot.lang
rename to data/language-specs/dot.lang
diff --git a/gtksourceview/language-specs/dpatch.lang b/data/language-specs/dpatch.lang
similarity index 100%
rename from gtksourceview/language-specs/dpatch.lang
rename to data/language-specs/dpatch.lang
diff --git a/gtksourceview/language-specs/dtd.lang b/data/language-specs/dtd.lang
similarity index 100%
rename from gtksourceview/language-specs/dtd.lang
rename to data/language-specs/dtd.lang
diff --git a/gtksourceview/language-specs/eiffel.lang b/data/language-specs/eiffel.lang
similarity index 100%
rename from gtksourceview/language-specs/eiffel.lang
rename to data/language-specs/eiffel.lang
diff --git a/gtksourceview/language-specs/erlang.lang b/data/language-specs/erlang.lang
similarity index 100%
rename from gtksourceview/language-specs/erlang.lang
rename to data/language-specs/erlang.lang
diff --git a/gtksourceview/language-specs/fcl.lang b/data/language-specs/fcl.lang
similarity index 100%
rename from gtksourceview/language-specs/fcl.lang
rename to data/language-specs/fcl.lang
diff --git a/gtksourceview/language-specs/forth.lang b/data/language-specs/forth.lang
similarity index 100%
rename from gtksourceview/language-specs/forth.lang
rename to data/language-specs/forth.lang
diff --git a/gtksourceview/language-specs/fortran.lang b/data/language-specs/fortran.lang
similarity index 100%
rename from gtksourceview/language-specs/fortran.lang
rename to data/language-specs/fortran.lang
diff --git a/gtksourceview/language-specs/fsharp.lang b/data/language-specs/fsharp.lang
similarity index 100%
rename from gtksourceview/language-specs/fsharp.lang
rename to data/language-specs/fsharp.lang
diff --git a/gtksourceview/language-specs/gap.lang b/data/language-specs/gap.lang
similarity index 100%
rename from gtksourceview/language-specs/gap.lang
rename to data/language-specs/gap.lang
diff --git a/gtksourceview/language-specs/glsl.lang b/data/language-specs/glsl.lang
similarity index 100%
rename from gtksourceview/language-specs/glsl.lang
rename to data/language-specs/glsl.lang
diff --git a/gtksourceview/language-specs/gtk-doc.lang b/data/language-specs/gtk-doc.lang
similarity index 100%
rename from gtksourceview/language-specs/gtk-doc.lang
rename to data/language-specs/gtk-doc.lang
diff --git a/gtksourceview/language-specs/gtkrc.lang b/data/language-specs/gtkrc.lang
similarity index 100%
rename from gtksourceview/language-specs/gtkrc.lang
rename to data/language-specs/gtkrc.lang
diff --git a/gtksourceview/language-specs/haddock.lang b/data/language-specs/haddock.lang
similarity index 100%
rename from gtksourceview/language-specs/haddock.lang
rename to data/language-specs/haddock.lang
diff --git a/gtksourceview/language-specs/haskell-literate.lang b/data/language-specs/haskell-literate.lang
similarity index 100%
rename from gtksourceview/language-specs/haskell-literate.lang
rename to data/language-specs/haskell-literate.lang
diff --git a/gtksourceview/language-specs/haskell.lang b/data/language-specs/haskell.lang
similarity index 100%
rename from gtksourceview/language-specs/haskell.lang
rename to data/language-specs/haskell.lang
diff --git a/gtksourceview/language-specs/html.lang b/data/language-specs/html.lang
similarity index 100%
rename from gtksourceview/language-specs/html.lang
rename to data/language-specs/html.lang
diff --git a/gtksourceview/language-specs/idl.lang b/data/language-specs/idl.lang
similarity index 100%
rename from gtksourceview/language-specs/idl.lang
rename to data/language-specs/idl.lang
diff --git a/gtksourceview/language-specs/ini.lang b/data/language-specs/ini.lang
similarity index 100%
rename from gtksourceview/language-specs/ini.lang
rename to data/language-specs/ini.lang
diff --git a/gtksourceview/language-specs/java.lang b/data/language-specs/java.lang
similarity index 100%
rename from gtksourceview/language-specs/java.lang
rename to data/language-specs/java.lang
diff --git a/gtksourceview/language-specs/javascript.lang b/data/language-specs/javascript.lang
similarity index 100%
rename from gtksourceview/language-specs/javascript.lang
rename to data/language-specs/javascript.lang
diff --git a/gtksourceview/language-specs/lang_v1_to_v2.xslt b/data/language-specs/lang_v1_to_v2.xslt
similarity index 100%
rename from gtksourceview/language-specs/lang_v1_to_v2.xslt
rename to data/language-specs/lang_v1_to_v2.xslt
diff --git a/gtksourceview/language-specs/language.dtd b/data/language-specs/language.dtd
similarity index 100%
rename from gtksourceview/language-specs/language.dtd
rename to data/language-specs/language.dtd
diff --git a/gtksourceview/language-specs/language.rng b/data/language-specs/language.rng
similarity index 100%
rename from gtksourceview/language-specs/language.rng
rename to data/language-specs/language.rng
diff --git a/gtksourceview/language-specs/language2.rng b/data/language-specs/language2.rng
similarity index 100%
rename from gtksourceview/language-specs/language2.rng
rename to data/language-specs/language2.rng
diff --git a/gtksourceview/language-specs/latex.lang b/data/language-specs/latex.lang
similarity index 100%
rename from gtksourceview/language-specs/latex.lang
rename to data/language-specs/latex.lang
diff --git a/gtksourceview/language-specs/libtool.lang b/data/language-specs/libtool.lang
similarity index 100%
rename from gtksourceview/language-specs/libtool.lang
rename to data/language-specs/libtool.lang
diff --git a/gtksourceview/language-specs/lua.lang b/data/language-specs/lua.lang
similarity index 100%
rename from gtksourceview/language-specs/lua.lang
rename to data/language-specs/lua.lang
diff --git a/gtksourceview/language-specs/m4.lang b/data/language-specs/m4.lang
similarity index 100%
rename from gtksourceview/language-specs/m4.lang
rename to data/language-specs/m4.lang
diff --git a/gtksourceview/language-specs/makefile.lang b/data/language-specs/makefile.lang
similarity index 100%
rename from gtksourceview/language-specs/makefile.lang
rename to data/language-specs/makefile.lang
diff --git a/gtksourceview/language-specs/mallard.lang b/data/language-specs/mallard.lang
similarity index 100%
rename from gtksourceview/language-specs/mallard.lang
rename to data/language-specs/mallard.lang
diff --git a/gtksourceview/language-specs/msil.lang b/data/language-specs/msil.lang
similarity index 100%
rename from gtksourceview/language-specs/msil.lang
rename to data/language-specs/msil.lang
diff --git a/gtksourceview/language-specs/nemerle.lang b/data/language-specs/nemerle.lang
similarity index 100%
rename from gtksourceview/language-specs/nemerle.lang
rename to data/language-specs/nemerle.lang
diff --git a/gtksourceview/language-specs/nsis.lang b/data/language-specs/nsis.lang
similarity index 100%
rename from gtksourceview/language-specs/nsis.lang
rename to data/language-specs/nsis.lang
diff --git a/gtksourceview/language-specs/objc.lang b/data/language-specs/objc.lang
similarity index 100%
rename from gtksourceview/language-specs/objc.lang
rename to data/language-specs/objc.lang
diff --git a/gtksourceview/language-specs/ocaml.lang b/data/language-specs/ocaml.lang
similarity index 100%
rename from gtksourceview/language-specs/ocaml.lang
rename to data/language-specs/ocaml.lang
diff --git a/gtksourceview/language-specs/ocl.lang b/data/language-specs/ocl.lang
similarity index 100%
rename from gtksourceview/language-specs/ocl.lang
rename to data/language-specs/ocl.lang
diff --git a/gtksourceview/language-specs/octave.lang b/data/language-specs/octave.lang
similarity index 100%
rename from gtksourceview/language-specs/octave.lang
rename to data/language-specs/octave.lang
diff --git a/gtksourceview/language-specs/ooc.lang b/data/language-specs/ooc.lang
similarity index 100%
rename from gtksourceview/language-specs/ooc.lang
rename to data/language-specs/ooc.lang
diff --git a/gtksourceview/language-specs/pascal.lang b/data/language-specs/pascal.lang
similarity index 100%
rename from gtksourceview/language-specs/pascal.lang
rename to data/language-specs/pascal.lang
diff --git a/gtksourceview/language-specs/perl.lang b/data/language-specs/perl.lang
similarity index 100%
rename from gtksourceview/language-specs/perl.lang
rename to data/language-specs/perl.lang
diff --git a/gtksourceview/language-specs/php.lang b/data/language-specs/php.lang
similarity index 100%
rename from gtksourceview/language-specs/php.lang
rename to data/language-specs/php.lang
diff --git a/gtksourceview/language-specs/pkgconfig.lang b/data/language-specs/pkgconfig.lang
similarity index 100%
rename from gtksourceview/language-specs/pkgconfig.lang
rename to data/language-specs/pkgconfig.lang
diff --git a/gtksourceview/language-specs/po.lang b/data/language-specs/po.lang
similarity index 100%
rename from gtksourceview/language-specs/po.lang
rename to data/language-specs/po.lang
diff --git a/gtksourceview/language-specs/prolog.lang b/data/language-specs/prolog.lang
similarity index 100%
rename from gtksourceview/language-specs/prolog.lang
rename to data/language-specs/prolog.lang
diff --git a/gtksourceview/language-specs/python.lang b/data/language-specs/python.lang
similarity index 100%
rename from gtksourceview/language-specs/python.lang
rename to data/language-specs/python.lang
diff --git a/gtksourceview/language-specs/rpmspec.lang b/data/language-specs/rpmspec.lang
similarity index 100%
rename from gtksourceview/language-specs/rpmspec.lang
rename to data/language-specs/rpmspec.lang
diff --git a/gtksourceview/language-specs/ruby.lang b/data/language-specs/ruby.lang
similarity index 100%
rename from gtksourceview/language-specs/ruby.lang
rename to data/language-specs/ruby.lang
diff --git a/gtksourceview/language-specs/scheme.lang b/data/language-specs/scheme.lang
similarity index 100%
rename from gtksourceview/language-specs/scheme.lang
rename to data/language-specs/scheme.lang
diff --git a/gtksourceview/language-specs/sh.lang b/data/language-specs/sh.lang
similarity index 100%
rename from gtksourceview/language-specs/sh.lang
rename to data/language-specs/sh.lang
diff --git a/gtksourceview/language-specs/sparql.lang b/data/language-specs/sparql.lang
similarity index 100%
rename from gtksourceview/language-specs/sparql.lang
rename to data/language-specs/sparql.lang
diff --git a/gtksourceview/language-specs/sql.lang b/data/language-specs/sql.lang
similarity index 100%
rename from gtksourceview/language-specs/sql.lang
rename to data/language-specs/sql.lang
diff --git a/gtksourceview/language-specs/t2t.lang b/data/language-specs/t2t.lang
similarity index 100%
rename from gtksourceview/language-specs/t2t.lang
rename to data/language-specs/t2t.lang
diff --git a/gtksourceview/language-specs/tcl.lang b/data/language-specs/tcl.lang
similarity index 100%
rename from gtksourceview/language-specs/tcl.lang
rename to data/language-specs/tcl.lang
diff --git a/gtksourceview/language-specs/testfiles.sh b/data/language-specs/testfiles.sh
similarity index 100%
rename from gtksourceview/language-specs/testfiles.sh
rename to data/language-specs/testfiles.sh
diff --git a/gtksourceview/language-specs/testv1.lang b/data/language-specs/testv1.lang
similarity index 100%
rename from gtksourceview/language-specs/testv1.lang
rename to data/language-specs/testv1.lang
diff --git a/gtksourceview/language-specs/texinfo.lang b/data/language-specs/texinfo.lang
similarity index 100%
rename from gtksourceview/language-specs/texinfo.lang
rename to data/language-specs/texinfo.lang
diff --git a/gtksourceview/language-specs/ue2gsv.pl b/data/language-specs/ue2gsv.pl
similarity index 100%
rename from gtksourceview/language-specs/ue2gsv.pl
rename to data/language-specs/ue2gsv.pl
diff --git a/gtksourceview/language-specs/vala.lang b/data/language-specs/vala.lang
similarity index 100%
rename from gtksourceview/language-specs/vala.lang
rename to data/language-specs/vala.lang
diff --git a/gtksourceview/language-specs/vbnet.lang b/data/language-specs/vbnet.lang
similarity index 100%
rename from gtksourceview/language-specs/vbnet.lang
rename to data/language-specs/vbnet.lang
diff --git a/gtksourceview/language-specs/verilog.lang b/data/language-specs/verilog.lang
similarity index 100%
rename from gtksourceview/language-specs/verilog.lang
rename to data/language-specs/verilog.lang
diff --git a/gtksourceview/language-specs/vhdl.lang b/data/language-specs/vhdl.lang
similarity index 100%
rename from gtksourceview/language-specs/vhdl.lang
rename to data/language-specs/vhdl.lang
diff --git a/gtksourceview/language-specs/xml.lang b/data/language-specs/xml.lang
similarity index 100%
rename from gtksourceview/language-specs/xml.lang
rename to data/language-specs/xml.lang
diff --git a/gtksourceview/language-specs/xslt.lang b/data/language-specs/xslt.lang
similarity index 100%
rename from gtksourceview/language-specs/xslt.lang
rename to data/language-specs/xslt.lang
diff --git a/gtksourceview/language-specs/yacc.lang b/data/language-specs/yacc.lang
similarity index 100%
rename from gtksourceview/language-specs/yacc.lang
rename to data/language-specs/yacc.lang
diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
new file mode 100644
index 0000000..2e0043c
--- /dev/null
+++ b/data/styles/Makefile.am
@@ -0,0 +1,15 @@
+TESTS = check-style.sh
+
+STYLES =		\
+	classic.xml	\
+	cobalt.xml	\
+	kate.xml	\
+	oblivion.xml	\
+	tango.xml
+
+stylesdir = $(datadir)/gtksourceview-2.0/styles
+styles_DATA = $(STYLES) styles.rng
+
+EXTRA_DIST = $(styles_DATA) check-style.sh
+
+-include $(top_srcdir)/git.mk
diff --git a/data/styles/check-style.sh b/data/styles/check-style.sh
new file mode 100755
index 0000000..9ff8e71
--- /dev/null
+++ b/data/styles/check-style.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# "./check.sh files..." will validate files given on command line.
+# "./check.sh" without arguments will validate all style files
+# in the source directory
+
+check_file() {
+  xmllint --relaxng styles.rng --noout $1 || exit 1
+}
+
+files=""
+
+if [ $1 ]; then
+  files=$@
+else
+  files=*.xml
+fi
+
+for file in $files; do
+  check_file $file
+done
diff --git a/gtksourceview/language-specs/classic.xml b/data/styles/classic.xml
similarity index 100%
rename from gtksourceview/language-specs/classic.xml
rename to data/styles/classic.xml
diff --git a/gtksourceview/language-specs/cobalt.xml b/data/styles/cobalt.xml
similarity index 100%
rename from gtksourceview/language-specs/cobalt.xml
rename to data/styles/cobalt.xml
diff --git a/gtksourceview/language-specs/kate.xml b/data/styles/kate.xml
similarity index 100%
rename from gtksourceview/language-specs/kate.xml
rename to data/styles/kate.xml
diff --git a/gtksourceview/language-specs/oblivion.xml b/data/styles/oblivion.xml
similarity index 100%
rename from gtksourceview/language-specs/oblivion.xml
rename to data/styles/oblivion.xml
diff --git a/gtksourceview/language-specs/styles.rng b/data/styles/styles.rng
similarity index 100%
rename from gtksourceview/language-specs/styles.rng
rename to data/styles/styles.rng
diff --git a/gtksourceview/language-specs/tango.xml b/data/styles/tango.xml
similarity index 100%
rename from gtksourceview/language-specs/tango.xml
rename to data/styles/tango.xml
diff --git a/gtksourceview/language-specs/testdark.xml b/data/styles/testdark.xml
similarity index 100%
rename from gtksourceview/language-specs/testdark.xml
rename to data/styles/testdark.xml
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index e1911a5..78381fb 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -1,7 +1,5 @@
-SUBDIRS = language-specs
-
 if ENABLE_PROVIDERS
-SUBDIRS += completion-providers
+SUBDIRS = completion-providers
 endif
 
 INCLUDES = 				\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eae54b7..806c861 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,88 @@
+data/styles/classic.xml
+data/styles/cobalt.xml
+data/styles/kate.xml
+data/styles/oblivion.xml
+data/styles/tango.xml
+data/language-specs/ada.lang
+data/language-specs/asp.lang
+data/language-specs/awk.lang
+data/language-specs/bibtex.lang
+data/language-specs/boo.lang
+data/language-specs/changelog.lang
+data/language-specs/chdr.lang
+data/language-specs/c.lang
+data/language-specs/cg.lang
+data/language-specs/cmake.lang
+data/language-specs/cpp.lang
+data/language-specs/csharp.lang
+data/language-specs/css.lang
+data/language-specs/cuda.lang
+data/language-specs/def.lang
+data/language-specs/desktop.lang
+data/language-specs/diff.lang
+data/language-specs/d.lang
+data/language-specs/docbook.lang
+data/language-specs/dosbatch.lang
+data/language-specs/dot.lang
+data/language-specs/dpatch.lang
+data/language-specs/dtd.lang
+data/language-specs/eiffel.lang
+data/language-specs/erlang.lang
+data/language-specs/fcl.lang
+data/language-specs/forth.lang
+data/language-specs/fortran.lang
+data/language-specs/fsharp.lang
+data/language-specs/gap.lang
+data/language-specs/glsl.lang
+data/language-specs/gtk-doc.lang
+data/language-specs/gtkrc.lang
+data/language-specs/haddock.lang
+data/language-specs/haskell.lang
+data/language-specs/haskell-literate.lang
+data/language-specs/html.lang
+data/language-specs/idl.lang
+data/language-specs/ini.lang
+data/language-specs/java.lang
+data/language-specs/javascript.lang
+data/language-specs/latex.lang
+data/language-specs/libtool.lang
+data/language-specs/lua.lang
+data/language-specs/m4.lang
+data/language-specs/makefile.lang
+data/language-specs/mallard.lang
+data/language-specs/msil.lang
+data/language-specs/msil.lang
+data/language-specs/nemerle.lang
+data/language-specs/nsis.lang
+data/language-specs/objc.lang
+data/language-specs/ocaml.lang
+data/language-specs/ocl.lang
+data/language-specs/octave.lang
+data/language-specs/ooc.lang
+data/language-specs/pascal.lang
+data/language-specs/perl.lang
+data/language-specs/php.lang
+data/language-specs/pkgconfig.lang
+data/language-specs/po.lang
+data/language-specs/prolog.lang
+data/language-specs/python.lang
+data/language-specs/R.lang
+data/language-specs/rpmspec.lang
+data/language-specs/ruby.lang
+data/language-specs/scheme.lang
+data/language-specs/sh.lang
+data/language-specs/sparql.lang
+data/language-specs/sql.lang
+data/language-specs/t2t.lang
+data/language-specs/tcl.lang
+data/language-specs/texinfo.lang
+data/language-specs/vala.lang
+data/language-specs/vbnet.lang
+data/language-specs/verilog.lang
+data/language-specs/vhdl.lang
+data/language-specs/xml.lang
+data/language-specs/xslt.lang
+data/language-specs/yacc.lang
 gtksourceview/completion-providers/words/gtksourcecompletionwords.c
 gtksourceview/gtksourcebuffer.c
 gtksourceview/gtksourcecompletion.c
@@ -17,89 +102,3 @@ gtksourceview/gtksourcestyleschememanager.c
 gtksourceview/gtksourceundomanagerdefault.c
 gtksourceview/gtksourceview.c
 gtksourceview/gtksourceview-i18n.c
-gtksourceview/language-specs/ada.lang
-gtksourceview/language-specs/asp.lang
-gtksourceview/language-specs/awk.lang
-gtksourceview/language-specs/bibtex.lang
-gtksourceview/language-specs/boo.lang
-gtksourceview/language-specs/changelog.lang
-gtksourceview/language-specs/chdr.lang
-gtksourceview/language-specs/c.lang
-gtksourceview/language-specs/cg.lang
-gtksourceview/language-specs/classic.xml
-gtksourceview/language-specs/cmake.lang
-gtksourceview/language-specs/cobalt.xml
-gtksourceview/language-specs/cpp.lang
-gtksourceview/language-specs/csharp.lang
-gtksourceview/language-specs/css.lang
-gtksourceview/language-specs/cuda.lang
-gtksourceview/language-specs/def.lang
-gtksourceview/language-specs/desktop.lang
-gtksourceview/language-specs/diff.lang
-gtksourceview/language-specs/d.lang
-gtksourceview/language-specs/docbook.lang
-gtksourceview/language-specs/dosbatch.lang
-gtksourceview/language-specs/dot.lang
-gtksourceview/language-specs/dpatch.lang
-gtksourceview/language-specs/dtd.lang
-gtksourceview/language-specs/eiffel.lang
-gtksourceview/language-specs/erlang.lang
-gtksourceview/language-specs/fcl.lang
-gtksourceview/language-specs/forth.lang
-gtksourceview/language-specs/fortran.lang
-gtksourceview/language-specs/fsharp.lang
-gtksourceview/language-specs/gap.lang
-gtksourceview/language-specs/glsl.lang
-gtksourceview/language-specs/gtk-doc.lang
-gtksourceview/language-specs/gtkrc.lang
-gtksourceview/language-specs/haddock.lang
-gtksourceview/language-specs/haskell.lang
-gtksourceview/language-specs/haskell-literate.lang
-gtksourceview/language-specs/html.lang
-gtksourceview/language-specs/idl.lang
-gtksourceview/language-specs/ini.lang
-gtksourceview/language-specs/java.lang
-gtksourceview/language-specs/javascript.lang
-gtksourceview/language-specs/kate.xml
-gtksourceview/language-specs/latex.lang
-gtksourceview/language-specs/libtool.lang
-gtksourceview/language-specs/lua.lang
-gtksourceview/language-specs/m4.lang
-gtksourceview/language-specs/makefile.lang
-gtksourceview/language-specs/mallard.lang
-gtksourceview/language-specs/msil.lang
-gtksourceview/language-specs/msil.lang
-gtksourceview/language-specs/nemerle.lang
-gtksourceview/language-specs/nsis.lang
-gtksourceview/language-specs/objc.lang
-gtksourceview/language-specs/oblivion.xml
-gtksourceview/language-specs/ocaml.lang
-gtksourceview/language-specs/ocl.lang
-gtksourceview/language-specs/octave.lang
-gtksourceview/language-specs/ooc.lang
-gtksourceview/language-specs/pascal.lang
-gtksourceview/language-specs/perl.lang
-gtksourceview/language-specs/php.lang
-gtksourceview/language-specs/pkgconfig.lang
-gtksourceview/language-specs/po.lang
-gtksourceview/language-specs/prolog.lang
-gtksourceview/language-specs/python.lang
-gtksourceview/language-specs/R.lang
-gtksourceview/language-specs/rpmspec.lang
-gtksourceview/language-specs/ruby.lang
-gtksourceview/language-specs/scheme.lang
-gtksourceview/language-specs/sh.lang
-gtksourceview/language-specs/sparql.lang
-gtksourceview/language-specs/sql.lang
-gtksourceview/language-specs/t2t.lang
-gtksourceview/language-specs/tango.xml
-gtksourceview/language-specs/tcl.lang
-gtksourceview/language-specs/texinfo.lang
-gtksourceview/language-specs/vala.lang
-gtksourceview/language-specs/vbnet.lang
-gtksourceview/language-specs/verilog.lang
-gtksourceview/language-specs/vhdl.lang
-gtksourceview/language-specs/xml.lang
-gtksourceview/language-specs/xslt.lang
-gtksourceview/language-specs/yacc.lang
-
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e7ffc48..e7376ca 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,3 @@
-gtksourceview/language-specs/testdark.xml
+data/styles/testdark.xml
 gtksourceview/regex/glib/gregex.c
 tests/test-scheme.xml
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]