obtain integer primary keys by calling nextval() on the sequence instead of quering...

[plcapi.git] / Makefile

diff --git a/Makefile b/Makefile
index 6eba7ee..7c84512 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,62 +10,36 @@
 # Metafiles
 init := PLC/__init__.py PLC/Methods/__init__.py
 
-# Python modules
-modules := psycopg2
-
-# Temporarily until we can kill the Fedora Core 2 build
-curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum))
-pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1
-pycurl_incompatnum := $(shell printf %d 0x071000) # 7.16.0
-ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1)
-ifeq ($(shell test $(curl_vernum) -ge $(pycurl_incompatnum) && echo 0),1)
-modules += pycurl
-endif
-endif
-
-modules-install := $(foreach module, $(modules), $(module)-install)
-modules-clean := $(foreach module, $(modules), $(module)-clean)
+# python-pycurl and python-psycopg2 avail. from fedora 5
+# we used to ship our own version of psycopg2 and pycurl, for fedora4
+# starting with 5.0, support for these two modules is taken out
 
-# Other stuff
-subdirs := doc php php/xmlrpc
+# Other stuff - doc not implicit, it's redone by myplc-docs
+subdirs := php php/xmlrpc
 
 # autoconf compatible variables
-DESTDIR := /plc/root
+DESTDIR := /
 datadir := /usr/share
 bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-all: $(init) $(subdirs) $(modules)
+all: $(init) $(subdirs) 
        python setup.py build
 
-install: $(modules-install)
+install: 
        python 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
-       install -D -m 755 refresh-peer.py $(DESTDIR)/$(bindir)/refresh-peer.py
 
-$(subdirs): $(init) $(modules)
+$(subdirs): $(init)
 
 $(subdirs): %:
        $(MAKE) -C $@
 
-$(modules):
-        # Install in the current directory so that we can import it while developing
-       cd $@ && \
-           python setup.py build && \
-           python setup.py install_lib --install-dir=$(PWD)
-
-$(modules-install): %-install:
-       cd $* && \
-           python setup.py install_lib --install-dir=$(DESTDIR)/$(datadir)/plc_api
-
-$(modules-clean): %-clean:
-       cd $* && python setup.py clean && rm -rf build
-
-clean: $(modules-clean)
+clean: 
        find . -name '*.pyc' | xargs rm -f
        rm -f $(INIT)
        for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done
@@ -76,29 +50,7 @@ index: $(init)
 index-clean:
        rm $(init)
 
-tags:
-       find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags
-
-########## make sync PLCHOST=hostname
-ifdef PLCHOST
-PLCSSH:=root@$(PLCHOST)
-endif
-
-LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
-RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --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)
-
-sync:
-ifeq (,$(PLCSSH))
-       echo "sync: You must define target host as PLCHOST on the command line"
-       echo " e.g. make sync PLCHOST=private.one-lab.org" ; exit 1
-else
-       +$(RSYNC) PLC planetlab4.sql migrations $(PLCSSH):/plc/root/usr/share/plc_api/
-       ssh $(PLCSSH) chroot /plc/root apachectl graceful
-endif
-
-####################
+#################### regenerate indexes - not used by the build, as both files are svn added - please update as appropriate
 # All .py files in PLC/
 
 # the current content of __init__.py
@@ -128,7 +80,34 @@ PLC/Methods/__init__.py:
 
 force:
 
-.PHONY: all install force clean index tags $(subdirs) $(modules)
+.PHONY: all install force clean index tags $(subdirs)
+
+#################### devel tools
+tags:
+       find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags
+
+.PHONY: tags
+
+########## make sync PLCHOST=hostname VSERVER=vservername
+ifdef PLCHOST
+ifdef VSERVER
+PLCSSH:=root@$(PLCHOST):/vservers/$(VSERVER)
+endif
+endif
+
+LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
+RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --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)
+
+sync:
+ifeq (,$(PLCSSH))
+       echo "sync: You must define PLCHOST and VSERVER on the command line"
+       echo " e.g. make sync PLCHOST=private.one-lab.org VSERVER=myplc01" ; exit 1
+else
+       +$(RSYNC) PLC planetlab5.sql migrations $(PLCSSH)/usr/share/plc_api/
+       ssh root@$(PLCHOST) vserver $(VSERVER) exec apachectl graceful
+endif
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)