From 1be54e32324eeecd228c620bdcc80e84518864a0 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 5 Feb 2013 10:45:25 +0100
Subject: [PATCH] review packaging - isolate wsgi in a subdir this needs
changes in myplc that are only ongoing
---
ModPython.py => apache/ModPython.py | 0
ModPythonJson.py => apache/ModPythonJson.py | 0
ModWSGI.wsgi => apache/plc.wsgi | 0
setup.py | 7 ++++---
4 files changed, 4 insertions(+), 3 deletions(-)
rename ModPython.py => apache/ModPython.py (100%)
rename ModPythonJson.py => apache/ModPythonJson.py (100%)
rename ModWSGI.wsgi => apache/plc.wsgi (100%)
diff --git a/ModPython.py b/apache/ModPython.py
similarity index 100%
rename from ModPython.py
rename to apache/ModPython.py
diff --git a/ModPythonJson.py b/apache/ModPythonJson.py
similarity index 100%
rename from ModPythonJson.py
rename to apache/ModPythonJson.py
diff --git a/ModWSGI.wsgi b/apache/plc.wsgi
similarity index 100%
rename from ModWSGI.wsgi
rename to apache/plc.wsgi
diff --git a/setup.py b/setup.py
index 3291cd5a..e52e4b60 100755
--- a/setup.py
+++ b/setup.py
@@ -9,11 +9,12 @@
from distutils.core import setup
from glob import glob
-setup(py_modules = ['ModPython'],
- packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', 'aspects'],
+setup(packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', 'aspects'],
scripts = ['plcsh', 'Server.py'],
data_files = [
- ('', ['planetlab5.sql' , 'ModWSGI.wsgi' ]),
+ ('', ['planetlab5.sql']),
+ # don't package for mod_python anymore
+ (' apache', ['plc.wsgi']),
('php', ['php/plc_api.php']),
('migrations',
['migrations/README.txt',
--
2.47.0