From 2d823c7ca7e9544b01ffa4abc83426b40842502a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 8 Jul 2009 14:37:34 +0000 Subject: [PATCH] elaborate wsdl files at build-time --- Makefile | 18 +- setup.py | 1 - sfa.spec | 2 +- wsdl/Makefile | 24 ++- wsdl/sfa.wsdl | 453 -------------------------------------------------- 5 files changed, 39 insertions(+), 459 deletions(-) delete mode 100644 wsdl/sfa.wsdl diff --git a/Makefile b/Makefile index 26251f03..0ada9fea 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,11 @@ DESTDIR="/" ########## -all: keyconvert python +all: keyconvert python wsdl -install: keyconvert-install python-install +install: keyconvert-install python-install wsdl-install -clean: keyconvert-clean python-clean +clean: keyconvert-clean python-clean wsdl-clean .PHONY: all install clean @@ -37,6 +37,18 @@ python-clean: .PHONY: python python-install python-clean ########## +wsdl: + $(MAKE) -C wsdl + +# propagate DESTDIR from the specfile +wsdl-install: + $(MAKE) -C wsdl install + +wsdl-clean: + $(MAKE) -C wsdl clean + +.PHONY: wsdl wsdl-install wsdl-clean +########## # are the .java files used ? tags: diff --git a/setup.py b/setup.py index 3f4e729b..ded7f5ed 100755 --- a/setup.py +++ b/setup.py @@ -31,7 +31,6 @@ data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml', 'config/sfi_config', ]), ('/etc/init.d/', ['sfa/init.d/sfa']), - ('/var/www/html/wsdl', [ 'wsdl/sfa.wsdl' ] ), ] symlinks = [ '/usr/share/sfa' ] initscripts = [ '/etc/init.d/sfa' ] diff --git a/sfa.spec b/sfa.spec index 048d658e..2c337eb8 100644 --- a/sfa.spec +++ b/sfa.spec @@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT %files %{python_sitelib}/* /usr/bin/keyconvert -/var/www/html/wsdl/sfa.wsdl +/var/www/html/wsdl/*.wsdl %files plc %defattr(-,root,root) diff --git a/wsdl/Makefile b/wsdl/Makefile index 3b82120d..21d17d3b 100644 --- a/wsdl/Makefile +++ b/wsdl/Makefile @@ -16,7 +16,29 @@ aggregate.wsdl: sfa.wsdl: PYTHONPATH=../ ./gw2wsdl.py --registry --slice-manager --aggregate > $@ +#################### install +# DESTDIR set but the calling Makefile in ../ +INSTALL_PATH=/var/www/html/wsdl +INSTALLED=$(foreach wsdl,$(ALL),$(DESTDIR)$(INSTALL_PATH)/$(wsdl)) + +foo: + @echo INSTALLED=$(INSTALLED) + +install: $(INSTALLED) + +$(DESTDIR)$(INSTALL_PATH): + install -d -m 0755 $(DESTDIR)$(INSTALL_PATH) + +$(DESTDIR)$(INSTALL_PATH)/%: wsdl=$(notdir $@) +$(DESTDIR)$(INSTALL_PATH)/%: $(DESTDIR)$(INSTALL_PATH) % + install -c -m 0755 $(wsdl) $@ + +#################### clean clean: rm -f *wsdl -.PHONY: all clean +install-clean: + rm -f $(INSTALLED) + +.PHONY: all clean install install-clean + diff --git a/wsdl/sfa.wsdl b/wsdl/sfa.wsdl deleted file mode 100644 index 8399f776..00000000 --- a/wsdl/sfa.wsdl +++ /dev/null @@ -1,453 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.43.0