[pytango] 335/483: build in windows debug mode

[Sandor Bodo-Merle]

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 a34b4b5728829fa50131a1330bf2b5e1bf9f6be8
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Fri Nov 29 16:20:27 2013 +0000

    build in windows debug mode
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24447 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 setup.py                        | 17 +++++++++++++----
 win/PyTango_VS9/PyTango.vsprops | 14 ++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index d77114d..4e31d95 100644
--- a/setup.py
+++ b/setup.py
@@ -42,14 +42,19 @@ try:
         import IPython.genutils
         get_ipython_dir = IPython.genutils.get_ipython_dir
     _IPY_LOCAL = str(get_ipython_dir())
-except:
+except ImportError:
     IPython = None
 
 try:
     import numpy
-except:
+except ImportError:
     numpy = None
 
+try:
+    import py2exe
+except ImportError:
+    py2exe = None
+    
 is64 = 8 * struct.calcsize("P") == 64
 
 
@@ -485,7 +490,7 @@ def main():
     if sphinx:
         cmdclass['build_doc'] = build_doc
 
-    dist = setup(
+    opts = dict(
         name='PyTango',
         version=Release.version,
         description=Release.description,
@@ -509,7 +514,11 @@ def main():
         ext_package='PyTango',
         ext_modules=[_pytango],
         cmdclass=cmdclass)
-
+    
+    if py2exe:
+        opts['console'] = get_script_files()
+    
+    dist = setup(**opts)
     return dist
 
 if __name__ == "__main__":
diff --git a/win/PyTango_VS9/PyTango.vsprops b/win/PyTango_VS9/PyTango.vsprops
index 182e1b4..63ef9b4 100644
--- a/win/PyTango_VS9/PyTango.vsprops
+++ b/win/PyTango_VS9/PyTango.vsprops
@@ -91,7 +91,7 @@
     />
 
     <UserMacro Name="PyTangoBaseFile" Value="_PyTango" />
-
+	
     <UserMacro Name="TangoMajorVer" Value="8" />
     <UserMacro Name="TangoMinorVer" Value="1" />
     <UserMacro Name="TangoPatchVer" Value="2" />
@@ -106,9 +106,10 @@
     <UserMacro Name="BoostMinorVer" Value="53" />
     <UserMacro Name="BoostPatchVer" Value="0" />
     <UserMacro Name="BoostVer" Value="$(BoostMajorVer).$(BoostMinorVer).$(BoostPatchVer)" />
-
-    <UserMacro Name="TangoBaseDir" Value="C:\tango-$(TangoVer)" />
-    <UserMacro Name="BoostBaseDir" Value="C:\boost-$(BoostVer)" />
+	
+	<UserMacro Name="RootDir" Value="C:\Users\coutinho\bin" />
+    <UserMacro Name="TangoBaseDir" Value="$(RootDir)\tango-$(TangoVer)" />
+    <UserMacro Name="BoostBaseDir" Value="$(RootDir)\boost-$(BoostVer)" />
     <UserMacro Name="PythonBaseDir" Value="C:\Python" />
 
     <UserMacro Name="VCMajorVer" Value="9" />
@@ -122,8 +123,9 @@
 
     <UserMacro Name="TangoIncludeDir" Value="$(TangoBaseDir)\$(PlatformName)\include\vc$(VCMajorVer)" />
     <UserMacro Name="TangoLibDir" Value="$(TangoBaseDir)\$(PlatformName)\lib" />
+	<UserMacro Name="TangoLibDir_Debug" Value="$(TangoBaseDir)\$(PlatformName)\lib" />
 
-    <UserMacro Name="PythonDir" Value="C:\Python\$(PlatformName)" />
+    <UserMacro Name="PythonDir" Value="$(PythonBaseDir)\$(PlatformName)" />
     <UserMacro Name="NumpyRelativeIncludeDir" Value="Lib\site-packages\numpy\core\include" />
 
     <!-- Internal: DO NOT CHANGE -->
@@ -132,7 +134,7 @@
     <UserMacro Name="BaseDir" Value="$(ProjectDir)..\.." />
     <UserMacro Name="RelPrefixDir" Value="$(ConfigurationName)_$(PlatformName)_msvc$(VCVer)" />
 
-    <UserMacro Name="BaseBuildDir" Value="c:\temp\pytango\build_$(PyTangoVer)_tg$(TangoVer)_boost$(BoostVer)" />
+    <UserMacro Name="BaseBuildDir" Value="$(RootDir)\pytango\build_$(PyTangoVer)_tg$(TangoVer)_boost$(BoostVer)" />
     <UserMacro Name="BaseBuildLibDir" Value="$(BaseBuildDir)\lib" />
     <UserMacro Name="BaseTempDir" Value="$(BaseBuildDir)\temp" />
     <UserMacro Name="BaseDistDir" Value="$(BaseBuildDir)\dist" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git