gnue-common ./setup.py scripts/gnue-schema

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/10/05 14:01:54

Modified files:
        .              : setup.py 
        scripts        : gnue-schema 

Log message:
        removed old "magic" code needed for mcmillan packaging on win32

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/scripts/gnue-schema.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue-common/scripts/gnue-schema
diff -c gnue-common/scripts/gnue-schema:1.2 gnue-common/scripts/gnue-schema:1.3
*** gnue-common/scripts/gnue-schema:1.2 Mon Sep 29 08:50:33 2003
--- gnue-common/scripts/gnue-schema     Sun Oct  5 14:01:54 2003
***************
*** 19,40 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  
- import os
- import sys
- 
- if sys.platform == "win32":
-   if __name__ == "__main__":
-     _BASE = os.path.abspath (os.path.join (os.path.dirname (sys.argv[0]), 
".."))
-     _newpath = os.path.abspath (os.path.dirname (sys.argv[0]))
-     if os.environ.has_key ("PATH"):
-       _newpath = _newpath + ";" + os.environ ["PATH"]
-     os.environ ["PATH"] = _newpath
-   else:
-     _BASE = os.path.abspath (os.path.join (os.path.dirname (__file__), ".."))
-   os.putenv ("PYTHONCASEOK","1")
-   if os.path.isdir (os.path.join (_BASE, "extras")):
-     sys.path.append (os.path.join (_BASE, "extras"))
- 
  from gnue.common.schema.scripter.Scripter import ScripterRunner
  
  if __name__ == "__main__":
--- 19,24 ----
Index: gnue-common/setup.py
diff -c gnue-common/setup.py:1.85 gnue-common/setup.py:1.86
*** gnue-common/setup.py:1.85   Tue Sep 30 12:43:57 2003
--- gnue-common/setup.py        Sun Oct  5 14:01:54 2003
***************
*** 296,306 ****
      print "creating %s" % file
      output = open (file, "w")
      output.write ("# This file was generated during installation.\n")
      output.write ("\n")
      output.write ("lib     = \"%s\"\n" % self._quote (self.install_lib))
      output.write ("scripts = \"%s\"\n" % self._quote (self.install_scripts))
!     output.write ("data    = \"%s\"\n" % self._quote (self.install_data))
!     output.write ("config  = \"%s\"\n" % self._quote (self.install_config))
      output.close ()
  
    # 
---------------------------------------------------------------------------
--- 296,316 ----
      print "creating %s" % file
      output = open (file, "w")
      output.write ("# This file was generated during installation.\n")
+     output.write ("import os, sys\n")
      output.write ("\n")
      output.write ("lib     = \"%s\"\n" % self._quote (self.install_lib))
      output.write ("scripts = \"%s\"\n" % self._quote (self.install_scripts))
!     output.write ("\n")
!     output.write ("############################\n")
!     output.write ("# This is a workaround for McMillan packaging!!!\n")
!     output.write ("# McMillan sets sys.frozen=1 in packaged exe file.\n")
!     output.write ("############################\n")
!     output.write ("if hasattr(sys, 'frozen'):\n")
!     output.write ("  data    = os.path.join(os.path.dirname (sys.argv[0]), 
'..')\n")
!     output.write ("  config  = os.path.join(os.path.dirname (sys.argv[0]), 
'..\\etc')\n")
!     output.write ("else:\n")
!     output.write ("  data    = \"%s\"\n" % self._quote (self.install_data))
!     output.write ("  config  = \"%s\"\n" % self._quote (self.install_config))
      output.close ()
  
    # 
---------------------------------------------------------------------------