[pytango] 81/483: final fix to make compilation work in VS 2005

[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 6a3831c078dd9fe72553c382a4f1f2ab5bdb46b1
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Mon Dec 12 10:17:04 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@18625 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 setup.cfg   | 13 +++++----
 winsetup.py | 95 ++++++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a3a27d6..e3553ad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,7 @@
-[bdist_msi]
-skip_build=True
-
-[bdist_wininst]
-skip_build=True
-
+[bdist_msi]
+skip_build=True
+
+[bdist_wininst]
+skip_build=True
+title=PyTango 7
+bitmap=doc\logo-medium.bmp
diff --git a/winsetup.py b/winsetup.py
index 15268fb..2eb3228 100644
--- a/winsetup.py
+++ b/winsetup.py
@@ -1,43 +1,60 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
+
+################################################################################
+##
+## This file is part of PyTango, a python binding for Tango
+## 
+## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
+##
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+## 
+## PyTango is free software: you can redistribute it and/or modify
+## it under the terms of the GNU Lesser General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+## 
+## PyTango is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU Lesser General Public License for more details.
+## 
+## You should have received a copy of the GNU Lesser General Public License
+## along with PyTango.  If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
 
 ################################################################################
-##
-## This file is part of PyTango, a python binding for Tango
-## 
-## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
-##
-## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
-## 
-## PyTango is free software: you can redistribute it and/or modify
-## it under the terms of the GNU Lesser General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-## 
-## PyTango is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU Lesser General Public License for more details.
-## 
-## You should have received a copy of the GNU Lesser General Public License
-## along with PyTango.  If not, see <http://www.gnu.org/licenses/>.
-##
+# WARNING: This script should only be executed as a Post-Build Event from inside
+#          Microsoft Visual Studio and not from the command line
 ################################################################################
 
-import sys
-import os
-import os.path as osp
-
-executable = sys.executable
-
-curr_dir = os.getcwd()
-
-winsetup_dir = osp.dirname(osp.abspath(__file__))
-os.chdir(winsetup_dir)
-setup_name = "setup.py"
-
-try:
-    cmd_line = "%s %s bdist_msi --skip-build" % (executable, setup_name)
-    print "Starting '%s'..." % cmd_line
-    os.system(cmd_line)
-finally:
-    os.chdir(curr_dir)
+
+import sys
+import os
+import os.path as osp
+
+executable = sys.executable
+
+curr_dir = os.getcwd()
+
+winsetup_dir = osp.dirname(osp.abspath(__file__))
+os.chdir(winsetup_dir)
+setup_name = "setup.py"
+bitmap = osp.join(winsetup_dir, 'doc', 'logo-medium.bmp')
+ver = ".".join(map(str, sys.version_info[:2]))
+
+try:
+    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)
+    os.system(cmd_line)
+except:
+    print "Failed:"
+    import traceback
+    traceback.print_exc()
+    sys.exit(1)
+finally:
+    os.chdir(curr_dir)

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