[Mobies-commit] [commit] r3760 - in UDM/trunk: InnoSetup src/UdmCliGen

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Jun 17 08:58:54 2011
New Revision: 3760

Log:
bundle_files=2=> dont bundle python26.dll, since boost_python needs to link with the real dll, not the memory-mapped dll

Modified:
   UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
   UDM/trunk/src/UdmCliGen/UdmCliGen-setup.py

Modified: UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
==============================================================================
--- UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Thu Jun 16 17:15:25 2011	(r3759)
+++ UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Fri Jun 17 08:58:54 2011	(r3760)
@@ -108,6 +108,7 @@
 Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCli.dll; DestDir: {app}\bin; StrongAssemblyName: "UdmCli, Version=3.2.8.0, Culture=neutral, PublicKeyToken=9b61694741cb5693, ProcessorArchitecture=x86"; Flags: "gacinstall sharedfile uninsnosharedfileprompt"; Components: CS
 Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCliBridge.dll; DestDir: {app}\bin; Components: CS; Flags: ignoreversion
 Source: {#UDMPATH}\src\UdmCliGen\dist\UdmCliGen.exe; DestDir: {app}\bin; Components: CS; Flags: ignoreversion
+Source: {#UDMPATH}\src\UdmCliGen\dist\python26.dll; DestDir: {app}\bin; Components: Python CS; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Release\udm.pyd; DestDir: {app}\bin; Components: Python CS; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Debug\udmd.pyd; DestDir: {app}\bin; Components: Python; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Release27\udm27.pyd; DestDir: {app}\bin; Components: Python; Flags: ignoreversion

Modified: UDM/trunk/src/UdmCliGen/UdmCliGen-setup.py
==============================================================================
--- UDM/trunk/src/UdmCliGen/UdmCliGen-setup.py	Thu Jun 16 17:15:25 2011	(r3759)
+++ UDM/trunk/src/UdmCliGen/UdmCliGen-setup.py	Fri Jun 17 08:58:54 2011	(r3760)
@@ -28,7 +28,7 @@
 options={"py2exe":{
                         "dll_excludes": ['w9xpopen.exe', 'UdmDll_3_2_VS10.dll', 'boost_python-vc100-mt-1_44.dll', 'xerces-c_2_8.dll'],
                         "excludes": ['udm'],
-                        "bundle_files": 1,
+                        "bundle_files": 2,
                         "includes": ["Cheetah.DummyTransaction"] + templates,
                 }
         },