[pytango] 329/483: fix typos
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.
commit 14561646914ca4e6c3dd30862c0295cc63131f67
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Wed Nov 27 07:23:59 2013 +0000
fix typos
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24391 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
src/boost/python/server.py | 4 +-
win/PyTango_VS10/PyTango.props | 20 +-
win/PyTango_VS10/PyTango.vcxproj | 12 +-
win/PyTango_VS9/PyTango.sln | 26 ++-
win/PyTango_VS9/PyTango.vcproj | 450 +++++++++++++++++++++++++++++++++++++--
win/PyTango_VS9/PyTango.vsprops | 26 ++-
6 files changed, 493 insertions(+), 45 deletions(-)
diff --git a/src/boost/python/server.py b/src/boost/python/server.py
index ca7130a..3384ef3 100644
--- a/src/boost/python/server.py
+++ b/src/boost/python/server.py
@@ -9,7 +9,7 @@
# See LICENSE.txt for more info.
# ------------------------------------------------------------------------------
-"""High Level API for writting Tango device servers.
+"""High Level API for writing Tango device servers.
.. _pytango-hlapi-datatypes:
@@ -17,7 +17,7 @@
When declaring attributes, properties or commands, one of the most important
information is the data type. It is given by the keyword argument *dtype*.
-In order to provide a more *pythonic* interface, this argument is not retricted
+In order to provide a more *pythonic* interface, this argument is not restricted
to the :obj:`~PyTango.CmdArgType` options.
For example, to define a *SCALAR* :obj:`~PyTango.CmdArgType.DevLong`
diff --git a/win/PyTango_VS10/PyTango.props b/win/PyTango_VS10/PyTango.props
index 5b64e88..e38e138 100755
--- a/win/PyTango_VS10/PyTango.props
+++ b/win/PyTango_VS10/PyTango.props
@@ -27,7 +27,7 @@
<TangoLibDir>$(TangoBaseDir)\$(Platform)\lib</TangoLibDir>
<PythonDir>C:\Python\$(Platform)</PythonDir>
<NumpyRelativeIncludeDir>Lib\site-packages\numpy\core\include</NumpyRelativeIncludeDir>
- <PyTangoCompileOptions>-Zm200 /MP2 /bigobj</PyTangoCompileOptions>
+ <PyTangoCompileOptions>-Zm200 /MP4 /bigobj</PyTangoCompileOptions>
<BaseDir>$(ProjectDir)..\..</BaseDir>
<RelPrefixDir>$(Configuration)_$(Platform)_msvc$(VCVer)</RelPrefixDir>
<BaseBuildDir>c:\temp\pytango\build_$(PyTangoVer)_tg$(TangoVer)_boost$(BoostVer)</BaseBuildDir>
@@ -52,9 +52,9 @@
<BasePreFlags>WIN32;NDEBUG</BasePreFlags>
<PreTangoStaticFlags>_WINSTATIC</PreTangoStaticFlags>
<PreTangoSharedFlags>LOG4TANGO_HAS_DLL;TANGO_HAS_DLL</PreTangoSharedFlags>
- <PreBoostSharedTantoSharedFlags>$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_DYNAMIC_LIB</PreBoostSharedTantoSharedFlags>
- <PreBoostStaticTantoSharedFlags>$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_STATIC_LIB</PreBoostStaticTantoSharedFlags>
- <PreBoostStaticTantoStaticFlags>$(BasePreFlags);$(PreTangoStaticFlags);BOOST_PYTHON_STATIC_LIB</PreBoostStaticTantoStaticFlags>
+ <PreBoostSharedTangoSharedFlags>$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_DYNAMIC_LIB</PreBoostSharedTangoSharedFlags>
+ <PreBoostStaticTangoSharedFlags>$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_STATIC_LIB</PreBoostStaticTangoSharedFlags>
+ <PreBoostStaticTangoStaticFlags>$(BasePreFlags);$(PreTangoStaticFlags);BOOST_PYTHON_STATIC_LIB</PreBoostStaticTangoStaticFlags>
<PreCompHeaderSrc>precompiled_header.hpp</PreCompHeaderSrc>
<PreCompHeaderDst>$(TempDir)\$(PyTangoBaseFile)_Boost-$(BoostVer).pch</PreCompHeaderDst>
<DatabaseFile>$(TempDir)\$(PyTangoBaseFile)_Boost-$(BoostVer).pdb</DatabaseFile>
@@ -263,14 +263,14 @@
<BuildMacro Include="PreTangoSharedFlags">
<Value>$(PreTangoSharedFlags)</Value>
</BuildMacro>
- <BuildMacro Include="PreBoostSharedTantoSharedFlags">
- <Value>$(PreBoostSharedTantoSharedFlags)</Value>
+ <BuildMacro Include="PreBoostSharedTangoSharedFlags">
+ <Value>$(PreBoostSharedTangoSharedFlags)</Value>
</BuildMacro>
- <BuildMacro Include="PreBoostStaticTantoSharedFlags">
- <Value>$(PreBoostStaticTantoSharedFlags)</Value>
+ <BuildMacro Include="PreBoostStaticTangoSharedFlags">
+ <Value>$(PreBoostStaticTangoSharedFlags)</Value>
</BuildMacro>
- <BuildMacro Include="PreBoostStaticTantoStaticFlags">
- <Value>$(PreBoostStaticTantoStaticFlags)</Value>
+ <BuildMacro Include="PreBoostStaticTangoStaticFlags">
+ <Value>$(PreBoostStaticTangoStaticFlags)</Value>
</BuildMacro>
<BuildMacro Include="PreCompHeaderSrc">
<Value>$(PreCompHeaderSrc)</Value>
diff --git a/win/PyTango_VS10/PyTango.vcxproj b/win/PyTango_VS10/PyTango.vcxproj
index 3ba2b29..a817aad 100755
--- a/win/PyTango_VS10/PyTango.vcxproj
+++ b/win/PyTango_VS10/PyTango.vcxproj
@@ -109,7 +109,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostSharedTantoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -127,7 +127,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostSharedTantoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -143,7 +143,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTantoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -161,7 +161,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTantoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -177,7 +177,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTantoStaticFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -197,7 +197,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTantoStaticFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win/PyTango_VS9/PyTango.sln b/win/PyTango_VS9/PyTango.sln
index c344d2b..1f82a0e 100644
--- a/win/PyTango_VS9/PyTango.sln
+++ b/win/PyTango_VS9/PyTango.sln
@@ -35,7 +35,15 @@ Global
py33_bopystatic_tangoshared_release|x64 = py33_bopystatic_tangoshared_release|x64
py33_bopystatic_tangostatic_release|Win32 = py33_bopystatic_tangostatic_release|Win32
py33_bopystatic_tangostatic_release|x64 = py33_bopystatic_tangostatic_release|x64
- EndGlobalSection
+
+ py34_bopyshared_tangoshared_release|Win32 = py34_bopyshared_tangoshared_release|Win32
+ py34_bopyshared_tangoshared_release|x64 = py34_bopyshared_tangoshared_release|x64
+ py34_bopystatic_tangoshared_release|Win32 = py34_bopystatic_tangoshared_release|Win32
+ py34_bopystatic_tangoshared_release|x64 = py34_bopystatic_tangoshared_release|x64
+ py34_bopystatic_tangostatic_release|Win32 = py34_bopystatic_tangostatic_release|Win32
+ py34_bopystatic_tangostatic_release|x64 = py34_bopystatic_tangostatic_release|x64
+
+ EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.py26_bopyshared_tangoshared_release|Win32.ActiveCfg = py26_bopyshared_tangoshared_release|Win32
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.py26_bopyshared_tangoshared_release|Win32.Build.0 = py26_bopyshared_tangoshared_release|Win32
@@ -97,7 +105,21 @@ Global
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangostatic_release|Win32.Build.0 = py33_bopystatic_tangostatic_release|Win32
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangostatic_release|x64.ActiveCfg = py33_bopystatic_tangostatic_release|x64
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangostatic_release|x64.Build.0 = py33_bopystatic_tangostatic_release|x64
- EndGlobalSection
+
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopyshared_tangoshared_release|Win32.ActiveCfg = py34_bopyshared_tangoshared_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopyshared_tangoshared_release|Win32.Build.0 = py34_bopyshared_tangoshared_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopyshared_tangoshared_release|x64.ActiveCfg = py34_bopyshared_tangoshared_release|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopyshared_tangoshared_release|x64.Build.0 = py34_bopyshared_tangoshared_release|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangoshared_release|Win32.ActiveCfg = py34_bopystatic_tangoshared_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangoshared_release|Win32.Build.0 = py34_bopystatic_tangoshared_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangoshared_release|x64.ActiveCfg = py34_bopystatic_tangoshared_release|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangoshared_release|x64.Build.0 = py34_bopystatic_tangoshared_release|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangostatic_release|Win32.ActiveCfg = py34_bopystatic_tangostatic_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangostatic_release|Win32.Build.0 = py34_bopystatic_tangostatic_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangostatic_release|x64.ActiveCfg = py34_bopystatic_tangostatic_release|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py34_bopystatic_tangostatic_release|x64.Build.0 = py34_bopystatic_tangostatic_release|x64
+
+ EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
diff --git a/win/PyTango_VS9/PyTango.vcproj b/win/PyTango_VS9/PyTango.vcproj
index 7cde0e2..c361434 100644
--- a/win/PyTango_VS9/PyTango.vcproj
+++ b/win/PyTango_VS9/PyTango.vcproj
@@ -183,7 +183,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python26IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -250,7 +250,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python26IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -317,7 +317,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python26IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -386,7 +386,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python26IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -589,7 +589,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python27IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -656,7 +656,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python27IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -723,7 +723,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python27IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -792,7 +792,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python27IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -996,7 +996,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python31IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1063,7 +1063,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python31IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1130,7 +1130,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python31IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -1199,7 +1199,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python31IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -1402,7 +1402,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python32IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1469,7 +1469,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python32IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1536,7 +1536,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python32IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -1605,7 +1605,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python32IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -1808,7 +1808,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python33IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1875,7 +1875,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python33IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoSharedFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1942,7 +1942,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python33IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -2011,7 +2011,7 @@
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python33IncludeDirs)"
- PreprocessorDefinitions="$(PreBoostStaticTantoStaticFlags)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
RuntimeLibrary="0"
CompileAs="2"
/>
@@ -2054,7 +2054,415 @@
CommandLine="$(Py33) $(WinSetupArgs)"
/>
</Configuration>
- </Configurations>
+
+ <Configuration
+ Name="py34_bopyshared_tangoshared_release|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\PyTango.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python34IncludeDirs)"
+ PreprocessorDefinitions="$(PreBoostSharedTantoSharedFlags)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(PyTango34SharedLibs)"
+ AdditionalLibraryDirectories="$(Py34BoostSharedTangoSharedLibDir)"
+ LinkTimeCodeGeneration="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="$(Py34) $(WinSetupArgs)"
+ />
+ </Configuration>
+ <Configuration
+ Name="py34_bopyshared_tangoshared_release|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\PyTango.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python34IncludeDirs)"
+ PreprocessorDefinitions="$(PreBoostSharedTantoSharedFlags)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(PyTango34SharedLibs)"
+ AdditionalLibraryDirectories="$(Py34BoostSharedTangoSharedLibDir)"
+ LinkTimeCodeGeneration="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="$(Py34) $(WinSetupArgs)"
+ />
+ </Configuration>
+ <Configuration
+ Name="py34_bopystatic_tangoshared_release|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\PyTango.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python34IncludeDirs)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(PyTango34SharedLibs)"
+ AdditionalLibraryDirectories="$(Py34BoostStaticTangoSharedLibDir)"
+ LinkTimeCodeGeneration="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="$(Py34) $(WinSetupArgs)"
+ />
+ </Configuration>
+ <Configuration
+ Name="py34_bopystatic_tangoshared_release|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\PyTango.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python34IncludeDirs)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoSharedFlags)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(PyTango34SharedLibs)"
+ AdditionalLibraryDirectories="$(Py34BoostStaticTangoSharedLibDir)"
+ LinkTimeCodeGeneration="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="$(Py34) $(WinSetupArgs)"
+ />
+ </Configuration>
+ <Configuration
+ Name="py34_bopystatic_tangostatic_release|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\PyTango.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python34IncludeDirs)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
+ RuntimeLibrary="0"
+ CompileAs="2"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(PyTango34StaticLibs)"
+ AdditionalLibraryDirectories="$(Py34BoostStaticTangoStaticLibDir)"
+ LinkTimeCodeGeneration="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="$(Py34) $(WinSetupArgs)"
+ />
+ </Configuration>
+ <Configuration
+ Name="py34_bopystatic_tangostatic_release|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\PyTango.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="$(CommonIncludeDirs);$(Python34IncludeDirs)"
+ PreprocessorDefinitions="$(PreBoostStaticTangoStaticFlags)"
+ RuntimeLibrary="0"
+ CompileAs="2"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(PyTango34StaticLibs)"
+ AdditionalLibraryDirectories="$(Py34BoostStaticTangoStaticLibDir)"
+ LinkTimeCodeGeneration="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="$(Py34) $(WinSetupArgs)"
+ />
+ </Configuration>
+
+ </Configurations>
<References>
</References>
<Files>
diff --git a/win/PyTango_VS9/PyTango.vsprops b/win/PyTango_VS9/PyTango.vsprops
index f4b1f69..d6b346e 100644
--- a/win/PyTango_VS9/PyTango.vsprops
+++ b/win/PyTango_VS9/PyTango.vsprops
@@ -126,7 +126,7 @@
<UserMacro Name="NumpyRelativeIncludeDir" Value="Lib\site-packages\numpy\core\include" />
<!-- Internal: DO NOT CHANGE -->
- <UserMacro Name="PyTangoCompileOptions" Value="-Zm200 /MP8 /bigobj" />
+ <UserMacro Name="PyTangoCompileOptions" Value="-Zm200 /MP4 /bigobj" />
<UserMacro Name="BaseDir" Value="$(ProjectDir)..\.." />
<UserMacro Name="RelPrefixDir" Value="$(ConfigurationName)_$(PlatformName)_msvc$(VCVer)" />
@@ -185,13 +185,20 @@
<UserMacro Name="Python33IncludeDirs" Value="$(Python33IncludeDir);$(Numpy33IncludeDir)" />
<UserMacro Name="Python33LibDir" Value="$(Python33Dir)\libs" />
+ <UserMacro Name="Python34Dir" Value="$(PythonDir)\34" />
+ <UserMacro Name="Py34" Value="$(Python34Dir)\python" />
+ <UserMacro Name="Python34IncludeDir" Value="$(Python34Dir)\include" />
+ <UserMacro Name="Numpy34IncludeDir" Value="$(Python34Dir)\$(NumpyRelativeIncludeDir)" />
+ <UserMacro Name="Python34IncludeDirs" Value="$(Python34IncludeDir);$(Numpy34IncludeDir)" />
+ <UserMacro Name="Python34LibDir" Value="$(Python34Dir)\libs" />
+
<UserMacro Name="BasePreFlags" Value="WIN32;NDEBUG" />
<UserMacro Name="PreTangoStaticFlags" Value="_WINSTATIC" />
<UserMacro Name="PreTangoSharedFlags" Value="LOG4TANGO_HAS_DLL;TANGO_HAS_DLL" />
- <UserMacro Name="PreBoostSharedTantoSharedFlags" Value="$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_DYNAMIC_LIB" />
- <UserMacro Name="PreBoostStaticTantoSharedFlags" Value="$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_STATIC_LIB" />
- <UserMacro Name="PreBoostStaticTantoStaticFlags" Value="$(BasePreFlags);$(PreTangoStaticFlags);BOOST_PYTHON_STATIC_LIB" />
+ <UserMacro Name="PreBoostSharedTangoSharedFlags" Value="$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_DYNAMIC_LIB" />
+ <UserMacro Name="PreBoostStaticTangoSharedFlags" Value="$(BasePreFlags);$(PreTangoSharedFlags);BOOST_PYTHON_STATIC_LIB" />
+ <UserMacro Name="PreBoostStaticTangoStaticFlags" Value="$(BasePreFlags);$(PreTangoStaticFlags);BOOST_PYTHON_STATIC_LIB" />
<UserMacro Name="PreCompHeaderSrc" Value="precompiled_header.hpp" />
<UserMacro Name="PreCompHeaderDst" Value="$(TempDir)\$(PyTangoBaseFile)_Boost-$(BoostVer).pch" />
@@ -220,6 +227,9 @@
<UserMacro Name="PyTango33StaticLibs" Value="$(BasePyTangoStaticLibs) python33.lib" />
<UserMacro Name="PyTango33SharedLibs" Value="$(BasePyTangoSharedLibs) python33.lib" />
+ <UserMacro Name="PyTango34StaticLibs" Value="$(BasePyTangoStaticLibs) python34.lib" />
+ <UserMacro Name="PyTango34SharedLibs" Value="$(BasePyTangoSharedLibs) python34.lib" />
+
<UserMacro Name="BaseBoostSharedRtSharedLibDir" Value="$(BoostLibDir)\shared\runtime_shared" />
<UserMacro Name="BaseBoostStaticRtSharedLibDir" Value="$(BoostLibDir)\static\runtime_shared" />
<UserMacro Name="BaseBoostStaticRtStaticLibDir" Value="$(BoostLibDir)\static\runtime_static" />
@@ -244,6 +254,10 @@
<UserMacro Name="Boost33StaticRtSharedLibDir" Value="$(BaseBoostStaticRtSharedLibDir)\33;$(Python33LibDir)" />
<UserMacro Name="Boost33StaticRtStaticLibDir" Value="$(BaseBoostStaticRtStaticLibDir)\33;$(Python33LibDir)" />
+ <UserMacro Name="Boost34SharedRtSharedLibDir" Value="$(BaseBoostSharedRtSharedLibDir)\34;$(Python34LibDir)" />
+ <UserMacro Name="Boost34StaticRtSharedLibDir" Value="$(BaseBoostStaticRtSharedLibDir)\34;$(Python34LibDir)" />
+ <UserMacro Name="Boost34StaticRtStaticLibDir" Value="$(BaseBoostStaticRtStaticLibDir)\34;$(Python34LibDir)" />
+
<UserMacro Name="Py26BoostSharedTangoSharedLibDir" Value="$(Boost26SharedRtSharedLibDir);$(TangoLibDir)\vc$(VCMajorVer)_dll" />
<UserMacro Name="Py26BoostStaticTangoSharedLibDir" Value="$(Boost26StaticRtSharedLibDir);$(TangoLibDir)\vc$(VCMajorVer)_dll" />
<UserMacro Name="Py26BoostStaticTangoStaticLibDir" Value="$(Boost26StaticRtStaticLibDir);$(TangoLibDir)\vc$(VCMajorVer)" />
@@ -264,6 +278,10 @@
<UserMacro Name="Py33BoostStaticTangoSharedLibDir" Value="$(Boost33StaticRtSharedLibDir);$(TangoLibDir)\vc$(VCMajorVer)_dll" />
<UserMacro Name="Py33BoostStaticTangoStaticLibDir" Value="$(Boost33StaticRtStaticLibDir);$(TangoLibDir)\vc$(VCMajorVer)" />
+ <UserMacro Name="Py34BoostSharedTangoSharedLibDir" Value="$(Boost34SharedRtSharedLibDir);$(TangoLibDir)\vc$(VCMajorVer)_dll" />
+ <UserMacro Name="Py34BoostStaticTangoSharedLibDir" Value="$(Boost34StaticRtSharedLibDir);$(TangoLibDir)\vc$(VCMajorVer)_dll" />
+ <UserMacro Name="Py34BoostStaticTangoStaticLibDir" Value="$(Boost34StaticRtStaticLibDir);$(TangoLibDir)\vc$(VCMajorVer)" />
+
<UserMacro Name="WinSetupArgs" Value="$(BaseDir)\winsetup.py $(BuildDir) $(DistDir) $(BDistDir) $(ConfigurationName) $(PlatformName)" />
</VisualStudioPropertySheet>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git
More information about the debian-science-commits
mailing list