From 424b81aaf1c0bd057bb24ae9e18bfe4f8f4303de Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 22 Dec 2012 21:10:52 +0100 Subject: [PATCH] [matter] move matter to its own directory, get ready to split it off --- Makefile | 17 --------------- matter/Makefile | 21 +++++++++++++++++++ {server => matter}/antimatter.py | 0 {server => matter}/matter-scheduler | 0 {server => matter}/matter.py | 0 {server => matter}/matter/__init__.py | 0 {server => matter}/matter/binpms/__init__.py | 0 {server => matter}/matter/binpms/base.py | 0 .../matter/binpms/entropysrv.py | 0 {server => matter}/matter/builder.py | 0 {server => matter}/matter/lock.py | 0 {server => matter}/matter/main.py | 0 {server => matter}/matter/output.py | 0 {server => matter}/matter/spec.py | 0 {server => matter}/matter/utils.py | 0 .../matter_examples/buildfail-tinderbox.sh | 0 .../matter_examples/buildfail.sh | 0 .../matter_examples/entropy.particle | 0 .../matter_examples/fail.particle | 0 .../matter_examples/misc.particle | 0 {server => matter}/matter_examples/pkgpost.sh | 0 {server => matter}/matter_examples/pkgpre.sh | 0 {server => matter}/matter_examples/post.sh | 0 {server => matter}/matter_examples/pre.sh | 0 {server => matter}/matter_examples/sendfail | 0 .../matter_examples/zlib.particle | 0 server/Makefile | 8 +------ 27 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 Makefile create mode 100644 matter/Makefile rename {server => matter}/antimatter.py (100%) rename {server => matter}/matter-scheduler (100%) rename {server => matter}/matter.py (100%) rename {server => matter}/matter/__init__.py (100%) rename {server => matter}/matter/binpms/__init__.py (100%) rename {server => matter}/matter/binpms/base.py (100%) rename {server => matter}/matter/binpms/entropysrv.py (100%) rename {server => matter}/matter/builder.py (100%) rename {server => matter}/matter/lock.py (100%) rename {server => matter}/matter/main.py (100%) rename {server => matter}/matter/output.py (100%) rename {server => matter}/matter/spec.py (100%) rename {server => matter}/matter/utils.py (100%) rename {server => matter}/matter_examples/buildfail-tinderbox.sh (100%) rename {server => matter}/matter_examples/buildfail.sh (100%) rename {server => matter}/matter_examples/entropy.particle (100%) rename {server => matter}/matter_examples/fail.particle (100%) rename {server => matter}/matter_examples/misc.particle (100%) rename {server => matter}/matter_examples/pkgpost.sh (100%) rename {server => matter}/matter_examples/pkgpre.sh (100%) rename {server => matter}/matter_examples/post.sh (100%) rename {server => matter}/matter_examples/pre.sh (100%) rename {server => matter}/matter_examples/sendfail (100%) rename {server => matter}/matter_examples/zlib.particle (100%) diff --git a/Makefile b/Makefile deleted file mode 100644 index 245c2f1db..000000000 --- a/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -PKGNAME = entropy -PYTHON = python2 -SUBDIRS = lib client server magneto -PREFIX = /usr -BINDIR = $(PREFIX)/bin -LIBDIR = $(PREFIX)/lib -VARDIR = /var -DESTDIR = - -all: - for d in $(SUBDIRS); do $(MAKE) -C $$d; done - -clean: - for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done - -install: all - for d in $(SUBDIRS); do $(MAKE) -C $$d install; done diff --git a/matter/Makefile b/matter/Makefile new file mode 100644 index 000000000..202122af9 --- /dev/null +++ b/matter/Makefile @@ -0,0 +1,21 @@ +SUBDIRS = +PREFIX = /usr +LIBDIR = $(PREFIX)/lib +SBINDIR = $(PREFIX)/sbin +DESTDIR = + +all: + for d in $(SUBDIRS); do $(MAKE) -C $$d; done + +install: + mkdir -p $(DESTDIR)$(LIBDIR)/matter + mkdir -p $(DESTDIR)$(SBINDIR) + + cp -R matter $(DESTDIR)$(LIBDIR)/matter/ + install -m 755 matter.py $(DESTDIR)$(SBINDIR)/matter + install -m 755 antimatter.py $(DESTDIR)$(SBINDIR)/antimatter + + for d in $(SUBDIRS); do $(MAKE) -C $$d install; done + +clean: + for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done \ No newline at end of file diff --git a/server/antimatter.py b/matter/antimatter.py similarity index 100% rename from server/antimatter.py rename to matter/antimatter.py diff --git a/server/matter-scheduler b/matter/matter-scheduler similarity index 100% rename from server/matter-scheduler rename to matter/matter-scheduler diff --git a/server/matter.py b/matter/matter.py similarity index 100% rename from server/matter.py rename to matter/matter.py diff --git a/server/matter/__init__.py b/matter/matter/__init__.py similarity index 100% rename from server/matter/__init__.py rename to matter/matter/__init__.py diff --git a/server/matter/binpms/__init__.py b/matter/matter/binpms/__init__.py similarity index 100% rename from server/matter/binpms/__init__.py rename to matter/matter/binpms/__init__.py diff --git a/server/matter/binpms/base.py b/matter/matter/binpms/base.py similarity index 100% rename from server/matter/binpms/base.py rename to matter/matter/binpms/base.py diff --git a/server/matter/binpms/entropysrv.py b/matter/matter/binpms/entropysrv.py similarity index 100% rename from server/matter/binpms/entropysrv.py rename to matter/matter/binpms/entropysrv.py diff --git a/server/matter/builder.py b/matter/matter/builder.py similarity index 100% rename from server/matter/builder.py rename to matter/matter/builder.py diff --git a/server/matter/lock.py b/matter/matter/lock.py similarity index 100% rename from server/matter/lock.py rename to matter/matter/lock.py diff --git a/server/matter/main.py b/matter/matter/main.py similarity index 100% rename from server/matter/main.py rename to matter/matter/main.py diff --git a/server/matter/output.py b/matter/matter/output.py similarity index 100% rename from server/matter/output.py rename to matter/matter/output.py diff --git a/server/matter/spec.py b/matter/matter/spec.py similarity index 100% rename from server/matter/spec.py rename to matter/matter/spec.py diff --git a/server/matter/utils.py b/matter/matter/utils.py similarity index 100% rename from server/matter/utils.py rename to matter/matter/utils.py diff --git a/server/matter_examples/buildfail-tinderbox.sh b/matter/matter_examples/buildfail-tinderbox.sh similarity index 100% rename from server/matter_examples/buildfail-tinderbox.sh rename to matter/matter_examples/buildfail-tinderbox.sh diff --git a/server/matter_examples/buildfail.sh b/matter/matter_examples/buildfail.sh similarity index 100% rename from server/matter_examples/buildfail.sh rename to matter/matter_examples/buildfail.sh diff --git a/server/matter_examples/entropy.particle b/matter/matter_examples/entropy.particle similarity index 100% rename from server/matter_examples/entropy.particle rename to matter/matter_examples/entropy.particle diff --git a/server/matter_examples/fail.particle b/matter/matter_examples/fail.particle similarity index 100% rename from server/matter_examples/fail.particle rename to matter/matter_examples/fail.particle diff --git a/server/matter_examples/misc.particle b/matter/matter_examples/misc.particle similarity index 100% rename from server/matter_examples/misc.particle rename to matter/matter_examples/misc.particle diff --git a/server/matter_examples/pkgpost.sh b/matter/matter_examples/pkgpost.sh similarity index 100% rename from server/matter_examples/pkgpost.sh rename to matter/matter_examples/pkgpost.sh diff --git a/server/matter_examples/pkgpre.sh b/matter/matter_examples/pkgpre.sh similarity index 100% rename from server/matter_examples/pkgpre.sh rename to matter/matter_examples/pkgpre.sh diff --git a/server/matter_examples/post.sh b/matter/matter_examples/post.sh similarity index 100% rename from server/matter_examples/post.sh rename to matter/matter_examples/post.sh diff --git a/server/matter_examples/pre.sh b/matter/matter_examples/pre.sh similarity index 100% rename from server/matter_examples/pre.sh rename to matter/matter_examples/pre.sh diff --git a/server/matter_examples/sendfail b/matter/matter_examples/sendfail similarity index 100% rename from server/matter_examples/sendfail rename to matter/matter_examples/sendfail diff --git a/server/matter_examples/zlib.particle b/matter/matter_examples/zlib.particle similarity index 100% rename from server/matter_examples/zlib.particle rename to matter/matter_examples/zlib.particle diff --git a/server/Makefile b/server/Makefile index dbc8ce15f..1cedd09c2 100644 --- a/server/Makefile +++ b/server/Makefile @@ -1,4 +1,3 @@ -PKGNAME = entropy SUBDIRS = doc po PREFIX = /usr BINDIR = $(PREFIX)/bin @@ -10,18 +9,13 @@ all: install: mkdir -p $(DESTDIR)$(LIBDIR)/entropy/server - mkdir -p $(DESTDIR)$(LIBDIR)/matter mkdir -p $(DESTDIR)/etc/entropy - mkdir -p $(DESTDIR)$(PREFIX)/sbin mkdir -p $(DESTDIR)$(BINDIR) install -m 644 ../conf/server.conf.example $(DESTDIR)/etc/entropy/ - cp eit $(DESTDIR)$(LIBDIR)/entropy/server/ -R + cp -R eit $(DESTDIR)$(LIBDIR)/entropy/server/ install -m 755 eit.py $(DESTDIR)$(BINDIR)/eit - cp matter $(DESTDIR)$(LIBDIR)/matter/ -R - install -m 755 matter.py $(DESTDIR)$(PREFIX)/sbin/matter - install -m 755 antimatter.py $(DESTDIR)$(PREFIX)/sbin/antimatter for d in $(SUBDIRS); do $(MAKE) -C $$d install; done