Menu
▾
▴
[Ecell-cvs] SF.net SVN: ecell:[3187] ecell3/trunk/ecell
|
From: <mor...@us...> - 2008-10-10 09:57:22
|
Revision: 3187
http://ecell.svn.sourceforge.net/ecell/?rev=3187&view=rev
Author: moriyoshi
Date: 2008-10-10 09:53:00 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
* Merge from branch.
Modified Paths:
--------------
ecell3/trunk/ecell/Makefile.am
ecell3/trunk/ecell/configure.in
ecell3/trunk/ecell/frontend/session-monitor/Makefile.am
ecell3/trunk/ecell/frontend/session-monitor/setup.py
ecell3/trunk/ecell/pyecell/ecell/Session.py
ecell3/trunk/ecell/pyecell/ecell/config.py.in
Added Paths:
-----------
ecell3/trunk/ecell/frontend/
ecell3/trunk/ecell/frontend/Makefile.am
ecell3/trunk/ecell/frontend/session-monitor/
Removed Paths:
-------------
ecell3/trunk/ecell/session-monitor/
Modified: ecell3/trunk/ecell/Makefile.am
===================================================================
--- ecell3/trunk/ecell/Makefile.am 2008-10-10 09:42:51 UTC (rev 3186)
+++ ecell3/trunk/ecell/Makefile.am 2008-10-10 09:53:00 UTC (rev 3187)
@@ -1,9 +1,6 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libecs libemc pyecs pyecell bin dm
-if ENABLE_GUI
-SUBDIRS += session-monitor
-endif
+SUBDIRS = libecs libemc pyecs pyecell bin dm frontend
ECELL_DIRNAME=@ECELL_DIRNAME@
Modified: ecell3/trunk/ecell/configure.in
===================================================================
--- ecell3/trunk/ecell/configure.in 2008-10-10 09:42:51 UTC (rev 3186)
+++ ecell3/trunk/ecell/configure.in 2008-10-10 09:53:00 UTC (rev 3187)
@@ -307,9 +307,10 @@
pyecell/ecell/config.py
pyecs/Makefile
pyecs/setup.py
- session-monitor/Makefile
- session-monitor/plugins/Makefile
- session-monitor/glade/Makefile
+ frontend/Makefile
+ frontend/session-monitor/Makefile
+ frontend/session-monitor/plugins/Makefile
+ frontend/session-monitor/glade/Makefile
])
AC_CONFIG_FILES([bin/ecell3-dmc], [chmod +x bin/ecell3-dmc])
AC_OUTPUT
Property changes on: ecell3/trunk/ecell/frontend
___________________________________________________________________
Added: svn:ignore
+ Makefile
Makefile.in
Added: ecell3/trunk/ecell/frontend/Makefile.am
===================================================================
--- ecell3/trunk/ecell/frontend/Makefile.am (rev 0)
+++ ecell3/trunk/ecell/frontend/Makefile.am 2008-10-10 09:53:00 UTC (rev 3187)
@@ -0,0 +1,4 @@
+SUBDIRS =
+if ENABLE_GUI
+SUBDIRS += session-monitor
+endif
Property changes on: ecell3/trunk/ecell/frontend/Makefile.am
___________________________________________________________________
Added: svn:mime-type
+ text/x-makefile
Added: svn:eol-style
+ native
Modified: ecell3/trunk/ecell/frontend/session-monitor/Makefile.am
===================================================================
--- ecell3/trunk/ecell/session-monitor/Makefile.am 2008-08-15 23:39:58 UTC (rev 3137)
+++ ecell3/trunk/ecell/frontend/session-monitor/Makefile.am 2008-10-10 09:53:00 UTC (rev 3187)
@@ -1,6 +1,7 @@
SUBDIRS = glade plugins
-PYTHON_ = env PYTHONPATH=$(srcdir)/../pyecell $(PYTHON)
+PYTHON_ = env PYTHONPATH=$(top_srcdir)/pyecell sysconfdir=$(sysconfdir) datarootdir=$(datarootdir) libdir=$(libdir) $(PYTHON)
+
EXTRA_DIST = \
ecell/ui/__init__.py\
ecell/ui/osogo/AboutSessionMonitor.py\
@@ -44,25 +45,11 @@
ecell3-session-monitor
all-local:
- sysconfdir=$(sysconfdir) \
- datarootdir=$(datarootdir) \
- libdir=$(libdir) \
$(PYTHON_) setup.py config
- sysconfdir=$(sysconfdir) \
- datarootdir=$(datarootdir) \
- libdir=$(libdir) \
$(PYTHON_) setup.py build
mostlyclean-local:
- sysconfdir=$(sysconfdir) \
- datarootdir=$(datarootdir) \
- libdir=$(libdir) \
$(PYTHON_) setup.py clean
install-exec-local:
- DESTDIR=$(DESTDIR); \
- sysconfdir=$(sysconfdir) \
- datarootdir=$(datarootdir) \
- libdir=$(libdir) \
- $(PYTHON_) setup.py install -f --prefix=$(PREFIX) $${DESTDIR:+--root }$${DESTDIR}
-
+ $(PYTHON_) setup.py install -f --prefix=$(PREFIX) $(if $(DESTDIR),--root $(DESTDIR), )
Modified: ecell3/trunk/ecell/frontend/session-monitor/setup.py
===================================================================
--- ecell3/trunk/ecell/session-monitor/setup.py 2008-08-15 23:39:58 UTC (rev 3137)
+++ ecell3/trunk/ecell/frontend/session-monitor/setup.py 2008-10-10 09:53:00 UTC (rev 3187)
@@ -13,8 +13,8 @@
os.path.join( os.path.dirname( __file__ ), 'plugins', '*' ) )
setup(
- name = 'ecell.ui.osogo',
- version = "3.1.105",
+ name = 'ecell.session-monitor',
+ version = config.version,
description = 'E-Cell Osogo -- Session Monitor',
author = 'E-Cell project',
author_email = 'in...@e-...',
Modified: ecell3/trunk/ecell/pyecell/ecell/Session.py
===================================================================
--- ecell3/trunk/ecell/pyecell/ecell/Session.py 2008-10-10 09:42:51 UTC (rev 3186)
+++ ecell3/trunk/ecell/pyecell/ecell/Session.py 2008-10-10 09:53:00 UTC (rev 3187)
@@ -26,7 +26,6 @@
#
#END_HEADER
-import string
import eml
import sys
import os
@@ -137,7 +136,7 @@
<eml>
''' % ( time.asctime( time.localtime() ) , self.getCurrentTime() )
aString = anEml.asString()
- aBuffer = string.join( string.split( aString, '<eml>\n' ), aCurrentInfo )
+ aBuffer = aCurrentInfo.join( aString.split( '<eml>\n' ) )
aFileObject = open( aModel, 'w' )
aFileObject.write( aBuffer )
aFileObject.close()
Modified: ecell3/trunk/ecell/pyecell/ecell/config.py.in
===================================================================
--- ecell3/trunk/ecell/pyecell/ecell/config.py.in 2008-10-10 09:42:51 UTC (rev 3186)
+++ ecell3/trunk/ecell/pyecell/ecell/config.py.in 2008-10-10 09:53:00 UTC (rev 3187)
@@ -28,7 +28,7 @@
import sys
__all__ = (
- 'package',
+ 'PACKAGE',
'per_app_dir_name',
'version',
'version_info',
@@ -39,7 +39,10 @@
'bin_dir',
'lib_dir',
'data_dir',
+ 'datarootdir',
+ 'doc_dir',
'conf_dir',
+ 'builtin_dm_dir',
'dm_path'
)
@@ -51,7 +54,7 @@
else:
return os.path.abspath( sys.argv[0] )
-package = "@PACKAGE@"
+PACKAGE = "@PACKAGE@"
per_app_dir_name = "@ECELL_DIRNAME@"
version = "@VERSION@"
version_info = {
@@ -106,20 +109,31 @@
_lib_dir = os.path.join( prefix, 'lib' )
lib_dir = os.path.join( _lib_dir, per_app_dir_name )
-_data_dir = '''@datarootdir@'''
-_data_dir = expand_shell_variables( _data_dir, locals() )
-if len( _data_dir ) == 0 or not os.path.isdir( _data_dir ):
- _data_dir = os.path.join( prefix, 'share' )
-data_dir = os.path.join( _data_dir, per_app_dir_name )
+datarootdir = '''@datarootdir@'''
+datarootdir = expand_shell_variables( datarootdir, locals() )
+if len( datarootdir ) == 0 or not os.path.isdir( datarootdir ):
+ datarootdir = os.path.join( prefix, 'share' )
+data_dir = '''@datadir@'''
+data_dir = expand_shell_variables( data_dir, locals() )
+if len( data_dir ) == 0 or not os.path.isdir( data_dir ):
+ data_dir = os.path.join( datarootdir, per_app_dir_name )
+
_conf_dir = '''@sysconfdir@'''
_conf_dir = expand_shell_variables( _conf_dir, locals() )
if len( _conf_dir ) == 0 or not os.path.isdir( _conf_dir ):
_conf_dir = os.path.join( prefix, 'etc' )
conf_dir = os.path.join( _conf_dir, per_app_dir_name )
+doc_dir = '''@docdir@'''
+doc_dir = expand_shell_variables( doc_dir, locals() )
+if len( doc_dir ) == 0 or not os.path.isdir( doc_dir ):
+ doc_dir = os.path.join( datarootdir, 'doc' )
+
+builtin_dm_dir = os.path.join( lib_dir, 'dms' )
+
if os.environ.has_key( 'ECELL3_DM_PATH' ):
dm_path = os.environ[ 'ECELL3_DM_PATH' ].split( os.pathsep )
else:
dm_path = []
-dm_path += [ os.path.join( lib_dir, 'modules' ) ]
+dm_path += [ builtin_dm_dir ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
