[Ecell-cvs] SF.net SVN: ecell:[3224] ecell3/branches/ecell-3.1

[<mor...@us...>]

Revision: 3224
          http://ecell.svn.sourceforge.net/ecell/?rev=3224&view=rev
Author:   moriyoshi
Date:     2008-10-20 04:19:14 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
* Win32 build fix (nearly completed)

Modified Paths:
--------------
    ecell3/branches/ecell-3.1/build/msvc/dist.vcproj
    ecell3/branches/ecell-3.1/build/msvc/dist.wsf
    ecell3/branches/ecell-3.1/build/msvc/ecell.sln
    ecell3/branches/ecell-3.1/build/msvc/model-editor.vcproj
    ecell3/branches/ecell-3.1/build/msvc/pyecell.vcproj
    ecell3/branches/ecell-3.1/build/msvc/session-monitor.vcproj
    ecell3/branches/ecell-3.1/ecell/frontend/model-editor/setup.py
    ecell3/branches/ecell-3.1/ecell/frontend/session-monitor/setup.py

Modified: ecell3/branches/ecell-3.1/build/msvc/dist.vcproj
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/dist.vcproj	2008-10-19 16:35:20 UTC (rev 3223)
+++ ecell3/branches/ecell-3.1/build/msvc/dist.vcproj	2008-10-20 04:19:14 UTC (rev 3224)
@@ -314,7 +314,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Preparing files to be distributed..."
-					CommandLine="SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET PYTHONPATH=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages;$(PYTHONPATH)&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages\numpy\core\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;SET LIBDIR=\lib&#x0D;&#x0A;cscript &quot;$(InputPath)&quot; &quot;$(SolutionDir)\$(PlatformName)\$(ConfigurationName)&quot; &quot;$(SolutionDir)..\..&quot; &quot;$(OutDir)&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(PlatformName)\$(ConfigurationName)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
+					CommandLine="SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET PYTHONPATH=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages;%PYTHONPATH%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages\numpy\core\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;SET LIBDIR=\lib&#x0D;&#x0A;cscript &quot;$(InputPath)&quot; &quot;$(SolutionDir)\$(PlatformName)\$(ConfigurationName)&quot; &quot;$(SolutionDir)..\..&quot; &quot;$(OutDir)&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(PlatformName)\$(ConfigurationName)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
 					Outputs="$(PlatformName)\$(ConfigurationName)\$(ProjectName).stamp"
 				/>
 			</FileConfiguration>

Modified: ecell3/branches/ecell-3.1/build/msvc/dist.wsf
===================================================================
(Binary files differ)

Modified: ecell3/branches/ecell-3.1/build/msvc/ecell.sln
===================================================================
(Binary files differ)

Modified: ecell3/branches/ecell-3.1/build/msvc/model-editor.vcproj
===================================================================
(Binary files differ)

Modified: ecell3/branches/ecell-3.1/build/msvc/pyecell.vcproj
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/pyecell.vcproj	2008-10-19 16:35:20 UTC (rev 3223)
+++ ecell3/branches/ecell-3.1/build/msvc/pyecell.vcproj	2008-10-20 04:19:14 UTC (rev 3224)
@@ -364,6 +364,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\ecell\pyecell\ecell\config.py"
+					>
+				</File>
+				<File
 					RelativePath="..\..\ecell\pyecell\ecell\convertEML2SBML.py"
 					>
 				</File>
@@ -962,7 +966,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Running distutils..."
-					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(SolutionDir)..\..\ecell\pyecell\setup.py&quot; build -g -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
+					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(ProjectDir)..\..\ecell\pyecell\setup.py&quot; build -g -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;"
 					Outputs="$(OutDir)\$(ProjectName).stamp"
 				/>
 			</FileConfiguration>
@@ -972,7 +976,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Running distutils..."
-					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(SolutionDir)..\..\ecell\pyecell\setup.py&quot; build -g -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
+					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%;%LIB64%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(ProjectDir)..\..\ecell\pyecell\setup.py&quot; build -g -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
 					Outputs="$(OutDir)\$(ProjectName).stamp"
 				/>
 			</FileConfiguration>
@@ -982,7 +986,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Running distutils..."
-					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(SolutionDir)..\..\ecell\pyecell\setup.py&quot; build -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
+					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(ProjectDir)..\..\ecell\pyecell\setup.py&quot; build -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
 					Outputs="$(OutDir)\$(ProjectName).stamp"
 				/>
 			</FileConfiguration>
