[Greater-commits] r3727 - branches/3.0.0-usf/GREAT-ER-DB

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-28 10:31:05 +0200 (Thu, 28 Jul 2011)
New Revision: 3727

Modified:
   branches/3.0.0-usf/GREAT-ER-DB/
   branches/3.0.0-usf/GREAT-ER-DB/setup.py
Log:
Manually Merged revisions 174-176 from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER-DB

........
  r174 | aheinecke | 2011-06-09 11:26:30 +0200 (Thu, 09 Jun 2011) | 2 lines
  
  Fix encoding and deprectated license variable name
........
  r175 | aheinecke | 2011-06-09 12:57:29 +0200 (Thu, 09 Jun 2011) | 2 lines
  
  Add cmake buildsystem
........
  r176 | aheinecke | 2011-06-09 16:02:41 +0200 (Thu, 09 Jun 2011) | 2 lines
  
  Change options order for ecpg which is sensitive to their order on Windows
........



Property changes on: branches/3.0.0-usf/GREAT-ER-DB
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER-DB:1-173
   + /trunk/GREAT-ER-DB:1-176
Name: svn:mergeinfo
   - 

Modified: branches/3.0.0-usf/GREAT-ER-DB/setup.py
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB/setup.py	2011-07-27 16:45:39 UTC (rev 3726)
+++ branches/3.0.0-usf/GREAT-ER-DB/setup.py	2011-07-28 08:31:05 UTC (rev 3727)
@@ -129,13 +129,6 @@
 
     def postgres_extension_from_file(self):
         dbapi_dir     = os.path.dirname(self.postgres_interface_file)
-	#
-        # postgres_home wird nicht mehr benutzt, da die Pfade direkt gesetzt werden
-	# und nicht über zum Beispiel postgres_incdirs = os.path.join(postgres_home,"...") 
-	#
-	# postgres_home = os.getenv("POSTGRES_HOME")
-        # if not postgres_home:
-        #    raise RuntimeError("Environment variable POSTGRES_HOME not defined")
 	if self.postgres_incl_path:
 		postgres_incdirs = [self.postgres_incl_path]
 	else:
@@ -149,9 +142,9 @@
 	        postgres_lib_dirs = ["/usr/lib/postgresql/lib"] 
 	
 	# self.run_command("ecpg "+self.postgres_interface_file)
-	
-	# ecpg ist die Bibliothek, die für Embedded SQL in C benötigt wird
-	# pq bietet in diesem Fall die Schnittstelle für die BLOB's
+
+    # ecpg is the library, used for Embedded SQL in C,
+    # pq offers the BLOB interface in this case
         postgres_libs = ["ecpg","pq"]
         return Extension("GreaterDB._dagreater_pg",
                          ["dagreater/_dagreater_pg.c",
@@ -252,7 +245,7 @@
       version = "cvs",
       description = "GREAT-ER",
       long_description = """GREAT-ER""",
-      licence = "GPL",
+      license = "GPL",
       author = "Intevation GmbH",
       author_email = "bh at intevation.de",
       url = "http://great-er.intevation.de/",