[Inteproxy-commits] r345 - trunk

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2012-01-21 16:46:26 +0100 (Sat, 21 Jan 2012)
New Revision: 345

Modified:
   trunk/ChangeLog
   trunk/setup.py
Log:
Adjusted setup.py for distributing InteProxy with Python 2.7 under Windows.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-01-21 15:42:51 UTC (rev 344)
+++ trunk/ChangeLog	2012-01-21 15:46:26 UTC (rev 345)
@@ -1,5 +1,11 @@
 2012-01-21	Bjoern Schilberg	<bjoern.schilberg at intevation.de>
 
+	* M setup.py:
+	  Adjusted setup.py for distributing InteProxy with Python 2.7 under
+	  Windows.
+
+2012-01-21	Bjoern Schilberg	<bjoern.schilberg at intevation.de>
+
 	* A packaging/Windows/README_Python-2.7.txt:
 	  Added a new Windows packaging README for distributing InteProxy Desktop
 	  with Python 2.7.

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2012-01-21 15:42:51 UTC (rev 344)
+++ trunk/setup.py	2012-01-21 15:46:26 UTC (rev 345)
@@ -1,7 +1,8 @@
 #! /usr/bin/python
-# Copyright (C) 2006 by Intevation GmbH
+# Copyright (C) 2006-2012 by Intevation GmbH
 # Authors:
 # Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+# Bjoern Schilberg <bjoern.schilberg at intevation.de>
 #
 # This program is free software under the GPL (>=v2)
 # Read the file COPYING coming with the software for details.
@@ -17,18 +18,21 @@
 from distutils.core import setup
 import py2exe
 
-setup(console=['InteProxy.py'],
-	windows = [
-		{
-			'script': 'InteProxy.py',
-			#'icon_resources': [(1, "inteproxy.ico")],
-		}
-		],
-	options= {
-	"py2exe": {
-		"includes": "cairo, pango, pangocairo, atk, gobject"
-		}
-	},
-	data_files=[("share/images", ["share/images/InteProxy-icon.png",
-				      "share/images/InteProxy-logo.png"])],
-	)
+
+setup(name="InteProxy",
+      version="1.1.0",
+      description="Security extension for unsecure OWS clients",
+      console=["InteProxy.py"],
+      windows = [
+          {
+              "script": "InteProxy.py"
+              }
+          ],
+      options= {
+          "py2exe": {
+              "includes": "cairo, pango, pangocairo, atk, gobject, gio, lxml.etree, lxml._elementpath, gzip"
+              }
+          },
+      data_files=[("share/images", ["share/images/InteProxy-icon.png", "share/images/InteProxy-logo.png"]),
+                  "inteproxy.cfg"],
+      )