From: Martin Willi <martin@revosec.ch>
Date: Wed, 8 Oct 2014 11:46:22 +0000 (+0200)
Subject: vici: Use "gem"-assisted vici ruby gem building and installation
X-Git-Tag: 5.2.1rc1~8^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f684be6583d97aa4b5d1619cbbaff62d7214f4e2;p=thirdparty%2Fstrongswan.git

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

diff --git a/configure.ac b/configure.ac
index 01951709f1..dab78a9b47 100644
--- 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 7e459c58d8..da71de3949 100644
--- 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 c111b33137..6b98b820aa 100644
--- 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
index 0000000000..c4dbb808dd
--- /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 36bc21b901..5ad61c0a01 100644
--- 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{