[pytango] 155/483: Adapt to PyTango 8
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:35 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 b36401e114921d138330e8d0da3f6e11293932b9
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Mon Oct 8 15:57:22 2012 +0000
Adapt to PyTango 8
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@21229 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
win/PyTango_VS9/PyTango.sln | 20 ++--
win/PyTango_VS9/PyTango.vcproj | 220 ++++-------------------------------------
winsetup.py | 61 ++++++++++--
3 files changed, 77 insertions(+), 224 deletions(-)
diff --git a/win/PyTango_VS9/PyTango.sln b/win/PyTango_VS9/PyTango.sln
index e0c26ca..54767f7 100644
--- a/win/PyTango_VS9/PyTango.sln
+++ b/win/PyTango_VS9/PyTango.sln
@@ -1,24 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PyTango", "PyTango.vcproj", "{764A5ECE-11AE-4363-9A1C-573972A1BADD}"
EndProject
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
+ py2.6_bopy1.51.0_shared_release|Win32 = py2.6_bopy1.51.0_shared_release|Win32
+ py2.6_bopy1.51.0_static_release|Win32 = py2.6_bopy1.51.0_static_release|Win32
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|Win32
- {764A5ECE-11AE-4363-9A1C-573972A1BADD}.Release_Py27_boost147|x64.Build.0 = Release_Py27_boost147|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py2.6_bopy1.51.0_shared_release|Win32.ActiveCfg = py2.6_bopy1.51.0_shared_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py2.6_bopy1.51.0_shared_release|Win32.Build.0 = py2.6_bopy1.51.0_shared_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py2.6_bopy1.51.0_static_release|Win32.ActiveCfg = py2.6_bopy1.51.0_static_release|Win32
+ {764A5ECE-11AE-4363-9A1C-573972A1BADD}.py2.6_bopy1.51.0_static_release|Win32.Build.0 = py2.6_bopy1.51.0_static_release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win/PyTango_VS9/PyTango.vcproj b/win/PyTango_VS9/PyTango.vcproj
index f5be5ea..e602f4f 100644
--- a/win/PyTango_VS9/PyTango.vcproj
+++ b/win/PyTango_VS9/PyTango.vcproj
@@ -4,7 +4,7 @@
Version="9,00"
Name="PyTango"
ProjectGUID="{764A5ECE-11AE-4363-9A1C-573972A1BADD}"
- RootNamespace="PyTango_VS8"
+ RootNamespace="PyTango_VS9"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -20,9 +20,9 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Release_Py26_boost141|Win32"
- OutputDirectory="..\..\build\lib.$(PlatformName)-2.6\$(ProjectName)"
- IntermediateDirectory="..\..\build\temp.$(PlatformName)\python26\$(ConfigurationName)"
+ Name="py2.6_bopy1.51.0_shared_release|Win32"
+ OutputDirectory="$(ProjectDir)\..\..\build\lib.$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ProjectDir)\..\..\build\temp.$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -47,8 +47,8 @@
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\include;"C:\Python26\Lib\site-packages\numpy\core\include";"C:\Boost\include\boost-1_51";"C:\Program Files (x86)\tango\win32\include\vc9";"$(ProjectDir)\..\..\src\server";"$(ProjectDir)\..\..\src""
+ PreprocessorDefinitions="WIN32;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;BOOST_PYTHON_DYNAMIC_LIB"
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="1"
@@ -71,10 +71,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
+ AdditionalDependencies="tango.lib log4tango.lib COS4_rt.lib omniORB4_rt.lib omniDynamic4_rt.lib omnithread_rt.lib zmq.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 (x86)\tango\win32\lib\vc9_dll";C:\Boost\lib\release\shared\python26"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="2"
@@ -106,13 +106,13 @@
<Tool
Name="VCPostBuildEventTool"
Description="Starting setup.py bdist_msi"
- CommandLine="c:\python26\python $(SolutionDir)\..\..\winsetup.py"
+ CommandLine="c:\python26\python $(ProjectDir)..\..\winsetup.py $(ProjectDir)..\..\build\lib.$(ConfigurationName) $(ProjectDir)..\..\dist\$(ConfigurationName)"
/>
</Configuration>
<Configuration
- Name="Release_Py26_boost141|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="py2.6_bopy1.51.0_static_release|Win32"
+ OutputDirectory="$(ProjectDir)\..\..\build\lib.$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ProjectDir)\..\..\build\temp.$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -131,15 +131,14 @@
/>
<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"
+ AdditionalIncludeDirectories="C:\Python26\include;"C:\Python26\Lib\site-packages\numpy\core\include";"C:\Boost\include\boost-1_51";"C:\Program Files (x86)\tango\win32\include\vc9";"$(ProjectDir)\..\..\src\server";"$(ProjectDir)\..\..\src""
+ PreprocessorDefinitions="WIN32;NDEBUG;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;BOOST_PYTHON_STATIC_LIB"
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="1"
@@ -162,100 +161,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="tango.lib log4tango.lib omniORB414_rt.lib omniDynamic414_rt.lib omnithread34_rt.lib COS414_rt.lib"
+ AdditionalDependencies="tango.lib log4tango.lib COS4_rt.lib omniORB4_rt.lib omniDynamic4_rt.lib omnithread_rt.lib zmq.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="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Starting setup.py bdist_msi"
- 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""
+ AdditionalLibraryDirectories="C:\Python26\libs;"C:\Program Files (x86)\tango\win32\lib\vc9_dll";C:\Boost\lib\release\static\python26"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="2"
@@ -287,98 +196,7 @@
<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"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Starting setup.py bdist_msi"
- CommandLine="c:\python26\python $(SolutionDir)\..\..\winsetup.py"
+ CommandLine="c:\python26\python $(ProjectDir)..\..\winsetup.py $(ProjectDir)..\..\build\lib.$(ConfigurationName) $(ProjectDir)..\..\dist\$(ConfigurationName)"
/>
</Configuration>
</Configurations>
@@ -641,10 +459,6 @@
>
</File>
<File
- RelativePath="..\..\src\group_element.cpp"
- >
- </File>
- <File
RelativePath="..\..\src\group_reply.cpp"
>
</File>
diff --git a/winsetup.py b/winsetup.py
index 71f80a2..9b8e3a1 100644
--- a/winsetup.py
+++ b/winsetup.py
@@ -27,7 +27,8 @@
# WARNING: This script should only be executed as a Post-Build Event from inside
# Microsoft Visual Studio and not from the command line
################################################################################
-
+
+from __future__ import print_function
import sys
import os
@@ -43,22 +44,66 @@ setup_name = "setup.py"
bitmap = osp.join(winsetup_dir, 'doc', 'logo-medium.bmp')
ver = ".".join(map(str, sys.version_info[:2]))
+if len(sys.argv) < 3:
+ print("Need to supply build directory and distribution directory")
+ sys.exit(1)
+
+build_dir = sys.argv[1]
+dist_dir = sys.argv[2]
+
+try:
+ cmd_line = '%s %s ' % (executable, setup_name)
+ cmd_line += 'build_py --force --no-compile ' \
+ '--build-lib=%s ' \
+ % (build_dir,)
+ cmd_line += 'build_scripts --force '
+ cmd_line += 'install_lib --skip-build --build-dir=%s ' \
+ % (build_dir,)
+# cmd_line += 'install_scripts --skip-build --build-dir=%s ' \
+# % (build_dir,)
+ cmd_line += 'bdist_msi --skip-build --target-version=%s ' \
+ '--dist-dir=%s ' \
+ % (ver, dist_dir)
+ cmd_line += 'bdist_wininst --skip-build --target-version=%s ' \
+ '--dist-dir=%s ' \
+ '--title="PyTango 8" ' \
+ '--bitmap="%s" ' % (ver, dist_dir, bitmap)
+ os.system(cmd_line)
+except:
+ print("Failed:")
+ import traceback
+ traceback.print_exc()
+ sys.exit(1)
+finally:
+ os.chdir(curr_dir)
+
+sys.exit(0)
+
try:
- cmd_line = '%s %s build_py --force --no-compile' % (executable, setup_name)
+ cmd_line = '%s %s build_py --force --no-compile ' \
+ '--build-lib=%s' \
+ % (executable, setup_name, build_dir)
+ os.system(cmd_line)
+
+ cmd_line = '%s %s build_scripts --force' % (executable, setup_name)
os.system(cmd_line)
- cmd_line = '%s %s bdist_msi --skip-build --target-version=%s' \
- % (executable, setup_name, ver)
+ cmd_line = '%s %s bdist_msi --skip-build --target-version=%s ' \
+ '--dist-dir=%s' \
+ % (executable, setup_name, ver, dist_dir)
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)
+ cmd_line = '%s %s bdist_wininst --skip-build --target-version=%s ' \
+ '--dist-dir=%s ' \
+ '--title="PyTango 8" ' \
+ '--bitmap="%s"' % (executable, setup_name, ver, dist_dir, bitmap)
os.system(cmd_line)
except:
- print "Failed:"
+ print("Failed:")
import traceback
traceback.print_exc()
sys.exit(1)
finally:
os.chdir(curr_dir)
+
+sys.exit(0)
\ No newline at end of file
--
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