Skip to content

Commit

Permalink
Added windows project for sql_well
Browse files Browse the repository at this point in the history
fixed keyword_manager python export bug for linux
  • Loading branch information
mkhait committed Aug 4, 2011
1 parent 7eeb881 commit 899d0c8
Show file tree
Hide file tree
Showing 9 changed files with 135,443 additions and 16 deletions.
37 changes: 26 additions & 11 deletions bs-eagle.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_scal", "bs_scal\bs_scal.vcproj", "{6179CF48-524A-4031-993A-FD353AD2A74F}"
ProjectSection(ProjectDependencies) = postProject
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81} = {3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81} = {3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_mtx", "bs_mtx\bs_mtx.vcproj", "{D588B62C-A1A8-49D2-88AC-FFADACC4545A}"
ProjectSection(ProjectDependencies) = postProject
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blue-sky", "..\..\kernel\blue-sky.vcproj", "{7C235C2A-609A-49B4-A89B-AC23530F0F89}"
Expand All @@ -23,17 +23,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_bos_core_base", "bs_bos_
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_mesh", "bs_mesh\bs_mesh.vcproj", "{CE770FDD-686B-48FB-9DFA-B660196BEF89}"
ProjectSection(ProjectDependencies) = postProject
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_bos_core", "bs_bos_core\bs_bos_core.vcproj", "{B096BE31-726C-42A6-AFB0-C6BADE241F0D}"
ProjectSection(ProjectDependencies) = postProject
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
{6179CF48-524A-4031-993A-FD353AD2A74F} = {6179CF48-524A-4031-993A-FD353AD2A74F}
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81} = {3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{32C5BEFC-9E7D-4341-ACD4-DDDCFEB77652} = {32C5BEFC-9E7D-4341-ACD4-DDDCFEB77652}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81} = {3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}
{6179CF48-524A-4031-993A-FD353AD2A74F} = {6179CF48-524A-4031-993A-FD353AD2A74F}
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bspy_loader", "..\..\python\bspy_loader\bspy_loader.vcproj", "{5FC52CB5-D666-4608-A354-81E3B5DE6035}"
Expand All @@ -45,20 +45,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_types", "common_type
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_hdf5_storage", "hdf5_storage\bs_hdf5_storage.vcproj", "{E7322907-2C9C-4570-A99E-A2F3E56A3D57}"
ProjectSection(ProjectDependencies) = postProject
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_pvt", "bs_pvt\bs_pvt.vcproj", "{32C5BEFC-9E7D-4341-ACD4-DDDCFEB77652}"
ProjectSection(ProjectDependencies) = postProject
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81} = {3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81} = {3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs_bos_core_data_storage", "bs_bos_core_data_storage\bs_bos_core_data_storage.vcproj", "{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}"
ProjectSection(ProjectDependencies) = postProject
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
{578A43D7-0338-4ED0-A455-666FDA782085} = {578A43D7-0338-4ED0-A455-666FDA782085}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sql_well", "sql_well\sql_well.vcproj", "{EEAD7144-E89C-4C7B-84BA-E3328140EC48}"
ProjectSection(ProjectDependencies) = postProject
{7C235C2A-609A-49B4-A89B-AC23530F0F89} = {7C235C2A-609A-49B4-A89B-AC23530F0F89}
EndProjectSection
EndProject
Expand Down Expand Up @@ -181,6 +186,16 @@ Global
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}.Release_WO_Python|Win32.Build.0 = Release_WO_Python|Win32
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}.Release|Win32.ActiveCfg = Release|Win32
{3DF8BD9D-CAEF-4081-A1C2-B624E0959A81}.Release|Win32.Build.0 = Release|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Debug_MPI|Win32.ActiveCfg = Debug|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Debug_MPI|Win32.Build.0 = Debug|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Debug|Win32.ActiveCfg = Debug|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Debug|Win32.Build.0 = Debug|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.release_with_debug|Win32.ActiveCfg = Release|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.release_with_debug|Win32.Build.0 = Release|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Release_WO_Python|Win32.ActiveCfg = Release|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Release_WO_Python|Win32.Build.0 = Release|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Release|Win32.ActiveCfg = Release|Win32
{EEAD7144-E89C-4C7B-84BA-E3328140EC48}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
3 changes: 3 additions & 0 deletions bs_bos_core_data_storage/include/keyword_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ namespace blue_sky
//! registration of property keyword
void register_prop_keyword (const std::string &keyword, const std::string &format, prop_names_t &prop_names , handler_t external_handler = 0);

