[mapguide-commits] r7437 - in branches/2.5/MgDev: . Desktop/DesktopUnmanagedApi/DotNet

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Apr 1 03:51:54 PDT 2013 

Author: jng
Date: 2013-04-01 03:51:54 -0700 (Mon, 01 Apr 2013)
New Revision: 7437

Modified:
   branches/2.5/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile
   branches/2.5/MgDev/build_desktop.bat
   branches/2.5/MgDev/nuget_prepare.bat
Log:
mg-desktop packaging changes:
 - Update MapGuideDesktopMakefile 
   - Copy over .net XML documentation files of Foundation, Geometry and PlatformBase
   - Pass the /doc flag to csc.exe in order for the .net XML doc file to be created for OSGeo.MapGuide.Desktop.dll
 - Update nuget_prepare.bat to remove invalid DoxyTransform.exe call and to copy a missing .net XML doc file.

Modified: branches/2.5/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile
===================================================================
--- branches/2.5/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile	2013-04-01 06:29:47 UTC (rev 7436)
+++ branches/2.5/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile	2013-04-01 10:51:54 UTC (rev 7437)
@@ -36,10 +36,13 @@
   copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.dll $(OUTDIR)\OSGeo.MapGuide.Foundation.dll
   copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.dll $(OUTDIR)\OSGeo.MapGuide.Geometry.dll
   copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.dll $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll
+  copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.xml $(OUTDIR)\OSGeo.MapGuide.Foundation.xml
+  copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.xml $(OUTDIR)\OSGeo.MapGuide.Geometry.xml
+  copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.xml $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml
   copy /Y SignMapGuideApi.exe $(OUTDIR)\SignMapGuideApi.exe
   copy /Y maestroapi.key $(OUTDIR)\maestroapi.key
   $(SIGNER) $(OUTDIR)
-  csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs
+  csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Desktop.xml /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs
   copy /y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(OUTDIR)\OSGeo.MapGuide.Desktop.Temp.dll
   copy /Y $(WEB_BIN_DIR)\FoundationUnmanagedApi.dll $(OUTDIR)\FoundationUnmanagedApi.dll
   copy /Y $(WEB_BIN_DIR)\GeometryUnmanagedApi.dll $(OUTDIR)\GeometryUnmanagedApi.dll
@@ -49,16 +52,23 @@
   copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.dll
   copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.dll
   copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.dll
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.Foundation.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Foundation.xml
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.xml
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.xml
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.xml
 
 $(OUTDIR)\OSGeo.MapGuide.Desktop.dll:
   echo target - OSGeo.MapGuide.Desktop.dll
   copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.dll $(OUTDIR)\OSGeo.MapGuide.Foundation.dll
   copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.dll $(OUTDIR)\OSGeo.MapGuide.Geometry.dll
   copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.dll $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll
+  copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.xml $(OUTDIR)\OSGeo.MapGuide.Foundation.xml
+  copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.xml $(OUTDIR)\OSGeo.MapGuide.Geometry.xml
+  copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.xml $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml
   copy /Y SignMapGuideApi.exe $(OUTDIR)\SignMapGuideApi.exe
   copy /Y maestroapi.key $(OUTDIR)\maestroapi.key
   $(SIGNER) $(OUTDIR)
-  csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /target:library /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs 
+  csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Desktop.xml /target:library /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs 
   copy /Y $(WEB_BIN_DIR)\FoundationUnmanagedApi.dll $(OUTDIR)\FoundationUnmanagedApi.dll
   copy /Y $(WEB_BIN_DIR)\GeometryUnmanagedApi.dll $(OUTDIR)\GeometryUnmanagedApi.dll
   copy /Y $(WEB_BIN_DIR)\PlatformBaseUnmanagedApi.dll $(OUTDIR)\PlatformBaseUnmanagedApi.dll
@@ -66,4 +76,8 @@
   copy /Y $(OUTDIR)\OSGeo.MapGuide.Foundation.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Foundation.dll
   copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.dll
   copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.dll
-  copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.dll
\ No newline at end of file
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.dll
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.Foundation.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Foundation.xml
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.xml
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.xml
+  copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.xml
\ No newline at end of file

Modified: branches/2.5/MgDev/build_desktop.bat
===================================================================
--- branches/2.5/MgDev/build_desktop.bat	2013-04-01 06:29:47 UTC (rev 7436)
+++ branches/2.5/MgDev/build_desktop.bat	2013-04-01 10:51:54 UTC (rev 7437)
@@ -30,8 +30,6 @@
 %MSBUILD% /p:Platform=%DESKTOP_PLATFORM% MgDesktopDotNet%VS_SLN_SUFFIX%.sln
 if "%errorlevel%"=="1" goto error
 popd
-echo [build]: .net intellisense files
-DoxyTransform.exe dotnet "%MG_DOC_XML%" "%MG_OUTPUT_DESKTOP%"
 echo [install]: binaries
 %XCOPY% "Desktop\bin\%TYPEBUILD%" "%MG_OUTPUT_DESKTOP%" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
 pushd "%MG_OUTPUT_DESKTOP%"

Modified: branches/2.5/MgDev/nuget_prepare.bat
===================================================================
--- branches/2.5/MgDev/nuget_prepare.bat	2013-04-01 06:29:47 UTC (rev 7436)
+++ branches/2.5/MgDev/nuget_prepare.bat	2013-04-01 10:51:54 UTC (rev 7437)
@@ -82,9 +82,8 @@
 echo [install]: Copy api-desktop files to nuget staging
 xcopy /S /Y "%DESKTOP_BASEDIR%\*" "%NUGET_CONTENT_DESKTOP%" /EXCLUDE:package_excludes.txt+desktop_package_excludes.txt
 xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Desktop.dll" "%NUGET_LIB_DESKTOP%"
+xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Desktop.xml" "%NUGET_LIB_DESKTOP%"
 echo [install]: Copy api-web files to nuget staging
-REM Just in case
-DoxyTransform.exe dotnet "%MG_DOC_XML%" "%WEB_BASEDIR%"
 xcopy /Y /I "%WEB_BASEDIR%\MgWebApp.dll" "%NUGET_CONTENT_WEB%"
 xcopy /Y /I "%WEB_BASEDIR%\MgWebSupport.dll" "%NUGET_CONTENT_WEB%"
 xcopy /Y /I "%WEB_BASEDIR%\MgHttpHandler.dll" "%NUGET_CONTENT_WEB%"

More information about the mapguide-commits mailing list