[pytango] 344/483: prepare 8.1.2 clean VS9 and VS10 solution
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:57 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 63982d9b4e3e48bf482f63f2e8aa9cd5d5f9edcf
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Wed Dec 11 16:11:17 2013 +0000
prepare 8.1.2
clean VS9 and VS10 solution
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24515 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
win/PyTango_VS10/PyTango.props | 65 ++++++++++--
win/PyTango_VS10/PyTango.sln | 20 ++++
win/PyTango_VS10/PyTango.vcxproj | 208 +++++++++++++++++++++++++++++++++++++--
win/PyTango_VS9/PyTango.vsprops | 6 +-
4 files changed, 283 insertions(+), 16 deletions(-)
diff --git a/win/PyTango_VS10/PyTango.props b/win/PyTango_VS10/PyTango.props
index e38e138..78fd1e6 100755
--- a/win/PyTango_VS10/PyTango.props
+++ b/win/PyTango_VS10/PyTango.props
@@ -8,23 +8,35 @@
<TangoVer>$(TangoMajorVer).$(TangoMinorVer).$(TangoPatchVer)</TangoVer>
<PyTangoMajorVer>8</PyTangoMajorVer>
<PyTangoMinorVer>1</PyTangoMinorVer>
- <PyTangoPatchVer>1</PyTangoPatchVer>
+ <PyTangoPatchVer>2</PyTangoPatchVer>
<PyTangoVer>$(PyTangoMajorVer).$(PyTangoMinorVer).$(PyTangoPatchVer)</PyTangoVer>
<BoostMajorVer>1</BoostMajorVer>
<BoostMinorVer>53</BoostMinorVer>
<BoostPatchVer>0</BoostPatchVer>
<BoostVer>$(BoostMajorVer).$(BoostMinorVer).$(BoostPatchVer)</BoostVer>
- <TangoBaseDir>C:\tango-$(TangoVer)</TangoBaseDir>
- <BoostBaseDir>C:\boost-$(BoostVer)</BoostBaseDir>
+
+ <!-- Tiago Coutinho personal configuration -->
+ <!-- <RootDir>C:\Users\coutinho\bin</RootDir> -->
+ <RootDir>C:</RootDir>
+
+ <TangoBaseDir>$(RootDir)\tango-$(TangoVer)</TangoBaseDir>
+ <BoostBaseDir>$(RootDir)\boost-$(BoostVer)</BoostBaseDir>
+
<PythonBaseDir>C:\Python</PythonBaseDir>
+
<VCMajorVer>10</VCMajorVer>
<VCMinorVer>0</VCMinorVer>
<VCVer>$(VCMajorVer).$(VCMinorVer)</VCVer>
+
<BoostIncludeDir>$(BoostBaseDir)\include\boost-$(BoostMajorVer)_$(BoostMinorVer)</BoostIncludeDir>
<BoostLibDir>$(BoostBaseDir)\multi\release\msvc-$(VCVer)\$(Platform)</BoostLibDir>
+ <BoostLibDir_Debug>$(BoostBaseDir)\multi\debug\msvc-$(VCVer)\$(Platform)</BoostLibDir_Debug>
+
<TangoIncludeDir>$(TangoBaseDir)\$(Platform)\include\vc$(VCMajorVer)</TangoIncludeDir>
<TangoLibDir>$(TangoBaseDir)\$(Platform)\lib</TangoLibDir>
+ <TangoLibDir_Debug>$(TangoBaseDir)\$(Platform)\lib</TangoLibDir_Debug>
+
<PythonDir>C:\Python\$(Platform)</PythonDir>
<NumpyRelativeIncludeDir>Lib\site-packages\numpy\core\include</NumpyRelativeIncludeDir>
<PyTangoCompileOptions>-Zm200 /MP4 /bigobj</PyTangoCompileOptions>
@@ -35,46 +47,87 @@
<BaseTempDir>$(BaseBuildDir)\temp</BaseTempDir>
<BaseDistDir>$(BaseBuildDir)\dist</BaseDistDir>
<BaseBDistDir>$(BaseBuildDir)\temp_dist</BaseBDistDir>
+
+ <!-- to be used in the internal winsetup.py script -->
<BuildDir>$(BaseBuildLibDir)\$(RelPrefixDir)</BuildDir>
<DistDir>$(BaseDistDir)\$(RelPrefixDir)</DistDir>
<TempDir>$(BaseTempDir)\$(RelPrefixDir)</TempDir>
<BDistDir>$(BaseBDistDir)\$(RelPrefixDir)</BDistDir>
+
+ <!-- to be set to OutputDir and IntDir -->
<PyTangoBuildDir>$(BuildDir)\$(ProjectName)</PyTangoBuildDir>
<PyTangoTempDir>$(TempDir)\$(ProjectName)</PyTangoTempDir>
+
<BaseSrcDir>$(BaseDir)\src\boost\cpp</BaseSrcDir>
<CommonIncludeDirs>$(BoostIncludeDir);$(TangoIncludeDir);$(BaseSrcDir);$(BaseSrcDir)\server</CommonIncludeDirs>
+
<Python33Dir>$(PythonDir)\33</Python33Dir>
<Py33>$(Python33Dir)\python</Py33>
<Python33IncludeDir>$(Python33Dir)\include</Python33IncludeDir>
<Numpy33IncludeDir>$(Python33Dir)\$(NumpyRelativeIncludeDir)</Numpy33IncludeDir>
<Python33IncludeDirs>$(Python33IncludeDir);$(Numpy33IncludeDir)</Python33IncludeDirs>
<Python33LibDir>$(Python33Dir)\libs</Python33LibDir>
- <BasePreFlags>WIN32;NDEBUG</BasePreFlags>
+
+ <BasePreFlags>WIN32</BasePreFlags>
<PreTangoStaticFlags>_WINSTATIC</PreTangoStaticFlags>
<PreTangoSharedFlags>LOG4TANGO_HAS_DLL;TANGO_HAS_DLL</PreTangoSharedFlags>
+
<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>
+
<BaseDisableWarningFlags>4005;4996;4250</BaseDisableWarningFlags>
+
+ <BaseLibs>comctl32.lib;ws2_32.lib;mswsock.lib</BaseLibs>
+
<omniStaticLibs>COS4.lib;omniORB4.lib;omniDynamic4.lib;omnithread.lib</omniStaticLibs>
<omniSharedLibs>COS4_rt.lib;omniORB4_rt.lib;omniDynamic4_rt.lib;omnithread_rt.lib</omniSharedLibs>
- <BaseTangoLibs>zmq.lib;log4tango.lib;tango.lib</BaseTangoLibs>
- <BasePyTangoStaticLibs>$(omniStaticLibs);$(BaseTangoLibs);comctl32.lib;ws2_32.lib;mswsock.lib</BasePyTangoStaticLibs>
+ <BaseTangoLibs>zmq.lib;log4tango.lib;tango.lib;$(BaseLibs)</BaseTangoLibs>
+ <BasePyTangoStaticLibs>$(omniStaticLibs);$(BaseTangoLibs)</BasePyTangoStaticLibs>
<BasePyTangoSharedLibs>$(omniSharedLibs);$(BaseTangoLibs)</BasePyTangoSharedLibs>
+
+ <omniStaticLibs_Debug>COS4d.lib;omniORB4d.lib;omniDynamic4d.lib;omnithreadd.lib</omniStaticLibs_Debug>
+ <omniSharedLibs_Debug>COS4_rtd.lib;omniORB4_rtd.lib;omniDynamic4_rtd.lib;omnithread_rtd.lib</omniSharedLibs_Debug>
+ <BaseTangoLibs_Debug>zmqd.lib;log4tangod.lib;tangod.lib;$(BaseLibs)</BaseTangoLibs_Debug>
+ <BasePyTangoStaticLibs_Debug>$(omniStaticLibs_Debug);$(BaseTangoLibs_Debug)</BasePyTangoStaticLibs_Debug>
+ <BasePyTangoSharedLibs_Debug>$(omniSharedLibs_Debug);$(BaseTangoLibs_Debug)</BasePyTangoSharedLibs_Debug>
+
<PyTango33StaticLibs>$(BasePyTangoStaticLibs);python33.lib</PyTango33StaticLibs>
<PyTango33SharedLibs>$(BasePyTangoSharedLibs);python33.lib</PyTango33SharedLibs>
+
<BaseBoostSharedRtSharedLibDir>$(BoostLibDir)\shared\runtime_shared</BaseBoostSharedRtSharedLibDir>
<BaseBoostStaticRtSharedLibDir>$(BoostLibDir)\static\runtime_shared</BaseBoostStaticRtSharedLibDir>
<BaseBoostStaticRtStaticLibDir>$(BoostLibDir)\static\runtime_static</BaseBoostStaticRtStaticLibDir>
+
<Boost33SharedRtSharedLibDir>$(BaseBoostSharedRtSharedLibDir)\33;$(Python33LibDir)</Boost33SharedRtSharedLibDir>
<Boost33StaticRtSharedLibDir>$(BaseBoostStaticRtSharedLibDir)\33;$(Python33LibDir)</Boost33StaticRtSharedLibDir>
<Boost33StaticRtStaticLibDir>$(BaseBoostStaticRtStaticLibDir)\33;$(Python33LibDir)</Boost33StaticRtStaticLibDir>
+
<Py33BoostSharedTangoSharedLibDir>$(Boost33SharedRtSharedLibDir);$(TangoLibDir)\vc$(VCMajorVer)_dll</Py33BoostSharedTangoSharedLibDir>
<Py33BoostStaticTangoSharedLibDir>$(Boost33StaticRtSharedLibDir);$(TangoLibDir)\vc$(VCMajorVer)_dll</Py33BoostStaticTangoSharedLibDir>
<Py33BoostStaticTangoStaticLibDir>$(Boost33StaticRtStaticLibDir);$(TangoLibDir)\vc$(VCMajorVer)</Py33BoostStaticTangoStaticLibDir>
+
+ <!-- debug variables -->
+
+ <PyTango33StaticLibs_Debug>$(BasePyTangoStaticLibs_Debug);python33.lib</PyTango33StaticLibs_Debug>
+ <PyTango33SharedLibs_Debug>$(BasePyTangoSharedLibs_Debug);python33.lib</PyTango33SharedLibs_Debug>
+
+ <BaseBoostSharedRtSharedLibDir_Debug>$(BoostLibDir)\shared\runtime_shared</BaseBoostSharedRtSharedLibDir_Debug>
+ <BaseBoostStaticRtSharedLibDir_Debug>$(BoostLibDir)\static\runtime_shared</BaseBoostStaticRtSharedLibDir_Debug>
+ <BaseBoostStaticRtStaticLibDir_Debug>$(BoostLibDir)\static\runtime_static</BaseBoostStaticRtStaticLibDir_Debug>
+
+ <Boost33SharedRtSharedLibDir_Debug>$(BaseBoostSharedRtSharedLibDir_Debug)\33;$(Python33LibDir)</Boost33SharedRtSharedLibDir_Debug>
+ <Boost33StaticRtSharedLibDir_Debug>$(BaseBoostStaticRtSharedLibDir_Debug)\33;$(Python33LibDir)</Boost33StaticRtSharedLibDir_Debug>
+ <Boost33StaticRtStaticLibDir_Debug>$(BaseBoostStaticRtStaticLibDir_Debug)\33;$(Python33LibDir)</Boost33StaticRtStaticLibDir_Debug>
+
+ <Py33BoostSharedTangoSharedLibDir_Debug>$(Boost33SharedRtSharedLibDir_Debug);$(TangoLibDir_Debug)\vc$(VCMajorVer)_dll</Py33BoostSharedTangoSharedLibDir_Debug>
+ <Py33BoostStaticTangoSharedLibDir_Debug>$(Boost33StaticRtSharedLibDir_Debug);$(TangoLibDir_Debug)\vc$(VCMajorVer)_dll</Py33BoostStaticTangoSharedLibDir_Debug>
+ <Py33BoostStaticTangoStaticLibDir_Debug>$(Boost33StaticRtStaticLibDir_Debug);$(TangoLibDir_Debug)\vc$(VCMajorVer)</Py33BoostStaticTangoStaticLibDir_Debug>
+
<WinSetupArgs>$(BaseDir)\winsetup.py $(BuildDir) $(DistDir) $(BDistDir) $(Configuration) $(Platform)</WinSetupArgs>
</PropertyGroup>
<PropertyGroup>
diff --git a/win/PyTango_VS10/PyTango.sln b/win/PyTango_VS10/PyTango.sln
index 7d9e6ac..4de3a1d 100755
--- a/win/PyTango_VS10/PyTango.sln
+++ b/win/PyTango_VS10/PyTango.sln
@@ -11,6 +11,13 @@ 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
+
+ py33_bopyshared_tangoshared_debug|Win32 = py33_bopyshared_tangoshared_debug|Win32
+ py33_bopyshared_tangoshared_debug|x64 = py33_bopyshared_tangoshared_debug|x64
+ py33_bopystatic_tangoshared_debug|Win32 = py33_bopystatic_tangoshared_debug|Win32
+ py33_bopystatic_tangoshared_debug|x64 = py33_bopystatic_tangoshared_debug|x64
+ py33_bopystatic_tangostatic_debug|Win32 = py33_bopystatic_tangostatic_debug|Win32
+ py33_bopystatic_tangostatic_debug|x64 = py33_bopystatic_tangostatic_debug|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopyshared_tangoshared_release|Win32.ActiveCfg = py33_bopyshared_tangoshared_release|Win32
@@ -25,6 +32,19 @@ 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
+
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopyshared_tangoshared_debug|Win32.ActiveCfg = py33_bopyshared_tangoshared_debug|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopyshared_tangoshared_debug|Win32.Build.0 = py33_bopyshared_tangoshared_debug|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopyshared_tangoshared_debug|x64.ActiveCfg = py33_bopyshared_tangoshared_debug|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopyshared_tangoshared_debug|x64.Build.0 = py33_bopyshared_tangoshared_debug|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangoshared_debug|Win32.ActiveCfg = py33_bopystatic_tangoshared_debug|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangoshared_debug|Win32.Build.0 = py33_bopystatic_tangoshared_debug|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangoshared_debug|x64.ActiveCfg = py33_bopystatic_tangoshared_debug|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangoshared_debug|x64.Build.0 = py33_bopystatic_tangoshared_debug|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangostatic_debug|Win32.ActiveCfg = py33_bopystatic_tangostatic_debug|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangostatic_debug|Win32.Build.0 = py33_bopystatic_tangostatic_debug|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangostatic_debug|x64.ActiveCfg = py33_bopystatic_tangostatic_debug|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py33_bopystatic_tangostatic_debug|x64.Build.0 = py33_bopystatic_tangostatic_debug|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win/PyTango_VS10/PyTango.vcxproj b/win/PyTango_VS10/PyTango.vcxproj
index a817aad..dcb26b8 100755
--- a/win/PyTango_VS10/PyTango.vcxproj
+++ b/win/PyTango_VS10/PyTango.vcxproj
@@ -25,6 +25,30 @@
<Configuration>py33_bopystatic_tangostatic_release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="py33_bopyshared_tangoshared_debug|Win32">
+ <Configuration>py33_bopyshared_tangoshared_debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="py33_bopyshared_tangoshared_debug|x64">
+ <Configuration>py33_bopyshared_tangoshared_debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="py33_bopystatic_tangoshared_debug|Win32">
+ <Configuration>py33_bopystatic_tangoshared_debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="py33_bopystatic_tangoshared_debug|x64">
+ <Configuration>py33_bopystatic_tangoshared_debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="py33_bopystatic_tangostatic_debug|Win32">
+ <Configuration>py33_bopystatic_tangostatic_debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="py33_bopystatic_tangostatic_debug|x64">
+ <Configuration>py33_bopystatic_tangostatic_debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{764A5ECE-11AE-4363-9A1C-573972A1BADD}</ProjectGuid>
@@ -62,6 +86,36 @@
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -89,6 +143,30 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="PyTango.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="PyTango.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="PyTango.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="PyTango.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="PyTango.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="PyTango.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="PyTango.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -104,12 +182,24 @@
<TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_release|x64'">.pyd</TargetExt>
<TargetName Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_release|x64'">$(PyTangoBaseFile)</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_release|x64'">.pyd</TargetExt>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|Win32'">$(PyTangoBaseFile)</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|Win32'">.pyd</TargetExt>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|Win32'">$(PyTangoBaseFile)</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|Win32'">.pyd</TargetExt>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|Win32'">$(PyTangoBaseFile)</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|Win32'">.pyd</TargetExt>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|x64'">$(PyTangoBaseFile)</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|x64'">.pyd</TargetExt>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|x64'">$(PyTangoBaseFile)</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|x64'">.pyd</TargetExt>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|x64'">$(PyTangoBaseFile)</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|x64'">.pyd</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_release|Win32'">
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -127,7 +217,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -143,7 +233,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -161,7 +251,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(PyTango33SharedLibs);%(AdditionalDependencies)</AdditionalDependencies>
@@ -177,7 +267,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -197,7 +287,7 @@
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -211,6 +301,112 @@
<Command>$(Py33) $(WinSetupArgs)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|Win32'">
+ <ClCompile>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>$(PyTango33SharedLibs_Debug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(Py33BoostSharedTangoSharedLibDir_Debug);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <PostBuildEvent>
+ <Command>$(Py33) $(WinSetupArgs)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopyshared_tangoshared_debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(PreBoostSharedTangoSharedFlags);%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>$(PyTango33SharedLibs_Debug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(Py33BoostSharedTangoSharedLibDir_Debug);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Command>$(Py33) $(WinSetupArgs)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|Win32'">
+ <ClCompile>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>$(PyTango33SharedLibs_Debug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(Py33BoostStaticTangoSharedLibDir_Debug);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <PostBuildEvent>
+ <Command>$(Py33) $(WinSetupArgs)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangoshared_debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoSharedFlags);%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>$(PyTango33SharedLibs_Debug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(Py33BoostStaticTangoSharedLibDir_Debug);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Command>$(Py33) $(WinSetupArgs)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|Win32'">
+ <ClCompile>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>$(PyTango33StaticLibs_Debug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(Py33BoostStaticTangoStaticLibDir_Debug);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <PostBuildEvent>
+ <Command>$(Py33) $(WinSetupArgs)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='py33_bopystatic_tangostatic_debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>$(CommonIncludeDirs);$(Python33IncludeDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(PreBoostStaticTangoStaticFlags);%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>$(PyTango33StaticLibs_Debug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(Py33BoostStaticTangoStaticLibDir_Debug);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Command>$(Py33) $(WinSetupArgs)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\src\boost\cpp\server\attr.h" />
<ClInclude Include="..\..\src\boost\cpp\server\attribute.h" />
diff --git a/win/PyTango_VS9/PyTango.vsprops b/win/PyTango_VS9/PyTango.vsprops
index cce8763..8b03682 100644
--- a/win/PyTango_VS9/PyTango.vsprops
+++ b/win/PyTango_VS9/PyTango.vsprops
@@ -108,10 +108,9 @@
<UserMacro Name="BoostVer" Value="$(BoostMajorVer).$(BoostMinorVer).$(BoostPatchVer)" />
<!-- Tiago Coutinho personal configuration -->
- <!-- <UserMacro Name="RootDir" Value="C:\Users\coutinho\bin" /> -->
- <!-- <UserMacro Name="TangoBaseDir" Value="$(RootDir)\tango" /> -->
+ <-- <UserMacro Name="RootDir" Value="C:\Users\coutinho\bin" /> -->
+ <UserMacro Name="RootDir" Value="C:" />
- <UserMacro Name="RootDir" Value="C:\" />
<UserMacro Name="TangoBaseDir" Value="$(RootDir)\tango-$(TangoVer)" />
<UserMacro Name="BoostBaseDir" Value="$(RootDir)\boost-$(BoostVer)" />
@@ -213,7 +212,6 @@
<UserMacro Name="BasePyTangoStaticLibs_Debug" Value="$(omniStaticLibs_Debug) $(BaseTangoLibs_Debug)" />
<UserMacro Name="BasePyTangoSharedLibs_Debug" Value="$(omniSharedLibs_Debug) $(BaseTangoLibs_Debug)" />
-
<UserMacro Name="PyTango26StaticLibs" Value="$(BasePyTangoStaticLibs) python26.lib" />
<UserMacro Name="PyTango26SharedLibs" Value="$(BasePyTangoSharedLibs) python26.lib" />
--
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