git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we return the rspec object, otherwise the subsequent rspec.filter fails
[sfa.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
26251f0
..
1ad12d2
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-5,11
+5,11
@@
DESTDIR="/"
##########
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
.PHONY: all install clean
@@
-30,6
+30,7
@@
python:
python-install:
python setup.py install --root=$(DESTDIR)
python-install:
python setup.py install --root=$(DESTDIR)
+ chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
python-clean:
python setup.py clean
python-clean:
python setup.py clean
@@
-37,6
+38,18
@@
python-clean:
.PHONY: python python-install 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:
# are the .java files used ?
tags:
@@
-67,6
+80,11
@@
RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+BINS = ./config/sfa-config-tty ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py \
+ ./sfa/server/sfa-server.py \
+ ./sfa/client/sfi.py ./sfa/client/getNodes.py ./sfa/client/getRecord.py \
+ ./sfa/client/setRecord.py ./sfa/client/sfadump.py
+
sync:
ifeq (,$(SSHURL))
@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
sync:
ifeq (,$(SSHURL))
@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
@@
-75,7
+93,7
@@
ifeq (,$(SSHURL))
@exit 1
else
+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
@exit 1
else
+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
- +$(RSYNC)
./config/sfa-config-tty
$(SSHURL)/usr/bin
+ +$(RSYNC)
$(BINS)
$(SSHURL)/usr/bin
$(SSHCOMMAND) exec service sfa restart
endif
$(SSHCOMMAND) exec service sfa restart
endif