vici: Use "gem"-assisted vici ruby gem building and installation

diff --git a/configure.ac b/configure.ac
index 01951709f13c0fc4fb87bc73d53573905ceb8b7b..dab78a9b47dd638f63e4ddb6e446e04b1b46b0d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1727,6 +1727,7 @@ AC_CONFIG_FILES([
        src/libcharon/plugins/maemo/Makefile
        src/libcharon/plugins/stroke/Makefile
        src/libcharon/plugins/vici/Makefile
+       src/libcharon/plugins/vici/ruby/Makefile
        src/libcharon/plugins/updown/Makefile
        src/libcharon/plugins/dhcp/Makefile
        src/libcharon/plugins/unit_tester/Makefile

diff --git a/src/libcharon/plugins/vici/Makefile.am b/src/libcharon/plugins/vici/Makefile.am
index 7e459c58d8107e2afe7bcde509df874f90dfafc5..da71de394967efe6ee9c3744d90ad517603179ad 100644 (file)
--- a/src/libcharon/plugins/vici/Makefile.am
+++ b/src/libcharon/plugins/vici/Makefile.am
@@ -67,3 +67,10 @@ vici_tests_LDFLAGS = @COVERAGE_LDFLAGS@
 vici_tests_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libstrongswan/tests/libtest.la
+
+
+SUBDIRS =
+
+if USE_RUBY_GEMS
+SUBDIRS += ruby
+endif

diff --git a/src/libcharon/plugins/vici/ruby/.gitignore b/src/libcharon/plugins/vici/ruby/.gitignore
index c111b331371ae211d3bc2e3a9e34ad2a7d6b3982..6b98b820aa66c873762debbe4975949a5f46fc07 100644 (file)
--- a/src/libcharon/plugins/vici/ruby/.gitignore
+++ b/src/libcharon/plugins/vici/ruby/.gitignore
@@ -1 +1,2 @@
 *.gem
+*.gemspec

diff --git a/src/libcharon/plugins/vici/ruby/Makefile.am b/src/libcharon/plugins/vici/ruby/Makefile.am
new file mode 100644 (file)
index 0000000..c4dbb80
--- /dev/null
+++ b/src/libcharon/plugins/vici/ruby/Makefile.am
@@ -0,0 +1,20 @@
+vici.gemspec: $(srcdir)/vici.gemspec.in
+       $(AM_V_GEN) sed \
+       -e "s:@GEM_VERSION@:$(PACKAGE_VERSION):" \
+       $(srcdir)/vici.gemspec.in > $@
+
+vici-$(PACKAGE_VERSION).gem: vici.gemspec
+       $(GEM) build vici.gemspec
+
+all-local: vici-$(PACKAGE_VERSION).gem
+
+clean-local:
+       rm -f vici.gemspec vici-$(PACKAGE_VERSION).gem
+
+install-data-local: vici-$(PACKAGE_VERSION).gem
+       $(GEM) install --install-dir $(DESTDIR)$(RUBYGEMDIR) \
+               vici-$(PACKAGE_VERSION).gem
+
+uninstall-local:
+       $(GEM) uninstall --install-dir $(DESTDIR)$(RUBYGEMDIR) \
+               --version $(PACKAGE_VERSION) vici

diff --git a/src/libcharon/plugins/vici/ruby/vici.gemspec b/src/libcharon/plugins/vici/ruby/vici.gemspec.in
similarity index 94%
rename from src/libcharon/plugins/vici/ruby/vici.gemspec
rename to src/libcharon/plugins/vici/ruby/vici.gemspec.in
index 36bc21b9012855542f1936fe247ae801d4ca5330..5ad61c0a012fb779ed9525483c30564b3b151e19 100644 (file)
--- a/src/libcharon/plugins/vici/ruby/vici.gemspec
+++ b/src/libcharon/plugins/vici/ruby/vici.gemspec.in
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "vici"
-  s.version       = "0.0.1"
+  s.version       = "@GEM_VERSION@"
   s.authors       = ["Martin Willi"]
   s.email         = ["martin@strongswan.ch"]
   s.description   = %q{