[pywin32-checkins] /hgroot/pywin32/pywin32: Compile message files first (bug #36121...

[<pyw...@li...>]

changeset 4ded0a838f8c in /hgroot/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgroot/pywin32/pywin32?cmd=changeset;node=4ded0a838f8c
summary: Compile message files first (bug #3612178, patch from Tim Golden)

diffstat:

 setup.py |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 083fadd62226 -r 4ded0a838f8c setup.py
--- a/setup.py	Fri Apr 19 03:16:23 2013 -0400
+++ b/setup.py	Mon Apr 29 10:01:40 2013 -0400
@@ -91,7 +91,12 @@
 from distutils.command.build_py import build_py
 from distutils.command.build_scripts import build_scripts
 
-from distutils.command.bdist_msi import bdist_msi
+try:
+    from distutils.command.bdist_msi import bdist_msi
+except ImportError:
+    # py24 and earlier
+    bdist_msi = None
+
 from distutils.msvccompiler import get_build_version
 from distutils import log
 
@@ -1538,8 +1543,8 @@
 win32_extensions.append(
     WinExt_win32("perfmondata",
         sources=[
+            "win32/src/PerfMon/PyPerfMsgs.mc",
             "win32/src/PerfMon/perfmondata.cpp",
-            "win32/src/PerfMon/PyPerfMsgs.mc",
             ],
         libraries="advapi32",
         unicode_mode=True,
@@ -1674,7 +1679,7 @@
 ]
 win32_extensions += [
     WinExt_win32('servicemanager',
-           sources = ["win32/src/PythonService.cpp", "win32/src/PythonServiceMessages.mc"],
+           sources = ["win32/src/PythonServiceMessages.mc", "win32/src/PythonService.cpp"],
            extra_compile_args = ['-DPYSERVICE_BUILD_DLL'],
            libraries = "user32 ole32 advapi32 shell32",
            windows_h_version = 0x500,