[mapguide-commits] r9714 - in trunk/MgDev: . Web Web/src/DevHttpServer
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Aug 14 05:07:34 PDT 2020
Author: jng
Date: 2020-08-14 05:07:34 -0700 (Fri, 14 Aug 2020)
New Revision: 9714
Added:
trunk/MgDev/Web/src/DevHttpServer/postbuild.bat
Modified:
trunk/MgDev/Web/
trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj
trunk/MgDev/build.bat
Log:
#2811: Change the output directory for MgDevHttpServer so that its binaries don't get caught up in webtier xcopy invocations
Index: trunk/MgDev/Web
===================================================================
--- trunk/MgDev/Web 2020-08-14 10:41:32 UTC (rev 9713)
+++ trunk/MgDev/Web 2020-08-14 12:07:34 UTC (rev 9714)
Property changes on: trunk/MgDev/Web
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
+DevHttpServer
bin
lib
obj
Modified: trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj 2020-08-14 10:41:32 UTC (rev 9713)
+++ trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj 2020-08-14 12:07:34 UTC (rev 9714)
@@ -62,16 +62,16 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Configuration)\DevHttpServer\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\DevHttpServer\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\obj\$(Configuration)\DevHttpServer\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\$(Configuration)64\DevHttpServer\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\DevHttpServer\$(Configuration)64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\obj\$(Configuration)64\DevHttpServer\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Configuration)\DevHttpServer\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\DevHttpServer\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\obj\$(Configuration)\DevHttpServer\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\$(Configuration)64\DevHttpServer\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\DevHttpServer\$(Configuration)64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\obj\$(Configuration)64\DevHttpServer\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -116,21 +116,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>IF NOT EXIST "$(TargetDir)Resources" mkdir "$(TargetDir)Resources"
-echo Copy mapguide_en.res
-xcopy /r /d /y "$(ProjectDir)..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" "$(TargetDir)Resources"
-echo Copy webconfig.ini
-xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
-echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
-echo Copy viewer asset files
-IF NOT EXIST "$(TargetDir)wwwroot\viewerfiles" mkdir "$(TargetDir)wwwroot\mapagent\viewerfiles"
-xcopy /r /d /y "$(SolutionDir)viewerfiles\*.*" "$(TargetDir)wwwroot\viewerfiles"
-echo Copy web tier dlls
-xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
-echo Copy web tier pdbs
-xcopy /r /d /y "$(TargetDir)..\*.pdb" "$(TargetDir)"</Command>
+ <Command>call postbuild.bat "$(TargetDir)" "$(ProjectDir)" "$(Configuration)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -158,21 +144,7 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>IF NOT EXIST "$(TargetDir)Resources" mkdir "$(TargetDir)Resources"
-echo Copy mapguide_en.res
-xcopy /r /d /y "$(ProjectDir)..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" "$(TargetDir)Resources"
-echo Copy webconfig.ini
-xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
-echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
-echo Copy viewer asset files
-IF NOT EXIST "$(TargetDir)wwwroot\viewerfiles" mkdir "$(TargetDir)wwwroot\viewerfiles"
-xcopy /r /d /y "$(SolutionDir)viewerfiles\*.*" "$(TargetDir)wwwroot\viewerfiles"
-echo Copy web tier dlls
-xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
-echo Copy web tier pdbs
-xcopy /r /d /y "$(TargetDir)..\*.pdb" "$(TargetDir)"</Command>
+ <Command>call postbuild.bat "$(TargetDir)" "$(ProjectDir)" "$(Configuration)64"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -201,21 +173,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>IF NOT EXIST "$(TargetDir)Resources" mkdir "$(TargetDir)Resources"
-echo Copy mapguide_en.res
-xcopy /r /d /y "$(ProjectDir)..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" "$(TargetDir)Resources"
-echo Copy webconfig.ini
-xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
-echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
-echo Copy viewer asset files
-IF NOT EXIST "$(TargetDir)wwwroot\viewerfiles" mkdir "$(TargetDir)wwwroot\mapagent\viewerfiles"
-xcopy /r /d /y "$(SolutionDir)viewerfiles\*.*" "$(TargetDir)wwwroot\viewerfiles"
-echo Copy web tier dlls
-xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
-echo Copy web tier pdbs
-xcopy /r /d /y "$(TargetDir)..\*.pdb" "$(TargetDir)"</Command>
+ <Command>call postbuild.bat "$(TargetDir)" "$(ProjectDir)" "$(Configuration)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -244,21 +202,7 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>IF NOT EXIST "$(TargetDir)Resources" mkdir "$(TargetDir)Resources"
-echo Copy mapguide_en.res
-xcopy /r /d /y "$(ProjectDir)..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" "$(TargetDir)Resources"
-echo Copy webconfig.ini
-xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
-echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
-echo Copy viewer asset files
-IF NOT EXIST "$(TargetDir)wwwroot\viewerfiles" mkdir "$(TargetDir)wwwroot\mapagent\viewerfiles"
-xcopy /r /d /y "$(SolutionDir)viewerfiles\*.*" "$(TargetDir)wwwroot\viewerfiles"
-echo Copy web tier dlls
-xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
-echo Copy web tier pdbs
-xcopy /r /d /y "$(TargetDir)..\*.pdb" "$(TargetDir)"</Command>
+ <Command>call postbuild.bat "$(TargetDir)" "$(ProjectDir)" "$(Configuration)64"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Added: trunk/MgDev/Web/src/DevHttpServer/postbuild.bat
===================================================================
--- trunk/MgDev/Web/src/DevHttpServer/postbuild.bat (rev 0)
+++ trunk/MgDev/Web/src/DevHttpServer/postbuild.bat 2020-08-14 12:07:34 UTC (rev 9714)
@@ -0,0 +1,27 @@
+SET TARGET_DIR=%1
+SET PROJECT_DIR=%2
+SET TYPE_BUILD=%3
+
+IF NOT EXIST "%TARGET_DIR%Resources" mkdir "%TARGET_DIR%Resources"
+echo Copy mapguide_en.res
+xcopy /r /d /y "%PROJECT_DIR%..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" "%TARGET_DIR%Resources"
+echo Copy webconfig.ini
+xcopy /r /d /y "%TARGET_DIR%..\..\src\webconfig.ini" "%TARGET_DIR%"
+echo Copy mapagent test pages
+IF NOT EXIST "%TARGET_DIR%wwwroot\mapagent" mkdir "%TARGET_DIR%wwwroot\mapagent"
+xcopy /r /d /y "%PROJECT_DIR%..\..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "%TARGET_DIR%wwwroot\mapagent"
+echo Copy viewer asset files
+IF NOT EXIST "%TARGET_DIR%wwwroot\viewerfiles" mkdir "%TARGET_DIR%wwwroot\viewerfiles"
+copy /y "%TARGET_DIR%..\..\src\viewerfiles\*.*" "%TARGET_DIR%wwwroot\viewerfiles"
+echo Copy web tier dlls
+copy /y "%TARGET_DIR%..\..\bin\%TYPE_BUILD%\Mg*.dll" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\bin\%TYPE_BUILD%\ACE*.*" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\bin\%TYPE_BUILD%\GEOS*.*" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\bin\%TYPE_BUILD%\lib_json*.*" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\bin\%TYPE_BUILD%\xerces-c_3_1mg*.*" "%TARGET_DIR%"
+echo Copy web tier pdbs
+copy /y "%TARGET_DIR%..\..\..\Common\bin\%TYPE_BUILD%\Mg*.pdb" "%TARGET_DIR%"
+echo Copy common dlls
+copy /y "%TARGET_DIR%..\..\..\Common\bin\%TYPE_BUILD%\Mg*.dll" "%TARGET_DIR%"
+echo Copy common pdbs
+copy /y "%TARGET_DIR%..\..\..\Common\bin\%TYPE_BUILD%\Mg*.pdb" "%TARGET_DIR%"
\ No newline at end of file
Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat 2020-08-14 10:41:32 UTC (rev 9713)
+++ trunk/MgDev/build.bat 2020-08-14 12:07:34 UTC (rev 9714)
@@ -342,12 +342,8 @@
%XCOPY% "%MG_OEM%\fusionMG" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
echo [install]: Web Tier - MgDevHttpServer
if not exist "%MG_OUTPUT_WEB%\DevHttpServer" mkdir "%MG_OUTPUT_WEB%\DevHttpServer"
-copy /Y "%MG_WEB_BIN%\%TYPEBUILD%\Mg*.dll" "%MG_OUTPUT_WEB%\DevHttpServer"
-copy /Y "%MG_WEB_BIN%\%TYPEBUILD%\ACE.dll" "%MG_OUTPUT_WEB%\DevHttpServer"
-copy /Y "%MG_WEB_BIN%\%TYPEBUILD%\GEOS.dll" "%MG_OUTPUT_WEB%\DevHttpServer"
-copy /Y "%MG_WEB_BIN%\%TYPEBUILD%\lib_json.dll" "%MG_OUTPUT_WEB%\DevHttpServer"
-copy /Y "%MG_WEB_BIN%\%TYPEBUILD%\xerces-c_3_1mg.dll" "%MG_OUTPUT_WEB%\DevHttpServer"
-copy /Y "%MG_WEB_BIN%\%TYPEBUILD%\DevHttpServer\*.exe" "%MG_OUTPUT_WEB%\DevHttpServer"
+copy /Y "%MG_WEB%\DevHttpServer\%TYPEBUILD%\*.dll" "%MG_OUTPUT_WEB%\DevHttpServer"
+copy /Y "%MG_WEB%\DevHttpServer\%TYPEBUILD%\*.exe" "%MG_OUTPUT_WEB%\DevHttpServer"
echo [install]: Web Tier - Apache module
if not exist "%MG_OUTPUT_WEB%\Apache24\modules" mkdir "%MG_OUTPUT_WEB%\Apache24\modules"
%XCOPY% /F "%MG_BUILD_MAPAGENT%" "%MG_OUTPUT_WEB%\Apache24\modules"
More information about the mapguide-commits
mailing list