[mapguide-commits] r6742 - in trunk/MgDev: . BuildTools/WebTools BuildTools/WebTools/SetAssemblyVersion BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release Common/Foundation/Data Common/MapGuideCommon/Resources Server/src/Services/Feature Server/src/Services/Mapping Web/src/mapadmin/HelpDocs Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jun 10 21:44:16 PDT 2012
Author: jng
Date: 2012-06-10 21:44:16 -0700 (Sun, 10 Jun 2012)
New Revision: 6742
Added:
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.exe
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.pdb
trunk/MgDev/stampassemblies.bat
Removed:
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.exe
trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.pdb
Modified:
trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp
trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res
trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
trunk/MgDev/Web/src/mapadmin/HelpDocs/
trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
trunk/MgDev/Web/src/viewerfiles/
trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
trunk/MgDev/Web/src/viewerfiles/quickplot.js
Log:
Merge in r6738, r6739, r6740 and r6741 from 2.4 branch
Property changes on: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion
___________________________________________________________________
Added: svn:ignore
+ *.suo
Property changes on: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion
___________________________________________________________________
Added: svn:ignore
+ obj
Deleted: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs
===================================================================
--- branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs 2012-06-11 04:44:16 UTC (rev 6742)
@@ -1,141 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-
-namespace SetAssemblyVersion
-{
- /// <summary>
- /// A small utility to stamp the version of our .net API assemblies
- ///
- /// Original source: http://www.codeproject.com/Articles/31236/How-To-Update-Assembly-Version-Number-Automaticall
- /// </summary>
- class AssemblyInfoUtil
- {
- private static int incParamNum = 0;
-
- private static string fileName = "";
-
- private static string versionStr = null;
-
- private static bool isVB = false;
-
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- static void Main(string[] args)
- {
- for (int i = 0; i < args.Length; i++)
- {
- if (args[i].StartsWith("-inc:"))
- {
- string s = args[i].Substring("-inc:".Length);
- incParamNum = int.Parse(s);
- }
- else if (args[i].StartsWith("-set:"))
- {
- versionStr = args[i].Substring("-set:".Length);
- }
- else
- fileName = args[i];
- }
-
- if (Path.GetExtension(fileName).ToLower() == ".vb")
- isVB = true;
-
- if (fileName == "")
- {
- System.Console.WriteLine("Usage: AssemblyInfoUtil <path to AssemblyInfo.cs or AssemblyInfo.vb file> [options]");
- System.Console.WriteLine("Options: ");
- System.Console.WriteLine(" -set:<new version number> - set new version number (in NN.NN.NN.NN format)");
- System.Console.WriteLine(" -inc:<parameter index> - increases the parameter with specified index (can be from 1 to 4)");
- return;
- }
-
- if (!File.Exists(fileName))
- {
- System.Console.WriteLine("Error: Can not find file \"" + fileName + "\"");
- return;
- }
-
- System.Console.Write("Processing \"" + fileName + "\"...");
- StreamReader reader = new StreamReader(fileName);
- StreamWriter writer = new StreamWriter(fileName + ".out");
- String line;
-
- while ((line = reader.ReadLine()) != null)
- {
- line = ProcessLine(line);
- writer.WriteLine(line);
- }
- reader.Close();
- writer.Close();
-
- File.Delete(fileName);
- File.Move(fileName + ".out", fileName);
- System.Console.WriteLine("Done!");
- }
-
- private static string ProcessLine(string line)
- {
- if (isVB)
- {
- line = ProcessLinePart(line, "<Assembly: AssemblyVersion(\"");
- line = ProcessLinePart(line, "<Assembly: AssemblyFileVersion(\"");
- line = ProcessLinePart(line, "<Assembly: AssemblyInformationalVersion(\"");
- }
- else
- {
- line = ProcessLinePart(line, "[assembly: AssemblyVersion(\"");
- line = ProcessLinePart(line, "[assembly: AssemblyFileVersion(\"");
- line = ProcessLinePart(line, "[assembly: AssemblyInformationalVersion(\"");
- }
- return line;
- }
-
- private static string ProcessLinePart(string line, string part)
- {
- int spos = line.IndexOf(part);
- if (spos >= 0)
- {
- spos += part.Length;
- int epos = line.IndexOf('"', spos);
- string oldVersion = line.Substring(spos, epos - spos);
- string newVersion = "";
- bool performChange = false;
-
- if (incParamNum > 0)
- {
- string[] nums = oldVersion.Split('.');
- if (nums.Length >= incParamNum && nums[incParamNum - 1] != "*")
- {
- Int64 val = Int64.Parse(nums[incParamNum - 1]);
- val++;
- nums[incParamNum - 1] = val.ToString();
- newVersion = nums[0];
- for (int i = 1; i < nums.Length; i++)
- {
- newVersion += "." + nums[i];
- }
- performChange = true;
- }
- }
-
- else if (versionStr != null)
- {
- newVersion = versionStr;
- performChange = true;
- }
-
- if (performChange)
- {
- StringBuilder str = new StringBuilder(line);
- str.Remove(spos, epos - spos);
- str.Insert(spos, newVersion);
- line = str.ToString();
- }
- }
- return line;
- }
- }
-}
Copied: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs (from rev 6741, branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs)
===================================================================
--- trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs (rev 0)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Program.cs 2012-06-11 04:44:16 UTC (rev 6742)
@@ -0,0 +1,141 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace SetAssemblyVersion
+{
+ /// <summary>
+ /// A small utility to stamp the version of our .net API assemblies
+ ///
+ /// Original source: http://www.codeproject.com/Articles/31236/How-To-Update-Assembly-Version-Number-Automaticall
+ /// </summary>
+ class AssemblyInfoUtil
+ {
+ private static int incParamNum = 0;
+
+ private static string fileName = "";
+
+ private static string versionStr = null;
+
+ private static bool isVB = false;
+
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main(string[] args)
+ {
+ for (int i = 0; i < args.Length; i++)
+ {
+ if (args[i].StartsWith("-inc:"))
+ {
+ string s = args[i].Substring("-inc:".Length);
+ incParamNum = int.Parse(s);
+ }
+ else if (args[i].StartsWith("-set:"))
+ {
+ versionStr = args[i].Substring("-set:".Length);
+ }
+ else
+ fileName = args[i];
+ }
+
+ if (Path.GetExtension(fileName).ToLower() == ".vb")
+ isVB = true;
+
+ if (fileName == "")
+ {
+ System.Console.WriteLine("Usage: AssemblyInfoUtil <path to AssemblyInfo.cs or AssemblyInfo.vb file> [options]");
+ System.Console.WriteLine("Options: ");
+ System.Console.WriteLine(" -set:<new version number> - set new version number (in NN.NN.NN.NN format)");
+ System.Console.WriteLine(" -inc:<parameter index> - increases the parameter with specified index (can be from 1 to 4)");
+ return;
+ }
+
+ if (!File.Exists(fileName))
+ {
+ System.Console.WriteLine("Error: Can not find file \"" + fileName + "\"");
+ return;
+ }
+
+ System.Console.Write("Processing \"" + fileName + "\"...");
+ StreamReader reader = new StreamReader(fileName);
+ StreamWriter writer = new StreamWriter(fileName + ".out");
+ String line;
+
+ while ((line = reader.ReadLine()) != null)
+ {
+ line = ProcessLine(line);
+ writer.WriteLine(line);
+ }
+ reader.Close();
+ writer.Close();
+
+ File.Delete(fileName);
+ File.Move(fileName + ".out", fileName);
+ System.Console.WriteLine("Done!");
+ }
+
+ private static string ProcessLine(string line)
+ {
+ if (isVB)
+ {
+ line = ProcessLinePart(line, "<Assembly: AssemblyVersion(\"");
+ line = ProcessLinePart(line, "<Assembly: AssemblyFileVersion(\"");
+ line = ProcessLinePart(line, "<Assembly: AssemblyInformationalVersion(\"");
+ }
+ else
+ {
+ line = ProcessLinePart(line, "[assembly: AssemblyVersion(\"");
+ line = ProcessLinePart(line, "[assembly: AssemblyFileVersion(\"");
+ line = ProcessLinePart(line, "[assembly: AssemblyInformationalVersion(\"");
+ }
+ return line;
+ }
+
+ private static string ProcessLinePart(string line, string part)
+ {
+ int spos = line.IndexOf(part);
+ if (spos >= 0)
+ {
+ spos += part.Length;
+ int epos = line.IndexOf('"', spos);
+ string oldVersion = line.Substring(spos, epos - spos);
+ string newVersion = "";
+ bool performChange = false;
+
+ if (incParamNum > 0)
+ {
+ string[] nums = oldVersion.Split('.');
+ if (nums.Length >= incParamNum && nums[incParamNum - 1] != "*")
+ {
+ Int64 val = Int64.Parse(nums[incParamNum - 1]);
+ val++;
+ nums[incParamNum - 1] = val.ToString();
+ newVersion = nums[0];
+ for (int i = 1; i < nums.Length; i++)
+ {
+ newVersion += "." + nums[i];
+ }
+ performChange = true;
+ }
+ }
+
+ else if (versionStr != null)
+ {
+ newVersion = versionStr;
+ performChange = true;
+ }
+
+ if (performChange)
+ {
+ StringBuilder str = new StringBuilder(line);
+ str.Remove(spos, epos - spos);
+ str.Insert(spos, newVersion);
+ line = str.ToString();
+ }
+ }
+ return line;
+ }
+ }
+}
Deleted: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs
===================================================================
--- branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs 2012-06-11 04:44:16 UTC (rev 6742)
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SetAssemblyVersion")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SetAssemblyVersion")]
-[assembly: AssemblyCopyright("Copyright © 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("742bc60a-1bd9-47a1-8bbc-51827d2ba415")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
Copied: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs (from rev 6741, branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs)
===================================================================
--- trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs (rev 0)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/Properties/AssemblyInfo.cs 2012-06-11 04:44:16 UTC (rev 6742)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SetAssemblyVersion")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SetAssemblyVersion")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("742bc60a-1bd9-47a1-8bbc-51827d2ba415")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Deleted: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj
===================================================================
--- branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj 2012-06-11 04:44:16 UTC (rev 6742)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{FB6810AB-F710-4542-A55C-9DB8AB151B06}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>SetAssemblyVersion</RootNamespace>
- <AssemblyName>SetAssemblyVersion</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
Copied: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj (from rev 6741, branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj)
===================================================================
--- trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj (rev 0)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/SetAssemblyVersion.csproj 2012-06-11 04:44:16 UTC (rev 6742)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{FB6810AB-F710-4542-A55C-9DB8AB151B06}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>SetAssemblyVersion</RootNamespace>
+ <AssemblyName>SetAssemblyVersion</AssemblyName>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Program.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Property changes on: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin
___________________________________________________________________
Added: svn:ignore
+ Debug
Deleted: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.exe
===================================================================
(Binary files differ)
Copied: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.exe (from rev 6741, branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.exe)
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.pdb
===================================================================
(Binary files differ)
Copied: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.pdb (from rev 6741, branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion/bin/Release/SetAssemblyVersion.pdb)
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln
===================================================================
--- branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln 2012-06-11 04:44:16 UTC (rev 6742)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetAssemblyVersion", "SetAssemblyVersion\SetAssemblyVersion.csproj", "{FB6810AB-F710-4542-A55C-9DB8AB151B06}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Copied: trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln (from rev 6741, branches/2.4/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln)
===================================================================
--- trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln (rev 0)
+++ trunk/MgDev/BuildTools/WebTools/SetAssemblyVersion/SetAssemblyVersion.sln 2012-06-11 04:44:16 UTC (rev 6742)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetAssemblyVersion", "SetAssemblyVersion\SetAssemblyVersion.csproj", "{FB6810AB-F710-4542-A55C-9DB8AB151B06}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FB6810AB-F710-4542-A55C-9DB8AB151B06}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp 2012-06-11 04:44:16 UTC (rev 6742)
@@ -494,7 +494,11 @@
foundItem2 = GetItem(index);
if ((foundItem1 != NULL) && (foundItem1.p != foundItem2.p))
- throw new MgDuplicateObjectException(L"CheckDuplicate", __LINE__, __WFILE__, NULL, L"", NULL); // EXC::Create(Exception::NLSGetMessage(NLSID(45_ITEMINCOLLECTION),(String*) item->GetName()));
+ {
+ MgStringCollection args;
+ args.Add(item->GetName());
+ throw new MgDuplicateObjectException(L"CheckDuplicate", __LINE__, __WFILE__, NULL, L"MgDuplicateObject", &args); // EXC::Create(Exception::NLSGetMessage(NLSID(45_ITEMINCOLLECTION),(String*) item->GetName()));
+ }
}
}
Modified: trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res 2012-06-11 04:44:16 UTC (rev 6742)
@@ -225,6 +225,7 @@
MgCoordinateSystemUnknownUnit = Unknown unit.
MgDataReaderIdNotFound = The data reader ID was not found.
MgDocumentIdentifierFilenameFailed = Failed to get the filename from the document identifier because no matching document path found.
+MgDuplicateObject = Duplicate object found for name: %1
MgFailedToGetFileNameForDates = Failed to get the filename for the specified dates.
MgFailedToLoadFdoLibrary = Failed to load FDO library.
MgFailedToRetrieveSystemExceptionMesage = Failed to retrieve the system exception mesage. This message may not be unicode compliant.
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp 2012-06-11 04:44:16 UTC (rev 6742)
@@ -2286,7 +2286,9 @@
FdoPtr<FdoFeatureSchema> fdoSchema = GetFdoFeatureSchema(mgSchema);
if (fdoSchemaCol->Contains(fdoSchema))
{
- throw new MgDuplicateObjectException(L"MgServerFeatureUtil.GetFdoFeatureSchemaCollection", __LINE__, __WFILE__, NULL, L"", NULL);
+ MgStringCollection args;
+ args.Add(mgSchema->GetName());
+ throw new MgDuplicateObjectException(L"MgServerFeatureUtil.GetFdoFeatureSchemaCollection", __LINE__, __WFILE__, NULL, L"MgDuplicateObject", &args);
}
else
{
Property changes on: trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326
+ /branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6738-6741
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326
Property changes on: trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326
+ /branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6738-6741
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326
Property changes on: trunk/MgDev/Web/src/mapadmin/HelpDocs
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
+ /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs:6738-6741
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
Property changes on: trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326
+ /branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6738-6741
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326
Property changes on: trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
+ /branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6738-6741
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
Property changes on: trunk/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
+ /branches/2.4/MgDev/Web/src/viewerfiles:6738-6741
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2012-06-11 04:25:56 UTC (rev 6741)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2012-06-11 04:44:16 UTC (rev 6742)
@@ -2221,11 +2221,16 @@
function MapTip()
{
- var idxes = parent.tbFrame.GetMapTipButtons();
+ var idxes = null;
+ if (typeof parent.tbFrame.GetMapTipButtons == 'function')
+ {
+ idxes = parent.tbFrame.GetMapTipButtons();
+ }
+
if(!haveTooltip)
{
haveTooltip = true;
- for (var i = 0; i < idxes.length; i++) {
+ for (var i = 0; idxes != null && i < idxes.length; i++) {
var maptipBtn = parent.tbFrame.document.getElementById(idxes[i]);
//The tooltip is enabled.
//highlight the maptip button via change the background and the border color
@@ -2242,7 +2247,7 @@
var tip = document.getElementById("hlTip");
if (tip != null)
tip.style.display = 'none';
- for (var i = 0; i < idxes.length; i++) {
+ for (var i = 0; idxes != null && i < idxes.length; i++) {
var maptipBtn = parent.tbFrame.document.getElementById(idxes[i]);
//disable the tooltip
//change back the background and border color
Property changes on: trunk/MgDev/Web/src/viewerfiles/quickplot.js
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326
+ /branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js:6738-6741
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326
Copied: trunk/MgDev/stampassemblies.bat (from rev 6741, branches/2.4/MgDev/stampassemblies.bat)
===================================================================
--- trunk/MgDev/stampassemblies.bat (rev 0)
+++ trunk/MgDev/stampassemblies.bat 2012-06-11 04:44:16 UTC (rev 6742)
@@ -0,0 +1,25 @@
+ at echo off
+SET PATH=%PATH%;%CD%\BuildTools\WebTools\SetAssemblyVersion\SetAssemblyVersion\bin\Release
+SET VERSION=%1
+echo Stamping version %VERSION% to all instances of AssemblyInfo.cs
+pushd "%CD%\Web\src\DotNetApi"
+SetAssemblyVersion.exe -set:%1 AssemblyInfo.cs
+popd
+pushd "%CD%\Web\src\DotNetApi\Foundation"
+SetAssemblyVersion.exe -set:%1 AssemblyInfo.cs
+popd
+pushd "%CD%\Web\src\DotNetApi\Geometry"
+SetAssemblyVersion.exe -set:%1 AssemblyInfo.cs
+popd
+pushd "%CD%\Web\src\DotNetApi\MapGuideCommon"
+SetAssemblyVersion.exe -set:%1 AssemblyInfo.cs
+popd
+pushd "%CD%\Web\src\DotNetApi\PlatformBase"
+SetAssemblyVersion.exe -set:%1 AssemblyInfo.cs
+popd
+pushd "%CD%\Web\src\DotNetApi\Web"
+SetAssemblyVersion.exe -set:%1 AssemblyInfo.cs
+popd
+pushd "%CD%\Desktop\DesktopUnmanagedApi\DotNet\Partials"
+SetAssemblyVersion.exe -set:%1 AssemblyInfo.cs
+popd
\ No newline at end of file
More information about the mapguide-commits
mailing list