diff options
| author | Martin Willi <martin@revosec.ch> | 2014-10-08 13:46:22 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-10-10 11:42:17 +0200 |
| commit | f684be6583d97aa4b5d1619cbbaff62d7214f4e2 (patch) | |
| tree | cae393ccdbe0efddcf9b2ab34245147f02d72008 | |
| parent | 409f1fc144f47e12f1d8644382d41c5c12482f1b (diff) | |
| download | strongswan-f684be6583d97aa4b5d1619cbbaff62d7214f4e2.tar.bz2 strongswan-f684be6583d97aa4b5d1619cbbaff62d7214f4e2.tar.xz | |
vici: Use "gem"-assisted vici ruby gem building and installation
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/libcharon/plugins/vici/Makefile.am | 7 | ||||
| -rw-r--r-- | src/libcharon/plugins/vici/ruby/.gitignore | 1 | ||||
| -rw-r--r-- | src/libcharon/plugins/vici/ruby/Makefile.am | 20 | ||||
| -rw-r--r-- | src/libcharon/plugins/vici/ruby/vici.gemspec.in (renamed from src/libcharon/plugins/vici/ruby/vici.gemspec) | 2 |
5 files changed, 30 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 01951709f..dab78a9b4 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 7e459c58d..da71de394 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 c111b3313..6b98b820a 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 000000000..c4dbb808d --- /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 index 36bc21b90..5ad61c0a0 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{ |