[Mobies-commit] [commit] r3725 - in UDM/trunk/Projects/Win32/VC10/src: UdmCliBridge UdmCliSwig
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Wed May 11 11:54:08 CDT 2011
Author: ksmyth
Date: Wed May 11 11:54:08 2011
New Revision: 3725
Log:
Fix DllImport name
Modified:
UDM/trunk/Projects/Win32/VC10/src/UdmCliBridge/UdmCliBridgeProps.props
UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj.filters
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmCliBridge/UdmCliBridgeProps.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmCliBridge/UdmCliBridgeProps.props Wed May 11 11:52:45 2011 (r3724)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCliBridge/UdmCliBridgeProps.props Wed May 11 11:54:08 2011 (r3725)
@@ -3,6 +3,7 @@
<PropertyGroup Label="UserMacros">
<CliBridgeCppDir>$(MSBuildThisFileDirectory)\..\..\..\..\..\Build\Win32\VC10\Gen\src\UdmCliBridge\cpp</CliBridgeCppDir>
<CliBridgeCsDir>$(MSBuildThisFileDirectory)\..\..\..\..\..\Build\Win32\VC10\Gen\src\UdmCliBridge\cs</CliBridgeCsDir>
+ <UdmCliBridgeDll>UdmCliBridge.dll</UdmCliBridgeDll>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -25,5 +26,9 @@
<BuildMacro Include="CliBridgeCsDir">
<Value>$(CliBridgeCsDir)</Value>
</BuildMacro>
+ <BuildMacro Include="UdmCliBridgeDll">
+ <Value>$(UdmCliBridgeDll)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj Wed May 11 11:52:45 2011 (r3724)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj Wed May 11 11:54:08 2011 (r3725)
@@ -81,7 +81,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -94,7 +94,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -119,7 +119,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -132,7 +132,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -152,7 +152,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -165,7 +165,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -184,7 +184,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -197,7 +197,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -216,7 +216,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -229,7 +229,7 @@
"$(SWIG_EXE)" ^
-csharp ^
-namespace "Udm.Native.%(Filename)" ^
--dllimport "$(TargetFileName)" ^
+-dllimport "$(UdmCliBridgeDll)" ^
-outdir "$(CliBridgeCsDir)\%(Filename)" ^
-c++ ^
-o "%(Filename)"_wrap.cpp ^
@@ -255,5 +255,7 @@
<Target Name="BuildUdmCli">
<Message Importance="high" Text="Building UdmCli $(Configuration)" />
<MSBuild Projects="$(MSBuildThisFileDirectory)\..\UdmCli\UdmCli.csproj" Properties="Configuration=$(Configuration);Platform=AnyCpu" />
+ <Exec Command="gacutil /i "$(OutDir)\UdmCli.dll" /f /nologo" StandardErrorImportance="High"/>
+ <Exec Command="gacutil /l UdmCli /nologo" StandardErrorImportance="High" StandardOutputImportance="High"/>
</Target>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj.filters Wed May 11 11:52:45 2011 (r3724)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCliSwig/UdmCliSwig.vcxproj.filters Wed May 11 11:54:08 2011 (r3725)
@@ -3,11 +3,6 @@
<ItemGroup>
<None Include="..\..\..\..\..\include\UdmCli.i" />
<None Include="..\..\..\..\..\include\UdmException.i" />
- <None Include="$(CliBridgeCsDir)\Udm\Udm.cs" />
- <None Include="$(CliBridgeCsDir)\Uml\Uml.cs" />
- <None Include="$(CliBridgeCsDir)\UdmGme\UdmGme.cs" />
- <None Include="$(CliBridgeCsDir)\UdmDom\UdmDom.cs" />
- <None Include="$(CliBridgeCsDir)\UdmStatic\UdmStatic.cs" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\include\Udm.i" />
@@ -15,5 +10,10 @@
<CustomBuild Include="..\..\..\..\..\include\UdmGme.i" />
<CustomBuild Include="..\..\..\..\..\include\UdmStatic.i" />
<CustomBuild Include="..\..\..\..\..\include\Uml.i" />
+ <CustomBuild Include="$(CliBridgeCsDir)\Udm\Udm.cs" />
+ <CustomBuild Include="$(CliBridgeCsDir)\Uml\Uml.cs" />
+ <CustomBuild Include="$(CliBridgeCsDir)\UdmGme\UdmGme.cs" />
+ <CustomBuild Include="$(CliBridgeCsDir)\UdmDom\UdmDom.cs" />
+ <CustomBuild Include="$(CliBridgeCsDir)\UdmStatic\UdmStatic.cs" />
</ItemGroup>
</Project>
\ No newline at end of file
More information about the Mobies-commit
mailing list