[Thuban-commits] r2803 - branches/WIP-pyshapelib-Unicode/thuban

[scm-commit@wald.intevation.org]

Author: bramz
Date: 2008-01-09 01:21:05 +0100 (Wed, 09 Jan 2008)
New Revision: 2803

Modified:
   branches/WIP-pyshapelib-Unicode/thuban/setup.py
Log:
had some typos in my last commit. sorry, won't do it again =)

Modified: branches/WIP-pyshapelib-Unicode/thuban/setup.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/setup.py	2008-01-09 00:05:40 UTC (rev 2802)
+++ branches/WIP-pyshapelib-Unicode/thuban/setup.py	2008-01-09 00:21:05 UTC (rev 2803)
@@ -295,7 +295,7 @@
                             [ext_dir + "/pyshapelib/shapelibmodule.c",
                              shp_dir + "/shpopen.c",
                              shp_dir + "/shptree.c"]
-                             + sahooks_files],
+                            + sahooks_files,
                             include_dirs = [shp_dir],
                             define_macros = macros))
 extensions.append(Extension("Lib.shptree",
@@ -304,7 +304,7 @@
 extensions.append(Extension("Lib.dbflib",
                             [ext_dir + "/pyshapelib/dbflibmodule.c",
                              shp_dir + "/dbfopen.c"]
-                             + sahooks_files,
+                            + sahooks_files,
                             include_dirs = [shp_dir],
                             define_macros = macros))
 
@@ -348,8 +348,8 @@
 
 #add the Lib content to the output
 if os.path.isdir("Lib"):
-    for d in os.listdir("Lib"):
-        data_files.append(("Lib", ["Lib/"+d]))
+	for d in os.listdir("Lib"):
+		data_files.append(("Lib", ["Lib/"+d]))
 
 
 #
@@ -966,14 +966,14 @@
         # Obviously have to build before we can install
 
         # add gdal to the build
-    for (dirpath, dnames, fnames) in os.walk('gdal'):			
-        files_in_dir = []
-        dp = '/'.join(dirpath.split('\\'))
-        for f in fnames:
-            if os.path.isfile(os.path.join(dirpath,f)):			
-                files_in_dir.append( dp + '/' + f)		
-        if len(files_in_dir) > 0:
-            data_files.append(( dp , files_in_dir))
+	for (dirpath, dnames, fnames) in os.walk('gdal'):			
+		files_in_dir = []
+		dp = '/'.join(dirpath.split('\\'))
+		for f in fnames:
+			if os.path.isfile(os.path.join(dirpath,f)):			
+				files_in_dir.append( dp + '/' + f)		
+		if len(files_in_dir) > 0:
+			data_files.append(( dp , files_in_dir))
         # add thubaninit to the build
 
 
@@ -1095,7 +1095,7 @@
             "warn_dir": 0,
             "extra_files": ["COPYING", "Lib/proj.dll"],
             }
-    install_options["extra_files"].extend(self.get_gdal_content())
+	install_options["extra_files"].extend(self.get_gdal_content())
 
         # don't make a symlink because we're simulating windows, so
         # that we can generate the iss-file even on Linux
@@ -1107,12 +1107,12 @@
         '''
         Return the list of files in the gdal directory of the Thuban installation
         '''
-    gdal_files = []
-    for (dirpath, dnames, fnames) in os.walk('gdal'):		    
-        if len(fnames) > 0:
-            for file in fnames :
-            gdal_files.append(dirpath + os.sep + file)
-    return gdal_files
+	gdal_files = []
+	for (dirpath, dnames, fnames) in os.walk('gdal'):		    
+	    if len(fnames) > 0:
+	        for file in fnames :
+		    gdal_files.append(dirpath + os.sep + file)
+	return gdal_files
 
 class thuban_build_docs(Command):
 
@@ -1204,8 +1204,8 @@
       packages = ["Thuban", "Thuban.Lib", "Thuban.Model", "Thuban.UI",
                   "Extensions", "Extensions.gns2shp", "Extensions.wms",
                   "Extensions.importAPR", "Extensions.profiling", 
-                  "Extensions.svgexport", "Extensions.mouseposition", 
-                  "Extensions.bboxdump", "Extensions.ogr", 
+		          "Extensions.svgexport", "Extensions.mouseposition", 
+		          "Extensions.bboxdump", "Extensions.ogr", 
                   "Extensions.umn_mapserver"],
       ext_modules = extensions,
       py_modules = py_modules,