//! python registration of active integer pool keyword in factory
void py_register_i_pool_keyword (const std::string keyword, boost::python::list dimens, t_int def_value);

//! python registration of active floating point pool keyword in factory
void py_register_fp_pool_keyword (const std::string keyword, boost::python::list dimens, t_float def_value);

Expand Down
9 changes: 9 additions & 0 deletions bs_bos_core_data_storage/src/keyword_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,15 @@ namespace blue_sky
handlers.insert (std::make_pair (keyword, handler));
}

void keyword_manager::py_register_i_pool_keyword (const std::string keyword, boost::python::list dimens, t_int def_value)
{
npy_intp new_dimens[ARRAY_POOL_TOTAL];
for (int i = 0; i < ARRAY_POOL_TOTAL; i++)
{
new_dimens[i] = boost::python::extract<int>(dimens[i]);
}
register_i_pool_keyword (keyword, &new_dimens[0], def_value);
}

void keyword_manager::py_register_fp_pool_keyword (const std::string keyword, boost::python::list dimens, t_float def_value)
{
Expand Down
2 changes: 1 addition & 1 deletion bs_bos_core_data_storage/src/py_keyword_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ namespace python {

PY_EXPORTER (keyword_manager_exporter, default_exporter)
//.def ("register_keyword", register_keyword <T>)
.def ("register_i_pool_keyword", &T::register_i_pool_keyword)
.def ("register_i_pool_keyword", &T::py_register_i_pool_keyword)
.def ("register_fp_pool_keyword", &T::py_register_fp_pool_keyword)
.def ("register_keywords", &T::register_plugin_keywords)
.def ("register_plugin_keywords", &T::register_plugin_keywords)
Expand Down
2 changes: 1 addition & 1 deletion common_types/common_types.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(ProjectDir)/include&quot;;&quot;$(ProjectDir)/../../../kernel/include/python&quot;;&quot;$(ProjectDir)/../../../kernel/include&quot;;&quot;$(ProjectDir)/../bs_bos_core_data_storage/include&quot;;&quot;$(ProjectDir)/../bs_bos_core_base/include&quot;;&quot;$(BOOST_PATH)&quot;;&quot;$(PYTHON_PATH)/include&quot;;&quot;$(NUMPY_PATH)/include&quot;;&quot;$(HDF5_PATH)/include&quot;;&quot;$(LOKI_PATH)/include&quot;"
AdditionalIncludeDirectories="&quot;$(ProjectDir)/include&quot;;&quot;$(ProjectDir)/../../../kernel/include/python&quot;;&quot;$(ProjectDir)/../../../kernel/include&quot;;&quot;$(ProjectDir)/../bs_bos_core_base/include&quot;;&quot;$(BOOST_PATH)&quot;;&quot;$(PYTHON_PATH)/include&quot;;&quot;$(NUMPY_PATH)/include&quot;;&quot;$(HDF5_PATH)/include&quot;;&quot;$(LOKI_PATH)/include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BS_EXPORTING;BS_EXPORTING_PLUGIN;BSPY_EXPORTING;BSPY_EXPORTING_PLUGIN;_HDF5;H5_USE_16_API;_HDF5USEDLL_;BS_BOS_CORE_DEBUG_MEMORY_;BS_DISABLE_MT_LOCKS;BS_BOS_CORE_COLLECT_BACKTRACE_;BS_EXCEPTION_USE_BOOST_FORMAT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Expand Down
237 changes: 237 additions & 0 deletions sql_well/sql_well.vcproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="sql_well"
ProjectGUID="{EEAD7144-E89C-4C7B-84BA-E3328140EC48}"
RootNamespace="sql_well"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(ProjectDir)/include&quot;;&quot;$(ProjectDir)/../../../kernel/include/python&quot;;&quot;$(ProjectDir)/../../../kernel/include&quot;;&quot;$(ProjectDir)/../common_types/include/&quot;;&quot;$(ProjectDir)/../bs_bos_core_base/include&quot;;&quot;$(BOOST_PATH)&quot;;&quot;$(PYTHON_PATH)/include&quot;;&quot;$(NUMPY_PATH)/include&quot;;&quot;$(HDF5_PATH)/include&quot;;&quot;$(LOKI_PATH)/include&quot;;.\sqlite"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BS_EXPORTING;BS_EXPORTING_PLUGIN;BSPY_EXPORTING;BSPY_EXPORTING_PLUGIN;_HDF5;H5_USE_16_API;_HDF5USEDLL_;BS_BOS_CORE_DEBUG_MEMORY_;BS_DISABLE_MT_LOCKS;BS_BOS_CORE_COLLECT_BACKTRACE_;BS_EXCEPTION_USE_BOOST_FORMAT"
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="hdf5dll.lib loki_D.lib ws2_32.lib"
OutputFile="$(ProjectDir)/../../../exe/debug/plugins/$(ProjectName)_d.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(PYTHON_PATH)/libs&quot;;&quot;$(BOOST_PATH)/lib&quot;;&quot;$(ProjectDir)/../../../exe/debug&quot;;&quot;$(HDF5_PATH)/dll&quot;;&quot;$(LOKI_PATH)/lib&quot;"
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="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(LOKI_PATH)/include&quot;;&quot;$(BOOST_PATH)&quot;;&quot;$(NUMPY_PATH)/include&quot;;&quot;$(PYTHON_PATH)/include&quot;;&quot;$(ProjectDir)/../../../kernel/include&quot;;&quot;$(ProjectDir)/../../../kernel/include/python&quot;;.\include;&quot;$(HDF5_PATH)/include&quot;;&quot;$(ProjectDir)/../common_types/include/&quot;;&quot;$(ProjectDir)/../bs_bos_core_base/include/&quot;;.\sqlite"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BS_EXPORTING;BS_EXPORTING_PLUGIN;BSPY_EXPORTING;BSPY_EXPORTING_PLUGIN;_HDF5;H5_USE_16_API;_HDF5USEDLL_;_MPI_;BS_BOS_CORE_DEBUG_MEMORY_;BS_DISABLE_MT_LOCKS;BS_BOS_CORE_COLLECT_BACKTRACE_;BS_EXCEPTION_USE_BOOST_FORMAT"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="hdf5dll.lib"
OutputFile="$(ProjectDir)/../../../exe/release/plugins/$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(PYTHON_PATH)/libs&quot;;&quot;$(BOOST_PATH)/lib&quot;;&quot;$(ProjectDir)/../../../exe/release/&quot;;&quot;$(HDF5_PATH)/dll&quot;"
GenerateDebugInformation="true"
SubSystem="1"
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>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\src\main.cpp"
>
</File>
<File
RelativePath=".\src\py_sql_well.cpp"
>
</File>
<File
RelativePath=".\src\py_sql_well.h"
>
</File>
<File
RelativePath=".\src\sql_well.cpp"
>
</File>
<File
RelativePath=".\src\sql_well.h"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\include\well_pool_iface.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
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}"
>
</Filter>
<Filter
Name="sqlite"
>
<File
RelativePath=".\sqlite\sqlite3.c"
>
</File>
<File
RelativePath=".\sqlite\sqlite3.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Loading

0 comments on commit 899d0c8

Please sign in to comment.