add core3 to Makefiles and spec

Makefile

@@ -44,9 +44,8 @@ clean:
 	make -C qmemman clean
 
 all:
-	make all -C core
-	make all -C core-modules
-	make all -C tests
+	make all -C qubes
+#	make all -C tests
 	# Currently supported only on xen
 ifeq ($(BACKEND_VMM),xen)
 	make all -C qmemman
@@ -60,9 +59,8 @@ ifeq ($(OS),Linux)
 	$(MAKE) install -C linux/system-config
 endif
 	$(MAKE) install -C qvm-tools
-	$(MAKE) install -C core
-	$(MAKE) install -C core-modules
-	$(MAKE) install -C tests
+	$(MAKE) install -C qubes
+#	$(MAKE) install -C tests
 ifeq ($(BACKEND_VMM),xen)
 	# Currently supported only on xen
 	$(MAKE) install -C qmemman

qubes/Makefile

@@ -0,0 +1,59 @@
+OS ?= Linux
+
+PYTHON_QUBESPATH = $(PYTHON_SITEPATH)/qubes
+SETTINGS_SUFFIX = $(BACKEND_VMM)-$(OS)
+
+all:
+	python -m compileall .
+	python -O -m compileall .
+
+install:
+ifndef PYTHON_SITEPATH
+	$(error PYTHON_SITEPATH not defined)
+endif
+	mkdir -p $(DESTDIR)$(PYTHON_QUBESPATH)
+	mkdir \
+		$(DESTDIR)$(PYTHON_QUBESPATH)/vm \
+		$(DESTDIR)$(PYTHON_QUBESPATH)/ext \
+		$(DESTDIR)$(PYTHON_QUBESPATH)/tests \
+		$(DESTDIR)$(PYTHON_QUBESPATH)/tests/vm
+
+	cp \
+		__init__.py* \
+		_pluginloader.py* \
+		config.py* \
+		dochelpers.py* \
+		events.py* \
+		log.py* \
+		plugins.py* \
+		rngdoc.py* \
+		utils.py* \
+		$(DESTDIR)$(PYTHON_QUBESPATH)
+
+	cp \
+		vm/__init__.py* \
+		vm/adminvm.py* \
+		vm/appvm.py* \
+		vm/dispvm.py* \
+		vm/hvm.py* \
+		vm/netvm.py* \
+		vm/proxyvm.py* \
+		vm/qubesvm.py* \
+		vm/templatehvm.py* \
+		vm/templatevm.py* \
+		$(DESTDIR)$(PYTHON_QUBESPATH)/vm
+
+	cp ext/__init__.py* $(DESTDIR)$(PYTHON_QUBESPATH)/ext
+
+	cp \
+		tests/__init__.py* \
+		tests/events.py* \
+		tests/init.py* \
+		tests/run.py* \
+		$(DESTDIR)$(PYTHON_QUBESPATH)/tests
+
+	cp \
+		tests/vm/__init__.py* \
+		tests/vm/init.py* \
+		tests/vm/qubesvm.py* \
+		$(DESTDIR)$(PYTHON_QUBESPATH)/tests/vm

rpm_spec/core-dom0.spec

@@ -41,8 +41,14 @@ Group:		Qubes
 Vendor:		Invisible Things Lab
 License:	GPL
 URL:		http://www.qubes-os.org
+
 BuildRequires:  ImageMagick
 BuildRequires:	systemd-units
+
+# for building documentation
+BuildRequires:	python-sphinx
+BuildRequires:	libvirt-python
+
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -67,6 +73,9 @@ Requires:       bsdtar
 Requires:       dmidecode
 Requires:       PyQt4
 
+# for property's docstrings
+Requires:	python-docutils
+
 # Prevent preupgrade from installation (it pretend to provide distribution upgrade)
 Obsoletes:	preupgrade < 2.0
 Provides:	preupgrade = 2.0
