[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-common MANIFEST.in setup-cvs-win.py setup-...
From: |
Reinhard Mueller |
Subject: |
gnue-common MANIFEST.in setup-cvs-win.py setup-... |
Date: |
Thu, 25 Sep 2003 09:34:59 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-common
Branch:
Changes by: Reinhard Mueller <address@hidden> 03/09/25 09:34:59
Modified files:
. : MANIFEST.in setup-cvs-win.py setup-cvs.py
setup.py
Log message:
Generate gnue.paths module, and several other minor fixes.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/MANIFEST.in.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup-cvs-win.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup-cvs.py.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
Patches:
Index: gnue-common/MANIFEST.in
diff -c gnue-common/MANIFEST.in:1.10 gnue-common/MANIFEST.in:1.11
*** gnue-common/MANIFEST.in:1.10 Sun Nov 17 20:29:13 2002
--- gnue-common/MANIFEST.in Thu Sep 25 09:34:59 2003
***************
*** 1,19 ****
include AUTHORS
- include COPYING
include ChangeLog
include INSTALL
include NEWS
! include README*
include THANKS
include TODO
include setup.cfg.in
! include gnue_sys.py
include images/*
! include setupext/*.py
! include etc/*
! include scripts/*
! recursive-include doc *.txt *.pdf *.html
! recursive-include translations *
recursive-include packaging *
!
--- 1,18 ----
include AUTHORS
include ChangeLog
+ include COPYING
include INSTALL
include NEWS
! include README
! include README.databases
include THANKS
include TODO
include setup.cfg.in
! recursive-include doc *.txt *.lyx *.sxw *.dtd *.html
! include etc/sample.*
include images/*
! include man/*
recursive-include packaging *
! recursive-include scripts *.in *.sh
! recursive-include translations *
Index: gnue-common/setup-cvs-win.py
diff -c gnue-common/setup-cvs-win.py:1.2 gnue-common/setup-cvs-win.py:1.3
*** gnue-common/setup-cvs-win.py:1.2 Tue Nov 12 03:47:08 2002
--- gnue-common/setup-cvs-win.py Thu Sep 25 09:34:59 2003
***************
*** 474,479 ****
--- 474,490 ----
os.makedirs(GNUEDIR + os.sep + 'gnue')
+
+ # create path.py
+ output = open ("%s/paths.py" % GNUEDIR, "w")
+ output.write ("# This file was generated by setup-cvs.py.\n")
+ output.write ("\n")
+ output.write ("lib = \"%s\"\n" % GNUEDIR)
+ output.write ("scripts = \"%s\"\n" % BINDIR)
+ output.write ("data = \"%s\"\n" % CONFDIR)
+ output.write ("config = \"%s/etc\"\n" % CONFDIR)
+ output.close ()
+
os.chdir(GNUEDIR)
exec2('link', CVSDIR + '/common/gnue/__init__.py __init__.py')
exec2('link', CVSDIR + '/common/src common')
Index: gnue-common/setup-cvs.py
diff -c gnue-common/setup-cvs.py:1.52 gnue-common/setup-cvs.py:1.53
*** gnue-common/setup-cvs.py:1.52 Thu Sep 18 21:59:37 2003
--- gnue-common/setup-cvs.py Thu Sep 25 09:34:59 2003
***************
*** 363,373 ****
! if os.path.isdir(os.path.join(GNUEDIR,'gnue')):
os.system ('rm -rf %s' % GNUEDIR)
! os.makedirs('%s/gnue' % GNUEDIR)
os.system ("""
cd %(GNUEDIR)s
ln -s %(CVSDIR)s/gnue-common/module/base/__init__.py .
--- 363,384 ----
! if os.path.isdir (GNUEDIR):
os.system ('rm -rf %s' % GNUEDIR)
! os.makedirs(GNUEDIR)
!
! # create path.py
! output = open ("%s/paths.py" % GNUEDIR, "w")
! output.write ("# This file was generated by setup-cvs.py.\n")
! output.write ("\n")
! output.write ("lib = \"%s\"\n" % GNUEDIR)
! output.write ("scripts = \"%s\"\n" % BINDIR)
! output.write ("data = \"%s\"\n" % CONFDIR)
! output.write ("config = \"%s/etc\"\n" % CONFDIR)
! output.close ()
!
os.system ("""
cd %(GNUEDIR)s
ln -s %(CVSDIR)s/gnue-common/module/base/__init__.py .
Index: gnue-common/setup.py
diff -c gnue-common/setup.py:1.65 gnue-common/setup.py:1.66
*** gnue-common/setup.py:1.65 Wed Sep 24 10:14:20 2003
--- gnue-common/setup.py Thu Sep 25 09:34:59 2003
***************
*** 20,26 ****
# - Suite 330, Boston, MA 02111-1307, USA.
#
# Copyright 2001-2003 Free Software Foundation
- #
import sys
import string
--- 20,25 ----
***************
*** 79,85 ****
except ValueError:
pass
! if (sys.platform != "win32" and not have_prefix) or have_setupcfg:
os.system ("cp %s setup.cfg" % setupcfg)
else:
try:
--- 78,85 ----
except ValueError:
pass
! if (sys.platform != "win32" and not have_prefix and "install" in sys.argv) \
! or have_setupcfg:
os.system ("cp %s setup.cfg" % setupcfg)
else:
try:
***************
*** 112,117 ****
--- 112,120 ----
#
-----------------------------------------------------------------------------
if "sdist" in sys.argv:
+ # if a paths.py exists, it would get distributed if we didn't remove it
+ if os.path.isfile ("module/base/paths.py"):
+ os.remove ("module/base/paths.py")
build_files ()
#
-----------------------------------------------------------------------------
***************
*** 160,179 ****
pass
#
---------------------------------------------------------------------------
! # Create gnue_sys.py and site_config.cfg
#
---------------------------------------------------------------------------
def _write_config (self):
- dict = self.distribution.get_option_dict ("install")
-
- options = []
- for key in dict.keys():
- options.append('%s = "%s"' % (key,
string.replace(str(dict[key][1]),'"','\\"')))
! if dict.has_key('prefix') and not dict.has_key('install_prefix'):
! options.append('install_prefix = prefix')
!
! gnue_sys_py = """\
#
# Copyright 2001-2003 Free Software Foundation
#
--- 163,176 ----
pass
#
---------------------------------------------------------------------------
! # Create paths.py and site_config.cfg
#
---------------------------------------------------------------------------
def _write_config (self):
! output = open ("module/base/paths.py", "w")
! output.write ("""\
! # GNU Enterprise file path setup
#
# Copyright 2001-2003 Free Software Foundation
#
***************
*** 193,214 ****
# License along with program; see the file COPYING. If not,
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
! #
!
! import sys
! # Settings used during installation
! %s
! # Add gnue base directory to the sys.path
! if install_lib not in sys.path:
! sys.path.insert(0,install_lib)
! """ % string.join(options,'\n')
! output = open("gnue_sys.py", "w")
! output.write(gnue_sys_py)
! output.close()
output = open("site_config.cfg", "w")
output.write("""# IF YOU DON'T KNOW WHAT THIS FILE IS FOR, THEN YOU DON'T
NEED TO BE HERE
--- 190,215 ----
# License along with program; see the file COPYING. If not,
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
! """)
! output.write ("\n")
! output.write ("# This file was generated during installation.\n")
! output.write ("\n")
! output.write ("lib = \"%s\"\n" % self.install_lib)
! output.write ("scripts = \"%s\"\n" % self.install_scripts)
! output.write ("data = \"%s\"\n" % self.install_data)
! # output.write ("config = \"%s\"\n" % self.install_config)
! output.close ()
! #
-------------------------------------------------------------------------
+ dict = self.distribution.get_option_dict ("install")
! options = []
! for key in dict.keys():
! options.append('%s = "%s"' % (key,
string.replace(str(dict[key][1]),'"','\\"')))
! if dict.has_key('prefix') and not dict.has_key('install_prefix'):
! options.append('install_prefix = prefix')
output = open("site_config.cfg", "w")
output.write("""# IF YOU DON'T KNOW WHAT THIS FILE IS FOR, THEN YOU DON'T
NEED TO BE HERE
***************
*** 393,399 ****
base_dir = 'install_data',
copy_to = 'share/doc/gnue-common',
template = ['recursive-include doc *',
! 'prune doc/CVS'],
strip_dirs = 1, # This is a number, not true/false
preserve_path = 1)
]
--- 394,401 ----
base_dir = 'install_data',
copy_to = 'share/doc/gnue-common',
template = ['recursive-include doc *',
! 'prune doc/CVS',
! 'prune doc/technotes/CVS'],
strip_dirs = 1, # This is a number, not true/false
preserve_path = 1)
]
***************
*** 553,555 ****
--- 555,564 ----
scripts = ["scripts/gnue-schema"],
)
+
+ #
-----------------------------------------------------------------------------
+ # Clean up
+ #
-----------------------------------------------------------------------------
+
+ if os.path.isfile ("setup.cfg"):
+ os.remove ("setup.cfg")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-common MANIFEST.in setup-cvs-win.py setup-...,
Reinhard Mueller <=