@@ -992,7 +996,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Running distutils..."
-					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(SolutionDir)..\..\ecell\pyecell\setup.py&quot; build -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;&#x0D;&#x0A;"
+					CommandLine="cd &quot;$(ProjectDir)..\..\ecell\pyecell&quot;&#x0D;&#x0A;SET MSSDK=1&#x0D;&#x0A;SET DISTUTILS_USE_SDK=1&#x0D;&#x0A;SET SYSCONFDIR=etc&#x0D;&#x0A;SET DATAROOTDIR=share&#x0D;&#x0A;SET DATADIR=%DATAROOTDIR%&#x0D;&#x0A;SET INCLTDL=/I$(SolutionDir)\..\..\libltdl&#x0D;&#x0A;SET LIBDIR=lib&#x0D;&#x0A;SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%&#x0D;&#x0A;SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%;%LIB64%&#x0D;&#x0A;&quot;$(PYTHONHOME)\python&quot; &quot;$(ProjectDir)..\..\ecell\pyecell\setup.py&quot; build -b &quot;$(OutDir)\$(ProjectName).build&quot; &amp;&amp; ECHO &quot;1&quot; &gt; &quot;$(OutDir)\$(ProjectName).stamp&quot;"
 					Outputs="$(OutDir)\$(ProjectName).stamp"
 				/>
 			</FileConfiguration>

Modified: ecell3/branches/ecell-3.1/build/msvc/session-monitor.vcproj
===================================================================
(Binary files differ)

Modified: ecell3/branches/ecell-3.1/ecell/frontend/model-editor/setup.py
===================================================================
--- ecell3/branches/ecell-3.1/ecell/frontend/model-editor/setup.py	2008-10-19 16:35:20 UTC (rev 3223)
+++ ecell3/branches/ecell-3.1/ecell/frontend/model-editor/setup.py	2008-10-20 04:19:14 UTC (rev 3224)
@@ -6,6 +6,14 @@
 from distutils.core import setup, Extension
 import ecell.config as config
 
+def relative( basePath, path ):
+	separators = os.sep + ( os.altsep or "" )
+	commonPrefix = os.path.commonprefix( [ basePath, path ] )
+	if len( basePath[ len( commonPrefix ): ].rstrip( separators ) ) != 0:
+		return path
+	else:
+		return path[ len( commonPrefix ): ].lstrip( separators )
+
 resources = glob(
     os.path.join( os.path.dirname( __file__ ), 'glade', '*' ) )
 
@@ -22,8 +30,8 @@
     packages = [ 'ecell.ui.model_editor' ],
     scripts = [ 'ecell3-model-editor' ],
     data_files = [
-        ( config.conf_dir, [ 'model-editor.ini' ] ),
-        ( os.path.join( config.data_dir, 'model-editor', 'glade' ), resources ),
-        ( os.path.join( config.lib_dir, 'model-editor', 'plugins' ), plugins ),
+        ( relative( config.prefix, config.conf_dir ), [ 'model-editor.ini' ] ),
+        ( os.path.join( relative( config.prefix, config.data_dir ), 'model-editor', 'glade' ), resources ),
+        ( os.path.join( relative( config.prefix, config.lib_dir ), 'model-editor', 'plugins' ), plugins ),
         ]
     )

Modified: ecell3/branches/ecell-3.1/ecell/frontend/session-monitor/setup.py
===================================================================
--- ecell3/branches/ecell-3.1/ecell/frontend/session-monitor/setup.py	2008-10-19 16:35:20 UTC (rev 3223)
+++ ecell3/branches/ecell-3.1/ecell/frontend/session-monitor/setup.py	2008-10-20 04:19:14 UTC (rev 3224)
@@ -6,6 +6,14 @@
 from distutils.core import setup, Extension
 import ecell.config as config
 
+def relative( basePath, path ):
+	separators = os.sep + ( os.altsep or "" )
+	commonPrefix = os.path.commonprefix( [ basePath, path ] )
+	if len( basePath[ len( commonPrefix ): ].rstrip( separators ) ) != 0:
+		return path
+	else:
+		return path[ len( commonPrefix ): ].lstrip( separators )
+
 resources = glob(
     os.path.join( os.path.dirname( __file__ ), 'glade', '*' ) )
 
@@ -22,8 +30,8 @@
     packages = [ 'ecell.ui', 'ecell.ui.osogo' ],
     scripts = [ 'ecell3-session-monitor' ],
     data_files = [
-        ( config.conf_dir, [ 'osogo.ini' ] ),
-        ( os.path.join( config.data_dir, 'session-monitor', 'glade' ), resources ),
-        ( os.path.join( config.lib_dir, 'session-monitor', 'plugins' ), plugins ),
+        ( relative( config.prefix, config.conf_dir ), [ 'osogo.ini' ] ),
+        ( os.path.join( relative( config.prefix, config.data_dir ), 'session-monitor', 'glade' ), resources ),
+        ( os.path.join( relative( config.prefix, config.lib_dir), 'session-monitor', 'plugins' ), plugins ),
         ]
     )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.