@@ -178,32 +187,51 @@ fi
 %config(noreplace) %attr(0664,root,qubes) %{_sysconfdir}/qubes/qmemman.conf
 /usr/bin/qvm-*
 /usr/bin/qubes-*
+
 %dir %{python_sitearch}/qubes
-%{python_sitearch}/qubes/qubes.py
-%{python_sitearch}/qubes/qubes.pyc
-%{python_sitearch}/qubes/qubes.pyo
-%{python_sitearch}/qubes/qubesutils.py
-%{python_sitearch}/qubes/qubesutils.pyc
-%{python_sitearch}/qubes/qubesutils.pyo
-%{python_sitearch}/qubes/guihelpers.py
-%{python_sitearch}/qubes/guihelpers.pyc
-%{python_sitearch}/qubes/guihelpers.pyo
-%{python_sitearch}/qubes/notify.py
-%{python_sitearch}/qubes/notify.pyc
-%{python_sitearch}/qubes/notify.pyo
-%{python_sitearch}/qubes/backup.py
-%{python_sitearch}/qubes/backup.pyc
-%{python_sitearch}/qubes/backup.pyo
-%{python_sitearch}/qubes/storage/*.py
-%{python_sitearch}/qubes/storage/*.pyc
-%{python_sitearch}/qubes/storage/*.pyo
-%{python_sitearch}/qubes/settings.py
-%{python_sitearch}/qubes/settings.pyc
-%{python_sitearch}/qubes/settings.pyo
-%{python_sitearch}/qubes/qmemman*.py*
-%{python_sitearch}/qubes/modules/0*.py*
-%{python_sitearch}/qubes/modules/__init__.py*
-%{python_sitearch}/qubes/tests
+%{python_sitearch}/qubes/__init__.py*
+%{python_sitearch}/qubes/_pluginloader.py*
+%{python_sitearch}/qubes/config.py*
+%{python_sitearch}/qubes/dochelpers.py*
+%{python_sitearch}/qubes/events.py*
+%{python_sitearch}/qubes/log.py*
+%{python_sitearch}/qubes/plugins.py*
+%{python_sitearch}/qubes/rngdoc.py*
+%{python_sitearch}/qubes/utils.py*
+
+%dir %{python_sitearch}/qubes/vm
+%{python_sitearch}/qubes/vm/__init__.py*
+%{python_sitearch}/qubes/vm/adminvm.py*
+%{python_sitearch}/qubes/vm/appvm.py*
+%{python_sitearch}/qubes/vm/dispvm.py*
+%{python_sitearch}/qubes/vm/hvm.py*
+%{python_sitearch}/qubes/vm/netvm.py*
+%{python_sitearch}/qubes/vm/proxyvm.py*
+%{python_sitearch}/qubes/vm/qubesvm.py*
+%{python_sitearch}/qubes/vm/templatehvm.py*
+%{python_sitearch}/qubes/vm/templatevm.py*
+
+%dir %{python_sitearch}/qubes/ext
+%{python_sitearch}/qubes/ext/__init__.py*
+
+%dir %{python_sitearch}/qubes/tests
+%{python_sitearch}/qubes/tests/__init__.py*
+%{python_sitearch}/qubes/tests/run.py*
+
+%{python_sitearch}/qubes/tests/events.py*
+%{python_sitearch}/qubes/tests/init.py*
+
+%dir %{python_sitearch}/qubes/tests/vm
+%{python_sitearch}/qubes/tests/vm/__init__.py*
+%{python_sitearch}/qubes/tests/vm/init.py*
+%{python_sitearch}/qubes/tests/vm/qubesvm.py*
+
+# qmemman
+%{python_sitearch}/qubes/qmemman.py*
+%{python_sitearch}/qubes/qmemman_algo.py*
+%{python_sitearch}/qubes/qmemman_client.py*
+%{python_sitearch}/qubes/qmemman_server.py*
+
 /usr/lib/qubes/unbind-pci-device.sh
 /usr/lib/qubes/cleanup-dispvms
 /usr/lib/qubes/qmemman_daemon.py*