[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/setup.py designer/setup.py forms/se...
|
From: |
Jason Cater |
|
Subject: |
gnue common/setup.py designer/setup.py forms/se... |
|
Date: |
Sat, 27 Apr 2002 16:59:51 -0400 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/04/27 16:59:51
Modified files:
common : setup.py
designer : setup.py
forms : setup.py
navigator : setup.py
reports : setup.py
Log message:
to do a non-standard installation, pass "--cfg-file /my/site/file.cfg"
to all the setup.py
scripts
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/setup.py.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/setup.py.diff?cvsroot=OldCVS&tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/setup.py.diff?cvsroot=OldCVS&tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/navigator/setup.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/setup.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gnue/common/setup.py
diff -c gnue/common/setup.py:1.35 gnue/common/setup.py:1.36
*** gnue/common/setup.py:1.35 Sat Apr 27 16:30:41 2002
--- gnue/common/setup.py Sat Apr 27 16:59:51 2002
***************
*** 197,204 ****
# Site config stuff
try:
! index = sys.argv.index('--cfg-path')
! site_config =
os.path.join(os.path.abspath(sys.argv[index+1]),'.gnue-install.cfg')
sys.argv.pop(index)
sys.argv.pop(index)
if 'install' in sys.argv:
--- 197,204 ----
# Site config stuff
try:
! index = sys.argv.index('--cfg-file')
! site_config = os.path.join(os.path.abspath(sys.argv[index+1]))
sys.argv.pop(index)
sys.argv.pop(index)
if 'install' in sys.argv:
Index: gnue/designer/setup.py
diff -c gnue/designer/setup.py:1.24 gnue/designer/setup.py:1.25
*** gnue/designer/setup.py:1.24 Tue Mar 26 17:10:47 2002
--- gnue/designer/setup.py Sat Apr 27 16:59:51 2002
***************
*** 1,6 ****
#!/usr/bin/env python
#
! # Copyright 2001 Free Software Foundation
#
# This file is part of GNU Enterprise.
#
--- 1,6 ----
#!/usr/bin/env python
#
! # Copyright 2001-2002 Free Software Foundation
#
# This file is part of GNU Enterprise.
#
***************
*** 143,150 ****
"""
sys.exit()
! class my_build_scripts(build_scripts):
! def finalize_options(self):
build_scripts.finalize_options(self)
if self.finalized:
--- 143,163 ----
"""
sys.exit()
!
! # Site config stuff
! try:
! index = sys.argv.index('--cfg-file')
! site_config = os.path.join(os.path.abspath(sys.argv[index+1]))
! sys.argv.pop(index)
! sys.argv.pop(index)
! config_line = "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config
!
! except ValueError:
! config_line = ""
!
!
! class my_build_scripts(build_scripts):
! def finalize_options(self):
build_scripts.finalize_options(self)
if self.finalized:
***************
*** 161,166 ****
--- 174,180 ----
+ "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" %
dict['prefix'][1] \
+ "os.environ['INSTALL_LIB']='%s'\n" % dict['install_lib'][1] \
+ "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
+ + config_line \
+ "#######\n"
else:
gnue_env = \
***************
*** 182,191 ****
+ "os.putenv('PYTHONCASEOK','1')\n" \
+ "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
+ " sys.path.append(os.path.join(_BASE,'extras'))\n" \
+ "#######\n\n"
! for script in self.scripts:
fin = open(script+".in", "r")
fout = open(script, "w")
--- 196,206 ----
+ "os.putenv('PYTHONCASEOK','1')\n" \
+ "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
+ " sys.path.append(os.path.join(_BASE,'extras'))\n" \
+ + config_line \
+ "#######\n\n"
! for script in self.scripts:
fin = open(script+".in", "r")
fout = open(script, "w")
Index: gnue/forms/setup.py
diff -c gnue/forms/setup.py:1.61 gnue/forms/setup.py:1.62
*** gnue/forms/setup.py:1.61 Sat Apr 27 16:30:42 2002
--- gnue/forms/setup.py Sat Apr 27 16:59:51 2002
***************
*** 1,6 ****
#!/usr/bin/env python
#
! # Copyright 2001 Free Software Foundation
#
# This file is part of GNU Enterprise.
#
--- 1,6 ----
#!/usr/bin/env python
#
! # Copyright 2001-2002 Free Software Foundation
#
# This file is part of GNU Enterprise.
#
***************
*** 198,203 ****
--- 198,215 ----
"""
sys.exit()
+
+ # Site config stuff
+ try:
+ index = sys.argv.index('--cfg-file')
+ site_config = os.path.join(os.path.abspath(sys.argv[index+1]))
+ sys.argv.pop(index)
+ sys.argv.pop(index)
+ config_line = "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config
+
+ except ValueError:
+ config_line = ""
+
class my_build_scripts(build_scripts):
***************
*** 212,226 ****
install_prefix = dict['prefix'][1]
- # Site config stuff
- index = sys.argv.index('--cfg-path')
- if index > 0:
- site_config = sys.argv[index+1]
- else:
- site_config = os.path.join(install_prefix,'etc')
-
- site_config =
os.path.join(os.path.abspath(site_config),'.gnue-install.cfg')
-
if sys.platform != 'win32':
gnue_env = \
"#######\n" \
--- 224,229 ----
***************
*** 230,236 ****
+ "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" %
dict['prefix'][1] \
+ "os.environ['INSTALL_LIB']='%s'\n" % dict['install_lib'][1] \
+ "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
! + "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config \
+ "#######\n"
else:
gnue_env = \
--- 233,239 ----
+ "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" %
dict['prefix'][1] \
+ "os.environ['INSTALL_LIB']='%s'\n" % dict['install_lib'][1] \
+ "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
! + config_line \
+ "#######\n"
else:
gnue_env = \
***************
*** 250,256 ****
+ "os.environ['INSTALL_PREFIX']=_BASE\n" \
+ "os.environ['INSTALL_LIB']=_BASE\n" \
+ "os.putenv('PYTHONCASEOK','1')\n" \
! + "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config \
+ "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
+ " sys.path.append(os.path.join(_BASE,'extras'))\n" \
+ "#######\n\n"
--- 253,259 ----
+ "os.environ['INSTALL_PREFIX']=_BASE\n" \
+ "os.environ['INSTALL_LIB']=_BASE\n" \
+ "os.putenv('PYTHONCASEOK','1')\n" \
! + config_line \
+ "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
+ " sys.path.append(os.path.join(_BASE,'extras'))\n" \
+ "#######\n\n"
Index: gnue/navigator/setup.py
diff -c gnue/navigator/setup.py:1.4 gnue/navigator/setup.py:1.5
*** gnue/navigator/setup.py:1.4 Mon Apr 22 03:18:16 2002
--- gnue/navigator/setup.py Sat Apr 27 16:59:51 2002
***************
*** 94,99 ****
--- 94,113 ----
+
+ # Site config stuff
+ try:
+ index = sys.argv.index('--cfg-file')
+ site_config = os.path.join(os.path.abspath(sys.argv[index+1]))
+ sys.argv.pop(index)
+ sys.argv.pop(index)
+ config_line = "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config
+
+ except ValueError:
+ config_line = ""
+
+
+
class my_build_scripts(build_scripts):
def finalize_options(self):
***************
*** 113,118 ****
--- 127,133 ----
+ "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" %
dict['prefix'][1] \
+ "os.environ['INSTALL_LIB']='%s'\n" % dict['install_lib'][1] \
+ "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
+ + config_line \
+ "#######\n"
else:
gnue_env = \
***************
*** 134,139 ****
--- 149,155 ----
+ "os.putenv('PYTHONCASEOK','1')\n" \
+ "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
+ " sys.path.append(os.path.join(_BASE,'extras'))\n" \
+ + config_line \
+ "#######\n\n"
for script in self.scripts:
Index: gnue/reports/setup.py
diff -c gnue/reports/setup.py:1.5 gnue/reports/setup.py:1.6
*** gnue/reports/setup.py:1.5 Mon Apr 22 03:18:16 2002
--- gnue/reports/setup.py Sat Apr 27 16:59:51 2002
***************
*** 1,6 ****
#!/usr/bin/env python
#
! # Copyright 2001 Free Software Foundation
#
# This file is part of GNU Enterprise.
#
--- 1,6 ----
#!/usr/bin/env python
#
! # Copyright 2001-2002 Free Software Foundation
#
# This file is part of GNU Enterprise.
#
***************
*** 99,105 ****
ln -s ../../src/__init__.py .
ln -s ../../../gnue-common/src common
ln -s ../../../reports/src reports
! ln -s ../../src reports
cd designer
ln -s ../../../../designer/src/* .
ln -s ../../../../designer/templates templates
--- 99,105 ----
ln -s ../../src/__init__.py .
ln -s ../../../gnue-common/src common
ln -s ../../../reports/src reports
! ln -s ../../src reports
cd designer
ln -s ../../../../designer/src/* .
ln -s ../../../../designer/templates templates
***************
*** 110,116 ****
file.write(grcvs)
file.close
os.system ('chmod 700 client/grcvs')
!
if not os.path.islink('/usr/local/bin/grcvs'):
print "We will now create a symlink to client/grcvs in /usr/local/bin"
print "You will be prompted for the root password on the machine to do
this."
--- 110,116 ----
file.write(grcvs)
file.close
os.system ('chmod 700 client/grcvs')
!
if not os.path.islink('/usr/local/bin/grcvs'):
print "We will now create a symlink to client/grcvs in /usr/local/bin"
print "You will be prompted for the root password on the machine to do
this."
***************
*** 166,176 ****
# sys.exit()
! class my_build_scripts(build_scripts):
def finalize_options(self):
build_scripts.finalize_options(self)
! if self.finalized:
return
dict = self.distribution.get_option_dict("install")
--- 166,190 ----
# sys.exit()
!
! # Site config stuff
! try:
! index = sys.argv.index('--cfg-file')
! site_config = os.path.join(os.path.abspath(sys.argv[index+1]))
! sys.argv.pop(index)
! sys.argv.pop(index)
! config_line = "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config
!
! except ValueError:
! config_line = ""
!
!
!
! class my_build_scripts(build_scripts):
def finalize_options(self):
build_scripts.finalize_options(self)
! if self.finalized:
return
dict = self.distribution.get_option_dict("install")
***************
*** 183,188 ****
--- 197,203 ----
+ "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" %
dict['prefix'][1] \
+ "os.environ['INSTALL_LIB']='%s'\n" % dict['install_lib'][1] \
+ "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
+ + config_line \
+ "#######\n"
else:
gnue_env = \
***************
*** 191,201 ****
+ "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % (sys.prefix)
\
+ "os.environ['INSTALL_PREFIX']='%s'\n" % (sys.prefix)
\
+ "os.environ['INSTALL_LIB']='%s'\n" % (sys.prefix)
\
+ "#######\n"
! for script in self.scripts:
print "Building %s..."% (script),
!
fin = open(script+".in", "r")
fout = open(script, "w")
--- 206,217 ----
+ "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % (sys.prefix)
\
+ "os.environ['INSTALL_PREFIX']='%s'\n" % (sys.prefix)
\
+ "os.environ['INSTALL_LIB']='%s'\n" % (sys.prefix)
\
+ + config_line \
+ "#######\n"
! for script in self.scripts:
print "Building %s..."% (script),
!
fin = open(script+".in", "r")
fout = open(script, "w")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/setup.py designer/setup.py forms/se...,
Jason Cater <=