# starting with 5.0, support for these two modules is taken out
# Other stuff - doc not implicit, it's redone by myplc-docs
-subdirs := php/xmlrpc
# autoconf compatible variables
DESTDIR := /
PWD := $(shell pwd)
-all: $(subdirs)
- python setup.py build
+all:
+ python3 setup.py build
-install:
- python setup.py install \
+install: install-python install-phpxmlrpc
+
+install-python:
+ python3 setup.py install \
--install-purelib=$(DESTDIR)/$(datadir)/plc_api \
--install-scripts=$(DESTDIR)/$(datadir)/plc_api \
--install-data=$(DESTDIR)/$(datadir)/plc_api
- install -D -m 755 php/xmlrpc/xmlrpc.so $(DESTDIR)/$(shell php-config --extension-dir)/xmlrpc.so
-$(subdirs): %:
- $(MAKE) -C $@
+# phpxmlrpc is a git subtree; we just ship all its contents
+# under /usr/share/plc_api/php/phpxmlrpc
+install-phpxmlrpc:
+ mkdir -p $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/
+ rsync --exclude .git -ai php/phpxmlrpc/ $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/
-clean:
+clean:
find . -name '*.pyc' | xargs rm -f
- rm -f $(INIT)
- for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done
- python setup.py clean && rm -rf build
+ python3 setup.py clean && rm -rf build
index:
echo "This step is obsolete"
force:
-.PHONY: all install force clean index tags $(subdirs)
+.PHONY: all install force clean index tags
#################### devel tools
tags:
SSHCOMMAND:=ssh root@$(PLC)
else
ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
-else
-ifdef PLCHOSTVS
-SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
-endif
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME)
endif
endif
LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' --exclude Accessors_site.py
-RSYNC_EXCLUDES := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES := --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+RSYNC := rsync -ai $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
sync:
ifeq (,$(SSHURL))
@echo "sync: I need more info from the command line, e.g."
@echo " make sync PLC=boot.planetlab.eu"
- @echo " make sync PLCHOSTVS=.. GUESTNAME=.."
- @echo " make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
+ @echo " make sync PLCHOSTLXC=.. GUESTHOSTNAME=.. GUESTNAME=.."
@exit 1
else
- +$(RSYNC) plcsh PLC planetlab5.sql migrations aspects $(SSHURL)/usr/share/plc_api/
+ +$(RSYNC) plcsh PLC planetlab5.sql migrations php $(SSHURL)/usr/share/plc_api/
+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
- $(SSHCOMMAND) apachectl graceful
+ +$(RSYNC) apache/plc.wsgi $(SSHURL)/usr/share/plc_api/apache/
+ $(SSHCOMMAND) systemctl restart plc
endif
#################### convenience, for debugging only
+%: varname=$(subst +,,$@)
+%:
@echo "$($(varname))"
-