[mapguide-commits] r8489 - trunk/Tools/Maestro/Install

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-12-30 06:19:44 -0800 (Tue, 30 Dec 2014)
New Revision: 8489

Modified:
   trunk/Tools/Maestro/Install/Maestro.nsi
Log:
Update installer in light of #2513

Modified: trunk/Tools/Maestro/Install/Maestro.nsi
===================================================================
--- trunk/Tools/Maestro/Install/Maestro.nsi	2014-12-29 18:10:49 UTC (rev 8488)
+++ trunk/Tools/Maestro/Install/Maestro.nsi	2014-12-30 14:19:44 UTC (rev 8489)
@@ -204,6 +204,7 @@
     File "${INST_OUTPUT_MAESTRO}\Maestro.Packaging.xml"
     File "${INST_OUTPUT_MAESTRO}\Maestro.Shared.UI.xml"
     File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.MaestroAPI.xml"
+    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.xml"
     
     # libraries
     File "${INST_OUTPUT_MAESTRO}\Aga.Controls.dll"
@@ -224,25 +225,9 @@
     File "${INST_OUTPUT_MAESTRO}\Microsoft.Scripting.dll"
     File "${INST_OUTPUT_MAESTRO}\Microsoft.Scripting.Metadata.dll"
     File "${INST_OUTPUT_MAESTRO}\NetTopologySuite.Merged.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ExtendedObjectModels.dll"
+    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.dll"
     File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.MaestroAPI.dll"
     File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.MaestroAPI.Http.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-2.3.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.MapDefinition-2.3.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.3.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WebLayout-2.4.0.dll"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WebLayout-2.6.0.dll"
     File "${INST_OUTPUT_MAESTRO}\WeifenLuo.WinFormsUI.Docking.dll"
     
     # pdbs for greater context in exception stack traces
@@ -258,24 +243,9 @@
     File "${INST_OUTPUT_MAESTRO}\Maestro.MapViewer.pdb"
     File "${INST_OUTPUT_MAESTRO}\Maestro.Packaging.pdb"
     File "${INST_OUTPUT_MAESTRO}\Maestro.Shared.UI.pdb"
+    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.pdb"
     File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.MaestroAPI.pdb"
     File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.MaestroAPI.Http.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-2.3.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.MapDefinition-2.3.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.3.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WebLayout-2.4.0.pdb"
-    File "${INST_OUTPUT_MAESTRO}\OSGeo.MapGuide.ObjectModels.WebLayout-2.6.0.pdb"
     File "${INST_OUTPUT_MAESTRO}\RtMapInspector.pdb"
 
     # main executables