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
sfaprotocol is renamed into sfaserverproxy, with class SfaServerProxy
[sfa.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
dfd3a8c
..
93c808b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-15,10
+15,13
@@
uninstall: python-uninstall tests-uninstall
.PHONY: all install clean uninstall
.PHONY: all install clean uninstall
-VERSIONTAG=should-be-redefined-by-specfile
+##########
+rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
+# somehow %{taglevel} is empty, turns out %{release} has what we want
+rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
+VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
SCMURL=should-be-redefined-by-specfile
SCMURL=should-be-redefined-by-specfile
-##########
python: version
version: sfa/util/version.py
python: version
version: sfa/util/version.py
@@
-86,9
+89,13
@@
sfa/methods/__init__.py:
force:
##########
force:
##########
+# a lot of stuff in the working dir is just noise
+scan:
+ @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$'
tags:
tags:
- find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$|~$$|\.png$$|\.svg$$|\.out$$' | xargs etags
-.PHONY: tags
+ $(MAKE) scan | xargs etags
+
+.PHONY: scan tags
signatures:
(cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
signatures:
(cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
@@
-114,15
+121,17
@@
SSHURL:=root@$(PLC):/
SSHCOMMAND:=ssh root@$(PLC)
endif
SSHCOMMAND:=ssh root@$(PLC)
endif
-LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc'
+LOCAL_RSYNC_EXCLUDES += --exclude '*.pyc'
+LOCAL_RSYNC_EXCLUDES += --exclude '*.png' --exclude '*.svg' --exclude '*.out'
RSYNC_EXCLUDES := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
RSYNC_EXCLUDES := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
+CLIENTS = $(shell ls sfa/clientbin/*.py)
+
BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
- ./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
+ ./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
+ $(CLIENTS)
sync:
ifeq (,$(SSHURL))
sync:
ifeq (,$(SSHURL))
@@
-133,9
+142,21
@@
ifeq (,$(SSHURL))
else
+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
else
+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
- +$(RSYNC) $(BINS) $(SSHURL)/usr/bin
+ +$(RSYNC) $(BINS) $(SSHURL)/usr/bin/
+ +$(RSYNC) ./init.d/sfa $(SSHURL)/etc/init.d/
+ +$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
+ +$(RSYNC) ./sfa/storage/sfa.sql $(SSHURL)/usr/share/sfa/
$(SSHCOMMAND) exec service sfa restart
endif
$(SSHCOMMAND) exec service sfa restart
endif
-.PHONY: sync
+# 99% of the time this is enough
+fastsync:
+ +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+ $(SSHCOMMAND) exec service sfa restart
+
+clientsync:
+ +$(RSYNC) $(BINS) $(SSHURL)/usr/bin/
+
+.PHONY: sync fastsync clientsync
+
##########
##########