[mapguide-commits] r9994 - in trunk/MgDev: . Web/src/DevHttpServer

[svn_mapguide at osgeo.org]

Author: jng
Date: 2022-10-26 05:03:08 -0700 (Wed, 26 Oct 2022)
New Revision: 9994

Modified:
   trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj
   trunk/MgDev/Web/src/DevHttpServer/postbuild.bat
   trunk/MgDev/build.bat
Log:
#2852: Have MgDevHttpServer build to the same WebTier bin directory as other web tier targets. Fix up its postbuild.bat to copy required thirdparty dlls from their source locations. Fix up root build.bat to copy MgDevHttpServer binaries from the correct source location.

Modified: trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj	2022-10-24 11:24:44 UTC (rev 9993)
+++ trunk/MgDev/Web/src/DevHttpServer/DevHttpServer.vcxproj	2022-10-26 12:03:08 UTC (rev 9994)
@@ -62,16 +62,16 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\DevHttpServer\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(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'">..\..\DevHttpServer\$(Configuration)64\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\$(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'">..\..\DevHttpServer\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(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'">..\..\DevHttpServer\$(Configuration)64\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\$(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>

Modified: trunk/MgDev/Web/src/DevHttpServer/postbuild.bat
===================================================================
--- trunk/MgDev/Web/src/DevHttpServer/postbuild.bat	2022-10-24 11:24:44 UTC (rev 9993)
+++ trunk/MgDev/Web/src/DevHttpServer/postbuild.bat	2022-10-26 12:03:08 UTC (rev 9994)
@@ -2,6 +2,15 @@
 SET PROJECT_DIR=%2
 SET TYPE_BUILD=%3
 
+SET LIBDIR=lib64
+SET CONFDIR=Release
+
+if "%TYPE_BUILD%" == "Debug64" (
+  SET CONFDIR=Debug
+)
+
+echo Copying to %TARGET_DIR%
+
 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"
@@ -15,10 +24,14 @@
 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%"
+copy /y "%TARGET_DIR%..\..\..\Oem\ACE\ACE_Wrappers\%LIBDIR%\%CONFDIR%\ACE*.dll" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\..\Oem\ACE\ACE_Wrappers\%LIBDIR%\%CONFDIR%\ACE*.pdb" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\..\Oem\geos\VisualStudio\%TYPE_BUILD%\GEOS*.dll" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\..\Oem\geos\VisualStudio\%TYPE_BUILD%\GEOS*.pdb" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\..\Oem\jsoncpp\%LIBDIR%\%CONFDIR%\lib_json*.dll" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\..\Oem\jsoncpp\%LIBDIR%\%CONFDIR%\lib_json*.pdb" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\..\Oem\dbxml\bin64\%CONFDIR%\xerces-c_3_1mg*.dll" "%TARGET_DIR%"
+copy /y "%TARGET_DIR%..\..\..\Oem\dbxml\bin64\%CONFDIR%\xerces-c_3_1mg*.pdb" "%TARGET_DIR%"
 echo Copy web tier pdbs
 copy /y "%TARGET_DIR%..\..\..\Common\bin\%TYPE_BUILD%\Mg*.pdb" "%TARGET_DIR%"
 echo Copy common dlls

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2022-10-24 11:24:44 UTC (rev 9993)
+++ trunk/MgDev/build.bat	2022-10-26 12:03:08 UTC (rev 9994)
@@ -407,8 +407,7 @@
 echo [install]: Web Tier - MgDevHttpServer
 if not exist "%MG_OUTPUT_WEB%\DevHttpServer" mkdir "%MG_OUTPUT_WEB%\DevHttpServer"
 %XCOPY_SINGLE% "%MG_WEB_BIN%\%TYPEBUILD%\*.dll" "%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"
+copy /Y "%MG_WEB_BIN%\%TYPEBUILD%\MgDevHttpServer.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" /EXCLUDE:%CONFIGURATION%_excludes.txt