diff --git a/.gitignore b/.gitignore index ed824b5..cb2962b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ include lib db dbd +python _build diff --git a/Makefile b/Makefile index 0eb9545..f1da26b 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ $(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir) iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS)) +UNINSTALL_DIRS += $(TOP)/python + include $(TOP)/configure/RULES_TOP #useful targets includ: doc-html and doc-clean diff --git a/configure/Makefile b/configure/Makefile index 3f54d2c..51da564 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -5,9 +5,12 @@ include $(TOP)/configure/CONFIG TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) -TARGETS += CONFIG_PY +TARGETS += CONFIG_PY RULES_PY include $(TOP)/configure/RULES CONFIG_PY: $(TOP)/makehelper.py $(PYTHON) $< $@ + +RULES_PY: ../RULES_PY + install -m644 $< $@ diff --git a/configure/RULES_PY b/configure/RULES_PY new file mode 100644 index 0000000..567bdb8 --- /dev/null +++ b/configure/RULES_PY @@ -0,0 +1,9 @@ + +PY_FILES = $(PY:%=$(INSTALL_LOCATION)/python/%) + +$(PY_FILES) : $(INSTALL_LOCATION)/python/%: ../% + @[ -d $(dir $@) ] || install -d $(dir $@) + @echo "Install PROTO $@" + install -m 644 $< $@ + +build: $(PY_FILES) diff --git a/devsupApp/src/Makefile b/devsupApp/src/Makefile index e4a0db7..9642713 100644 --- a/devsupApp/src/Makefile +++ b/devsupApp/src/Makefile @@ -50,9 +50,18 @@ devsup_SRCS += dbdset.c # Finally link to the EPICS Base libraries devsup_LIBS += $(EPICS_BASE_IOC_LIBS) + +PY += devsup/__init__.py +PY += devsup/_nullapi.py +PY += devsup/db.py +PY += devsup/hooks.py +PY += devsup/interfaces.py +PY += devsup/util.py + #=========================== include $(TOP)/configure/RULES +include $(TOP)/configure/RULES_PY #---------------------------------------- # ADD RULES AFTER THIS LINE diff --git a/python/devsup/__init__.py b/devsupApp/src/devsup/__init__.py similarity index 100% rename from python/devsup/__init__.py rename to devsupApp/src/devsup/__init__.py diff --git a/python/devsup/_nullapi.py b/devsupApp/src/devsup/_nullapi.py similarity index 100% rename from python/devsup/_nullapi.py rename to devsupApp/src/devsup/_nullapi.py diff --git a/python/devsup/db.py b/devsupApp/src/devsup/db.py similarity index 100% rename from python/devsup/db.py rename to devsupApp/src/devsup/db.py diff --git a/python/devsup/hooks.py b/devsupApp/src/devsup/hooks.py similarity index 100% rename from python/devsup/hooks.py rename to devsupApp/src/devsup/hooks.py diff --git a/python/devsup/interfaces.py b/devsupApp/src/devsup/interfaces.py similarity index 100% rename from python/devsup/interfaces.py rename to devsupApp/src/devsup/interfaces.py diff --git a/python/devsup/util.py b/devsupApp/src/devsup/util.py similarity index 100% rename from python/devsup/util.py rename to devsupApp/src/devsup/util.py