gnue designer/setup.py gnuef/setup.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/12 17:24:03

Modified files:
        designer       : setup.py 
        gnuef          : setup.py 

Log message:
        cleaned up setup.py for Win32 machines (did not change functionality)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/setup.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.47&tr2=1.48&r1=text&r2=text

Patches:
Index: gnue/designer/setup.py
diff -u gnue/designer/setup.py:1.12 gnue/designer/setup.py:1.13
--- gnue/designer/setup.py:1.12 Mon Nov 12 16:48:12 2001
+++ gnue/designer/setup.py      Mon Nov 12 17:24:03 2001
@@ -159,17 +159,18 @@
     else:
       gnue_env = \
                "#######\n" \
-             + "# The following variables were set when GNUe was 
installed\n\n"    \
+             + "# The following variables were set when GNUe was installed\n"  
  \
+             + "# (Generated for a Win32 system)\n" \
              + "import os, sys\n" \
              + "if __name__ == '__main__': \n" \
-             + "  _BASE = os.path.join(os.path.dirname(sys.argv[0]),'..')\n" \
+             + "  _BASE = 
os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),'..'))\n" \
              + "else: \n" \
-             + "  _BASE = os.path.join(os.path.dirname(__file__),'..')\n" \
+             + "  _BASE = 
os.path.abspath(os.path.join(os.path.dirname(__file__),'..'))\n" \
              + 
"INST_GNUE_CONNECTIONS=os.path.join(_BASE,'etc','connections.conf')\n" \
              + "os.environ['INSTALL_PREFIX']=_BASE\n"                \
              + "os.environ['INSTALL_LIB']=_BASE\n"                   \
-             + "#######\n"  \
-             + "os.putenv('PYTHONCASEOK','1')"
+             + "os.putenv('PYTHONCASEOK','1')\n" \
+             + "#######\n\n"
             
 
     for script in self.scripts: 
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.47 gnue/gnuef/setup.py:1.48
--- gnue/gnuef/setup.py:1.47    Mon Nov 12 16:48:12 2001
+++ gnue/gnuef/setup.py Mon Nov 12 17:24:03 2001
@@ -230,17 +230,18 @@
     else:
       gnue_env = \
                "#######\n" \
-             + "# The following variables were set when GNUe was 
installed\n\n"    \
+             + "# The following variables were set when GNUe was installed\n"  
  \
+             + "# (Generated for a Win32 system)\n" \
              + "import os, sys\n" \
              + "if __name__ == '__main__': \n" \
-             + "  _BASE = os.path.join(os.path.dirname(sys.argv[0]),'..')\n" \
+             + "  _BASE = 
os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),'..'))\n" \
              + "else: \n" \
-             + "  _BASE = os.path.join(os.path.dirname(__file__),'..')\n" \
+             + "  _BASE = 
os.path.abspath(os.path.join(os.path.dirname(__file__),'..'))\n" \
              + 
"INST_GNUE_CONNECTIONS=os.path.join(_BASE,'etc','connections.conf')\n" \
              + "os.environ['INSTALL_PREFIX']=_BASE\n"                \
              + "os.environ['INSTALL_LIB']=_BASE\n"                   \
-             + "#######\n"  \
-             + "os.putenv('PYTHONCASEOK','1')"
+             + "os.putenv('PYTHONCASEOK','1')" \
+             + "#######\n\n"
 
     for script in self.scripts:
       print "Building %s..."% (script),