[mapguide-commits] r8143 - in branches/2.6/MgDev/UnitTest/WebTier/DotNet: . MgTestRunner TestCommon TestMapGuideApi
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed May 21 01:20:37 PDT 2014
Author: jng
Date: 2014-05-21 01:20:37 -0700 (Wed, 21 May 2014)
New Revision: 8143
Added:
branches/2.6/MgDev/UnitTest/WebTier/DotNet/prebuild.bat
Modified:
branches/2.6/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj
branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestCommon/TestCommon.csproj
branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/TestMapGuideApi.csproj
Log:
Improve the build set up for the DotNet test runner
Modified: branches/2.6/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj
===================================================================
--- branches/2.6/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj 2014-05-21 07:34:44 UTC (rev 8142)
+++ branches/2.6/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj 2014-05-21 08:20:37 UTC (rev 8143)
@@ -23,7 +23,7 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <OutputPath>bin\x64\Release\</OutputPath>
+ <OutputPath>..\..\DotNet_x64\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -45,7 +45,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <OutputPath>bin\x86\Release\</OutputPath>
+ <OutputPath>..\..\DotNet_x86\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -53,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Foundation">
@@ -98,8 +99,11 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)Libs\*.*" "$(TargetDir)"
-xcopy /S /Y /I ..\..\..\Web\src\mapagent\Resources "$(TargetDir)\Resources"</PostBuildEvent>
+xcopy /S /Y /I $(SolutionDir)..\..\..\Web\src\mapagent\Resources "$(TargetDir)\Resources"</PostBuildEvent>
</PropertyGroup>
+ <PropertyGroup>
+ <PreBuildEvent>call "$(SolutionDir)prebuild.bat" "$(ConfigurationName)" "$(PlatformName)"</PreBuildEvent>
+ </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Modified: branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestCommon/TestCommon.csproj
===================================================================
--- branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestCommon/TestCommon.csproj 2014-05-21 07:34:44 UTC (rev 8142)
+++ branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestCommon/TestCommon.csproj 2014-05-21 08:20:37 UTC (rev 8143)
@@ -47,6 +47,7 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Foundation">
@@ -91,6 +92,9 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>call "$(SolutionDir)prebuild.bat" "$(ConfigurationName)" "$(PlatformName)"</PreBuildEvent>
+ </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Modified: branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/TestMapGuideApi.csproj
===================================================================
--- branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/TestMapGuideApi.csproj 2014-05-21 07:34:44 UTC (rev 8142)
+++ branches/2.6/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/TestMapGuideApi.csproj 2014-05-21 08:20:37 UTC (rev 8143)
@@ -47,6 +47,7 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Foundation">
@@ -97,6 +98,9 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>call "$(SolutionDir)prebuild.bat" "$(ConfigurationName)" "$(PlatformName)"</PreBuildEvent>
+ </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Added: branches/2.6/MgDev/UnitTest/WebTier/DotNet/prebuild.bat
===================================================================
--- branches/2.6/MgDev/UnitTest/WebTier/DotNet/prebuild.bat (rev 0)
+++ branches/2.6/MgDev/UnitTest/WebTier/DotNet/prebuild.bat 2014-05-21 08:20:37 UTC (rev 8143)
@@ -0,0 +1,36 @@
+ at echo off
+SET SLN_DIR=%~dp0
+SET CFG=%1
+SET PLAT=%2
+echo Solution Dir: %SLN_DIR%
+echo Configuration: %CFG%
+echo Platform: %PLAT%
+if not exist "%SLN_DIR%Libs\" (
+ echo Libs dir does not exist. Creating it
+ pushd %SLN_DIR%
+ mkdir Libs
+ popd
+ goto copy
+)
+if not exist "%SLN_DIR%Libs\SqliteDotNet.dll" goto copy
+if not exist "%SLN_DIR%Libs\OSGeo.MapGuide.Foundation.dll" goto copy
+if not exist "%SLN_DIR%Libs\OSGeo.MapGuide.Geometry.dll" goto copy
+if not exist "%SLN_DIR%Libs\OSGeo.MapGuide.PlatformBase.dll" goto copy
+if not exist "%SLN_DIR%Libs\OSGeo.MapGuide.MapGuideCommon.dll" goto copy
+if not exist "%SLN_DIR%Libs\OSGeo.MapGuide.Web.dll" goto copy
+echo Files already exist. Nothing to do
+goto done
+
+:copy
+if "%PLAT%"=="x64" (
+ echo Copying x64 binaries from %SLN_DIR%..\..\..\Web\bin\%CFG%64
+ copy /Y %SLN_DIR%..\..\..\Web\bin\%CFG%64\*.* "%SLN_DIR%Libs\"
+ echo Copying x64 SqliteDotNet.dll
+ copy /Y %SLN_DIR%..\..\..\Oem\SQLite\bin\%CFG%64\SqliteDotNet.dll "%SLN_DIR%Libs\"
+) else (
+ echo Copying x86 binaries from %SLN_DIR%..\..\..\Web\bin\%CFG%
+ copy /Y %SLN_DIR%..\..\..\Web\bin\%CFG%\*.* "%SLN_DIR%Libs\"
+ echo Copying x86 SqliteDotNet.dll
+ copy /Y %SLN_DIR%..\..\..\Oem\SQLite\bin\%CFG%\SqliteDotNet.dll "%SLN_DIR%Libs\"
+)
+:done
\ No newline at end of file
More information about the mapguide-commits
mailing list