[prev in list] [next in list] [prev in thread] [next in thread]
List: mapguide-commits
Subject: [mapguide-commits] r6513 - in trunk/Tools/Maestro: . Install Maestro Maestro.Base MaestroAPITestRunn
From: svn_mapguide () osgeo ! org
Date: 2012-02-15 12:52:47
Message-ID: 20120215125247.5C7BC39015B () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2012-02-15 04:52:47 -0800 (Wed, 15 Feb 2012)
New Revision: 6513
Added:
trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs
Modified:
trunk/Tools/Maestro/Install/Maestro.nsi
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
trunk/Tools/Maestro/Maestro/Program.cs
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
trunk/Tools/Maestro/build.bat
Log:
#1955: Use the new default application data root of %APPDATA%\Maestro-x.y. The \
existing code already sets up user addin installation to be under \
%APPDATA%\Maestro-x.y\AddIns
Also fix a bad output path for the LocalNative provider in release mode.
Modified: trunk/Tools/Maestro/Install/Maestro.nsi
===================================================================
--- trunk/Tools/Maestro/Install/Maestro.nsi 2012-02-15 11:50:35 UTC (rev 6512)
+++ trunk/Tools/Maestro/Install/Maestro.nsi 2012-02-15 12:52:47 UTC (rev 6513)
@@ -175,8 +175,11 @@
# set installation dir
SetOutPath $INSTDIR
- # directories
- File /r "${INST_OUTPUT_MAESTRO}\AddIns"
+ # directories / core addins
+ File /r "${INST_OUTPUT_MAESTRO}\AddIns\ExtendedObjectModels"
+ File /r "${INST_OUTPUT_MAESTRO}\AddIns\FdoToolbox"
+ File /r "${INST_OUTPUT_MAESTRO}\AddIns\Scripting"
+ File "${INST_OUTPUT_MAESTRO}\AddIns\Maestro.Base.addin"
File /r "${INST_OUTPUT_MAESTRO}\Data"
File /r "${INST_OUTPUT_MAESTRO}\Schemas"
File /r "${INST_OUTPUT_MAESTRO}\UserDoc"
Modified: trunk/Tools/Maestro/Maestro/Program.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Program.cs 2012-02-15 11:50:35 UTC (rev 6512)
+++ trunk/Tools/Maestro/Maestro/Program.cs 2012-02-15 12:52:47 UTC (rev 6513)
@@ -105,7 +105,11 @@
CoreStartup coreStartup = new CoreStartup("MapGuide Maestro");
// It is also used as default storage location for the application \
settings:
// "%Application Data%\%Application Name%", but you can override that by \
setting c.ConfigDirectory
-
+
+ // #1955: Each version of Maestro from here on in will store their user \
data under + // %APPDATA%\Maestro-x.y
+ coreStartup.ConfigDirectory = MaestroPaths.BasePath;
+
// Specify the name of the application settings file (.xml is \
automatically appended) coreStartup.PropertiesName = "AppProperties";
Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2012-02-15 11:50:35 UTC (rev \
6512)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2012-02-15 12:52:47 UTC (rev \
6513) @@ -417,6 +417,7 @@
<Compile Include="UI\ValidationResultsDialog.Designer.cs">
<DependentUpon>ValidationResultsDialog.cs</DependentUpon>
</Compile>
+ <Compile Include="MaestroPaths.cs" />
<Compile Include="Workbench.cs">
<SubType>Form</SubType>
</Compile>
Added: trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs 2012-02-15 12:52:47 UTC (rev \
6513) @@ -0,0 +1,66 @@
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie@gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using System.IO;
+
+namespace Maestro.Base
+{
+ public class MaestroPaths
+ {
+ public static string AppName
+ {
+ get
+ {
+ var asmVersion = Assembly.GetExecutingAssembly().GetName().Version;
+ return string.Format("Maestro-{0}.{1}", asmVersion.Major, \
asmVersion.Minor); + }
+ }
+
+ /// <summary>
+ /// Gets the root directory for all application configuration and data
+ /// </summary>
+ public static string BasePath
+ {
+ get
+ {
+ return \
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), \
AppName); + }
+ }
+
+ /*
+ /// <summary>
+ /// Gets the path for user-installable addins
+ /// </summary>
+ public static string UserAddInLocation
+ {
+ get
+ {
+ var asmVersion = Assembly.GetExecutingAssembly().GetName().Version;
+ return \
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + \
string.Format("Maestro-{0}.{1}", asmVersion.Major, asmVersion.Minor), + \
"AddIns"); + }
+ }*/
+ }
+}
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2012-02-15 \
11:50:35 UTC (rev 6512)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2012-02-15 \
12:52:47 UTC (rev 6513) @@ -99,9 +99,8 @@
</None>
</ItemGroup>
<ItemGroup>
- <Content Include="..\SDK\bin\OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.dll">
+ <Content Include="..\SDK\bin\bin.x86.MGOS2.2.0\OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.dll">
<Link>MGOS22\OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.dll</Link>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\Thirdparty\MGOS_2_2_0_x86\OSGeo.MapGuide.Foundation.dll">
<Link>MGOS22\OSGeo.MapGuide.Foundation.dll</Link>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2012-02-15 \
11:50:35 UTC (rev 6512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2012-02-15 \
12:52:47 UTC (rev 6513) @@ -41,7 +41,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\</OutputPath>
+ <OutputPath>..\SDK\bin\bin.x86.MGOS2.2.0\</OutputPath>
<DefineConstants>TRACE;DEBUG;MG220</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: trunk/Tools/Maestro/build.bat
===================================================================
--- trunk/Tools/Maestro/build.bat 2012-02-15 11:50:35 UTC (rev 6512)
+++ trunk/Tools/Maestro/build.bat 2012-02-15 12:52:47 UTC (rev 6513)
@@ -2,7 +2,7 @@
SET TYPEACTION=build
SET TYPEBUILD=Release
SET PLATFORM=Any CPU
-SET RELEASE_VERSION=4.0.0
+SET RELEASE_VERSION=5.0.0
SET OLDPATH=%PATH%
SET PATH=%PATH%;%CD%\Thirdparty\NSIS;C:\Windows\Microsoft.NET\Framework\v4.0.30319
SET SLNDIR=%CD%
_______________________________________________
mapguide-commits mailing list
mapguide-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/mapguide-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic