[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-common ./setup-cvs.py ./setup.py src/apps/...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue-common ./setup-cvs.py ./setup.py src/apps/... |
|
Date: |
Tue, 30 Sep 2003 12:35:20 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-common
Branch:
Changes by: Reinhard Mueller <address@hidden> 03/09/30 12:35:20
Modified files:
. : setup-cvs.py setup.py
src/apps : GBaseApp.py GConfig.py
src/rpc/drivers/xmlrpc/pw_xmlrpc: ClientAdapter.py
src/rpc/drivers/xmlrpc/py_xmlrpc: ClientAdapter.py
Log message:
Changed install localtions for images and translations to standard
directories.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup-cvs.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/apps/GBaseApp.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/apps/GConfig.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ClientAdapter.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnue-common/setup-cvs.py
diff -c gnue-common/setup-cvs.py:1.56 gnue-common/setup-cvs.py:1.57
*** gnue-common/setup-cvs.py:1.56 Mon Sep 29 18:33:17 2003
--- gnue-common/setup-cvs.py Tue Sep 30 12:35:19 2003
***************
*** 328,334 ****
"%s/share" % CONFDIR, # new
"%s/share/gnue" % CONFDIR,
"%s/share/gnue/grpc" % CONFDIR,
! "%s/translations" % CONFDIR ]
willInstallDocs = 0
--- 328,335 ----
"%s/share" % CONFDIR, # new
"%s/share/gnue" % CONFDIR,
"%s/share/gnue/grpc" % CONFDIR,
! "%s/share/gnue/images" % CONFDIR,
! "%s/share/locale" % CONFDIR ]
willInstallDocs = 0
***************
*** 407,420 ****
ln -s %(CVSDIR)s/gnue-common/etc/sample.* .
cd %(CONFDIR)s/shared
! rm -rf images filters
mkdir filters
- mkdir images
! cd %(CONFDIR)s/translations
rm -f ?? ??_??
! ln -s %(CVSDIR)s/gnue-common/translations/?? %(CONFDIR)s/translations/
! ln -s %(CVSDIR)s/gnue-common/translations/??_?? %(CONFDIR)s/translations/
""" % globals() )
--- 408,420 ----
ln -s %(CVSDIR)s/gnue-common/etc/sample.* .
cd %(CONFDIR)s/shared
! rm -rf filters
mkdir filters
! cd %(CONFDIR)s/share/locale
rm -f ?? ??_??
! ln -s %(CVSDIR)s/gnue-common/translations/?? %(CONFDIR)s/share/locale/
! ln -s %(CVSDIR)s/gnue-common/translations/??_?? %(CONFDIR)s/share/locale/
""" % globals() )
Index: gnue-common/setup.py
diff -c gnue-common/setup.py:1.83 gnue-common/setup.py:1.84
*** gnue-common/setup.py:1.83 Mon Sep 29 18:05:53 2003
--- gnue-common/setup.py Tue Sep 30 12:35:19 2003
***************
*** 60,66 ****
# TODO: get rid of setupext!
params ["data_files"] = \
[Data_Files (base_dir = 'install_data',
! copy_to = 'shared',
template = ['recursive-include images *.png',
'recursive-include images *.xpm',
'recursive-include images *.ico',
--- 60,66 ----
# TODO: get rid of setupext!
params ["data_files"] = \
[Data_Files (base_dir = 'install_data',
! copy_to = 'share/gnue',
template = ['recursive-include images *.png',
'recursive-include images *.xpm',
'recursive-include images *.ico',
***************
*** 72,79 ****
'prune etc/CVS'],
preserve_path = 0),
Data_Files (base_dir = 'install_data',
! copy_to = '',
template = ['recursive-include translations *.mo'],
preserve_path = 1),
Data_Files (base_dir = 'install_data',
copy_to = 'share/doc/gnue-common',
--- 72,80 ----
'prune etc/CVS'],
preserve_path = 0),
Data_Files (base_dir = 'install_data',
! copy_to = 'share/locale',
template = ['recursive-include translations *.mo'],
+ strip_dirs = 1,
preserve_path = 1),
Data_Files (base_dir = 'install_data',
copy_to = 'share/doc/gnue-common',
Index: gnue-common/src/apps/GBaseApp.py
diff -c gnue-common/src/apps/GBaseApp.py:1.39
gnue-common/src/apps/GBaseApp.py:1.40
*** gnue-common/src/apps/GBaseApp.py:1.39 Fri Sep 26 10:24:55 2003
--- gnue-common/src/apps/GBaseApp.py Tue Sep 30 12:35:19 2003
***************
*** 235,241 ****
# no need for LC_ALL on win2k and XP with this variant
lang = [locale.getdefaultlocale()[0]]
global catalog, textEncoding
! catalog =
gettext.translation('gnue',GConfig.getInstalledBase('install_prefix')+'/translations',languages=lang)
catalog.install(unicode=1)
textEncoding = gConfig('textEncoding')
if not catalog.charset():
--- 235,241 ----
# no need for LC_ALL on win2k and XP with this variant
lang = [locale.getdefaultlocale()[0]]
global catalog, textEncoding
! catalog =
gettext.translation('gnue',paths.data+'share/locale',languages=lang)
catalog.install(unicode=1)
textEncoding = gConfig('textEncoding')
if not catalog.charset():
Index: gnue-common/src/apps/GConfig.py
diff -c gnue-common/src/apps/GConfig.py:1.37
gnue-common/src/apps/GConfig.py:1.38
*** gnue-common/src/apps/GConfig.py:1.37 Mon Sep 29 11:09:12 2003
--- gnue-common/src/apps/GConfig.py Tue Sep 30 12:35:20 2003
***************
*** 253,258 ****
_site_config = {
"install_prefix": paths.data,
"common_etc": paths.config,
! "common_images": os.path.join (paths.data, "shared", "images"),
"common_appbase": paths.data,
! "common_shared": os.path.join (paths.data, "shared")}
--- 253,258 ----
_site_config = {
"install_prefix": paths.data,
"common_etc": paths.config,
! "common_images": os.path.join (paths.data, "share", "gnue", "images"),
"common_appbase": paths.data,
! "common_shared": os.path.join (paths.data, "share", "gnue")}
Index: gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py
diff -c gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py:1.1
gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py:1.2
*** gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py:1.1 Mon Sep
22 18:28:41 2003
--- gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ClientAdapter.py Tue Sep
30 12:35:20 2003
***************
*** 62,67 ****
--- 62,68 ----
from gnue.common.rpc import GComm, GCommBase
from gnue.common.apps import GConfig, GDebug
+ from gnue import paths
import string, sys
***************
*** 71,77 ****
import gettext
try:
!
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
except IOError:
GDebug.printMesg(1,'Unable to load locale information falling back to
default English language translations.')
import __builtin__
--- 72,78 ----
import gettext
try:
! gettext.install('gnue',paths.data+'share/locale')
except IOError:
GDebug.printMesg(1,'Unable to load locale information falling back to
default English language translations.')
import __builtin__
Index: gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ClientAdapter.py
diff -c gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ClientAdapter.py:1.1
gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ClientAdapter.py:1.2
*** gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ClientAdapter.py:1.1 Mon Sep
22 18:28:42 2003
--- gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ClientAdapter.py Tue Sep
30 12:35:20 2003
***************
*** 48,53 ****
--- 48,54 ----
from gnue.common.rpc import GCommBase
from gnue.common.rpc import GComm
from gnue.common.apps import GConfig
+ from gnue import paths
import string, sys
***************
*** 57,63 ****
import gettext
try:
!
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
except IOError:
GDebug.printMesg(1,'Unable to load locale information falling back to
default English language translations.')
import __builtin__
--- 58,64 ----
import gettext
try:
! gettext.install('gnue',paths.data+'/share/locale')
except IOError:
GDebug.printMesg(1,'Unable to load locale information falling back to
default English language translations.')
import __builtin__
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-common ./setup-cvs.py ./setup.py src/apps/...,
Reinhard Mueller <=