[libpeas] Merge test plugins extension-gjs and extension-seed

[Garrett Regier <gregier src gnome org>]

commit 8a8345f2b967c04ee9ea85a29699005687ad50ee
Author: Garrett Regier <garrettregier gmail com>
Date:   Mon Sep 19 21:05:56 2011 -0700

    Merge test plugins extension-gjs and extension-seed

 .gitignore                                         |    4 +++
 configure.ac                                       |    4 +-
 tests/libpeas/plugins/Makefile.am                  |   10 ++++----
 tests/libpeas/plugins/extension-gjs/Makefile.am    |    7 -----
 .../plugins/extension-gjs/extension-gjs.plugin     |    9 -------
 tests/libpeas/plugins/extension-js/Makefile.am     |   22 ++++++++++++++++
 .../extension-js.js}                               |    2 +-
 .../plugins/extension-js/extension-js.plugin       |    9 +++++++
 tests/libpeas/plugins/extension-seed/Makefile.am   |    7 -----
 .../plugins/extension-seed/extension-seed.js       |   26 --------------------
 .../plugins/extension-seed/extension-seed.plugin   |    9 -------
 11 files changed, 43 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87b5f14..47ad3a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,10 @@ Makefile.in
 /tests/libpeas/extension-seed
 /tests/libpeas/extension-set
 /tests/libpeas/plugin-info
+/tests/libpeas/plugins/extension-js/extension-gjs.js
+/tests/libpeas/plugins/extension-js/extension-gjs.plugin
+/tests/libpeas/plugins/extension-js/extension-seed.js
+/tests/libpeas/plugins/extension-js/extension-seed.plugin
 /tests/libpeas-gtk/plugin-manager
 /tests/libpeas-gtk/plugin-manager-store
 /tests/libpeas-gtk/plugin-manager-view
diff --git a/configure.ac b/configure.ac
index d831bab..f2e3a95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ dnl ================================================================
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
+AC_PROG_LN_S
 
 # Initialize libtool
 LT_PREREQ([2.2.6])
@@ -490,9 +491,8 @@ tests/Makefile
 tests/libpeas/Makefile
 tests/libpeas/plugins/Makefile
 tests/libpeas/plugins/extension-c/Makefile
-tests/libpeas/plugins/extension-gjs/Makefile
+tests/libpeas/plugins/extension-js/Makefile
 tests/libpeas/plugins/extension-python/Makefile
-tests/libpeas/plugins/extension-seed/Makefile
 tests/libpeas/introspection/Makefile
 tests/libpeas/testing/Makefile
 tests/libpeas-gtk/Makefile
diff --git a/tests/libpeas/plugins/Makefile.am b/tests/libpeas/plugins/Makefile.am
index f254725..1b093f9 100644
--- a/tests/libpeas/plugins/Makefile.am
+++ b/tests/libpeas/plugins/Makefile.am
@@ -3,17 +3,17 @@ include $(top_srcdir)/tests/Makefile.plugin
 SUBDIRS = extension-c
 
 if ENABLE_GJS
-SUBDIRS += extension-gjs
+SUBDIRS += extension-js
+else
+if ENABLE_SEED
+SUBDIRS += extension-js
+endif
 endif
 
 if ENABLE_PYTHON
 SUBDIRS += extension-python
 endif
 
-if ENABLE_SEED
-SUBDIRS += extension-seed
-endif
-
 noinst_PLUGIN = \
 	disabled-loader.plugin			\
 	extension-c-nonexistent.plugin		\
diff --git a/tests/libpeas/plugins/extension-js/Makefile.am b/tests/libpeas/plugins/extension-js/Makefile.am
new file mode 100644
index 0000000..cab7122
--- /dev/null
+++ b/tests/libpeas/plugins/extension-js/Makefile.am
@@ -0,0 +1,22 @@
+noinst_DATA = \
+	extension-gjs.js	\
+	extension-gjs.plugin	\
+	extension-seed.js	\
+	extension-seed.plugin
+
+extension-js.%:
+	test -e $@
+
+%.js: extension-js.js
+	$(AM_V_GEN) $(LN_S) $< $@
+
+%.plugin: extension-js.plugin
+	$(AM_V_GEN) cp $< $@ && \
+	$(SED) -i -e 's/JS_LOADER/$(@:extension-%.plugin=%)/' $@
+
+EXTRA_DIST = \
+	extension-js.js 	\
+	extension-js.plugin
+
+CLEANFILES = $(noinst_DATA)
+DISTCLEANFILES = $(noinst_DATA)
diff --git a/tests/libpeas/plugins/extension-gjs/extension-gjs.js b/tests/libpeas/plugins/extension-js/extension-js.js
similarity index 93%
rename from tests/libpeas/plugins/extension-gjs/extension-gjs.js
rename to tests/libpeas/plugins/extension-js/extension-js.js
index 0770992..c7dbc7b 100644
--- a/tests/libpeas/plugins/extension-gjs/extension-gjs.js
+++ b/tests/libpeas/plugins/extension-js/extension-js.js
@@ -16,7 +16,7 @@ callable_extension.prototype = {
 };
 
 function properties_extension() {
-  this.read_only = "read-only",
+  this.read_only = "read-only"
   this.readwrite = "readwrite"
 };
 
diff --git a/tests/libpeas/plugins/extension-js/extension-js.plugin b/tests/libpeas/plugins/extension-js/extension-js.plugin
new file mode 100644
index 0000000..5931eff
--- /dev/null
+++ b/tests/libpeas/plugins/extension-js/extension-js.plugin
@@ -0,0 +1,9 @@
+[Plugin]
+Module=extension-JS_LOADER
+Loader=JS_LOADER
+IAge=2
+Name=Extension JS_LOADER
+Description=This plugin is for the JS_LOADER PeasExtension tests.
+Authors=Garrett Regier
+Copyright=Copyright  2011 Garrett Regier
+Website=http://live.gnome.org/Libpeas