From 8ced3d9d302eea6ba71c1dfccee5350d3becf9d3 Mon Sep 17 00:00:00 2001
From: Denis Barbier <bouzim@gmail.com>
Date: Wed, 19 May 2010 23:57:29 +0200
Subject: [PATCH 1/5] Fix end-of-lines

---
 src/setup.py               |   24 ++++++++++++------------
 src/wrapper/environment.py |    2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/setup.py b/src/setup.py
index 06f40c9..3b6bdd6 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -398,15 +398,15 @@ def create_init_script():
     init_fp = open(os.path.join(init_directory,'__init__.py'),'w')
     #
     # if it is 'all_in_one' build, then the __init__.py script sets the env CSF_GraphicShr:
-    #
-    if ALL_IN_ONE and sys.platform=='win32':
-        init_fp.write('import os\n')
-        init_fp.write('import sys\n')
+    #
+    if ALL_IN_ONE and sys.platform=='win32':
+        init_fp.write('import os\n')
+        init_fp.write('import sys\n')
         init_fp.write("os.environ['CSF_GraphicShr'] = os.path.join(__path__[0],'TKOpenGl.dll')\n")
     #
     # Include Version number
     #
-    init_fp.write("VERSION='%s'\n"%environment.VERSION)
+    init_fp.write("VERSION='%s'\n"%environment.VERSION)
     init_fp.write('__all__=[')
     for module_tuple in Modules.MODULES:
         module_name = module_tuple[0]
@@ -488,7 +488,7 @@ if __name__=='__main__': #hack to enable multiprocessing under Windows
                         extra_link_args = environment.ELA,
                         )
             extension.append(module_extension)
-    
+    
     #
     # Salome SMESH extensions
     #
@@ -510,17 +510,17 @@ if __name__=='__main__': #hack to enable multiprocessing under Windows
                         extra_compile_args = environment.ECA,
                         extra_link_args = environment.ELA,
                         )
-            extension.append(module_extension)
+            extension.append(module_extension)
     
     NB_EXT = len(extension)
     
     KARGS = {"ext_modules":extension}
     #
     # SETUP
-    #
-    if ALL_IN_ONE and sys.platform=='win32':
-        package_name = "pythonOCC-all_in_one"
-    else:
+    #
+    if ALL_IN_ONE and sys.platform=='win32':
+        package_name = "pythonOCC-all_in_one"
+    else:
         package_name = "pythonOCC"
     
     #
@@ -528,7 +528,7 @@ if __name__=='__main__': #hack to enable multiprocessing under Windows
     #
     if BUILD:
         create_init_script()
-
+
     setup(cmdclass={'build_ext': build_ext},
           name = package_name,
           license = "GNU General Public License v3",
diff --git a/src/wrapper/environment.py b/src/wrapper/environment.py
index dfb0b3f..6b10380 100644
--- a/src/wrapper/environment.py
+++ b/src/wrapper/environment.py
@@ -227,6 +227,6 @@ VISUALIZATION_PATH = os.path.join(os.getcwd(),'Visualization')
 MISC_PATH = os.path.join(os.getcwd(),'Misc')
 CONFIG_H_PATH = OCC_ROOT
 BOOST_INC = os.path.join(os.getcwd(),'contrib')
-SALOME_GEOM_INC = os.path.join(os.getcwd(),'contrib','GEOM','inc_pythonocc')
+SALOME_GEOM_INC = os.path.join(os.getcwd(),'contrib','GEOM','inc_pythonocc')
 SALOME_SMESH_INC = os.path.join(os.getcwd(),'contrib','SMESH','inc')
 
-- 
1.7.1