[Mobies-commit] [commit] r3801 - in UDM/trunk: InnoSetup Projects/Win32/VC10/src/UdmPython

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Wed Jul 27 15:28:13 2011
New Revision: 3801

Log:
udm.pyd in bin has priority over udm.py; remove it

Modified:
   UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
   UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj

Modified: UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
==============================================================================
--- UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Wed Jul 27 13:17:38 2011	(r3800)
+++ UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Wed Jul 27 15:28:13 2011	(r3801)
@@ -60,6 +60,9 @@
 Name: System; Description: Register Environment Variables System-Wide (recommended); Types: Typical Full
 Name: Full3rdParty; Description: Full 3rdParty Package (deprecated); Types: Full
 
+[InstallDelete]
+Type: files; Name: "{app}\bin\udm.pyd"
+
 [Files]
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 ;Udm Root folder
@@ -84,11 +87,11 @@
 Source: {#UDM3rdPartyPath}\zlib\zlibD.lib; DestDir: {app}\3rdparty\zlib; Components: Full3rdParty; Flags: ignoreversion
 ;Udm bin folder
 Source: {#UDM3rdPartyPath}\xerces-c_2_8_0\bin\xerces-c_2_8.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
-Source: {#UDM3rdPartyPath}\xerces-c_2_8_0\bin\xerces-c_2_8D.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
+Source: {#UDM3rdPartyPath}\xerces-c_2_8_0\bin\xerces-c_2_8D.dll; DestDir: {app}\bin; Components: Full3rdParty; Flags: ignoreversion
 Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\bin\Xalan-C_1_11.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
-Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\bin\Xalan-C_1_11D.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
+Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\bin\Xalan-C_1_11D.dll; DestDir: {app}\bin; Components: Full3rdParty; Flags: ignoreversion
 Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\bin\XalanMessages_1_11.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
-Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\bin\XalanMessages_1_11D.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
+Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\bin\XalanMessages_1_11D.dll; DestDir: {app}\bin; Components: Full3rdParty; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC9\Release\{#UDMDLL}; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC9\Debug\{#UDMDLLD}; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC9\Release\GmeOclExprChecker.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion regserver

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj	Wed Jul 27 13:17:38 2011	(r3800)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj	Wed Jul 27 15:28:13 2011	(r3801)
@@ -68,11 +68,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$([System.IO.Path]::GetFullPath($(UDM_PATH)\bin\Python$(PYTHON_VERSION)))\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CustomBuildStep>
-      <Message>Copying $(TargetFileName) to bin\</Message>
-      <Command>copy /y "$(TargetPath)"  "$(UDM_PATH)"\bin</Command>
-      <Outputs>$(UDM_PATH)\bin\$(TargetFileName);%(Outputs)</Outputs>
-    </CustomBuildStep>
+    <CustomBuildStep />
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;UDM_PY_MODULE_NAME=$(TargetName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -92,11 +88,7 @@
     <PostBuildEvent />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CustomBuildStep>
-      <Message>Copying $(TargetFileName) to bin\</Message>
-      <Command>copy /y "$(TargetPath)"  "$(UDM_PATH)"\bin</Command>
-      <Outputs>$(UDM_PATH)\bin\$(TargetFileName);%(Outputs)</Outputs>
-    </CustomBuildStep>
+    <CustomBuildStep />
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -120,11 +112,7 @@
     <PostBuildEvent />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release27|Win32'">
-    <CustomBuildStep>
-      <Message>Copying $(TargetFileName) to bin\</Message>
-      <Command>copy /y "$(TargetPath)"  "$(UDM_PATH)"\bin</Command>
-      <Outputs>$(UDM_PATH)\bin\$(TargetFileName);%(Outputs)</Outputs>
-    </CustomBuildStep>
+    <CustomBuildStep />
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>