[pytango] 87/483: final fix to make compilation work in VS 2005
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:27 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 14efdca42540a3be7df70b9241ca847e8c1d9083
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Mon Dec 12 15:55:05 2011 +0000
final fix to make compilation work in VS 2005
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@18636 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
win/PyTango_VS8/PyTango.sln | 6 +
win/PyTango_VS8/PyTango.vcproj | 183 +++++++++++++++++++++++++
win/PyTango_VS9/PyTango.sln | 24 ++--
win/PyTango_VS9/PyTango.vcproj | 303 ++++++++++++++++++++++++-----------------
winsetup.py | 6 +-
5 files changed, 382 insertions(+), 140 deletions(-)
diff --git a/win/PyTango_VS8/PyTango.sln b/win/PyTango_VS8/PyTango.sln
index 43e0f42..6430c34 100644
--- a/win/PyTango_VS8/PyTango.sln
+++ b/win/PyTango_VS8/PyTango.sln
@@ -7,12 +7,18 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release_Py26_boost141|Win32 = Release_Py26_boost141|Win32
Release_Py26_boost141|x64 = Release_Py26_boost141|x64
+ Release_Py27_boost147|Win32 = Release_Py27_boost147|Win32
+ Release_Py27_boost147|x64 = Release_Py27_boost147|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|Win32.ActiveCfg = Release_Py26_boost141|Win32
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|Win32.Build.0 = Release_Py26_boost141|Win32
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|x64.ActiveCfg = Release_Py26_boost141|x64
{764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|x64.Build.0 = Release_Py26_boost141|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|Win32.ActiveCfg = Release_Py27_boost147|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|Win32.Build.0 = Release_Py27_boost147|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|x64.ActiveCfg = Release_Py27_boost147|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|x64.Build.0 = Release_Py27_boost147|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win/PyTango_VS8/PyTango.vcproj b/win/PyTango_VS8/PyTango.vcproj
index f4aefd6..f122062 100644
--- a/win/PyTango_VS8/PyTango.vcproj
+++ b/win/PyTango_VS8/PyTango.vcproj
@@ -201,6 +201,189 @@
CommandLine="c:\python26\python $(SolutionDir)\..\..\winsetup.py"
/>
</Configuration>
+ <Configuration
+ Name="Release_Py27_boost147|Win32"
+ OutputDirectory="..\..\build\lib.$(PlatformName)-2.7\$(ProjectName)"
+ IntermediateDirectory="..\..\build\temp.$(PlatformName)\python27\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="-Zm200"
+ Optimization="3"
+ WholeProgramOptimization="false"
+ AdditionalIncludeDirectories="C:\Python27\include;"C:\Python27\Lib\site-packages\numpy\core\include";"c:\Program Files\boost\boost_1_47";"C:\Program Files\tango\win32_vc8\win32_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
+ PreprocessorDefinitions="WIN32;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="precompiled_header.hpp"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ DisableSpecificWarnings="4005;4996;4250"
+ ErrorReporting="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
+ OutputFile="$(OutDir)\_PyTango.pyd"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Python27\libs;"C:\Program Files\tango\win32_vc8\win32_dll\lib";"C:\Program Files\boost\boost_1_47\lib""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="0"
+ 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"
+ Description="Starting setup.py bdist_msi"
+ CommandLine="c:\python27\python $(SolutionDir)\..\..\winsetup.py"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Py27_boost147|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="-Zm200"
+ Optimization="3"
+ WholeProgramOptimization="false"
+ AdditionalIncludeDirectories=""C:\Python26\Lib\site-packages\numpy\core\include";"c:\Program Files\boost\boost_1_41";C:\Python26\include;"C:\Program Files\tango\win64_vc8\win64_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
+ PreprocessorDefinitions="WIN64;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="precompiled_header.hpp"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ DisableSpecificWarnings="4005;4996;4250"
+ ErrorReporting="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
+ OutputFile="$(OutDir)\_PyTango.pyd"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Python26\libs;"C:\Program Files\tango\win64_vc8\win64_dll\lib";"C:\Program Files\boost\boost_1_41\lib""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="0"
+ 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"
+ Description="Starting setup.py bdist_msi"
+ CommandLine="c:\python26\python $(SolutionDir)\..\..\winsetup.py"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
diff --git a/win/PyTango_VS9/PyTango.sln b/win/PyTango_VS9/PyTango.sln
index e92635e..e0c26ca 100644
--- a/win/PyTango_VS9/PyTango.sln
+++ b/win/PyTango_VS9/PyTango.sln
@@ -5,20 +5,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PyTango", "PyTango.vcproj",
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release_Py26|Win32 = Release_Py26|Win32
- Release_Py27_numpy16|Win32 = Release_Py27_numpy16|Win32
- Release|Win32 = Release|Win32
+ Release_Py26_boost141|Win32 = Release_Py26_boost141|Win32
+ Release_Py26_boost141|x64 = Release_Py26_boost141|x64
+ Release_Py27_boost147|Win32 = Release_Py27_boost147|Win32
+ Release_Py27_boost147|x64 = Release_Py27_boost147|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Debug|Win32.ActiveCfg = Debug|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Debug|Win32.Build.0 = Debug|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26|Win32.ActiveCfg = Release_Py26|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26|Win32.Build.0 = Release_Py26|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_numpy16|Win32.ActiveCfg = Release_Py27_numpy16|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_numpy16|Win32.Build.0 = Release_Py27_numpy16|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release|Win32.ActiveCfg = Release|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release|Win32.Build.0 = Release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|Win32.ActiveCfg = Release_Py26_boost141|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|Win32.Build.0 = Release_Py26_boost141|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|x64.ActiveCfg = Release_Py26_boost141|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py26_boost141|x64.Build.0 = Release_Py26_boost141|x64
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|Win32.ActiveCfg = Release_Py27_boost147|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|Win32.Build.0 = Release_Py27_boost147|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|x64.ActiveCfg = Release_Py27_boost147|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|x64.Build.0 = Release_Py27_boost147|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win/PyTango_VS9/PyTango.vcproj b/win/PyTango_VS9/PyTango.vcproj
index 59f71bc..f5be5ea 100644
--- a/win/PyTango_VS9/PyTango.vcproj
+++ b/win/PyTango_VS9/PyTango.vcproj
@@ -12,16 +12,20 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release_Py26_boost141|Win32"
+ OutputDirectory="..\..\build\lib.$(PlatformName)-2.6\$(ProjectName)"
+ IntermediateDirectory="..\..\build\temp.$(PlatformName)\python26\$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -40,15 +44,21 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTANGO_VS8_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
+ AdditionalOptions="-Zm200"
+ Optimization="3"
+ WholeProgramOptimization="false"
+ AdditionalIncludeDirectories=""C:\Python26\Lib\site-packages\numpy\core\include";"c:\Program Files\boost\boost_1_41";C:\Python26\include;"C:\Program Files\tango\win32_vc8\win32_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
+ PreprocessorDefinitions="WIN32;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="precompiled_header.hpp"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ DisableSpecificWarnings="4005;4996;4250"
+ ErrorReporting="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -61,9 +71,16 @@
/>
<Tool
Name="VCLinkerTool"
- LinkIncremental="2"
+ AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
+ OutputFile="$(OutDir)\_PyTango.pyd"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Python26\libs;"C:\Program Files\tango\win32_vc8\win32_dll\lib";"C:\Program Files\boost\boost_1_41\lib""
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
@@ -88,14 +105,16 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Starting setup.py bdist_msi"
+ CommandLine="c:\python26\python $(SolutionDir)\..\..\winsetup.py"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release_Py26_boost141|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1"
+ CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
@@ -112,15 +131,25 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTANGO_VS8_EXPORTS"
+ AdditionalOptions="-Zm200"
+ Optimization="3"
+ WholeProgramOptimization="false"
+ AdditionalIncludeDirectories=""C:\Python26\Lib\site-packages\numpy\core\include";"c:\Program Files\boost\boost_1_41";C:\Python26\include;"C:\Program Files\tango\win64_vc8\win64_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
+ PreprocessorDefinitions="WIN64;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL"
RuntimeLibrary="2"
- UsePrecompiledHeader="2"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="precompiled_header.hpp"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ DisableSpecificWarnings="4005;4996;4250"
+ ErrorReporting="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -133,14 +162,19 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
+ OutputFile="$(OutDir)\_PyTango.pyd"
LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Python26\libs;"C:\Program Files\tango\win64_vc8\win64_dll\lib";"C:\Program Files\boost\boost_1_41\lib""
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -162,12 +196,14 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Starting setup.py bdist_msi"
+ CommandLine="c:\python26\python $(SolutionDir)\..\..\winsetup.py"
/>
</Configuration>
<Configuration
- Name="Release_Py27_numpy16|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release_Py27_boost147|Win32"
+ OutputDirectory="..\..\build\lib.$(PlatformName)-2.7\$(ProjectName)"
+ IntermediateDirectory="..\..\build\temp.$(PlatformName)\python27\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -189,19 +225,21 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="-Zm200"
Optimization="3"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories=""C:\Python27\Lib\site-packages\numpy\core\include";C:\boost_1_47;C:\Python27\include;"C:\Program Files\tango\win32_vc8\win32_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
+ AdditionalIncludeDirectories="C:\Python27\include;"C:\Python27\Lib\site-packages\numpy\core\include";"c:\Program Files\boost\boost_1_47";"C:\Program Files\tango\win32_vc8\win32_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
PreprocessorDefinitions="WIN32;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL"
RuntimeLibrary="2"
BufferSecurityCheck="false"
- UsePrecompiledHeader="0"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="precompiled_header.hpp"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
CompileAs="0"
DisableSpecificWarnings="4005;4996;4250"
- ErrorReporting="0"
+ ErrorReporting="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -217,11 +255,13 @@
AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
OutputFile="$(OutDir)\_PyTango.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Python27\libs;"C:\Program Files\tango\win32_vc8\win32_dll\lib";C:\boost_1_47\lib"
+ AdditionalLibraryDirectories="C:\Python27\libs;"C:\Program Files\tango\win32_vc8\win32_dll\lib";"C:\Program Files\boost\boost_1_47\lib""
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
@@ -246,12 +286,14 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Starting setup.py bdist_msi"
+ CommandLine="c:\python27\python $(SolutionDir)\..\..\winsetup.py"
/>
</Configuration>
<Configuration
- Name="Release_Py26|Win32"
- OutputDirectory="..\..\build\lib.win32-2.6\$(ProjectName)"
- IntermediateDirectory="..\..\build\temp_VS_$(ProjectName)_$(ConfigurationName)"
+ Name="Release_Py27_boost147|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -270,14 +312,15 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="-Zm200"
Optimization="3"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories=""C:\Python26\Lib\site-packages\numpy\core\include";"c:\Program Files\boost\boost_1_41";C:\Python26\include;"C:\Program Files\tango\win32_vc8\win32_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
- PreprocessorDefinitions="WIN32;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL"
+ AdditionalIncludeDirectories=""C:\Python26\Lib\site-packages\numpy\core\include";"c:\Program Files\boost\boost_1_41";C:\Python26\include;"C:\Program Files\tango\win64_vc8\win64_dll\include";Z:\PyTangoWin\PyTango\src\server;Z:\PyTangoWin\PyTango\src"
+ PreprocessorDefinitions="WIN64;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL"
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="1"
@@ -303,7 +346,7 @@
AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
OutputFile="$(OutDir)\_PyTango.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Python26\libs;"C:\Program Files\tango\win32_vc8\win32_dll\lib";"C:\Program Files\boost\boost_1_41\lib""
+ AdditionalLibraryDirectories="C:\Python26\libs;"C:\Program Files\tango\win64_vc8\win64_dll\lib";"C:\Program Files\boost\boost_1_41\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="2"
@@ -312,7 +355,7 @@
LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -334,6 +377,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Starting setup.py bdist_msi"
+ CommandLine="c:\python26\python $(SolutionDir)\..\..\winsetup.py"
/>
</Configuration>
</Configurations>
@@ -341,345 +386,349 @@
</References>
<Files>
<Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\src\api_util.cpp"
+ RelativePath="..\..\src\server\attr.h"
>
</File>
<File
- RelativePath="..\..\src\archive_event_info.cpp"
+ RelativePath="..\..\src\server\attribute.h"
>
</File>
<File
- RelativePath="..\..\src\server\attr.cpp"
+ RelativePath="..\..\src\base_types_numpy.hpp"
>
</File>
<File
- RelativePath="..\..\src\attr_conf_event_data.cpp"
+ RelativePath="..\..\src\callback.h"
>
</File>
<File
- RelativePath="..\..\src\server\attribute.cpp"
+ RelativePath="..\..\src\server\command.h"
>
</File>
<File
- RelativePath="..\..\src\attribute_alarm_info.cpp"
+ RelativePath="..\..\src\defs.h"
>
</File>
<File
- RelativePath="..\..\src\attribute_dimension.cpp"
+ RelativePath="..\..\src\device_attribute.h"
>
</File>
<File
- RelativePath="..\..\src\attribute_event_info.cpp"
+ RelativePath="..\..\src\device_attribute_numpy.hpp"
>
</File>
<File
- RelativePath="..\..\src\attribute_info.cpp"
+ RelativePath="..\..\src\server\device_class.h"
>
</File>
<File
- RelativePath="..\..\src\attribute_info_ex.cpp"
+ RelativePath="..\..\src\server\device_impl.h"
>
</File>
<File
- RelativePath="..\..\src\attribute_proxy.cpp"
+ RelativePath="..\..\src\exception.h"
>
</File>
<File
- RelativePath="..\..\src\base_types.cpp"
+ RelativePath="..\..\src\fast_from_py.h"
>
</File>
<File
- RelativePath="..\..\src\callback.cpp"
+ RelativePath="..\..\src\fast_from_py_numpy.hpp"
>
</File>
<File
- RelativePath="..\..\src\change_event_info.cpp"
+ RelativePath="..\..\src\from_py.h"
>
</File>
<File
- RelativePath="..\..\src\server\command.cpp"
+ RelativePath="..\..\src\precompiled_header.hpp"
>
</File>
<File
- RelativePath="..\..\src\command_info.cpp"
+ RelativePath="..\..\src\pytgutils.h"
>
</File>
<File
- RelativePath="..\..\src\connection.cpp"
+ RelativePath="..\..\src\pyutils.h"
>
</File>
<File
- RelativePath="..\..\src\constants.cpp"
+ RelativePath="..\..\src\tango_numpy.h"
>
</File>
<File
- RelativePath="..\..\src\data_ready_event_data.cpp"
+ RelativePath="..\..\src\tgutils.h"
>
</File>
<File
- RelativePath="..\..\src\database.cpp"
+ RelativePath="..\..\src\to_py.h"
>
</File>
<File
- RelativePath="..\..\src\db.cpp"
+ RelativePath="..\..\src\to_py_numpy.hpp"
>
</File>
<File
- RelativePath="..\..\src\dev_command_info.cpp"
+ RelativePath="..\..\src\server\wattribute_numpy.hpp"
>
</File>
+ </Filter>
+ <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\dev_error.cpp"
+ RelativePath="..\..\src\api_util.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_attribute.cpp"
+ RelativePath="..\..\src\archive_event_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_attribute_config.cpp"
+ RelativePath="..\..\src\server\attr.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_attribute_history.cpp"
+ RelativePath="..\..\src\attr_conf_event_data.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\device_class.cpp"
+ RelativePath="..\..\src\server\attribute.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_data.cpp"
+ RelativePath="..\..\src\attribute_alarm_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_data_history.cpp"
+ RelativePath="..\..\src\attribute_dimension.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\device_impl.cpp"
+ RelativePath="..\..\src\attribute_event_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_info.cpp"
+ RelativePath="..\..\src\attribute_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_proxy.cpp"
+ RelativePath="..\..\src\attribute_info_ex.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\dserver.cpp"
+ RelativePath="..\..\src\attribute_proxy.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\encoded_attribute.cpp"
+ RelativePath="..\..\src\base_types.cpp"
>
</File>
<File
- RelativePath="..\..\src\enums.cpp"
+ RelativePath="..\..\src\callback.cpp"
>
</File>
<File
- RelativePath="..\..\src\event_data.cpp"
+ RelativePath="..\..\src\change_event_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\exception.cpp"
+ RelativePath="..\..\src\server\command.cpp"
>
</File>
<File
- RelativePath="..\..\src\from_py.cpp"
+ RelativePath="..\..\src\command_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\group.cpp"
+ RelativePath="..\..\src\connection.cpp"
>
</File>
<File
- RelativePath="..\..\src\group_element.cpp"
+ RelativePath="..\..\src\constants.cpp"
>
</File>
<File
- RelativePath="..\..\src\group_reply.cpp"
+ RelativePath="..\..\src\data_ready_event_data.cpp"
>
</File>
<File
- RelativePath="..\..\src\group_reply_list.cpp"
+ RelativePath="..\..\src\database.cpp"
>
</File>
<File
- RelativePath="..\..\src\locker_info.cpp"
+ RelativePath="..\..\src\db.cpp"
>
</File>
<File
- RelativePath="..\..\src\locking_thread.cpp"
+ RelativePath="..\..\src\dev_command_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\log4tango.cpp"
+ RelativePath="..\..\src\dev_error.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\multi_attribute.cpp"
+ RelativePath="..\..\src\device_attribute.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\multi_class_attribute.cpp"
+ RelativePath="..\..\src\device_attribute_config.cpp"
>
</File>
<File
- RelativePath="..\..\src\periodic_event_info.cpp"
+ RelativePath="..\..\src\device_attribute_history.cpp"
>
</File>
<File
- RelativePath="..\..\src\poll_device.cpp"
+ RelativePath="..\..\src\server\device_class.cpp"
>
</File>
<File
- RelativePath="..\..\src\precompiled_header.cpp"
+ RelativePath="..\..\src\device_data.cpp"
>
</File>
<File
- RelativePath="..\..\src\pytango.cpp"
+ RelativePath="..\..\src\device_data_history.cpp"
>
</File>
<File
- RelativePath="..\..\src\pytgutils.cpp"
+ RelativePath="..\..\src\server\device_impl.cpp"
>
</File>
<File
- RelativePath="..\..\src\pyutils.cpp"
+ RelativePath="..\..\src\device_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\subdev.cpp"
+ RelativePath="..\..\src\device_proxy.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\tango_util.cpp"
+ RelativePath="..\..\src\server\dserver.cpp"
>
</File>
<File
- RelativePath="..\..\src\time_val.cpp"
+ RelativePath="..\..\src\server\encoded_attribute.cpp"
>
</File>
<File
- RelativePath="..\..\src\to_py.cpp"
+ RelativePath="..\..\src\enums.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\user_default_attr_prop.cpp"
+ RelativePath="..\..\src\event_data.cpp"
>
</File>
<File
- RelativePath="..\..\src\version.cpp"
+ RelativePath="..\..\src\exception.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\wattribute.cpp"
+ RelativePath="..\..\src\from_py.cpp"
>
</File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
<File
- RelativePath="..\..\src\server\attr.h"
+ RelativePath="..\..\src\group.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\attribute.h"
+ RelativePath="..\..\src\group_element.cpp"
>
</File>
<File
- RelativePath="..\..\src\base_types_numpy.hpp"
+ RelativePath="..\..\src\group_reply.cpp"
>
</File>
<File
- RelativePath="..\..\src\callback.h"
+ RelativePath="..\..\src\group_reply_list.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\command.h"
+ RelativePath="..\..\src\locker_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\defs.h"
+ RelativePath="..\..\src\locking_thread.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_attribute.h"
+ RelativePath="..\..\src\server\log4tango.cpp"
>
</File>
<File
- RelativePath="..\..\src\device_attribute_numpy.hpp"
+ RelativePath="..\..\src\server\multi_attribute.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\device_class.h"
+ RelativePath="..\..\src\server\multi_class_attribute.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\device_impl.h"
+ RelativePath="..\..\src\periodic_event_info.cpp"
>
</File>
<File
- RelativePath="..\..\src\exception.h"
+ RelativePath="..\..\src\poll_device.cpp"
>
</File>
<File
- RelativePath="..\..\src\fast_from_py.h"
+ RelativePath="..\..\src\precompiled_header.cpp"
>
</File>
<File
- RelativePath="..\..\src\fast_from_py_numpy.hpp"
+ RelativePath="..\..\src\pytango.cpp"
>
</File>
<File
- RelativePath="..\..\src\from_py.h"
+ RelativePath="..\..\src\pytgutils.cpp"
>
</File>
<File
- RelativePath="..\..\src\precompiled_header.hpp"
+ RelativePath="..\..\src\pyutils.cpp"
>
</File>
<File
- RelativePath="..\..\src\pytgutils.h"
+ RelativePath="..\..\src\server\subdev.cpp"
>
</File>
<File
- RelativePath="..\..\src\pyutils.h"
+ RelativePath="..\..\src\server\tango_util.cpp"
>
</File>
<File
- RelativePath="..\..\src\tango_numpy.h"
+ RelativePath="..\..\src\time_val.cpp"
>
</File>
<File
- RelativePath="..\..\src\tgutils.h"
+ RelativePath="..\..\src\to_py.cpp"
>
</File>
<File
- RelativePath="..\..\src\to_py.h"
+ RelativePath="..\..\src\server\user_default_attr_prop.cpp"
>
</File>
<File
- RelativePath="..\..\src\to_py_numpy.hpp"
+ RelativePath="..\..\src\version.cpp"
>
</File>
<File
- RelativePath="..\..\src\server\wattribute_numpy.hpp"
+ RelativePath="..\..\src\server\wattribute.cpp"
>
</File>
</Filter>
+ <File
+ RelativePath="..\..\winsetup.py"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/winsetup.py b/winsetup.py
index 2eb3228..71f80a2 100644
--- a/winsetup.py
+++ b/winsetup.py
@@ -43,10 +43,14 @@ setup_name = "setup.py"
bitmap = osp.join(winsetup_dir, 'doc', 'logo-medium.bmp')
ver = ".".join(map(str, sys.version_info[:2]))
-try:
+try:
+ cmd_line = '%s %s build_py --force --no-compile' % (executable, setup_name)
+ os.system(cmd_line)
+
cmd_line = '%s %s bdist_msi --skip-build --target-version=%s' \
% (executable, setup_name, ver)
os.system(cmd_line)
+
cmd_line = '%s %s bdist_wininst --skip-build --target-version=%s ' \
'--title="PyTango 7" ' \
'--bitmap="%s"' % (executable, setup_name, ver, bitmap)
--
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