Menu
▾
▴
[Ecell-cvs] SF.net SVN: ecell:[3220] ecell3/branches/ecell-3.1
|
From: <mor...@us...> - 2008-10-19 14:46:52
|
Revision: 3220
http://ecell.svn.sourceforge.net/ecell/?rev=3220&view=rev
Author: moriyoshi
Date: 2008-10-19 14:46:45 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
* Fixing win32 build.
Modified Paths:
--------------
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/libecs.vcproj
ecell3/branches/ecell-3.1/build/msvc/libemc.vcproj
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/dmtool/DMObject.hpp
ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp
ecell3/branches/ecell-3.1/dmtool/DynamicModuleInfo.hpp
ecell3/branches/ecell-3.1/dmtool/ModuleMaker.hpp
ecell3/branches/ecell-3.1/ecell/libecs/PropertySlot.hpp
Removed Paths:
-------------
ecell3/branches/ecell-3.1/build/msvc/pyecs.vcproj
Property Changed:
----------------
ecell3/branches/ecell-3.1/ecell/dm/
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/libecs.vcproj
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/libecs.vcproj 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/build/msvc/libecs.vcproj 2008-10-19 14:46:45 UTC (rev 3220)
@@ -48,7 +48,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\libltdl;..\..\osdep\win32;..\..;..\..\ecell;..\..\ecell\libecs;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;DM_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -134,7 +134,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\libltdl;..\..\osdep\win32;..\..;..\..\ecell;..\..\ecell\libecs;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;DM_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -219,7 +219,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\libltdl;..\..\osdep\win32;..\..;..\..\ecell;..\..\ecell\libecs;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;DM_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
ExceptionHandling="1"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -305,7 +305,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\libltdl;..\..\osdep\win32;..\..;..\..\ecell;..\..\ecell\libecs;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBECS_EXPORTS;DM_EXPORTS;GSL_DLL;HAVE_CONFIG_H;__STDC__=1;_WIN32_WINNT=0x500"
ExceptionHandling="1"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -450,26 +450,14 @@
>
</File>
<File
- RelativePath="..\..\ecell\libecs\Polymorph.cpp"
- >
- </File>
- <File
RelativePath="..\..\ecell\libecs\Process.cpp"
>
</File>
<File
- RelativePath="..\..\ecell\libecs\ProcessMaker.cpp"
- >
- </File>
- <File
RelativePath="..\..\ecell\libecs\PropertiedClass.cpp"
>
</File>
<File
- RelativePath="..\..\ecell\libecs\PropertiedObjectMaker.cpp"
- >
- </File>
- <File
RelativePath="..\..\ecell\libecs\PropertyInterface.cpp"
>
</File>
@@ -486,18 +474,10 @@
>
</File>
<File
- RelativePath="..\..\ecell\libecs\StepperMaker.cpp"
- >
- </File>
- <File
RelativePath="..\..\ecell\libecs\System.cpp"
>
</File>
<File
- RelativePath="..\..\ecell\libecs\SystemMaker.cpp"
- >
- </File>
- <File
RelativePath="..\..\ecell\libecs\SystemStepper.cpp"
>
</File>
@@ -510,10 +490,6 @@
>
</File>
<File
- RelativePath="..\..\ecell\libecs\VariableMaker.cpp"
- >
- </File>
- <File
RelativePath="..\..\ecell\libecs\VariableReference.cpp"
>
</File>
@@ -660,6 +636,10 @@
>
</File>
<File
+ RelativePath="..\..\ecell\libecs\PropertyAttributes.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\ecell\libecs\PropertyInterface.hpp"
>
</File>
@@ -725,10 +705,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File
- RelativePath=".\ecs.rct"
- >
- </File>
</Filter>
<Filter
Name="Templates"
Modified: ecell3/branches/ecell-3.1/build/msvc/libemc.vcproj
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/libemc.vcproj 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/build/msvc/libemc.vcproj 2008-10-19 14:46:45 UTC (rev 3220)
@@ -361,10 +361,6 @@
RelativePath="..\..\ecell\libemc\SimulatorImplementation.cpp"
>
</File>
- <File
- RelativePath="..\..\ecell\libemc\SimulatorMaker.cpp"
- >
- </File>
</Filter>
<Filter
Name="Header Files"
@@ -387,10 +383,6 @@
RelativePath="..\..\ecell\libemc\SimulatorImplementation.hpp"
>
</File>
- <File
- RelativePath="..\..\ecell\libemc\SimulatorMaker.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
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 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/build/msvc/pyecell.vcproj 2008-10-19 14:46:45 UTC (rev 3220)
@@ -298,6 +298,10 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath="..\..\ecell\pyecell\ecell\_ecs.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\ecell\pyecell\ecell\_tableio.c"
>
<FileConfiguration
@@ -376,10 +380,26 @@
>
</File>
<File
+ RelativePath="..\..\ecell\pyecell\ecell\ecs.py"
+ >
+ </File>
+ <File
+ RelativePath="..\..\ecell\pyecell\ecell\ecs_constants.py"
+ >
+ </File>
+ <File
+ RelativePath="..\..\ecell\pyecell\ecell\ecssupport.py"
+ >
+ </File>
+ <File
RelativePath="..\..\ecell\pyecell\ecell\em.py"
>
</File>
<File
+ RelativePath="..\..\ecell\pyecell\ecell\emc.py"
+ >
+ </File>
+ <File
RelativePath="..\..\ecell\pyecell\ecell\eml.py"
>
</File>
@@ -625,7 +645,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)config.py"
/>
</FileConfiguration>
@@ -635,7 +655,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)config.py"
/>
</FileConfiguration>
@@ -645,7 +665,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)config.py"
/>
</FileConfiguration>
@@ -655,7 +675,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)config.py"
/>
</FileConfiguration>
@@ -669,7 +689,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-em2eml"
/>
</FileConfiguration>
@@ -679,7 +699,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-em2eml"
/>
</FileConfiguration>
@@ -689,7 +709,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-em2eml"
/>
</FileConfiguration>
@@ -699,7 +719,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-em2eml"
/>
</FileConfiguration>
@@ -713,7 +733,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2em"
/>
</FileConfiguration>
@@ -723,7 +743,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2em"
/>
</FileConfiguration>
@@ -733,7 +753,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2em"
/>
</FileConfiguration>
@@ -743,7 +763,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2em"
/>
</FileConfiguration>
@@ -757,7 +777,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2sbml"
/>
</FileConfiguration>
@@ -767,7 +787,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2sbml"
/>
</FileConfiguration>
@@ -777,7 +797,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2sbml"
/>
</FileConfiguration>
@@ -787,7 +807,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-eml2sbml"
/>
</FileConfiguration>
@@ -801,7 +821,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-sbml2eml"
/>
</FileConfiguration>
@@ -811,7 +831,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-sbml2eml"
/>
</FileConfiguration>
@@ -821,7 +841,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-sbml2eml"
/>
</FileConfiguration>
@@ -831,7 +851,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-sbml2eml"
/>
</FileConfiguration>
@@ -845,7 +865,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session-manager"
/>
</FileConfiguration>
@@ -855,7 +875,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session-manager"
/>
</FileConfiguration>
@@ -865,7 +885,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session-manager"
/>
</FileConfiguration>
@@ -875,7 +895,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session-manager"
/>
</FileConfiguration>
@@ -889,7 +909,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session"
/>
</FileConfiguration>
@@ -899,7 +919,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session"
/>
</FileConfiguration>
@@ -909,7 +929,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session"
/>
</FileConfiguration>
@@ -919,7 +939,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating $(InputFileName)..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(InputDir)ecell3-session"
/>
</FileConfiguration>
@@ -934,7 +954,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -g -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
+ CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET INCLTDL=/I$(SolutionDir)\..\..\libltdl
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -g -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
Outputs="$(OutDir)\$(ProjectName).stamp"
/>
</FileConfiguration>
@@ -944,7 +964,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -g -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
+ CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET INCLTDL=/I$(SolutionDir)\..\..\libltdl
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -g -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
Outputs="$(OutDir)\$(ProjectName).stamp"
/>
</FileConfiguration>
@@ -954,7 +974,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
+ CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET INCLTDL=/I$(SolutionDir)\..\..\libltdl
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
Outputs="$(OutDir)\$(ProjectName).stamp"
/>
</FileConfiguration>
@@ -964,7 +984,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
+ CommandLine="cd "$(ProjectDir)..\..\ecell\pyecell"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET INCLTDL=/I$(SolutionDir)\..\..\libltdl
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecell\setup.py" build -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
Outputs="$(OutDir)\$(ProjectName).stamp"
/>
</FileConfiguration>
@@ -978,7 +998,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
/>
</FileConfiguration>
@@ -988,7 +1008,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
/>
</FileConfiguration>
@@ -998,7 +1018,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
/>
</FileConfiguration>
@@ -1008,7 +1028,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)""
+ CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
/>
</FileConfiguration>
Deleted: ecell3/branches/ecell-3.1/build/msvc/pyecs.vcproj
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/pyecs.vcproj 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/build/msvc/pyecs.vcproj 2008-10-19 14:46:45 UTC (rev 3220)
@@ -1,548 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="pyecs"
- ProjectGUID="{C27B250F-D9CA-4E9F-B3EF-D887F2A65301}"
- RootNamespace="pyecs"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\$(ProjectName).build"
- ConfigurationType="2"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description=""
- CommandLine=""
- AdditionalDependencies=""
- Outputs=""
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)..\..\libltdl;$(ProjectDir)..\..\osdep\win32;$(ProjectDir)..\..\ecell;$(ProjectDir)..\..;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYECS_EXPORTS;_WIN32_WINNT=0x500"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ecs.lib emc.lib boost_python-gd.lib"
- OutputFile="$(OutDir)\_ecs.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB)"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description=""
- CommandLine=""
- AdditionalDependencies=""
- Outputs=""
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)..\..\libltdl;$(ProjectDir)..\..\osdep\win32;$(ProjectDir)..\..\ecell;$(ProjectDir)..\..;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYECS_EXPORTS;_WIN32_WINNT=0x500"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ecs.lib emc.lib boost_python-gd.lib"
- OutputFile="$(OutDir)\_ecs.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64)"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\$(ProjectName).build"
- ConfigurationType="2"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description=""
- CommandLine=""
- AdditionalDependencies=""
- Outputs=""
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ProjectDir)..\..\libltdl;$(ProjectDir)..\..\osdep\win32;$(ProjectDir)..\..\ecell;$(ProjectDir)..\..;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYECS_EXPORTS;_WIN32_WINNT=0x500"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ecs.lib emc.lib boost_python.lib"
- OutputFile="$(OutDir)\_ecs.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB)"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description=""
- CommandLine=""
- AdditionalDependencies=""
- Outputs=""
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ProjectDir)..\..\libltdl;$(ProjectDir)..\..\osdep\win32;$(ProjectDir)..\..\ecell;$(ProjectDir)..\..;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(INCLUDE)"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYECS_EXPORTS;_WIN32_WINNT=0x500"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ecs.lib emc.lib boost_python.lib"
- OutputFile="$(OutDir)\_ecs.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64)"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="C++ Extensions"
- >
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\ecell\pyecs\PyEcs.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ecell\pyecs\PyEmc.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\..\ecell\pyecs\PyEcs.hpp"
- >
- </File>
- <File
- RelativePath="..\..\ecell\pyecs\PyEmc.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <File
- RelativePath="..\..\ecell\pyecs\setup.py"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecs"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages\numpy\core\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
SET LIBDIR=\lib
SET BOOST_PYTHON_LIB_NAME=boost_python-gd
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecs\setup.py" build -g -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
- Outputs="$(OutDir)\$(ProjectName).stamp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecs"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages\numpy\core\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64);%LIB%
SET LIBDIR=\lib
SET BOOST_PYTHON_LIB_NAME=boost_python-gd
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecs\setup.py" build -g -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
- Outputs="$(OutDir)\$(ProjectName).stamp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecs"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages\numpy\core\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB);%LIB%
SET LIBDIR=\lib
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecs\setup.py" build -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
- Outputs="$(OutDir)\$(ProjectName).stamp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Running distutils..."
- CommandLine="cd "$(ProjectDir)..\..\ecell\pyecs"
SET MSSDK=1
SET DISTUTILS_USE_SDK=1
SET SYSCONFDIR=etc
SET DATAROOTDIR=share
SET DATADIR=%DATAROOTDIR%
SET LIBDIR=lib
SET INCLUDE=$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\include;$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib\site-packages\numpy\core\include;$(INCLUDE);%INCLUDE%
SET LIB=$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64);%LIB%
SET LIBDIR=\lib
"$(PYTHONHOME)\python" "$(SolutionDir)..\..\ecell\pyecs\setup.py" build -b "$(OutDir)\$(ProjectName).build" && ECHO "1" > "$(OutDir)\$(ProjectName).stamp""
- Outputs="$(OutDir)\$(ProjectName).stamp"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ecell\pyecs\setup.py.in"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
- Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
- Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
- AdditionalDependencies=""
- Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating setup.py..."
- CommandLine="cscript "$(ProjectDir)\gen_file.wsf" "$(OutDir)" "$(ProjectDir)\..\.." "$(InputDir)$(InputName)"
"
- AdditionalDependencies=""
- Outputs="$(ProjectDir)..\..\ecell\pyecell\setup.py"
- />
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: ecell3/branches/ecell-3.1/build/msvc/session-monitor.vcproj
===================================================================
(Binary files differ)
Modified: ecell3/branches/ecell-3.1/dmtool/DMObject.hpp
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/DMObject.hpp 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/dmtool/DMObject.hpp 2008-10-19 14:46:45 UTC (rev 3220)
@@ -29,8 +29,12 @@
#define __DMOBJECT_HPP
#ifdef WIN32
+#if defined( DM_EXPORTS ) || defined( DLL_EXPORT )
#define DM_IF __declspec(dllexport)
#else
+#define DM_IF __declspec(dllimport)
+#endif /* DM_EXPORTS */
+#else
#define DM_IF
#endif /* WIN32 */
Modified: ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp 2008-10-19 14:46:45 UTC (rev 3220)
@@ -28,7 +28,7 @@
#ifndef __DYNAMIC_MODULE_DESCRIPTOR_HPP
#define __DYNAMIC_MODULE_DESCRIPTOR_HPP
-#include "dmtool/DynamicModuleInfo.hpp"
+class DynamicModuleInfo;
/**
DynamicModuleDescriptor is a POD class that holds the information about
Modified: ecell3/branches/ecell-3.1/dmtool/DynamicModuleInfo.hpp
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/DynamicModuleInfo.hpp 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/dmtool/DynamicModuleInfo.hpp 2008-10-19 14:46:45 UTC (rev 3220)
@@ -31,11 +31,13 @@
#include <string>
#include <utility>
+#include "dmtool/DMObject.hpp"
+
/**
DynamicModuleInfo defines an interface that provides the meta-information
that can be used to annotate the module.
*/
-class DynamicModuleInfo
+class DM_IF DynamicModuleInfo
{
public:
class EntryIterator
Modified: ecell3/branches/ecell-3.1/dmtool/ModuleMaker.hpp
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/ModuleMaker.hpp 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/dmtool/ModuleMaker.hpp 2008-10-19 14:46:45 UTC (rev 3220)
@@ -35,6 +35,7 @@
#include <string>
#include <cassert>
#include "ltdl.h"
+
#include "DynamicModule.hpp"
/**
Property changes on: ecell3/branches/ecell-3.1/ecell/dm
___________________________________________________________________
Modified: svn:ignore
- *.so
*.dylib
*.la
*.o
*.lo
*.loT
Makefile
Makefile.in
+ *.so
*.dylib
*.la
*.o
*.lo
*.loT
Makefile
Makefile.in
*.dll
Modified: ecell3/branches/ecell-3.1/ecell/libecs/PropertySlot.hpp
===================================================================
--- ecell3/branches/ecell-3.1/ecell/libecs/PropertySlot.hpp 2008-10-19 14:33:40 UTC (rev 3219)
+++ ecell3/branches/ecell-3.1/ecell/libecs/PropertySlot.hpp 2008-10-19 14:46:45 UTC (rev 3220)
@@ -270,7 +270,7 @@
static GetMethodPtr GetMethod( GetMethodPtr aGetMethodPtr );
protected:
- const String theName;
+ const libecs::String theName;
const enum PropertySlotBase::Type theType;
const SetMethodPtr theSetMethodPtr;
const GetMethodPtr theGetMethodPtr;
@@ -331,12 +331,12 @@
return isGetableMethod( theSaveMethodPtr );
}
- DM_IF virtual void loadPolymorph( T& anObject, Param<Polymorph>::type aValue ) const
+ DM_IF virtual void loadPolymorph( T& anObject, Param< libecs::Polymorph >::type aValue ) const
{
loadImpl( anObject, aValue );
}
- DM_IF virtual const Polymorph savePolymorph( const T& anObject ) const
+ DM_IF virtual const libecs::Polymorph savePolymorph( const T& anObject ) const
{
return saveImpl( anObject );
}
@@ -359,9 +359,9 @@
callLoadMethod( anObject, convertTo<SlotType>( aValue ) );
}
- inline const Polymorph saveImpl( const T& anObject ) const
+ inline const libecs::Polymorph saveImpl( const T& anObject ) const
{
- return convertTo<Polymorph>( callSaveMethod( anObject ) );
+ return convertTo< libecs::Polymorph >( callSaveMethod( anObject ) );
}
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
