Menu
▾
▴
ecell-cvs — CVS logs.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(71) |
Mar
(296) |
Apr
(77) |
May
(71) |
Jun
(128) |
Jul
(32) |
Aug
(69) |
Sep
(101) |
Oct
(31) |
Nov
(34) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(19) |
Feb
(52) |
Mar
(39) |
Apr
(61) |
May
(114) |
Jun
(57) |
Jul
(127) |
Aug
(134) |
Sep
(33) |
Oct
(51) |
Nov
(15) |
Dec
(21) |
| 2005 |
Jan
(24) |
Feb
(7) |
Mar
(16) |
Apr
(5) |
May
(50) |
Jun
(2) |
Jul
(8) |
Aug
(1) |
Sep
(4) |
Oct
(6) |
Nov
(43) |
Dec
(16) |
| 2006 |
Jan
|
Feb
(8) |
Mar
(7) |
Apr
(7) |
May
(26) |
Jun
(14) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(5) |
Nov
(24) |
Dec
(2) |
| 2007 |
Jan
|
Feb
(2) |
Mar
(3) |
Apr
(36) |
May
(51) |
Jun
(100) |
Jul
(29) |
Aug
(4) |
Sep
(22) |
Oct
(4) |
Nov
(10) |
Dec
(52) |
| 2008 |
Jan
(68) |
Feb
(49) |
Mar
(35) |
Apr
(12) |
May
(2) |
Jun
(18) |
Jul
|
Aug
(8) |
Sep
|
Oct
(136) |
Nov
(24) |
Dec
(45) |
| 2009 |
Jan
(19) |
Feb
(58) |
Mar
(22) |
Apr
(24) |
May
|
Jun
(28) |
Jul
(25) |
Aug
(49) |
Sep
(10) |
Oct
(6) |
Nov
(22) |
Dec
(30) |
| 2010 |
Jan
(138) |
Feb
(53) |
Mar
(1) |
Apr
(7) |
May
(4) |
Jun
(5) |
Jul
(7) |
Aug
(3) |
Sep
(15) |
Oct
|
Nov
(7) |
Dec
(7) |
| 2011 |
Jan
(11) |
Feb
(4) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mor...@us...> - 2010-02-11 09:46:00
|
Revision: 3823
http://ecell.svn.sourceforge.net/ecell/?rev=3823&view=rev
Author: moriyoshi
Date: 2010-02-11 09:45:52 +0000 (Thu, 11 Feb 2010)
Log Message:
-----------
* Rename ecell-3.2 as trunk
Added Paths:
-----------
ecell3/trunk/
Removed Paths:
-------------
ecell3/branches/ecell-3.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-11 09:45:07
|
Revision: 3822
http://ecell.svn.sourceforge.net/ecell/?rev=3822&view=rev
Author: moriyoshi
Date: 2010-02-11 09:44:54 +0000 (Thu, 11 Feb 2010)
Log Message:
-----------
* Move trunk to branches
Added Paths:
-----------
ecell3/branches/old-trunk/
Removed Paths:
-------------
ecell3/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-11 04:19:51
|
Revision: 3821
http://ecell.svn.sourceforge.net/ecell/?rev=3821&view=rev
Author: moriyoshi
Date: 2010-02-11 04:19:44 +0000 (Thu, 11 Feb 2010)
Log Message:
-----------
* Update for 3.2.0p1
Modified Paths:
--------------
ecell-build/trunk/pkg/deb/debian.lenny/changelog
ecell-build/trunk/pkg/deb/debian.lenny/control
ecell-build/trunk/pkg/deb/debian.lenny/ecell3-dev.install
ecell-build/trunk/pkg/deb/debian.lenny/ecell3-model-editor.install
ecell-build/trunk/pkg/deb/debian.lenny/ecell3-session-monitor.install
ecell-build/trunk/pkg/deb/debian.lenny/ecell3.install
ecell-build/trunk/pkg/deb/debian.lenny/rules
ecell-build/trunk/pkg/deb/ubuntu.jaunty/changelog
ecell-build/trunk/pkg/deb/ubuntu.jaunty/control
ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-dev.install
ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-model-editor.install
ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-session-monitor.install
ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3.install
ecell-build/trunk/pkg/deb/ubuntu.jaunty/rules
Added Paths:
-----------
ecell-build/trunk/pkg/deb/ubuntu.jaunty/patches/
ecell-build/trunk/pkg/deb/ubuntu.jaunty/patches/01_distutils_install_layout.patch
ecell-build/trunk/pkg/deb/ubuntu.karmic/
ecell-build/trunk/pkg/deb/ubuntu.karmic/README.Debian
ecell-build/trunk/pkg/deb/ubuntu.karmic/changelog
ecell-build/trunk/pkg/deb/ubuntu.karmic/compat
ecell-build/trunk/pkg/deb/ubuntu.karmic/control
ecell-build/trunk/pkg/deb/ubuntu.karmic/copyright
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.docs
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.install
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.doc-base
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.docs
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.install
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-session-monitor.install
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.doc-base
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.docs
ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.install
ecell-build/trunk/pkg/deb/ubuntu.karmic/patches/
ecell-build/trunk/pkg/deb/ubuntu.karmic/patches/01_distutils_install_layout.patch
ecell-build/trunk/pkg/deb/ubuntu.karmic/rules
Removed Paths:
-------------
ecell-build/trunk/pkg/deb/ubuntu.intrepid/
Modified: ecell-build/trunk/pkg/deb/debian.lenny/changelog
===================================================================
--- ecell-build/trunk/pkg/deb/debian.lenny/changelog 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/debian.lenny/changelog 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,3 +1,9 @@
+ecell (3.2.0p1-1) lenny; urgency=low
+
+ * Upstream update.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Fri, 5 Feb 2009 17:15:42 +0900
+
ecell (3.1.107-1) lenny; urgency=low
* Upstream update.
Modified: ecell-build/trunk/pkg/deb/debian.lenny/control
===================================================================
--- ecell-build/trunk/pkg/deb/debian.lenny/control 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/debian.lenny/control 2010-02-11 04:19:44 UTC (rev 3821)
@@ -2,11 +2,10 @@
Section: contrib/science
Priority: extra
Maintainer: Moriyoshi Koizumi <mo...@sf...>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, build-essential,
+Build-Depends: cdbs, debhelper (>= 5), automake, libtool, build-essential,
python2.5-dev, libboost-dev (>= 1.33.0), libboost-python-dev (>= 1.33.0),
- libgsl0-dev (>=1.8), python-numpy (>=1.0.1), python-numpy (>=1.0.1),
- python-gtk2 (>=2.6), python-gnome2 (>=2.6), python-glade2 (>=2.6),
- docbook-xml, docbook-utils, doxygen
+ libgsl0-dev (>=1.8), python-numpy (>=1.0.1), python-ply (>=2.5),
+ python-gtk2 (>=2.6), docbook-xml, docbook-utils, doxygen
Standards-Version: 3.7.2
Package: ecell3
@@ -21,8 +20,7 @@
Package: ecell3-session-monitor
Architecture: any
Section: contrib/science
-Depends: ecell3, ${shlibs:Depends}, ${misc:Depends}, python-gtk2 (>=2.6),
- python-glade2 (>=2.6)
+Depends: ecell3, ${shlibs:Depends}, ${misc:Depends}, python-gtk2 (>=2.6)
Description: E-Cell System is an object-oriented software suite for modeling,
simulation, and analysis of large scale complex systems, particularly focused
on biological details of cellular behavior.
@@ -31,8 +29,7 @@
Architecture: any
Section: contrib/science
Depends: ecell3, ecell3-session-monitor, ${shlibs:Depends}, ${misc:Depends},
- python-numpy (>=1.0.1), python-gtk2 (>=2.6), python-gnome2 (>=2.6),
- python-glade2 (>=2.6)
+ python-numpy (>=1.0.1), python-gtk2 (>=2.6), python-gnome2 (>=2.6)
Description: E-Cell System is an object-oriented software suite for modeling,
simulation, and analysis of large scale complex systems, particularly focused
on biological details of cellular behavior.
Modified: ecell-build/trunk/pkg/deb/debian.lenny/ecell3-dev.install
===================================================================
--- ecell-build/trunk/pkg/deb/debian.lenny/ecell3-dev.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/debian.lenny/ecell3-dev.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,8 +1,8 @@
debian/tmp/usr/bin/dmcompile
debian/tmp/usr/bin/ecell3-dmc
debian/tmp/usr/include/dmtool
-debian/tmp/usr/include/ecell-3.1
-debian/tmp/usr/share/ecell-3.1/dms
+debian/tmp/usr/include/ecell-3.2
+debian/tmp/usr/share/ecell-3.2/dms
debian/tmp/usr/lib/libecs.so
debian/tmp/usr/lib/libecs.la
debian/tmp/usr/lib/libemc.so
Modified: ecell-build/trunk/pkg/deb/debian.lenny/ecell3-model-editor.install
===================================================================
--- ecell-build/trunk/pkg/deb/debian.lenny/ecell3-model-editor.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/debian.lenny/ecell3-model-editor.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,5 +1,6 @@
+debian/tmp/etc/ecell-3.2/model-editor.ini
debian/tmp/usr/bin/ecell3-model-editor
-debian/tmp/usr/lib/ecell-3.1/model-editor
+debian/tmp/usr/lib/ecell-3.2/model-editor
debian/tmp/usr/lib/python2.5/site-packages/ecell.model_editor-*.egg-info
debian/tmp/usr/lib/python2.5/site-packages/ecell/ui/model_editor
-debian/tmp/usr/share/ecell-3.1/model-editor
+debian/tmp/usr/share/ecell-3.2/model-editor
Modified: ecell-build/trunk/pkg/deb/debian.lenny/ecell3-session-monitor.install
===================================================================
--- ecell-build/trunk/pkg/deb/debian.lenny/ecell3-session-monitor.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/debian.lenny/ecell3-session-monitor.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,5 +1,6 @@
+debian/tmp/etc/ecell-3.2/osogo.ini
debian/tmp/usr/bin/ecell3-session-monitor
-debian/tmp/usr/lib/ecell-3.1/session-monitor
-debian/tmp/usr/share/ecell-3.1/session-monitor
+debian/tmp/usr/lib/ecell-3.2/session-monitor
+debian/tmp/usr/share/ecell-3.2/session-monitor
debian/tmp/usr/lib/python2.5/site-packages/ecell.session_monitor-*.egg-info
debian/tmp/usr/lib/python2.5/site-packages/ecell/ui/osogo
Modified: ecell-build/trunk/pkg/deb/debian.lenny/ecell3.install
===================================================================
--- ecell-build/trunk/pkg/deb/debian.lenny/ecell3.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/debian.lenny/ecell3.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -7,10 +7,11 @@
debian/tmp/usr/bin/ecell3-session-manager
debian/tmp/usr/lib/libecs.so.*
debian/tmp/usr/lib/libemc.so.*
-debian/tmp/usr/lib/ecell-3.1/dms
+debian/tmp/usr/lib/ecell-3.2/dms
debian/tmp/usr/share/doc/ecell3/samples
debian/tmp/usr/lib/python2.5/site-packages/E_Cell-*.egg-info
-debian/tmp/usr/lib/python2.5/site-packages/*.py*
-debian/tmp/usr/lib/python2.5/site-packages/ui/__init__.py*
-debian/tmp/usr/lib/python2.5/site-packages/analysis
-debian/tmp/usr/lib/python2.5/site-packages/session_amanager
+debian/tmp/usr/lib/python2.5/site-packages/ecell/*.py*
+debian/tmp/usr/lib/python2.5/site-packages/ecell/*.so
+debian/tmp/usr/lib/python2.5/site-packages/ecell/ui/__init__.py*
+debian/tmp/usr/lib/python2.5/site-packages/ecell/analysis
+debian/tmp/usr/lib/python2.5/site-packages/ecell/session_manager
Modified: ecell-build/trunk/pkg/deb/debian.lenny/rules
===================================================================
--- ecell-build/trunk/pkg/deb/debian.lenny/rules 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/debian.lenny/rules 2010-02-11 04:19:44 UTC (rev 3821)
@@ -4,3 +4,9 @@
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_EXTRA_FLAGS = --docdir=/usr/share/doc/ecell3
+
+makebuilddir/ecell3::
+ ./autogen.sh
+
+binary-install/ecell3::
+ dh_pysupport -i
Modified: ecell-build/trunk/pkg/deb/ubuntu.jaunty/changelog
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/changelog 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/changelog 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,3 +1,9 @@
+ecell (3.2.0p1-1) jaunty; urgency=low
+
+ * Upstream update.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Fri, 5 Feb 2009 17:15:42 +0900
+
ecell (3.1.107-1) jaunty; urgency=low
* Upstream update.
Modified: ecell-build/trunk/pkg/deb/ubuntu.jaunty/control
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/control 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/control 2010-02-11 04:19:44 UTC (rev 3821)
@@ -2,10 +2,10 @@
Section: contrib/science
Priority: extra
Maintainer: Moriyoshi Koizumi <mo...@sf...>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, build-essential,
+Build-Depends: cdbs, debhelper (>= 5), automake, libtool, build-essential,
python2.6-dev, libboost-dev (>= 1.34.0), libboost-python-dev (>= 1.34.0),
- libgsl0-dev (>=1.8), python-numpy (>=1.0.1),
- python-gtk2 (>=2.6), python-gnomecanvas (>=2.6), python-glade2 (>=2.6),
+ libgsl0-dev (>=1.8), python-numpy (>=1.0.1), python-ply (>=2.5),
+ python-gtk2 (>=2.6), python-gnomecanvas (>=2.6),
docbook-xml, docbook-utils, doxygen
Standards-Version: 3.7.2
@@ -21,8 +21,7 @@
Package: ecell3-session-monitor
Architecture: any
Section: contrib/science
-Depends: ecell3, ${shlibs:Depends}, ${misc:Depends}, python-gtk2 (>=2.6),
- python-glade2 (>=2.6)
+Depends: ecell3, ${shlibs:Depends}, ${misc:Depends}, python-gtk2 (>=2.6)
Description: E-Cell System is an object-oriented software suite for modeling,
simulation, and analysis of large scale complex systems, particularly focused
on biological details of cellular behavior.
@@ -31,8 +30,7 @@
Architecture: any
Section: contrib/science
Depends: ecell3, ecell3-session-monitor, ${shlibs:Depends}, ${misc:Depends},
- python-numpy (>=1.0.1), python-gtk2 (>=2.6), python-gnomecanvas (>=2.6),
- python-glade2 (>=2.6)
+ python-numpy (>=1.0.1), python-gtk2 (>=2.6), python-gnomecanvas (>=2.6)
Description: E-Cell System is an object-oriented software suite for modeling,
simulation, and analysis of large scale complex systems, particularly focused
on biological details of cellular behavior.
Modified: ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-dev.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-dev.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-dev.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,8 +1,8 @@
debian/tmp/usr/bin/dmcompile
debian/tmp/usr/bin/ecell3-dmc
debian/tmp/usr/include/dmtool
-debian/tmp/usr/include/ecell-3.1
-debian/tmp/usr/share/ecell-3.1/dms
+debian/tmp/usr/include/ecell-3.2
+debian/tmp/usr/share/ecell-3.2/dms
debian/tmp/usr/lib/libecs.so
debian/tmp/usr/lib/libecs.la
debian/tmp/usr/lib/libemc.so
Modified: ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-model-editor.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-model-editor.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-model-editor.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,5 +1,6 @@
+debian/tmp/etc/ecell-3.2/model-editor.ini
debian/tmp/usr/bin/ecell3-model-editor
-debian/tmp/usr/lib/ecell-3.1/model-editor
-debian/tmp/usr/lib/python2.6/site-packages/ecell.model_editor-*.egg-info
-debian/tmp/usr/lib/python2.6/site-packages/ecell/ui/model_editor
-debian/tmp/usr/share/ecell-3.1/model-editor
+debian/tmp/usr/lib/ecell-3.2/model-editor
+debian/tmp/usr/lib/python2.6/dist-packages/ecell.model_editor-*.egg-info
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/ui/model_editor
+debian/tmp/usr/share/ecell-3.2/model-editor
Modified: ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-session-monitor.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-session-monitor.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3-session-monitor.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,5 +1,6 @@
+debian/tmp/etc/ecell-3.2/osogo.ini
debian/tmp/usr/bin/ecell3-session-monitor
-debian/tmp/usr/lib/ecell-3.1/session-monitor
-debian/tmp/usr/share/ecell-3.1/session-monitor
-debian/tmp/usr/lib/python2.6/site-packages/ecell.session_monitor-*.egg-info
-debian/tmp/usr/lib/python2.6/site-packages/ecell/ui/osogo
+debian/tmp/usr/lib/ecell-3.2/session-monitor
+debian/tmp/usr/share/ecell-3.2/session-monitor
+debian/tmp/usr/lib/python2.6/dist-packages/ecell.session_monitor-*.egg-info
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/ui/osogo
Modified: ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3.install 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/ecell3.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -7,10 +7,11 @@
debian/tmp/usr/bin/ecell3-session-manager
debian/tmp/usr/lib/libecs.so.*
debian/tmp/usr/lib/libemc.so.*
-debian/tmp/usr/lib/ecell-3.1/dms
+debian/tmp/usr/lib/ecell-3.2/dms
debian/tmp/usr/share/doc/ecell3/samples
-debian/tmp/usr/lib/python2.6/site-packages/E_Cell-*.egg-info
-debian/tmp/usr/lib/python2.6/site-packages/*.py*
-debian/tmp/usr/lib/python2.5/site-packages/ui/__init__.py*
-debian/tmp/usr/lib/python2.6/site-packages/analysis
-debian/tmp/usr/lib/python2.6/site-packages/session_amanager
+debian/tmp/usr/lib/python2.6/dist-packages/E_Cell-*.egg-info
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/*.py*
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/*.so
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/ui/__init__.py*
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/analysis
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/session_manager
Added: ecell-build/trunk/pkg/deb/ubuntu.jaunty/patches/01_distutils_install_layout.patch
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/patches/01_distutils_install_layout.patch (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/patches/01_distutils_install_layout.patch 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,27 @@
+diff -ur ecell-3.1.107~/ecell/frontend/model-editor/Makefile.am ecell-3.1.107/ecell/frontend/model-editor/Makefile.am
+--- ecell-3.1.107~/ecell/frontend/model-editor/Makefile.am 2009-04-30 05:56:48.000000000 +0900
++++ ecell-3.1.107/ecell/frontend/model-editor/Makefile.am 2009-06-26 13:54:48.037499775 +0900
+@@ -97,4 +97,4 @@
+ rm -rf build
+
+ install-exec-local:
+- $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) $(if $(DESTDIR),--root $(DESTDIR), )
++ $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) --install-layout=deb --no-compile -O0 $(if $(DESTDIR),--root $(DESTDIR), )
+diff -ur ecell-3.1.107~/ecell/frontend/session-monitor/Makefile.am ecell-3.1.107/ecell/frontend/session-monitor/Makefile.am
+--- ecell-3.1.107~/ecell/frontend/session-monitor/Makefile.am 2009-04-30 05:56:50.000000000 +0900
++++ ecell-3.1.107/ecell/frontend/session-monitor/Makefile.am 2009-06-26 13:54:52.829853254 +0900
+@@ -52,4 +52,4 @@
+ rm -rf build
+
+ install-exec-local:
+- $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) $(if $(DESTDIR),--root $(DESTDIR), )
++ $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) --install-layout=deb --no-compile -O0 $(if $(DESTDIR),--root $(DESTDIR), )
+diff -ur ecell-3.1.107~/ecell/pyecell/Makefile.am ecell-3.1.107/ecell/pyecell/Makefile.am
+--- ecell-3.1.107~/ecell/pyecell/Makefile.am 2009-04-30 05:56:55.000000000 +0900
++++ ecell-3.1.107/ecell/pyecell/Makefile.am 2009-06-26 13:54:28.079317075 +0900
+@@ -97,4 +97,4 @@
+ $(RM) -rf build
+
+ install-exec-local:
+- $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) $(if $(DESTDIR),--root $(DESTDIR), )
++ $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) --install-layout=deb --no-compile -O0 $(if $(DESTDIR),--root $(DESTDIR), )
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.jaunty/patches/01_distutils_install_layout.patch
___________________________________________________________________
Added: svn:mime-type
+ text/x-diff
Added: svn:eol-style
+ native
Modified: ecell-build/trunk/pkg/deb/ubuntu.jaunty/rules
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.jaunty/rules 2010-02-11 03:51:34 UTC (rev 3820)
+++ ecell-build/trunk/pkg/deb/ubuntu.jaunty/rules 2010-02-11 04:19:44 UTC (rev 3821)
@@ -1,6 +1,13 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_EXTRA_FLAGS = --docdir=/usr/share/doc/ecell3
+
+makebuilddir/ecell3::
+ ./autogen.sh
+
+binary-install/ecell3::
+ dh_pysupport -i
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/README.Debian
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/README.Debian (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/README.Debian 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,6 @@
+ecell for Debian
+----------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Moriyoshi Koizumi <mo...@sf...> Sat, 15 Dec 2007 07:44:09 +0900
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/README.Debian
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/changelog
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/changelog (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/changelog 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,48 @@
+ecell (3.2.0p1-1) karmic; urgency=low
+
+ * Upstream update.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Fri, 5 Feb 2009 17:15:42 +0900
+
+ecell (3.1.107-1) jaunty; urgency=low
+
+ * Upstream update.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Wed, 24 Jun 2008 13:24:12 +0900
+
+ecell (3.1.106-3) jaunty; urgency=low
+
+ * Reflect versioning scheme changes of libsbml packages.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Wed, 18 Jun 2008 18:24:12 +0900
+
+ecell (3.1.106-2) jaunty; urgency=low
+
+ * Fix dependencies between packages.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Tue, 05 Feb 2008 17:12:24 +0900
+
+ecell (3.1.106-1) jaunty; urgency=low
+
+ * Upstream update.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Mon, 04 Feb 2008 17:33:57 +0900
+
+ecell (3.1.106-0rc2-2) jaunty; urgency=low
+
+ * Fix ecell3.doc-base to specify users-manual instead of README.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Tue, 25 Dec 2007 19:59:02 +0900
+
+ecell (3.1.106-0rc2-1) jaunty; urgency=low
+
+ * Upstream update.
+
+ -- Moriyoshi Koizumi <mo...@sf...> Fri, 21 Dec 2007 02:57:00 +0900
+
+ecell (3.1.106-0rc1-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Moriyoshi Koizumi <mo...@sf...> Sat, 15 Dec 2007 07:44:09 +0900
+
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/changelog
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/compat
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/compat (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/compat 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1 @@
+5
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/compat
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/control
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/control (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/control 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,45 @@
+Source: ecell
+Section: contrib/science
+Priority: extra
+Maintainer: Moriyoshi Koizumi <mo...@sf...>
+Build-Depends: cdbs, debhelper (>= 5), automake, libtool, build-essential,
+ python2.6-dev, libboost-dev (>= 1.34.0), libboost-python-dev (>= 1.34.0),
+ libgsl0-dev (>=1.8), python-numpy (>=1.0.1), python-ply (>=2.5),
+ python-gtk2 (>=2.6), python-gnomecanvas (>=2.6),
+ docbook-xml, docbook-utils, doxygen
+Standards-Version: 3.7.2
+
+Package: ecell3
+Architecture: any
+Section: contrib/science
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-numpy (>=1.0.1)
+Recommends: python-sbml2 (>=2.3.5)
+Description: E-Cell System is an object-oriented software suite for modeling,
+ simulation, and analysis of large scale complex systems, particularly focused
+ on biological details of cellular behavior.
+
+Package: ecell3-session-monitor
+Architecture: any
+Section: contrib/science
+Depends: ecell3, ${shlibs:Depends}, ${misc:Depends}, python-gtk2 (>=2.6)
+Description: E-Cell System is an object-oriented software suite for modeling,
+ simulation, and analysis of large scale complex systems, particularly focused
+ on biological details of cellular behavior.
+
+Package: ecell3-model-editor
+Architecture: any
+Section: contrib/science
+Depends: ecell3, ecell3-session-monitor, ${shlibs:Depends}, ${misc:Depends},
+ python-numpy (>=1.0.1), python-gtk2 (>=2.6), python-gnomecanvas (>=2.6)
+Description: E-Cell System is an object-oriented software suite for modeling,
+ simulation, and analysis of large scale complex systems, particularly focused
+ on biological details of cellular behavior.
+
+Package: ecell3-dev
+Architecture: any
+Section: contrib/devel
+Depends: ecell3, ${shlibs:Depends}, ${misc:Depends}, libstdc++-dev,
+ libboost-dev (>= 1.34.0), libboost-python-dev, libgsl0-dev (>=1.8)
+Description: E-Cell System is an object-oriented software suite for modeling,
+ simulation, and analysis of large scale complex systems, particularly focused
+ on biological details of cellular behavior.
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/control
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/copyright
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/copyright (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/copyright 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,22 @@
+This package was debianized by Moriyoshi Koizumi <mo...@sf...> on
+Sat, 15 Dec 2007 07:44:09 +0900.
+
+It was downloaded from <fill in http/ftp site>
+
+Upstream Author: <put author(s) name and email here>
+
+Copyright: <put the year(s) of the copyright, and the names of the
+ copyright holder(s) here>
+
+License:
+
+<Put the license of the package here>
+
+
+The Debian packaging is (C) 2007, Moriyoshi Koizumi <mo...@sf...> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/copyright
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.docs
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.docs (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.docs 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/ecell3/api
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.docs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.install (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,9 @@
+debian/tmp/usr/bin/dmcompile
+debian/tmp/usr/bin/ecell3-dmc
+debian/tmp/usr/include/dmtool
+debian/tmp/usr/include/ecell-3.2
+debian/tmp/usr/share/ecell-3.2/dms
+debian/tmp/usr/lib/libecs.so
+debian/tmp/usr/lib/libecs.la
+debian/tmp/usr/lib/libemc.so
+debian/tmp/usr/lib/libemc.la
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-dev.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.doc-base
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.doc-base (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.doc-base 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,11 @@
+Document: ecell3-model-editor-manual
+Title: Users manual for E-Cell System version 3 Model Editor
+Author: Koichi Takahashi <kta...@mo...>
+Abstract: Users manual for E-Cell System version 3 Model Editor
+Section: unknown
+
+Format: HTML
+Index: /usr/share/doc/ecell/model-editor/index.html
+Files: /usr/share/doc/ecell/model-editor/*.html
+
+
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.doc-base
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.docs
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.docs (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.docs 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/ecell3/model-editor
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.docs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.install (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,6 @@
+debian/tmp/etc/ecell-3.2/model-editor.ini
+debian/tmp/usr/bin/ecell3-model-editor
+debian/tmp/usr/lib/ecell-3.2/model-editor
+debian/tmp/usr/lib/python2.6/dist-packages/ecell.model_editor-*.egg-info
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/ui/model_editor
+debian/tmp/usr/share/ecell-3.2/model-editor
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-model-editor.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-session-monitor.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-session-monitor.install (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-session-monitor.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,6 @@
+debian/tmp/etc/ecell-3.2/osogo.ini
+debian/tmp/usr/bin/ecell3-session-monitor
+debian/tmp/usr/lib/ecell-3.2/session-monitor
+debian/tmp/usr/share/ecell-3.2/session-monitor
+debian/tmp/usr/lib/python2.6/dist-packages/ecell.session_monitor-*.egg-info
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/ui/osogo
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3-session-monitor.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.doc-base
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.doc-base (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.doc-base 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,9 @@
+Document: ecell
+Title: E-Cell System Users Manual
+Author: Koichi Takahashi <kta...@mo...>
+Abstract: E-Cell System Users Manual
+Section: unknown
+
+Format: HTML
+Index: /usr/share/doc/ecell3/users-manual/index.html
+Files: /usr/share/doc/ecell3/users-manual/*
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.doc-base
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.docs
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.docs (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.docs 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,7 @@
+debian/tmp/usr/share/doc/ecell3/users-manual
+debian/tmp/usr/share/doc/ecell3/AUTHORS
+debian/tmp/usr/share/doc/ecell3/README
+debian/tmp/usr/share/doc/ecell3/COPYING
+debian/tmp/usr/share/doc/ecell3/INSTALL
+debian/tmp/usr/share/doc/ecell3/ChangeLog
+debian/tmp/usr/share/doc/ecell3/NEWS
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.docs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.install
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.install (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.install 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,17 @@
+debian/tmp/usr/bin/ecell3-em2eml
+debian/tmp/usr/bin/ecell3-eml2em
+debian/tmp/usr/bin/ecell3-eml2sbml
+debian/tmp/usr/bin/ecell3-python
+debian/tmp/usr/bin/ecell3-sbml2eml
+debian/tmp/usr/bin/ecell3-session
+debian/tmp/usr/bin/ecell3-session-manager
+debian/tmp/usr/lib/libecs.so.*
+debian/tmp/usr/lib/libemc.so.*
+debian/tmp/usr/lib/ecell-3.2/dms
+debian/tmp/usr/share/doc/ecell3/samples
+debian/tmp/usr/lib/python2.6/dist-packages/E_Cell-*.egg-info
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/*.py*
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/*.so
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/ui/__init__.py*
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/analysis
+debian/tmp/usr/lib/python2.6/dist-packages/ecell/session_manager
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/ecell3.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/patches/01_distutils_install_layout.patch
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/patches/01_distutils_install_layout.patch (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/patches/01_distutils_install_layout.patch 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,27 @@
+diff -ur ecell-3.1.107~/ecell/frontend/model-editor/Makefile.am ecell-3.1.107/ecell/frontend/model-editor/Makefile.am
+--- ecell-3.1.107~/ecell/frontend/model-editor/Makefile.am 2009-04-30 05:56:48.000000000 +0900
++++ ecell-3.1.107/ecell/frontend/model-editor/Makefile.am 2009-06-26 13:54:48.037499775 +0900
+@@ -97,4 +97,4 @@
+ rm -rf build
+
+ install-exec-local:
+- $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) $(if $(DESTDIR),--root $(DESTDIR), )
++ $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) --install-layout=deb --no-compile -O0 $(if $(DESTDIR),--root $(DESTDIR), )
+diff -ur ecell-3.1.107~/ecell/frontend/session-monitor/Makefile.am ecell-3.1.107/ecell/frontend/session-monitor/Makefile.am
+--- ecell-3.1.107~/ecell/frontend/session-monitor/Makefile.am 2009-04-30 05:56:50.000000000 +0900
++++ ecell-3.1.107/ecell/frontend/session-monitor/Makefile.am 2009-06-26 13:54:52.829853254 +0900
+@@ -52,4 +52,4 @@
+ rm -rf build
+
+ install-exec-local:
+- $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) $(if $(DESTDIR),--root $(DESTDIR), )
++ $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) --install-layout=deb --no-compile -O0 $(if $(DESTDIR),--root $(DESTDIR), )
+diff -ur ecell-3.1.107~/ecell/pyecell/Makefile.am ecell-3.1.107/ecell/pyecell/Makefile.am
+--- ecell-3.1.107~/ecell/pyecell/Makefile.am 2009-04-30 05:56:55.000000000 +0900
++++ ecell-3.1.107/ecell/pyecell/Makefile.am 2009-06-26 13:54:28.079317075 +0900
+@@ -97,4 +97,4 @@
+ $(RM) -rf build
+
+ install-exec-local:
+- $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) $(if $(DESTDIR),--root $(DESTDIR), )
++ $(PYTHON_) setup.py install -f --prefix=$(PREFIX) --install-scripts=$(bindir) --install-layout=deb --no-compile -O0 $(if $(DESTDIR),--root $(DESTDIR), )
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/patches/01_distutils_install_layout.patch
___________________________________________________________________
Added: svn:mime-type
+ text/x-diff
Added: svn:eol-style
+ native
Added: ecell-build/trunk/pkg/deb/ubuntu.karmic/rules
===================================================================
--- ecell-build/trunk/pkg/deb/ubuntu.karmic/rules (rev 0)
+++ ecell-build/trunk/pkg/deb/ubuntu.karmic/rules 2010-02-11 04:19:44 UTC (rev 3821)
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS = --docdir=/usr/share/doc/ecell3 \
+ --with-boost-python-libname=boost_python-mt
+
+makebuilddir/ecell3::
+ ./autogen.sh
+
+binary-install/ecell3::
+ dh_pysupport -i
Property changes on: ecell-build/trunk/pkg/deb/ubuntu.karmic/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-11 03:51:40
|
Revision: 3820
http://ecell.svn.sourceforge.net/ecell/?rev=3820&view=rev
Author: moriyoshi
Date: 2010-02-11 03:51:34 +0000 (Thu, 11 Feb 2010)
Log Message:
-----------
* Add missing files.
Modified Paths:
--------------
ecell-build/trunk/pkg/win32/ecell3-installer.iss
Modified: ecell-build/trunk/pkg/win32/ecell3-installer.iss
===================================================================
--- ecell-build/trunk/pkg/win32/ecell3-installer.iss 2010-02-10 04:04:22 UTC (rev 3819)
+++ ecell-build/trunk/pkg/win32/ecell3-installer.iss 2010-02-11 03:51:34 UTC (rev 3820)
@@ -82,6 +82,10 @@
Source: {#Stage}\bin\ecell3-eml2em.cmd; DestDir: {app}\bin; Flags: ignoreversion; Components: fe/cli;
Source: {#Stage}\bin\ecell3-em2eml; DestDir: {app}\bin; Flags: ignoreversion; Components: fe/cli;
Source: {#Stage}\bin\ecell3-em2eml.cmd; DestDir: {app}\bin; Flags: ignoreversion; Components: fe/cli;
+Source: {#Stage}\bin\ecell3-dmc; DestDir: {app}\bin; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\bin\ecell3-dmc.cmd; DestDir: {app}\bin; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\bin\dmcompile; DestDir: {app}\bin; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\bin\dmcompile.cmd; DestDir: {app}\bin; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\ltdl.h; DestDir: {app}\include; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\{#PkgDir}\*.*; DestDir: {app}\include\{#PkgDir}; Flags: recursesubdirs ignoreversion; Components: dev;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-10 04:04:28
|
Revision: 3819
http://ecell.svn.sourceforge.net/ecell/?rev=3819&view=rev
Author: moriyoshi
Date: 2010-02-10 04:04:22 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
* Merge from 3.2.
Modified Paths:
--------------
ecell3/branches/ecell-3.1/dmtool/dmcompile.in
Modified: ecell3/branches/ecell-3.1/dmtool/dmcompile.in
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/dmcompile.in 2010-02-10 03:58:25 UTC (rev 3818)
+++ ecell3/branches/ecell-3.1/dmtool/dmcompile.in 2010-02-10 04:04:22 UTC (rev 3819)
@@ -168,7 +168,11 @@
compiler = new_compiler( verbose=opts.verbose )
compiler.customize( None, need_cxx=1 )
- compiler = compiler.cxx_compiler()
+ if hasattr( compiler, 'cxx_compiler' ):
+ compiler = compiler.cxx_compiler()
+ else:
+ compiler.compiler_so[0] = compiler.compiler_cxx[0]
+ compiler.linker_so[0] = compiler.compiler_cxx[0]
if opts.verbose:
old_spawn = compiler.spawn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-10 03:58:31
|
Revision: 3818
http://ecell.svn.sourceforge.net/ecell/?rev=3818&view=rev
Author: moriyoshi
Date: 2010-02-10 03:58:25 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
* Compatibility with older numpy.
Modified Paths:
--------------
ecell3/branches/ecell-3.2/dmtool/dmcompile.in
Modified: ecell3/branches/ecell-3.2/dmtool/dmcompile.in
===================================================================
--- ecell3/branches/ecell-3.2/dmtool/dmcompile.in 2010-02-10 03:36:34 UTC (rev 3817)
+++ ecell3/branches/ecell-3.2/dmtool/dmcompile.in 2010-02-10 03:58:25 UTC (rev 3818)
@@ -168,7 +168,11 @@
compiler = new_compiler( verbose=opts.verbose )
compiler.customize( None, need_cxx=1 )
- compiler = compiler.cxx_compiler()
+ if hasattr( compiler, 'cxx_compiler' ):
+ compiler = compiler.cxx_compiler()
+ else:
+ compiler.compiler_so[0] = compiler.compiler_cxx[0]
+ compiler.linker_so[0] = compiler.compiler_cxx[0]
if opts.verbose:
old_spawn = compiler.spawn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-10 03:36:41
|
Revision: 3817
http://ecell.svn.sourceforge.net/ecell/?rev=3817&view=rev
Author: moriyoshi
Date: 2010-02-10 03:36:34 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
* Actually requiring 1.34.0 (notified by Obinata-san. Thanks)
Modified Paths:
--------------
ecell3/branches/ecell-3.2/INSTALL
Modified: ecell3/branches/ecell-3.2/INSTALL
===================================================================
--- ecell3/branches/ecell-3.2/INSTALL 2010-02-09 19:19:26 UTC (rev 3816)
+++ ecell3/branches/ecell-3.2/INSTALL 2010-02-10 03:36:34 UTC (rev 3817)
@@ -54,7 +54,7 @@
http://www.python.org/
-3. Boost C++ libraries (version 1.33.0 or later)
+3. Boost C++ libraries (version 1.34.0 or later)
http://www.boost.org/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-02-09 19:19:32
|
Revision: 3816
http://ecell.svn.sourceforge.net/ecell/?rev=3816&view=rev
Author: kaizu
Date: 2010-02-09 19:19:26 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
A small bugfix
Modified Paths:
--------------
ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am
Modified: ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am 2010-02-09 18:30:54 UTC (rev 3815)
+++ ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am 2010-02-09 19:19:26 UTC (rev 3816)
@@ -105,7 +105,9 @@
QuasiDynamicFluxProcess$(LTDL_SHLIB_EXT) \
ExpressionFluxProcess$(LTDL_SHLIB_EXT) \
ExpressionAlgebraicProcess$(LTDL_SHLIB_EXT) \
- ExpressionAssignmentProcess$(LTDL_SHLIB_EXT)
+ ExpressionAssignmentProcess$(LTDL_SHLIB_EXT) \
+ BooleanProcess$(LTDL_SHLIB_EXT) \
+ BooleanStepper$(LTDL_SHLIB_EXT)
if HAVE_PYTHON_LIB
SOS += \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-02-09 18:31:01
|
Revision: 3815
http://ecell.svn.sourceforge.net/ecell/?rev=3815&view=rev
Author: kaizu
Date: 2010-02-09 18:30:54 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
Adding Boolean modules.
Modified Paths:
--------------
ecell3/branches/kaizu/ecell-3.1/doc/samples/Makefile.am
ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am
Added Paths:
-----------
ecell3/branches/kaizu/ecell-3.1/doc/samples/boolean/
ecell3/branches/kaizu/ecell-3.1/doc/samples/boolean/repressilator.sif
ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.cpp
ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.hpp
ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.cpp
ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.hpp
Modified: ecell3/branches/kaizu/ecell-3.1/doc/samples/Makefile.am
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/doc/samples/Makefile.am 2010-02-09 14:24:23 UTC (rev 3814)
+++ ecell3/branches/kaizu/ecell-3.1/doc/samples/Makefile.am 2010-02-09 18:30:54 UTC (rev 3815)
@@ -13,6 +13,7 @@
ga \
heatshock \
session_manager \
+ boolean \
simple \
tauleap
Added: ecell3/branches/kaizu/ecell-3.1/doc/samples/boolean/repressilator.sif
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/doc/samples/boolean/repressilator.sif (rev 0)
+++ ecell3/branches/kaizu/ecell-3.1/doc/samples/boolean/repressilator.sif 2010-02-09 18:30:54 UTC (rev 3815)
@@ -0,0 +1,3 @@
+A inhibit B
+B inhibit C
+C inhibit A
\ No newline at end of file
Property changes on: ecell3/branches/kaizu/ecell-3.1/doc/samples/boolean/repressilator.sif
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.cpp
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.cpp (rev 0)
+++ ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.cpp 2010-02-09 18:30:54 UTC (rev 3815)
@@ -0,0 +1,31 @@
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+// This file is part of the E-Cell System
+//
+// Copyright (C) 1996-2009 Keio University
+// Copyright (C) 2005-2008 The Molecular Sciences Institute
+//
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+//
+// E-Cell System is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// E-Cell System is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with E-Cell System -- see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//END_HEADER
+
+#include "BooleanProcess.hpp"
+
+
+LIBECS_DM_INIT( BooleanProcess, Process );
Property changes on: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.hpp
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.hpp (rev 0)
+++ ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.hpp 2010-02-09 18:30:54 UTC (rev 3815)
@@ -0,0 +1,129 @@
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+// This file is part of the E-Cell System
+//
+// Copyright (C) 1996-2009 Keio University
+// Copyright (C) 2005-2008 The Molecular Sciences Institute
+//
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+//
+// E-Cell System is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// E-Cell System is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with E-Cell System -- see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//END_HEADER
+//
+// written by Kazunari Kaizu <ka...@sf...>,
+// E-Cell Project.
+//
+#ifndef __BOOLEANPROCESS_HPP
+#define __BOOLEANPROCESS_HPP
+
+#include "ExpressionProcessBase.hpp"
+
+USE_LIBECS;
+
+LIBECS_DM_CLASS( BooleanProcess, ExpressionProcessBase )
+{
+ public:
+
+ LIBECS_DM_OBJECT( BooleanProcess, Process )
+ {
+ INHERIT_PROPERTIES( ExpressionProcessBase );
+
+ PROPERTYSLOT_SET_GET( Real, J );
+ }
+
+ BooleanProcess()
+ :
+ J( 0.1 )
+ {
+ // FIXME: additional properties:
+ // Unidirectional -> call declareUnidirectional() in initialize()
+ // if this is set
+ }
+
+ virtual ~BooleanProcess()
+ {
+ ; // do nothing
+ }
+
+ SIMPLE_SET_GET_METHOD( Real, J );
+
+ virtual void initialize()
+ {
+ ExpressionProcessBase::initialize();
+
+ const Real aSize( theVariableReferenceVector.size() );
+ const Real
+ aZeroVariableReferenceOffset( getZeroVariableReferenceOffset() );
+ const Real
+ aPositiveVariableReferenceOffset( getPositiveVariableReferenceOffset() );
+
+ if ( aZeroVariableReferenceOffset
+ + aSize - aPositiveVariableReferenceOffset != 1 )
+ {
+ THROW_EXCEPTION( InitializationFailed,
+ getClassNameString() +
+ ": Only One target is allowed "
+ "in each BooleanProcess." );
+ }
+ else if ( aZeroVariableReferenceOffset > 0 )
+ {
+ target = theVariableReferenceVector[ 0 ];
+ }
+ else if ( aPositiveVariableReferenceOffset < aSize )
+ {
+ target
+ = theVariableReferenceVector[ aPositiveVariableReferenceOffset ];
+ }
+ }
+
+ void evaluate()
+ {
+ // addValue( theVirtualMachine.execute( theCompiledCode ) );
+ setFlux( theVirtualMachine.execute( theCompiledCode ) );
+ }
+
+ virtual void fire()
+ {
+ const Real Vmax( theVirtualMachine.execute( theCompiledCode ) );
+
+ Real aValue;
+ if ( target.getCoefficient() < 0 )
+ {
+ aValue = target.getVariable()->getValue();
+ }
+ else
+ {
+ aValue = 1.0 - target.getVariable()->getValue();
+ }
+
+ const Real anActivity( Vmax * aValue / ( J + aValue ) );
+ setFlux( anActivity );
+ }
+
+ virtual const bool isContinuous() const
+ {
+ return true;
+ }
+
+ protected:
+
+ VariableReference target;
+ Real J;
+};
+
+#endif /* __BOOLEANPROCESS_HPP */
Property changes on: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanProcess.hpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.cpp
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.cpp (rev 0)
+++ ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.cpp 2010-02-09 18:30:54 UTC (rev 3815)
@@ -0,0 +1,113 @@
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+// This file is part of the E-Cell System
+//
+// Copyright (C) 1996-2009 Keio University
+// Copyright (C) 2005-2008 The Molecular Sciences Institute
+//
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+//
+// E-Cell System is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// E-Cell System is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with E-Cell System -- see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//END_HEADER
+//
+// written by Kazunari Kaizu <ka...@sf...>,
+// E-Cell Project.
+//
+
+#ifdef HAVE_CONFIG_H
+#include "ecell_config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include "BooleanStepper.hpp"
+
+//////////////////// BooleanStepper
+
+LIBECS_DM_INIT( BooleanStepper, Stepper );
+
+void BooleanStepper::initialize()
+{
+ Stepper::initialize();
+
+ theBooleanProcessVector.clear();
+
+ try
+ {
+ std::transform( theProcessVector.begin(), theProcessVector.end(),
+ std::back_inserter( theBooleanProcessVector ),
+ DynamicCaster<BooleanProcessPtr, ProcessPtr>() );
+ }
+ catch ( const libecs::TypeError& )
+ {
+ THROW_EXCEPTION( InitializationFailed,
+ getClassNameString() +
+ ": Only BooleanProcesses are allowed to exist "
+ "in this Stepper." );
+ }
+}
+
+void BooleanStepper::step()
+{
+ const VariableVector::size_type
+ aReadOnlyVariableOffset( getReadOnlyVariableOffset() );
+
+ FOR_ALL( BooleanProcessVector, theBooleanProcessVector )
+ {
+ (*i)->evaluate();
+ }
+
+ for ( VariableVector::size_type c( 0 ); c < aReadOnlyVariableOffset; ++c )
+ {
+ VariablePtr const aVariable( theVariableVector[ c ] );
+ aVariable->loadValue( 0.0 );
+ }
+
+ FOR_ALL( BooleanProcessVector, theBooleanProcessVector )
+ {
+ const Real anActivity( (*i)->getActivity() );
+ (*i)->addValue( anActivity );
+ }
+
+ for ( VariableVector::size_type c( 0 ); c < aReadOnlyVariableOffset; ++c )
+ {
+ VariablePtr const aVariable( theVariableVector[ c ] );
+ const Real aValue( aVariable->getValue() );
+
+ if ( aValue > 0 )
+ {
+ aVariable->loadValue( 1.0 );
+ }
+ else if ( aValue < 0 )
+ {
+ aVariable->loadValue( 0.0 );
+ }
+ else
+ {
+ ; // do nothing if aValue == 0
+ }
+ }
+}
+
+
+/*
+ Do not modify
+ $Author: moriyoshi $
+ $Revision: 3386 $
+ $Date: 2009-02-05 15:01:04 +0900 (木, 05 2月 2009) $
+ $Locker$
+*/
+
Property changes on: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.hpp
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.hpp (rev 0)
+++ ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.hpp 2010-02-09 18:30:54 UTC (rev 3815)
@@ -0,0 +1,122 @@
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+// This file is part of the E-Cell System
+//
+// Copyright (C) 1996-2009 Keio University
+// Copyright (C) 2005-2008 The Molecular Sciences Institute
+//
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+//
+//
+// E-Cell System is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// E-Cell System is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with E-Cell System -- see the file COPYING.
+// If not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//END_HEADER
+//
+// written by Kazunari Kaizu <ka...@sf...>,
+// E-Cell Project.
+//
+
+#ifndef __BOOLEANSTEPPER_HPP
+#define __BOOLEANSTEPPER_HPP
+
+#include "libecs/libecs.hpp"
+#include "libecs/Stepper.hpp"
+#include "BooleanProcess.hpp"
+
+
+USE_LIBECS;
+
+/** @addtogroup stepper
+ *@{
+ */
+
+/** @file */
+
+/**
+ BooleanStepper has a fixed step interval.
+
+ This stepper ignores incoming interruptions, but dispatches
+ interruptions always when it steps.
+
+ Process objects in this Stepper isn't allowed to use
+ Variable::addVelocity() method, but Variable::setValue() method only.
+*/
+
+DECLARE_CLASS( BooleanProcess );
+DECLARE_VECTOR( BooleanProcessPtr, BooleanProcessVector );
+
+LIBECS_DM_CLASS( BooleanStepper, Stepper )
+{
+
+ public:
+
+ LIBECS_DM_OBJECT( BooleanStepper, Stepper )
+ {
+ INHERIT_PROPERTIES( Stepper );
+ }
+
+ BooleanStepper( void )
+ {
+ ; // do nothing
+ }
+
+ virtual ~BooleanStepper() {}
+
+ virtual void initialize();
+
+ /**
+ This method calls fire() method of all Processes.
+ */
+
+ virtual void step();
+
+ /**
+ Do nothing. This Stepper ignores interruption.
+ */
+
+ virtual void interrupt( TimeParam )
+ {
+ ; // ignore interruption
+ }
+
+ /**
+ TimeScale of this Stepper is always zero by default.
+
+ This behavior may be changed in subclasses.
+ */
+
+ virtual GET_METHOD( Real, TimeScale )
+ {
+ return 0.0;
+ }
+
+ protected:
+
+ BooleanProcessVector theBooleanProcessVector;
+
+};
+
+#endif /* __BOOLEANSTEPPER_HPP */
+
+
+
+/*
+ Do not modify
+ $Author: moriyoshi $
+ $Revision: 3386 $
+ $Date: 2009-02-05 15:01:04 +0900 (木, 05 2月 2009) $
+ $Locker$
+*/
Property changes on: ecell3/branches/kaizu/ecell-3.1/ecell/dm/BooleanStepper.hpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am
===================================================================
--- ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am 2010-02-09 14:24:23 UTC (rev 3814)
+++ ecell3/branches/kaizu/ecell-3.1/ecell/dm/Makefile.am 2010-02-09 18:30:54 UTC (rev 3815)
@@ -41,6 +41,8 @@
PythonProcess.cpp \
QuasiDynamicFluxProcess.cpp \
SSystemProcess.cpp \
+ BooleanStepper.cpp \
+ BooleanProcess.cpp \
TauLeapProcess.cpp \
TauLeapStepper.cpp
@@ -53,6 +55,8 @@
ExpressionCompiler.hpp \
GillespieProcess.hpp \
QuasiDynamicFluxProcess.hpp \
+ BooleanStepper.hpp \
+ BooleanProcess.hpp \
TauLeapProcess.hpp
DESCS = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 14:24:30
|
Revision: 3814
http://ecell.svn.sourceforge.net/ecell/?rev=3814&view=rev
Author: moriyoshi
Date: 2010-02-09 14:24:23 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Update.
Modified Paths:
--------------
ecell3/branches/ecell-3.2/NEWS
Modified: ecell3/branches/ecell-3.2/NEWS
===================================================================
--- ecell3/branches/ecell-3.2/NEWS 2010-02-09 14:17:58 UTC (rev 3813)
+++ ecell3/branches/ecell-3.2/NEWS 2010-02-09 14:24:23 UTC (rev 3814)
@@ -11,7 +11,9 @@
* Fixed a bug in System::detach() that causes random segfault on cleanup.
+ * Fixed infinite recursion in ecell._ecs.Simulator.getDMSearchPath().
+
ecell-3.2.0: 5-Feb-2010
* See the entries for 3.1.108.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 14:18:05
|
Revision: 3813
http://ecell.svn.sourceforge.net/ecell/?rev=3813&view=rev
Author: moriyoshi
Date: 2010-02-09 14:17:58 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Fix infinite loop :-p
Modified Paths:
--------------
ecell3/branches/ecell-3.2/ecell/pyecell/ecell/_ecs.cpp
Modified: ecell3/branches/ecell-3.2/ecell/pyecell/ecell/_ecs.cpp
===================================================================
--- ecell3/branches/ecell-3.2/ecell/pyecell/ecell/_ecs.cpp 2010-02-09 11:40:24 UTC (rev 3812)
+++ ecell3/branches/ecell-3.2/ecell/pyecell/ecell/_ecs.cpp 2010-02-09 14:17:58 UTC (rev 3813)
@@ -2504,11 +2504,6 @@
theEventHandler = anEventHandler;
}
- const std::string getDMSearchPath() const
- {
- return getDMSearchPath();
- }
-
void addPythonDM( py::object obj )
{
if ( !PyType_Check( obj.ptr() ) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 11:40:30
|
Revision: 3812
http://ecell.svn.sourceforge.net/ecell/?rev=3812&view=rev
Author: moriyoshi
Date: 2010-02-09 11:40:24 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Update.
Modified Paths:
--------------
ecell3/branches/ecell-3.2/NEWS
Modified: ecell3/branches/ecell-3.2/NEWS
===================================================================
--- ecell3/branches/ecell-3.2/NEWS 2010-02-09 11:38:53 UTC (rev 3811)
+++ ecell3/branches/ecell-3.2/NEWS 2010-02-09 11:40:24 UTC (rev 3812)
@@ -1,4 +1,4 @@
-ecell-3.2.0p1: 8-Feb-2010
+ecell-3.2.0p1: 9-Feb-2010
* Fixed the build system so that resource files for the GUI tools are
correctly installed under the package data directory.
@@ -7,7 +7,11 @@
the text box for the filename entry. Because of this bug, models could not
be saved in session-monitor or model editor.
+ * Made ecell3-dmc and dmcompile available on Windows.
+ * Fixed a bug in System::detach() that causes random segfault on cleanup.
+
+
ecell-3.2.0: 5-Feb-2010
* See the entries for 3.1.108.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 11:38:59
|
Revision: 3811
http://ecell.svn.sourceforge.net/ecell/?rev=3811&view=rev
Author: moriyoshi
Date: 2010-02-09 11:38:53 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Duh! Iterators get invalidated when the associated container is manipulated. This fixes segmentation fault in the destructor.
Modified Paths:
--------------
ecell3/branches/ecell-3.2/ecell/libecs/System.cpp
Modified: ecell3/branches/ecell-3.2/ecell/libecs/System.cpp
===================================================================
--- ecell3/branches/ecell-3.2/ecell/libecs/System.cpp 2010-02-09 09:53:08 UTC (rev 3810)
+++ ecell3/branches/ecell-3.2/ecell/libecs/System.cpp 2010-02-09 11:38:53 UTC (rev 3811)
@@ -472,27 +472,37 @@
void System::detach()
{
+ typedef std::vector< Entity* > EntityVector;
+ EntityVector entitiesToDetach;
+
for ( SystemMap::iterator i( theSystemMap.begin() ),
e( theSystemMap.end() );
i != e; ++i )
{
- ( *i ).second->detach();
+ entitiesToDetach.push_back( ( *i ).second );
}
for ( ProcessMap::iterator i( theProcessMap.begin() ),
e( theProcessMap.end() );
i != e; ++i )
{
- ( *i ).second->detach();
+ entitiesToDetach.push_back( ( *i ).second );
}
for ( VariableMap::iterator i( theVariableMap.begin() ),
e( theVariableMap.end() );
i != e; ++i )
{
- ( *i ).second->detach();
+ entitiesToDetach.push_back( ( *i ).second );
}
+ for ( EntityVector::iterator i( entitiesToDetach.begin() ),
+ e( entitiesToDetach.end() );
+ i != e; ++i )
+ {
+ ( *i )->detach();
+ }
+
if ( theStepper )
{
try { theStepper->unregisterSystem( this ); } catch ( NotFound const& ) {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 09:53:15
|
Revision: 3810
http://ecell.svn.sourceforge.net/ecell/?rev=3810&view=rev
Author: moriyoshi
Date: 2010-02-09 09:53:08 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Merge from 3.2.
Modified Paths:
--------------
ecell3/branches/ecell-3.1/build/msvc/dist.wsf
ecell3/branches/ecell-3.1/build/msvc/info.js
ecell3/branches/ecell-3.1/dmtool/dmcompile.in
ecell3/branches/ecell-3.1/ecell/bin/ecell3-dmc.in
Property Changed:
----------------
ecell3/branches/ecell-3.1/
Property changes on: ecell3/branches/ecell-3.1
___________________________________________________________________
Modified: svn:mergeinfo
- /ecell3/branches/ecell-3.1:3677,3694
/ecell3/branches/ecell-3.2:3372,3467,3481,3562,3568,3572,3585,3592,3598-3599,3608,3615,3619-3620,3625,3688-3692,3697,3699-3700,3702,3704,3706,3708-3710,3713,3715,3721,3726,3734-3735,3748,3750,3752-3754,3758,3760,3762,3781,3789-3791
+ /ecell3/branches/ecell-3.1:3677,3694
/ecell3/branches/ecell-3.2:3372,3467,3481,3562,3568,3572,3585,3592,3598-3599,3608,3615,3619-3620,3625,3688-3692,3697,3699-3700,3702,3704,3706,3708-3710,3713,3715,3721,3726,3734-3735,3748,3750,3752-3754,3758,3760,3762,3781,3789-3791,3802,3804,3807-3809
Modified: ecell3/branches/ecell-3.1/build/msvc/dist.wsf
===================================================================
(Binary files differ)
Modified: ecell3/branches/ecell-3.1/build/msvc/info.js
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/info.js 2010-02-09 09:49:57 UTC (rev 3809)
+++ ecell3/branches/ecell-3.1/build/msvc/info.js 2010-02-09 09:53:08 UTC (rev 3810)
@@ -16,7 +16,11 @@
VERSION: sh.env.ECELL_VERSION_NUMBER,
INCLTDL: '/I' + buildInfo.projectDir + '\\libltdl',
DMTOOL_INCLUDE_DIR: buildInfo.projectDir,
- NUMPY_INCLUDE_DIR: buildInfo.pythonHome + '\\lib\\site-packages\\numpy\\core\\include'
+ NUMPY_INCLUDE_DIR: buildInfo.pythonHome + '\\lib\\site-packages\\numpy\\core\\include',
+ LTDL_SHLIB_EXT: '.dll',
+ CXXFLAGS: '',
+ CPPFLAGS: '-DBOOST_ALL_NO_LIB=1 -DWIN32=1 -D_WIN32=1 -D__STDC__=1 -D_WIN32_WINNT=0x500 -D_SECURE_SCL=0',
+ LDFLAGS: ''
});
})();
Modified: ecell3/branches/ecell-3.1/dmtool/dmcompile.in
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/dmcompile.in 2010-02-09 09:49:57 UTC (rev 3809)
+++ ecell3/branches/ecell-3.1/dmtool/dmcompile.in 2010-02-09 09:53:08 UTC (rev 3810)
@@ -7,13 +7,10 @@
import glob
from optparse import OptionParser, IndentedHelpFormatter, BadOptionError, make_option
from numpy.distutils.ccompiler import new_compiler
-from distutils.sysconfig import get_config_var, customize_compiler
+from distutils.sysconfig import get_config_vars, customize_compiler
from distutils.errors import CompileError, LinkError
from distutils.util import split_quoted
-# prefix='@prefix@'
-# exec_prefix='@exec_prefix@'
-# libdir='@libdir@'
OBJECT_EXTS = ['.so', '.o', '.obj', '.a', '.lib'];
ORIG_CXXFLAGS = '@CXXFLAGS@'
@@ -167,7 +164,7 @@
for flag in opts.unknown:
cxxflags.append( flag )
- shlflags = split_quoted( get_config_var('CCSHARED') )
+ shlflags = split_quoted( get_config_vars().get( 'CCSHARED', '' ) )
compiler = new_compiler( verbose=opts.verbose )
compiler.customize( None, need_cxx=1 )
@@ -210,11 +207,10 @@
compiler.linker_so = [ arg for arg in compiler.linker_so if arg != '-shard' ]
dlflags = []
- dlflags.extend(
- split_quoted(
- get_config_var( 'LDSHARED' ).replace(
- get_config_var( 'LINKCC' ), '' ).replace(
- get_config_var( 'LDFLAGS' ), '' ) ) )
+ dlflags.extend( split_quoted(
+ get_config_vars().get( 'LDSHARED', '' )
+ .replace( get_config_vars().get( 'LINKCC', '' ), '' )
+ .replace( get_config_vars().get( 'LDFLAGS', '' ), '' ) ) )
try:
try:
Modified: ecell3/branches/ecell-3.1/ecell/bin/ecell3-dmc.in
===================================================================
--- ecell3/branches/ecell-3.1/ecell/bin/ecell3-dmc.in 2010-02-09 09:49:57 UTC (rev 3809)
+++ ecell3/branches/ecell-3.1/ecell/bin/ecell3-dmc.in 2010-02-09 09:53:08 UTC (rev 3810)
@@ -6,8 +6,6 @@
# authors: Tomoya Kitayama <to...@e-...>
# Satya Arjunan <sa...@sf...>
-#PACKAGE=bin
-#VERSION=0.0
import sys
import os
@@ -15,6 +13,69 @@
import operator
from glob import glob
from distutils.util import split_quoted
+
+# Inspired by BTL::platform::get_module_filename
+def get_running_executable():
+ if getattr( sys, 'frozen', '' ) == 'windows_exe':
+ import win32api
+ return win32api.GetModuleFileName( 0 )
+ else:
+ return os.path.abspath( sys.argv[0] )
+
+per_app_dir_name = "@ECELL_DIRNAME@"
+
+prefix = '''@prefix@'''
+if len( prefix ) == 0 or not os.path.isdir( prefix ):
+ prefix = os.path.dirname(
+ os.path.dirname( get_running_executable() )
+ )
+
+if os.name == 'nt':
+ try:
+ from win32com.shell import shell, shellcon
+ home_dir = shell.SHGetPathFromIDList(
+ shell.SHGetSpecialFolderLocation( 0, shellcon.CSIDL_PROFILE )
+ )
+ user_prefs_dir = os.path.join(
+ shell.SHGetPathFromIDList(
+ shell.SHGetSpecialFolderLocation( 0, shellcon.CSIDL_APPDATA )
+ ),
+ per_app_dir_name
+ )
+ except:
+ home_dir = os.environ['USERPROFILE']
+ user_prefs_dir = os.environ['APPDATA']
+else:
+ home_dir = os.path.expanduser( '~' )
+ user_prefs_dir = os.path.join( home_dir, '.' + per_app_dir_name )
+
+def expand_shell_variables( val, vars ):
+ import re
+ return re.compile( r'\$\{([^}]+)\}' ).sub(
+ lambda m: vars[ m.group( 1 ) ], val )
+
+exec_prefix = '''@exec_prefix@'''
+exec_prefix = expand_shell_variables( exec_prefix, locals() )
+if len( exec_prefix ) == 0 or not os.path.isdir( exec_prefix ):
+ exec_prefix = prefix
+
+bin_dir = '''@bindir@'''
+bin_dir = expand_shell_variables( bin_dir, locals() )
+if len( bin_dir ) == 0 or not os.path.isdir( bin_dir ):
+ bin_dir = os.path.join( prefix, 'bin' )
+
+_include_dir = '''@includedir@'''
+_include_dir = expand_shell_variables( _include_dir, locals() )
+if len( _include_dir ) == 0 or not os.path.isdir( _include_dir ):
+ _include_dir = os.path.join( prefix, 'include' )
+include_dir = os.path.join( _include_dir, per_app_dir_name )
+
+_lib_dir = '''@libdir@'''
+_lib_dir = expand_shell_variables( _lib_dir, locals() )
+if len( _lib_dir ) == 0 or not os.path.isdir( _lib_dir ):
+ _lib_dir = os.path.join( prefix, 'lib' )
+lib_dir = os.path.join( _lib_dir, per_app_dir_name )
+
DMCOMPILE = 'dmcompile'
CLASS_NAME_MACRO_NAME = '_ECELL3_DM_CLASSNAME'
@@ -22,7 +83,6 @@
progname = os.path.basename( sys.argv[ 0 ] )
def usage():
- global progname
print '''
%(progname)s -- Compile dynamic modules for E-Cell Simulation Environment Version 3.
@@ -32,7 +92,6 @@
''' % dict( progname = progname )
def help():
- global progname
usage()
print '''
%(progname)s options:
@@ -57,21 +116,44 @@
global progname
print "%s: %s" % ( progname, outstr )
+spawnvp = os.spawnv
+
+if hasattr(os, 'spawnvp'):
+ spawnvp = os.spawnvp
+elif os.name == 'nt':
+ def lookup_executable_path_nt(path, file):
+ for p in path:
+ for ext in ('', '.exe', '.cmd', '.bat'):
+ _file = os.path.join(p, file) + ext
+ try:
+ stat = os.stat(_file)
+ if stat.st_mode & 0500 == 0500:
+ return _file
+ except:
+ pass
+ return None
+
+ def spawnvp(mode, file, args):
+ if os.path.dirname(file) == '':
+ path = os.environ.get('PATH', None)
+ if path is not None:
+ path = path.split(os.pathsep)
+ else:
+ path = os.defpath
+ _file = lookup_executable_path_nt(path, file)
+ if _file is not None:
+ file = _file
+ return os.spawnv(mode, file, args)
+
+
def main():
-
# -------------------------------------
# initialize file names
# -------------------------------------
- prefix = r'''@PREFIX@'''
- ecell3dir = r'''@ECELL_DIRNAME@'''
- exec_prefix = prefix
- BINDIR = exec_prefix + os.sep + 'bin'
- STDLIBDIRS = [ '-L' + exec_prefix + os.sep + 'lib' ]
- ECELL_INCLUDE = prefix + os.sep + 'include' + os.sep + ecell3dir
- LIBECS_INCLUDE = ECELL_INCLUDE + os.sep + 'libecs'
- STDINCLUDE = [ '-I' + prefix + os.sep + 'include',
- '-I' + ECELL_INCLUDE,
- '-I' + LIBECS_INCLUDE ]
+ STDLIBDIRS = [ '-L' + _lib_dir, '-L' + lib_dir ]
+ STDINCLUDE = [ '-I' + _include_dir,
+ '-I' + include_dir,
+ '-I' + os.path.join(include_dir, 'libecs') ]
SRC = None
@@ -139,6 +221,7 @@
else:
dmcompile = anArg
+ # set output file
if anOption in ( "-o", "--output" ):
OUTPUT = anArg
@@ -153,7 +236,7 @@
if VERBOSE:
cmdList.append( '-v' )
- if OUTPUT is not None:
+ if OUTPUT:
cmdList += [ '-o', OUTPUT ]
# on MS-Windows, command line doesn't expand *.cpp automatically
@@ -187,7 +270,7 @@
# Need to us os.spawnv because of problems in MS-Windows with os.sytem
# when the dmcompile path contains whitespaces even if we force quotes
- ret = os.spawnvp( os.P_WAIT, cmdList[0], argList )
+ ret = spawnvp( os.P_WAIT, cmdList[0], argList )
if ret != 0:
msg( '%s returned error status: %d' % ( cmdList[0], ret ) )
return 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 09:50:04
|
Revision: 3809
http://ecell.svn.sourceforge.net/ecell/?rev=3809&view=rev
Author: moriyoshi
Date: 2010-02-09 09:49:57 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* GAH!!!
Modified Paths:
--------------
ecell3/branches/ecell-3.2/build/msvc/dist.wsf
ecell3/branches/ecell-3.2/build/msvc/info.js
Modified: ecell3/branches/ecell-3.2/build/msvc/dist.wsf
===================================================================
(Binary files differ)
Modified: ecell3/branches/ecell-3.2/build/msvc/info.js
===================================================================
--- ecell3/branches/ecell-3.2/build/msvc/info.js 2010-02-09 09:44:17 UTC (rev 3808)
+++ ecell3/branches/ecell-3.2/build/msvc/info.js 2010-02-09 09:49:57 UTC (rev 3809)
@@ -16,7 +16,11 @@
VERSION: sh.env.ECELL_VERSION_NUMBER,
INCLTDL: '/I' + buildInfo.projectDir + '\\libltdl',
DMTOOL_INCLUDE_DIR: buildInfo.projectDir,
- NUMPY_INCLUDE_DIR: buildInfo.pythonHome + '\\lib\\site-packages\\numpy\\core\\include'
+ NUMPY_INCLUDE_DIR: buildInfo.pythonHome + '\\lib\\site-packages\\numpy\\core\\include',
+ LTDL_SHLIB_EXT: '.dll',
+ CXXFLAGS: '',
+ CPPFLAGS: '-DBOOST_ALL_NO_LIB=1 -DWIN32=1 -D_WIN32=1 -D__STDC__=1 -D_WIN32_WINNT=0x500 -D_SECURE_SCL=0',
+ LDFLAGS: ''
});
})();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 09:44:23
|
Revision: 3808
http://ecell.svn.sourceforge.net/ecell/?rev=3808&view=rev
Author: moriyoshi
Date: 2010-02-09 09:44:17 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* GAH!!
Modified Paths:
--------------
ecell3/branches/ecell-3.2/build/msvc/dist.wsf
Modified: ecell3/branches/ecell-3.2/build/msvc/dist.wsf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 09:43:37
|
Revision: 3807
http://ecell.svn.sourceforge.net/ecell/?rev=3807&view=rev
Author: moriyoshi
Date: 2010-02-09 09:43:27 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* GAH!
Modified Paths:
--------------
ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
Modified: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in 2010-02-09 09:17:04 UTC (rev 3806)
+++ ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in 2010-02-09 09:43:27 UTC (rev 3807)
@@ -147,7 +147,6 @@
def main():
- _lib_dir = '@LIBDIR@'
# -------------------------------------
# initialize file names
# -------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 09:17:12
|
Revision: 3806
http://ecell.svn.sourceforge.net/ecell/?rev=3806&view=rev
Author: moriyoshi
Date: 2010-02-09 09:17:04 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Revert several changes.
Modified Paths:
--------------
ecell3/branches/ecell-3.2/build/msvc/dist.wsf
ecell3/branches/ecell-3.2/ecell/configure.ac.in
Added Paths:
-----------
ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
Removed Paths:
-------------
ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc
Property Changed:
----------------
ecell3/branches/ecell-3.2/ecell/bin/
Modified: ecell3/branches/ecell-3.2/build/msvc/dist.wsf
===================================================================
(Binary files differ)
Property changes on: ecell3/branches/ecell-3.2/ecell/bin
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
aclocal.m4
config.h
config.h.in
config.log
config.status
configure
Makefile
Makefile.in
stamp-h1
+ autom4te.cache
aclocal.m4
config.h
config.h.in
config.log
config.status
configure
ecell3-dmc
Makefile
Makefile.in
stamp-h1
Deleted: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc
===================================================================
--- ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc 2010-02-09 09:14:40 UTC (rev 3805)
+++ ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc 2010-02-09 09:17:04 UTC (rev 3806)
@@ -1,224 +0,0 @@
-#!/usr/bin/env python
-#
-# ecell3-dmc - a program to compile and/or docify dynamic module in
-# E-Cell Simulation Environment Version 3
-#
-# authors: Tomoya Kitayama <to...@e-...>
-# Satya Arjunan <sa...@sf...>
-
-#PACKAGE=bin
-#VERSION=0.0
-
-import sys
-import os
-import getopt
-import operator
-from glob import glob
-from distutils.util import split_quoted
-import ecell.config as config
-
-DMCOMPILE = 'dmcompile'
-CLASS_NAME_MACRO_NAME = '_ECELL3_DM_CLASSNAME'
-
-progname = os.path.basename( sys.argv[ 0 ] )
-
-def usage():
- print '''
-%(progname)s -- Compile dynamic modules for E-Cell Simulation Environment Version 3.
-
-Usage:
- %(progname)s [options] [sourcefile(s)]
- %(progname)s [-h] or [--help]
- ''' % dict( progname = progname )
-
-def help():
- usage()
- print '''
-%(progname)s options:
- --no-stdinclude Don't set standard include file path.
- --no-stdlibdir Don't set standard library directory path.
- --ldflags=[ldflags] Specify options to the linker.
- --cxxflags=[cxxflags] Add compiler options.
- --no-define-cxxflags=[cxxflags]
- Override the default compiler options.
- --dmcompile=[path] Specify dmcompile path.
- -v or --verbose Be verbose.
- -h or --help Print this message.
-
-
-This program is part of E-Cell Simulation Environment Version 3.
-Written by:
- Tomoya Kitayama <to...@e-...>
- Satya Arjunan <sa...@tt...>
- ''' % dict( progname = progname )
-
-def msg( outstr ):
- global progname
- print "%s: %s" % ( progname, outstr )
-
-spawnvp = os.spawnv
-
-if hasattr(os, 'spawnvp'):
- spawnvp = os.spawnvp
-elif os.name == 'nt':
- def lookup_executable_path_nt(path, file):
- for p in path:
- for ext in ('', '.exe', '.cmd', '.bat'):
- _file = os.path.join(p, file) + ext
- try:
- stat = os.stat(_file)
- if stat.st_mode & 0500 == 0500:
- return _file
- except:
- pass
- return None
-
- def spawnvp(mode, file, args):
- if os.path.dirname(file) == '':
- path = os.environ.get('PATH', None)
- if path is not None:
- path = path.split(os.pathsep)
- else:
- path = os.defpath
- _file = lookup_executable_path_nt(path, file)
- if _file is not None:
- file = _file
- return os.spawnv(mode, file, args)
-
-
-def main():
-
- # -------------------------------------
- # initialize file names
- # -------------------------------------
- STDLIBDIRS = [ '-L' + config._lib_dir, '-L' + config.lib_dir ]
- INCLUDE = os.path.join(config.prefix, 'include')
- ECELL_INCLUDE = os.path.join(INCLUDE, config.per_app_dir_name)
- LIBECS_INCLUDE = os.path.join(ECELL_INCLUDE, 'libecs')
- STDINCLUDE = [ '-I' + INCLUDE,
- '-I' + ECELL_INCLUDE,
- '-I' + LIBECS_INCLUDE ]
- SRC = None
-
-
- # -------------------------------------
- # get options and arguments
- # -------------------------------------
- try:
- opts , args = getopt.getopt( sys.argv[1:], "hvo:",
- ["help", "verbose", "no-stdinclude","no-stdlibdir", "ldflags=",
- "cxxflags=", "no-define-cxxflags=", "dmcompile=", "output="])
- except:
- help()
- sys.exit( 1 )
-
- VERBOSE = False
- NO_STDINCLUDE = False
- NO_STDLIBDIR = False
- NO_DEFINE_CXXFLAGS = False
- LDFLAGS = []
- CXXFLAGS = []
- CXXCOMPILEFLAGS = []
- OUTPUT = None
- cmdList = []
- dmcompile = DMCOMPILE
-
- # -------------------------------------
- # check argument
- # -------------------------------------
- for anOption, anArg in opts:
-
- # print help message
- if anOption in ( "-h", '--help' ):
- help()
- return 255
-
- # be verbose
- if anOption in ( "-v", '--verbose'):
- VERBOSE = True
-
- # without stdinclude
- if anOption == "--no-stdinclude":
- NO_STDINCLUDE = True
-
- # without stdlibdir
- if anOption == "--no-stdlibdir":
- NO_STDLIBDIR = True
-
- # set ldflags
- if anOption == "--ldflags":
- LDFLAGS.extend( split_quoted( anArg ) )
-
- # set no-define-cxxflags
- if anOption == "--no-define-cxxflags":
- NO_DEFINE_CXXFLAGS = True
- CXXFLAGS.extend( split_quoted( anArg ) )
-
- # set cxxflags
- if anOption == "--cxxflags":
- CXXFLAGS.extend( split_quoted( anArg ) )
-
- # set cxxflags
- if anOption == "--dmcompile":
- if os.path.isdir( anArg ):
- dmcompile = os.path.join( anArg, DMCOMPILE )
- else:
- dmcompile = anArg
-
- # set output file
- if anOption in ( "-o", "--output" ):
- OUTPUT = anArg
-
- # check if source file is given
- if len( args ) < 1:
- help()
- msg( "no source file is given." )
- return 1
-
- cmdList.append( dmcompile )
-
- if VERBOSE:
- cmdList.append( '-v' )
-
- if OUTPUT:
- cmdList += [ '-o', OUTPUT ]
-
- # on MS-Windows, command line doesn't expand *.cpp automatically
- srcs = reduce( operator.add, map( glob, args ) )
-
- # check if source file is valid
- if len( srcs ) < 1:
- msg( "source file "+ args[0] + " was not found." )
- return 1
-
- if NO_STDINCLUDE:
- STDINCLUDE = []
-
- if not NO_STDLIBDIR:
- LDFLAGS.extend( STDLIBDIRS )
-
- LDFLAGS.append( '-lecs' )
- LDFLAGS.append( '-lgsl' )
-
- cmdList.extend( STDINCLUDE )
- cmdList.extend( CXXFLAGS )
- cmdList.extend( LDFLAGS )
-
- for src in srcs:
- ext = os.path.basename( src )
- classname, ext = os.path.splitext( ext )
- argList = cmdList + [ '-D%s=%s' % ( CLASS_NAME_MACRO_NAME, classname ), src ]
-
- if VERBOSE:
- print ' '.join( argList[0:] )
-
- # Need to us os.spawnv because of problems in MS-Windows with os.sytem
- # when the dmcompile path contains whitespaces even if we force quotes
- ret = spawnvp( os.P_WAIT, cmdList[0], argList )
- if ret != 0:
- msg( '%s returned error status: %d' % ( cmdList[0], ret ) )
- return 1
- return 0
-
-if __name__ == '__main__':
- sys.exit( main() )
Added: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in (rev 0)
+++ ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in 2010-02-09 09:17:04 UTC (rev 3806)
@@ -0,0 +1,281 @@
+#!/usr/bin/env python
+#
+# ecell3-dmc - a program to compile and/or docify dynamic module in
+# E-Cell Simulation Environment Version 3
+#
+# authors: Tomoya Kitayama <to...@e-...>
+# Satya Arjunan <sa...@sf...>
+
+
+import sys
+import os
+import getopt
+import operator
+from glob import glob
+from distutils.util import split_quoted
+
+# Inspired by BTL::platform::get_module_filename
+def get_running_executable():
+ if getattr( sys, 'frozen', '' ) == 'windows_exe':
+ import win32api
+ return win32api.GetModuleFileName( 0 )
+ else:
+ return os.path.abspath( sys.argv[0] )
+
+per_app_dir_name = "@ECELL_DIRNAME@"
+
+prefix = '''@prefix@'''
+if len( prefix ) == 0 or not os.path.isdir( prefix ):
+ prefix = os.path.dirname(
+ os.path.dirname( get_running_executable() )
+ )
+
+if os.name == 'nt':
+ try:
+ from win32com.shell import shell, shellcon
+ home_dir = shell.SHGetPathFromIDList(
+ shell.SHGetSpecialFolderLocation( 0, shellcon.CSIDL_PROFILE )
+ )
+ user_prefs_dir = os.path.join(
+ shell.SHGetPathFromIDList(
+ shell.SHGetSpecialFolderLocation( 0, shellcon.CSIDL_APPDATA )
+ ),
+ per_app_dir_name
+ )
+ except:
+ home_dir = os.environ['USERPROFILE']
+ user_prefs_dir = os.environ['APPDATA']
+else:
+ home_dir = os.path.expanduser( '~' )
+ user_prefs_dir = os.path.join( home_dir, '.' + per_app_dir_name )
+
+def expand_shell_variables( val, vars ):
+ import re
+ return re.compile( r'\$\{([^}]+)\}' ).sub(
+ lambda m: vars[ m.group( 1 ) ], val )
+
+exec_prefix = '''@exec_prefix@'''
+exec_prefix = expand_shell_variables( exec_prefix, locals() )
+if len( exec_prefix ) == 0 or not os.path.isdir( exec_prefix ):
+ exec_prefix = prefix
+
+bin_dir = '''@bindir@'''
+bin_dir = expand_shell_variables( bin_dir, locals() )
+if len( bin_dir ) == 0 or not os.path.isdir( bin_dir ):
+ bin_dir = os.path.join( prefix, 'bin' )
+
+_include_dir = '''@includedir@'''
+_include_dir = expand_shell_variables( _include_dir, locals() )
+if len( _include_dir ) == 0 or not os.path.isdir( _include_dir ):
+ _include_dir = os.path.join( prefix, 'include' )
+include_dir = os.path.join( _include_dir, per_app_dir_name )
+
+_lib_dir = '''@libdir@'''
+_lib_dir = expand_shell_variables( _lib_dir, locals() )
+if len( _lib_dir ) == 0 or not os.path.isdir( _lib_dir ):
+ _lib_dir = os.path.join( prefix, 'lib' )
+lib_dir = os.path.join( _lib_dir, per_app_dir_name )
+
+
+DMCOMPILE = 'dmcompile'
+CLASS_NAME_MACRO_NAME = '_ECELL3_DM_CLASSNAME'
+
+progname = os.path.basename( sys.argv[ 0 ] )
+
+def usage():
+ print '''
+%(progname)s -- Compile dynamic modules for E-Cell Simulation Environment Version 3.
+
+Usage:
+ %(progname)s [options] [sourcefile(s)]
+ %(progname)s [-h] or [--help]
+ ''' % dict( progname = progname )
+
+def help():
+ usage()
+ print '''
+%(progname)s options:
+ --no-stdinclude Don't set standard include file path.
+ --no-stdlibdir Don't set standard library directory path.
+ --ldflags=[ldflags] Specify options to the linker.
+ --cxxflags=[cxxflags] Add compiler options.
+ --no-define-cxxflags=[cxxflags]
+ Override the default compiler options.
+ --dmcompile=[path] Specify dmcompile path.
+ -v or --verbose Be verbose.
+ -h or --help Print this message.
+
+
+This program is part of E-Cell Simulation Environment Version 3.
+Written by:
+ Tomoya Kitayama <to...@e-...>
+ Satya Arjunan <sa...@tt...>
+ ''' % dict( progname = progname )
+
+def msg( outstr ):
+ global progname
+ print "%s: %s" % ( progname, outstr )
+
+spawnvp = os.spawnv
+
+if hasattr(os, 'spawnvp'):
+ spawnvp = os.spawnvp
+elif os.name == 'nt':
+ def lookup_executable_path_nt(path, file):
+ for p in path:
+ for ext in ('', '.exe', '.cmd', '.bat'):
+ _file = os.path.join(p, file) + ext
+ try:
+ stat = os.stat(_file)
+ if stat.st_mode & 0500 == 0500:
+ return _file
+ except:
+ pass
+ return None
+
+ def spawnvp(mode, file, args):
+ if os.path.dirname(file) == '':
+ path = os.environ.get('PATH', None)
+ if path is not None:
+ path = path.split(os.pathsep)
+ else:
+ path = os.defpath
+ _file = lookup_executable_path_nt(path, file)
+ if _file is not None:
+ file = _file
+ return os.spawnv(mode, file, args)
+
+
+def main():
+ _lib_dir = '@LIBDIR@'
+ # -------------------------------------
+ # initialize file names
+ # -------------------------------------
+ STDLIBDIRS = [ '-L' + _lib_dir, '-L' + lib_dir ]
+ STDINCLUDE = [ '-I' + _include_dir,
+ '-I' + include_dir,
+ '-I' + os.path.join(include_dir, 'libecs') ]
+ SRC = None
+
+
+ # -------------------------------------
+ # get options and arguments
+ # -------------------------------------
+ try:
+ opts , args = getopt.getopt( sys.argv[1:], "hvo:",
+ ["help", "verbose", "no-stdinclude","no-stdlibdir", "ldflags=",
+ "cxxflags=", "no-define-cxxflags=", "dmcompile=", "output="])
+ except:
+ help()
+ sys.exit( 1 )
+
+ VERBOSE = False
+ NO_STDINCLUDE = False
+ NO_STDLIBDIR = False
+ NO_DEFINE_CXXFLAGS = False
+ LDFLAGS = []
+ CXXFLAGS = []
+ CXXCOMPILEFLAGS = []
+ OUTPUT = None
+ cmdList = []
+ dmcompile = DMCOMPILE
+
+ # -------------------------------------
+ # check argument
+ # -------------------------------------
+ for anOption, anArg in opts:
+
+ # print help message
+ if anOption in ( "-h", '--help' ):
+ help()
+ return 255
+
+ # be verbose
+ if anOption in ( "-v", '--verbose'):
+ VERBOSE = True
+
+ # without stdinclude
+ if anOption == "--no-stdinclude":
+ NO_STDINCLUDE = True
+
+ # without stdlibdir
+ if anOption == "--no-stdlibdir":
+ NO_STDLIBDIR = True
+
+ # set ldflags
+ if anOption == "--ldflags":
+ LDFLAGS.extend( split_quoted( anArg ) )
+
+ # set no-define-cxxflags
+ if anOption == "--no-define-cxxflags":
+ NO_DEFINE_CXXFLAGS = True
+ CXXFLAGS.extend( split_quoted( anArg ) )
+
+ # set cxxflags
+ if anOption == "--cxxflags":
+ CXXFLAGS.extend( split_quoted( anArg ) )
+
+ # set cxxflags
+ if anOption == "--dmcompile":
+ if os.path.isdir( anArg ):
+ dmcompile = os.path.join( anArg, DMCOMPILE )
+ else:
+ dmcompile = anArg
+
+ # set output file
+ if anOption in ( "-o", "--output" ):
+ OUTPUT = anArg
+
+ # check if source file is given
+ if len( args ) < 1:
+ help()
+ msg( "no source file is given." )
+ return 1
+
+ cmdList.append( dmcompile )
+
+ if VERBOSE:
+ cmdList.append( '-v' )
+
+ if OUTPUT:
+ cmdList += [ '-o', OUTPUT ]
+
+ # on MS-Windows, command line doesn't expand *.cpp automatically
+ srcs = reduce( operator.add, map( glob, args ) )
+
+ # check if source file is valid
+ if len( srcs ) < 1:
+ msg( "source file "+ args[0] + " was not found." )
+ return 1
+
+ if NO_STDINCLUDE:
+ STDINCLUDE = []
+
+ if not NO_STDLIBDIR:
+ LDFLAGS.extend( STDLIBDIRS )
+
+ LDFLAGS.append( '-lecs' )
+ LDFLAGS.append( '-lgsl' )
+
+ cmdList.extend( STDINCLUDE )
+ cmdList.extend( CXXFLAGS )
+ cmdList.extend( LDFLAGS )
+
+ for src in srcs:
+ ext = os.path.basename( src )
+ classname, ext = os.path.splitext( ext )
+ argList = cmdList + [ '-D%s=%s' % ( CLASS_NAME_MACRO_NAME, classname ), src ]
+
+ if VERBOSE:
+ print ' '.join( argList[0:] )
+
+ # Need to us os.spawnv because of problems in MS-Windows with os.sytem
+ # when the dmcompile path contains whitespaces even if we force quotes
+ ret = spawnvp( os.P_WAIT, cmdList[0], argList )
+ if ret != 0:
+ msg( '%s returned error status: %d' % ( cmdList[0], ret ) )
+ return 1
+ return 0
+
+if __name__ == '__main__':
+ sys.exit( main() )
Property changes on: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: ecell3/branches/ecell-3.2/ecell/configure.ac.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/configure.ac.in 2010-02-09 09:14:40 UTC (rev 3805)
+++ ecell3/branches/ecell-3.2/ecell/configure.ac.in 2010-02-09 09:17:04 UTC (rev 3806)
@@ -309,6 +309,7 @@
frontend/model-editor/glade/Makefile
frontend/model-editor/plugins/Makefile
])
+AC_CONFIG_FILES([bin/ecell3-dmc], [chmod +x bin/ecell3-dmc])
AC_CONFIG_FILES([pyecell/ecell3-python], [chmod +x pyecell/ecell3-python])
AC_CONFIG_FILES([pyecell/ecell3-em2eml], [chmod +x pyecell/ecell3-em2eml])
AC_CONFIG_FILES([pyecell/ecell3-eml2em], [chmod +x pyecell/ecell3-eml2em])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 09:14:46
|
Revision: 3805
http://ecell.svn.sourceforge.net/ecell/?rev=3805&view=rev
Author: moriyoshi
Date: 2010-02-09 09:14:40 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Merge from 3.2.
Modified Paths:
--------------
ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in
Modified: ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in 2010-02-09 09:14:01 UTC (rev 3804)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in 2010-02-09 09:14:40 UTC (rev 3805)
@@ -68,16 +68,12 @@
'revision': '@ECELL_PACKAGE_REVISION@'
}
-prefix = '''@PREFIX@'''
+prefix = '''@prefix@'''
if len( prefix ) == 0 or not os.path.isdir( prefix ):
prefix = os.path.dirname(
os.path.dirname( get_running_executable() )
)
-exec_prefix = '''@EXEC_PREFIX@'''
-if len( exec_prefix ) == 0 or not os.path.isdir( exec_prefix ):
- exec_prefix = prefix
-
if os.name == 'nt':
try:
from win32com.shell import shell, shellcon
@@ -102,6 +98,11 @@
return re.compile( r'\$\{([^}]+)\}' ).sub(
lambda m: vars[ m.group( 1 ) ], val )
+exec_prefix = '''@exec_prefix@'''
+exec_prefix = expand_shell_variables( exec_prefix, locals() )
+if len( exec_prefix ) == 0 or not os.path.isdir( exec_prefix ):
+ exec_prefix = prefix
+
bin_dir = '''@bindir@'''
bin_dir = expand_shell_variables( bin_dir, locals() )
if len( bin_dir ) == 0 or not os.path.isdir( bin_dir ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 09:14:08
|
Revision: 3804
http://ecell.svn.sourceforge.net/ecell/?rev=3804&view=rev
Author: moriyoshi
Date: 2010-02-09 09:14:01 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* exec_prefix, not EXEC_PREFIX
Modified Paths:
--------------
ecell3/branches/ecell-3.2/ecell/pyecell/ecell/config.py.in
Modified: ecell3/branches/ecell-3.2/ecell/pyecell/ecell/config.py.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/pyecell/ecell/config.py.in 2010-02-09 08:43:12 UTC (rev 3803)
+++ ecell3/branches/ecell-3.2/ecell/pyecell/ecell/config.py.in 2010-02-09 09:14:01 UTC (rev 3804)
@@ -68,16 +68,12 @@
'revision': '@ECELL_PACKAGE_REVISION@'
}
-prefix = '''@PREFIX@'''
+prefix = '''@prefix@'''
if len( prefix ) == 0 or not os.path.isdir( prefix ):
prefix = os.path.dirname(
os.path.dirname( get_running_executable() )
)
-exec_prefix = '''@EXEC_PREFIX@'''
-if len( exec_prefix ) == 0 or not os.path.isdir( exec_prefix ):
- exec_prefix = prefix
-
if os.name == 'nt':
try:
from win32com.shell import shell, shellcon
@@ -102,6 +98,11 @@
return re.compile( r'\$\{([^}]+)\}' ).sub(
lambda m: vars[ m.group( 1 ) ], val )
+exec_prefix = '''@exec_prefix@'''
+exec_prefix = expand_shell_variables( exec_prefix, locals() )
+if len( exec_prefix ) == 0 or not os.path.isdir( exec_prefix ):
+ exec_prefix = prefix
+
bin_dir = '''@bindir@'''
bin_dir = expand_shell_variables( bin_dir, locals() )
if len( bin_dir ) == 0 or not os.path.isdir( bin_dir ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 08:43:19
|
Revision: 3803
http://ecell.svn.sourceforge.net/ecell/?rev=3803&view=rev
Author: moriyoshi
Date: 2010-02-09 08:43:12 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* It is no longer necessary to generate ecell3-dmc from the template.
Modified Paths:
--------------
ecell3/branches/ecell-3.2/build/msvc/dist.wsf
ecell3/branches/ecell-3.2/ecell/configure.ac.in
Added Paths:
-----------
ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc
Removed Paths:
-------------
ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
Property Changed:
----------------
ecell3/branches/ecell-3.2/ecell/bin/
Modified: ecell3/branches/ecell-3.2/build/msvc/dist.wsf
===================================================================
(Binary files differ)
Property changes on: ecell3/branches/ecell-3.2/ecell/bin
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
aclocal.m4
config.h
config.h.in
config.log
config.status
configure
ecell3-dmc
Makefile
Makefile.in
stamp-h1
+ autom4te.cache
aclocal.m4
config.h
config.h.in
config.log
config.status
configure
Makefile
Makefile.in
stamp-h1
Added: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc
===================================================================
--- ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc (rev 0)
+++ ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc 2010-02-09 08:43:12 UTC (rev 3803)
@@ -0,0 +1,224 @@
+#!/usr/bin/env python
+#
+# ecell3-dmc - a program to compile and/or docify dynamic module in
+# E-Cell Simulation Environment Version 3
+#
+# authors: Tomoya Kitayama <to...@e-...>
+# Satya Arjunan <sa...@sf...>
+
+#PACKAGE=bin
+#VERSION=0.0
+
+import sys
+import os
+import getopt
+import operator
+from glob import glob
+from distutils.util import split_quoted
+import ecell.config as config
+
+DMCOMPILE = 'dmcompile'
+CLASS_NAME_MACRO_NAME = '_ECELL3_DM_CLASSNAME'
+
+progname = os.path.basename( sys.argv[ 0 ] )
+
+def usage():
+ print '''
+%(progname)s -- Compile dynamic modules for E-Cell Simulation Environment Version 3.
+
+Usage:
+ %(progname)s [options] [sourcefile(s)]
+ %(progname)s [-h] or [--help]
+ ''' % dict( progname = progname )
+
+def help():
+ usage()
+ print '''
+%(progname)s options:
+ --no-stdinclude Don't set standard include file path.
+ --no-stdlibdir Don't set standard library directory path.
+ --ldflags=[ldflags] Specify options to the linker.
+ --cxxflags=[cxxflags] Add compiler options.
+ --no-define-cxxflags=[cxxflags]
+ Override the default compiler options.
+ --dmcompile=[path] Specify dmcompile path.
+ -v or --verbose Be verbose.
+ -h or --help Print this message.
+
+
+This program is part of E-Cell Simulation Environment Version 3.
+Written by:
+ Tomoya Kitayama <to...@e-...>
+ Satya Arjunan <sa...@tt...>
+ ''' % dict( progname = progname )
+
+def msg( outstr ):
+ global progname
+ print "%s: %s" % ( progname, outstr )
+
+spawnvp = os.spawnv
+
+if hasattr(os, 'spawnvp'):
+ spawnvp = os.spawnvp
+elif os.name == 'nt':
+ def lookup_executable_path_nt(path, file):
+ for p in path:
+ for ext in ('', '.exe', '.cmd', '.bat'):
+ _file = os.path.join(p, file) + ext
+ try:
+ stat = os.stat(_file)
+ if stat.st_mode & 0500 == 0500:
+ return _file
+ except:
+ pass
+ return None
+
+ def spawnvp(mode, file, args):
+ if os.path.dirname(file) == '':
+ path = os.environ.get('PATH', None)
+ if path is not None:
+ path = path.split(os.pathsep)
+ else:
+ path = os.defpath
+ _file = lookup_executable_path_nt(path, file)
+ if _file is not None:
+ file = _file
+ return os.spawnv(mode, file, args)
+
+
+def main():
+
+ # -------------------------------------
+ # initialize file names
+ # -------------------------------------
+ STDLIBDIRS = [ '-L' + config._lib_dir, '-L' + config.lib_dir ]
+ INCLUDE = os.path.join(config.prefix, 'include')
+ ECELL_INCLUDE = os.path.join(INCLUDE, config.per_app_dir_name)
+ LIBECS_INCLUDE = os.path.join(ECELL_INCLUDE, 'libecs')
+ STDINCLUDE = [ '-I' + INCLUDE,
+ '-I' + ECELL_INCLUDE,
+ '-I' + LIBECS_INCLUDE ]
+ SRC = None
+
+
+ # -------------------------------------
+ # get options and arguments
+ # -------------------------------------
+ try:
+ opts , args = getopt.getopt( sys.argv[1:], "hvo:",
+ ["help", "verbose", "no-stdinclude","no-stdlibdir", "ldflags=",
+ "cxxflags=", "no-define-cxxflags=", "dmcompile=", "output="])
+ except:
+ help()
+ sys.exit( 1 )
+
+ VERBOSE = False
+ NO_STDINCLUDE = False
+ NO_STDLIBDIR = False
+ NO_DEFINE_CXXFLAGS = False
+ LDFLAGS = []
+ CXXFLAGS = []
+ CXXCOMPILEFLAGS = []
+ OUTPUT = None
+ cmdList = []
+ dmcompile = DMCOMPILE
+
+ # -------------------------------------
+ # check argument
+ # -------------------------------------
+ for anOption, anArg in opts:
+
+ # print help message
+ if anOption in ( "-h", '--help' ):
+ help()
+ return 255
+
+ # be verbose
+ if anOption in ( "-v", '--verbose'):
+ VERBOSE = True
+
+ # without stdinclude
+ if anOption == "--no-stdinclude":
+ NO_STDINCLUDE = True
+
+ # without stdlibdir
+ if anOption == "--no-stdlibdir":
+ NO_STDLIBDIR = True
+
+ # set ldflags
+ if anOption == "--ldflags":
+ LDFLAGS.extend( split_quoted( anArg ) )
+
+ # set no-define-cxxflags
+ if anOption == "--no-define-cxxflags":
+ NO_DEFINE_CXXFLAGS = True
+ CXXFLAGS.extend( split_quoted( anArg ) )
+
+ # set cxxflags
+ if anOption == "--cxxflags":
+ CXXFLAGS.extend( split_quoted( anArg ) )
+
+ # set cxxflags
+ if anOption == "--dmcompile":
+ if os.path.isdir( anArg ):
+ dmcompile = os.path.join( anArg, DMCOMPILE )
+ else:
+ dmcompile = anArg
+
+ # set output file
+ if anOption in ( "-o", "--output" ):
+ OUTPUT = anArg
+
+ # check if source file is given
+ if len( args ) < 1:
+ help()
+ msg( "no source file is given." )
+ return 1
+
+ cmdList.append( dmcompile )
+
+ if VERBOSE:
+ cmdList.append( '-v' )
+
+ if OUTPUT:
+ cmdList += [ '-o', OUTPUT ]
+
+ # on MS-Windows, command line doesn't expand *.cpp automatically
+ srcs = reduce( operator.add, map( glob, args ) )
+
+ # check if source file is valid
+ if len( srcs ) < 1:
+ msg( "source file "+ args[0] + " was not found." )
+ return 1
+
+ if NO_STDINCLUDE:
+ STDINCLUDE = []
+
+ if not NO_STDLIBDIR:
+ LDFLAGS.extend( STDLIBDIRS )
+
+ LDFLAGS.append( '-lecs' )
+ LDFLAGS.append( '-lgsl' )
+
+ cmdList.extend( STDINCLUDE )
+ cmdList.extend( CXXFLAGS )
+ cmdList.extend( LDFLAGS )
+
+ for src in srcs:
+ ext = os.path.basename( src )
+ classname, ext = os.path.splitext( ext )
+ argList = cmdList + [ '-D%s=%s' % ( CLASS_NAME_MACRO_NAME, classname ), src ]
+
+ if VERBOSE:
+ print ' '.join( argList[0:] )
+
+ # Need to us os.spawnv because of problems in MS-Windows with os.sytem
+ # when the dmcompile path contains whitespaces even if we force quotes
+ ret = spawnvp( os.P_WAIT, cmdList[0], argList )
+ if ret != 0:
+ msg( '%s returned error status: %d' % ( cmdList[0], ret ) )
+ return 1
+ return 0
+
+if __name__ == '__main__':
+ sys.exit( main() )
Property changes on: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Deleted: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in 2010-02-09 08:29:22 UTC (rev 3802)
+++ ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in 2010-02-09 08:43:12 UTC (rev 3803)
@@ -1,224 +0,0 @@
-#!/usr/bin/env python
-#
-# ecell3-dmc - a program to compile and/or docify dynamic module in
-# E-Cell Simulation Environment Version 3
-#
-# authors: Tomoya Kitayama <to...@e-...>
-# Satya Arjunan <sa...@sf...>
-
-#PACKAGE=bin
-#VERSION=0.0
-
-import sys
-import os
-import getopt
-import operator
-from glob import glob
-from distutils.util import split_quoted
-import ecell.config as config
-
-DMCOMPILE = 'dmcompile'
-CLASS_NAME_MACRO_NAME = '_ECELL3_DM_CLASSNAME'
-
-progname = os.path.basename( sys.argv[ 0 ] )
-
-def usage():
- print '''
-%(progname)s -- Compile dynamic modules for E-Cell Simulation Environment Version 3.
-
-Usage:
- %(progname)s [options] [sourcefile(s)]
- %(progname)s [-h] or [--help]
- ''' % dict( progname = progname )
-
-def help():
- usage()
- print '''
-%(progname)s options:
- --no-stdinclude Don't set standard include file path.
- --no-stdlibdir Don't set standard library directory path.
- --ldflags=[ldflags] Specify options to the linker.
- --cxxflags=[cxxflags] Add compiler options.
- --no-define-cxxflags=[cxxflags]
- Override the default compiler options.
- --dmcompile=[path] Specify dmcompile path.
- -v or --verbose Be verbose.
- -h or --help Print this message.
-
-
-This program is part of E-Cell Simulation Environment Version 3.
-Written by:
- Tomoya Kitayama <to...@e-...>
- Satya Arjunan <sa...@tt...>
- ''' % dict( progname = progname )
-
-def msg( outstr ):
- global progname
- print "%s: %s" % ( progname, outstr )
-
-spawnvp = os.spawnv
-
-if hasattr(os, 'spawnvp'):
- spawnvp = os.spawnvp
-elif os.name == 'nt':
- def lookup_executable_path_nt(path, file):
- for p in path:
- for ext in ('', '.exe', '.cmd', '.bat'):
- _file = os.path.join(p, file) + ext
- try:
- stat = os.stat(_file)
- if stat.st_mode & 0500 == 0500:
- return _file
- except:
- pass
- return None
-
- def spawnvp(mode, file, args):
- if os.path.dirname(file) == '':
- path = os.environ.get('PATH', None)
- if path is not None:
- path = path.split(os.pathsep)
- else:
- path = os.defpath
- _file = lookup_executable_path_nt(path, file)
- if _file is not None:
- file = _file
- return os.spawnv(mode, file, args)
-
-
-def main():
-
- # -------------------------------------
- # initialize file names
- # -------------------------------------
- STDLIBDIRS = [ '-L' + config._lib_dir, '-L' + config.lib_dir ]
- INCLUDE = os.path.join(config.prefix, 'include')
- ECELL_INCLUDE = os.path.join(INCLUDE, config.per_app_dir_name)
- LIBECS_INCLUDE = os.path.join(ECELL_INCLUDE, 'libecs')
- STDINCLUDE = [ '-I' + INCLUDE,
- '-I' + ECELL_INCLUDE,
- '-I' + LIBECS_INCLUDE ]
- SRC = None
-
-
- # -------------------------------------
- # get options and arguments
- # -------------------------------------
- try:
- opts , args = getopt.getopt( sys.argv[1:], "hvo:",
- ["help", "verbose", "no-stdinclude","no-stdlibdir", "ldflags=",
- "cxxflags=", "no-define-cxxflags=", "dmcompile=", "output="])
- except:
- help()
- sys.exit( 1 )
-
- VERBOSE = False
- NO_STDINCLUDE = False
- NO_STDLIBDIR = False
- NO_DEFINE_CXXFLAGS = False
- LDFLAGS = []
- CXXFLAGS = []
- CXXCOMPILEFLAGS = []
- OUTPUT = None
- cmdList = []
- dmcompile = DMCOMPILE
-
- # -------------------------------------
- # check argument
- # -------------------------------------
- for anOption, anArg in opts:
-
- # print help message
- if anOption in ( "-h", '--help' ):
- help()
- return 255
-
- # be verbose
- if anOption in ( "-v", '--verbose'):
- VERBOSE = True
-
- # without stdinclude
- if anOption == "--no-stdinclude":
- NO_STDINCLUDE = True
-
- # without stdlibdir
- if anOption == "--no-stdlibdir":
- NO_STDLIBDIR = True
-
- # set ldflags
- if anOption == "--ldflags":
- LDFLAGS.extend( split_quoted( anArg ) )
-
- # set no-define-cxxflags
- if anOption == "--no-define-cxxflags":
- NO_DEFINE_CXXFLAGS = True
- CXXFLAGS.extend( split_quoted( anArg ) )
-
- # set cxxflags
- if anOption == "--cxxflags":
- CXXFLAGS.extend( split_quoted( anArg ) )
-
- # set cxxflags
- if anOption == "--dmcompile":
- if os.path.isdir( anArg ):
- dmcompile = os.path.join( anArg, DMCOMPILE )
- else:
- dmcompile = anArg
-
- # set output file
- if anOption in ( "-o", "--output" ):
- OUTPUT = anArg
-
- # check if source file is given
- if len( args ) < 1:
- help()
- msg( "no source file is given." )
- return 1
-
- cmdList.append( dmcompile )
-
- if VERBOSE:
- cmdList.append( '-v' )
-
- if OUTPUT:
- cmdList += [ '-o', OUTPUT ]
-
- # on MS-Windows, command line doesn't expand *.cpp automatically
- srcs = reduce( operator.add, map( glob, args ) )
-
- # check if source file is valid
- if len( srcs ) < 1:
- msg( "source file "+ args[0] + " was not found." )
- return 1
-
- if NO_STDINCLUDE:
- STDINCLUDE = []
-
- if not NO_STDLIBDIR:
- LDFLAGS.extend( STDLIBDIRS )
-
- LDFLAGS.append( '-lecs' )
- LDFLAGS.append( '-lgsl' )
-
- cmdList.extend( STDINCLUDE )
- cmdList.extend( CXXFLAGS )
- cmdList.extend( LDFLAGS )
-
- for src in srcs:
- ext = os.path.basename( src )
- classname, ext = os.path.splitext( ext )
- argList = cmdList + [ '-D%s=%s' % ( CLASS_NAME_MACRO_NAME, classname ), src ]
-
- if VERBOSE:
- print ' '.join( argList[0:] )
-
- # Need to us os.spawnv because of problems in MS-Windows with os.sytem
- # when the dmcompile path contains whitespaces even if we force quotes
- ret = spawnvp( os.P_WAIT, cmdList[0], argList )
- if ret != 0:
- msg( '%s returned error status: %d' % ( cmdList[0], ret ) )
- return 1
- return 0
-
-if __name__ == '__main__':
- sys.exit( main() )
Modified: ecell3/branches/ecell-3.2/ecell/configure.ac.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/configure.ac.in 2010-02-09 08:29:22 UTC (rev 3802)
+++ ecell3/branches/ecell-3.2/ecell/configure.ac.in 2010-02-09 08:43:12 UTC (rev 3803)
@@ -309,7 +309,6 @@
frontend/model-editor/glade/Makefile
frontend/model-editor/plugins/Makefile
])
-AC_CONFIG_FILES([bin/ecell3-dmc], [chmod +x bin/ecell3-dmc])
AC_CONFIG_FILES([pyecell/ecell3-python], [chmod +x pyecell/ecell3-python])
AC_CONFIG_FILES([pyecell/ecell3-em2eml], [chmod +x pyecell/ecell3-em2eml])
AC_CONFIG_FILES([pyecell/ecell3-eml2em], [chmod +x pyecell/ecell3-eml2em])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 08:29:39
|
Revision: 3802
http://ecell.svn.sourceforge.net/ecell/?rev=3802&view=rev
Author: moriyoshi
Date: 2010-02-09 08:29:22 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Make ecell3-dmc and dmcompile usable on Windows.
Modified Paths:
--------------
ecell3/branches/ecell-3.2/build/msvc/dist.wsf
ecell3/branches/ecell-3.2/dmtool/dmcompile.in
ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
Modified: ecell3/branches/ecell-3.2/build/msvc/dist.wsf
===================================================================
(Binary files differ)
Modified: ecell3/branches/ecell-3.2/dmtool/dmcompile.in
===================================================================
--- ecell3/branches/ecell-3.2/dmtool/dmcompile.in 2010-02-09 04:10:29 UTC (rev 3801)
+++ ecell3/branches/ecell-3.2/dmtool/dmcompile.in 2010-02-09 08:29:22 UTC (rev 3802)
@@ -7,13 +7,10 @@
import glob
from optparse import OptionParser, IndentedHelpFormatter, BadOptionError, make_option
from numpy.distutils.ccompiler import new_compiler
-from distutils.sysconfig import get_config_var, customize_compiler
+from distutils.sysconfig import get_config_vars, customize_compiler
from distutils.errors import CompileError, LinkError
from distutils.util import split_quoted
-# prefix='@prefix@'
-# exec_prefix='@exec_prefix@'
-# libdir='@libdir@'
OBJECT_EXTS = ['.so', '.o', '.obj', '.a', '.lib'];
ORIG_CXXFLAGS = '@CXXFLAGS@'
@@ -167,7 +164,7 @@
for flag in opts.unknown:
cxxflags.append( flag )
- shlflags = split_quoted( get_config_var('CCSHARED') )
+ shlflags = split_quoted( get_config_vars().get( 'CCSHARED', '' ) )
compiler = new_compiler( verbose=opts.verbose )
compiler.customize( None, need_cxx=1 )
@@ -210,11 +207,10 @@
compiler.linker_so = [ arg for arg in compiler.linker_so if arg != '-shard' ]
dlflags = []
- dlflags.extend(
- split_quoted(
- get_config_var( 'LDSHARED' ).replace(
- get_config_var( 'LINKCC' ), '' ).replace(
- get_config_var( 'LDFLAGS' ), '' ) ) )
+ dlflags.extend( split_quoted(
+ get_config_vars().get( 'LDSHARED', '' )
+ .replace( get_config_vars().get( 'LINKCC', '' ), '' )
+ .replace( get_config_vars().get( 'LDFLAGS', '' ), '' ) ) )
try:
try:
Modified: ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in 2010-02-09 04:10:29 UTC (rev 3801)
+++ ecell3/branches/ecell-3.2/ecell/bin/ecell3-dmc.in 2010-02-09 08:29:22 UTC (rev 3802)
@@ -15,6 +15,7 @@
import operator
from glob import glob
from distutils.util import split_quoted
+import ecell.config as config
DMCOMPILE = 'dmcompile'
CLASS_NAME_MACRO_NAME = '_ECELL3_DM_CLASSNAME'
@@ -55,19 +56,46 @@
global progname
print "%s: %s" % ( progname, outstr )
+spawnvp = os.spawnv
+
+if hasattr(os, 'spawnvp'):
+ spawnvp = os.spawnvp
+elif os.name == 'nt':
+ def lookup_executable_path_nt(path, file):
+ for p in path:
+ for ext in ('', '.exe', '.cmd', '.bat'):
+ _file = os.path.join(p, file) + ext
+ try:
+ stat = os.stat(_file)
+ if stat.st_mode & 0500 == 0500:
+ return _file
+ except:
+ pass
+ return None
+
+ def spawnvp(mode, file, args):
+ if os.path.dirname(file) == '':
+ path = os.environ.get('PATH', None)
+ if path is not None:
+ path = path.split(os.pathsep)
+ else:
+ path = os.defpath
+ _file = lookup_executable_path_nt(path, file)
+ if _file is not None:
+ file = _file
+ return os.spawnv(mode, file, args)
+
+
def main():
# -------------------------------------
# initialize file names
# -------------------------------------
- prefix = r'''@PREFIX@'''
- ecell3dir = r'''@ECELL_DIRNAME@'''
- exec_prefix = prefix
- BINDIR = exec_prefix + os.sep + 'bin'
- STDLIBDIRS = [ '-L' + exec_prefix + os.sep + 'lib' ]
- ECELL_INCLUDE = prefix + os.sep + 'include' + os.sep + ecell3dir
- LIBECS_INCLUDE = ECELL_INCLUDE + os.sep + 'libecs'
- STDINCLUDE = [ '-I' + prefix + os.sep + 'include',
+ STDLIBDIRS = [ '-L' + config._lib_dir, '-L' + config.lib_dir ]
+ INCLUDE = os.path.join(config.prefix, 'include')
+ ECELL_INCLUDE = os.path.join(INCLUDE, config.per_app_dir_name)
+ LIBECS_INCLUDE = os.path.join(ECELL_INCLUDE, 'libecs')
+ STDINCLUDE = [ '-I' + INCLUDE,
'-I' + ECELL_INCLUDE,
'-I' + LIBECS_INCLUDE ]
SRC = None
@@ -186,7 +214,7 @@
# Need to us os.spawnv because of problems in MS-Windows with os.sytem
# when the dmcompile path contains whitespaces even if we force quotes
- ret = os.spawnvp( os.P_WAIT, cmdList[0], argList )
+ ret = spawnvp( os.P_WAIT, cmdList[0], argList )
if ret != 0:
msg( '%s returned error status: %d' % ( cmdList[0], ret ) )
return 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-09 04:10:36
|
Revision: 3801
http://ecell.svn.sourceforge.net/ecell/?rev=3801&view=rev
Author: moriyoshi
Date: 2010-02-09 04:10:29 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
* Update for 1.40.0
Modified Paths:
--------------
ecell-build/trunk/pkg/win32/ecell3-installer.iss
Modified: ecell-build/trunk/pkg/win32/ecell3-installer.iss
===================================================================
--- ecell-build/trunk/pkg/win32/ecell3-installer.iss 2010-02-08 06:17:25 UTC (rev 3800)
+++ ecell-build/trunk/pkg/win32/ecell3-installer.iss 2010-02-09 04:10:29 UTC (rev 3801)
@@ -18,7 +18,7 @@
[Setup]
AppName=E-Cell Simulation Environment
AppVerName=E-Cell Simulation Environment {#Version}
-AppPublisher=Keio University
+AppPublisher=E-Cell Project
AppPublisherURL=http://www.e-cell.org/
DefaultDirName={pf}\E-Cell
DefaultGroupName=E-Cell
@@ -100,6 +100,8 @@
Source: {#Stage}\include\boost\concept\*; DestDir: {app}\include\boost\concept; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\concept_check\*; DestDir: {app}\include\boost\concept_check; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\config\*; DestDir: {app}\include\boost\config; Flags: recursesubdirs ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\detail\*; DestDir: {app}\include\boost\detail; Flags: recursesubdirs ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\exception\*; DestDir: {app}\include\boost\exception; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\format\*; DestDir: {app}\include\boost\format; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\function\*; DestDir: {app}\include\boost\function; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\fusion\*; DestDir: {app}\include\boost\fusion; Flags: recursesubdirs ignoreversion; Components: dev;
@@ -119,6 +121,7 @@
Source: {#Stage}\include\boost\tr1\*; DestDir: {app}\include\boost\tr1; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\tuple\*; DestDir: {app}\include\boost\tuple; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\type_traits\*; DestDir: {app}\include\boost\type_traits; Flags: recursesubdirs ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\typeof\*; DestDir: {app}\include\boost\typeof; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\unordered\*; DestDir: {app}\include\boost\unordered; Flags: recursesubdirs ignoreversion; Components: dev;
Source: {#Stage}\include\boost\utility\*; DestDir: {app}\include\boost\utility; Flags: recursesubdirs ignoreversion; Components: dev;
@@ -134,41 +137,13 @@
Source: {#Stage}\include\boost\concept_check.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\config.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\current_function.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\algorithm.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\allocator_utilities.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\atomic_count.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\binary_search.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\call_traits.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\catch_exceptions.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\compressed_pair.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\dynamic_bitset.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\endian.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\indirect_traits.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\interlocked.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\is_function_ref_tester.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\is_incrementable.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\is_xxx.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\iterator.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\lightweight_mutex.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\lightweight_test.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\limits.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\named_template_params.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\no_exceptions_support.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\none_t.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\numeric_traits.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\ob_call_traits.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\ob_compressed_pair.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\quick_allocator.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\reference_content.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\select_type.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\templated_streams.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\utf8_codecvt_facet.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\detail\workaround.hpp; DestDir: {app}\include\boost\detail; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\enable_shared_from_this.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\foreach.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\functional.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\function.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\function_equal.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\function_output_iterator.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\functional.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\generator_iterator.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\get_pointer.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\implicit_cast.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
@@ -183,14 +158,19 @@
Source: {#Stage}\include\boost\last_value.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\lexical_cast.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\limits.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\make_shared.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\math_fwd.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\mem_fn.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\memory_order.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\multi_array.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\multi_index_container.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\multi_index_container_fwd.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\next_prior.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\non_type.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\noncopyable.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\nondet_random.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\none.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
-Source: {#Stage}\include\boost\non_type.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\none_t.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\operators.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\optional.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\parameter.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
@@ -200,16 +180,20 @@
Source: {#Stage}\include\boost\preprocessor.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\python.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\range.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\rational.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\ref.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\regex_fwd.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\regex.h; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\regex.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\scope_exit.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\scoped_array.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\scoped_ptr.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\shared_array.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\shared_container_iterator.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\shared_ptr.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\smart_ptr.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\static_assert.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\strong_typedef.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\swap.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\static_assert.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\throw_exception.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
@@ -218,6 +202,8 @@
Source: {#Stage}\include\boost\unordered_map.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\unordered_set.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\utility.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\variant\*; DestDir: {app}\include\boost\variant; Flags: ignoreversion; Components: dev;
+Source: {#Stage}\include\boost\variant.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\version.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\visit_each.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
Source: {#Stage}\include\boost\weak_ptr.hpp; DestDir: {app}\include\boost; Flags: ignoreversion; Components: dev;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-08 06:17:31
|
Revision: 3800
http://ecell.svn.sourceforge.net/ecell/?rev=3800&view=rev
Author: moriyoshi
Date: 2010-02-08 06:17:25 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
* Hmm...
Modified Paths:
--------------
ecell3/branches/ecell-3.2/ecell/configure.ac.in
Modified: ecell3/branches/ecell-3.2/ecell/configure.ac.in
===================================================================
--- ecell3/branches/ecell-3.2/ecell/configure.ac.in 2010-02-08 05:44:47 UTC (rev 3799)
+++ ecell3/branches/ecell-3.2/ecell/configure.ac.in 2010-02-08 06:17:25 UTC (rev 3800)
@@ -86,6 +86,13 @@
AC_SUBST(LIBLTDL)
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
+AC_LTDL_SHLIBEXT
+if test -n "$shrext_cmds"; then
+ eval LTDL_SHLIB_EXT=$shrext_cmds
+elif test -n "$shrext"; then
+ eval LTDL_SHLIB_EXT=$shrext
+fi
+AC_SUBST(LTDL_SHLIB_EXT)
dnl to circumvent libltdl weirdness (already fixed in the newer versions)
case $host_os in
@@ -99,40 +106,6 @@
. ./conftest
rm -f conftest
-dnl compatibility for libtool 1.5.6
-
-LTDL_SHLIB_EXT=""
-if test -n "$shrext_cmds"; then
- module=yes eval LTDL_SHLIB_EXT=\"$shrext_cmds\"
-dnl compatibility for libtool 1.5.0
-elif test -n "$shrext"; then
- LTDL_SHLIB_EXT=$shrext
-dnl compatibility for libtool 1.4.x
-else
- AC_CACHE_CHECK([which extension is used for shared libraries],
- libltdl_cv_shlibext, [dnl
- (
- last=
- for spec in $library_names_spec; do
- last="$spec"
- done
- changequote(, )
- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
- changequote([, ])
- )
- libltdl_cv_shlibext=`cat conftest`
- rm -f conftest
- ])
- if test -n "$libltdl_cv_shlibext"; then
- LTDL_SHLIB_EXT=$libltdl_cv_shlibext
- fi
-fi
-
-AC_SUBST(LTDL_SHLIB_EXT)
-AC_DEFINE_UNQUOTED([LTDL_SHLIB_EXT]. ["$LTDL_SHLIB_EXT"],
- [Define to the extension used for shared libraries])
-
-
if test "$enable_pyecell" = "yes"; then
AM_PATH_PYTHON(2.2)
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mor...@us...> - 2010-02-08 05:44:53
|
Revision: 3799
http://ecell.svn.sourceforge.net/ecell/?rev=3799&view=rev
Author: moriyoshi
Date: 2010-02-08 05:44:47 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
* 3.2.0 Patchlevel1
Modified Paths:
--------------
ecell3/branches/ecell-3.2/NEWS
ecell3/branches/ecell-3.2/ecell_version.sh
Modified: ecell3/branches/ecell-3.2/NEWS
===================================================================
--- ecell3/branches/ecell-3.2/NEWS 2010-02-08 05:38:52 UTC (rev 3798)
+++ ecell3/branches/ecell-3.2/NEWS 2010-02-08 05:44:47 UTC (rev 3799)
@@ -1,3 +1,13 @@
+ecell-3.2.0p1: 8-Feb-2010
+
+ * Fixed the build system so that resource files for the GUI tools are
+ correctly installed under the package data directory.
+
+ * Fixed FileSelection combatibility wrapper so that they can present
+ the text box for the filename entry. Because of this bug, models could not
+ be saved in session-monitor or model editor.
+
+
ecell-3.2.0: 5-Feb-2010
* See the entries for 3.1.108.
Modified: ecell3/branches/ecell-3.2/ecell_version.sh
===================================================================
--- ecell3/branches/ecell-3.2/ecell_version.sh 2010-02-08 05:38:52 UTC (rev 3798)
+++ ecell3/branches/ecell-3.2/ecell_version.sh 2010-02-08 05:44:47 UTC (rev 3799)
@@ -1,5 +1,5 @@
ECELL_MAJOR_VERSION=3
ECELL_MINOR_VERSION=2
ECELL_MICRO_VERSION=0
-ECELL_PACKAGE_REVISION=
+ECELL_PACKAGE_REVISION=p1
ECELL_VERSION_NUMBER=${ECELL_MAJOR_VERSION}.${ECELL_MINOR_VERSION}.${ECELL_MICRO_VERSION}${ECELL_PACKAGE_REVISION}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
