Browse Source

Fixed path to ngen.

${ProductName} now can be used as reference to the name of the product using ICSharpCode.Core.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1038 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
f73f3cb986
  1. 2
      bin/setup/PostInstallTasks.bat
  2. 2
      bin/setup/PreUninstallTasks.bat
  3. 2
      src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
  4. 4
      src/Main/Core/Project/Src/AddInTree/AddInManager.cs
  5. 1
      src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
  6. 10
      src/Main/Core/Project/Src/Services/MessageService/MessageService.cs
  7. 2
      src/Main/Core/Project/Src/Services/StringParser/StringParser.cs

2
bin/setup/PostInstallTasks.bat

@ -20,7 +20,7 @@ echo. @@ -20,7 +20,7 @@ echo.
echo.
echo Compiling SharpDevelop to native code to improve startup time...
echo.
ngen install SharpDevelop.exe
%windir%\Microsoft.NET\Framework\v2.0.50727\ngen install SharpDevelop.exe
popd

2
bin/setup/PreUninstallTasks.bat

@ -13,7 +13,7 @@ echo. @@ -13,7 +13,7 @@ echo.
echo.
echo Uninstalling native images...
echo.
ngen uninstall SharpDevelop.exe
%windir%\Microsoft.NET\Framework\v2.0.50727\ngen uninstall SharpDevelop.exe
popd

2
src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs

@ -438,7 +438,7 @@ namespace ICSharpCode.AddInManager @@ -438,7 +438,7 @@ namespace ICSharpCode.AddInManager
switch (Path.GetExtension(file).ToLowerInvariant()) {
case ".addin":
if (FileUtility.IsBaseDirectory(FileUtility.ApplicationRootPath, file)) {
MessageService.ShowMessage("You cannot install AddIns inside the SharpDevelop directory, " +
MessageService.ShowMessage("You cannot install AddIns inside the ${ProductName} directory, " +
"they will be picked up as pre-installed AddIns automatically.");
return false;
}

4
src/Main/Core/Project/Src/AddInTree/AddInManager.cs

@ -130,8 +130,8 @@ namespace ICSharpCode.Core @@ -130,8 +130,8 @@ namespace ICSharpCode.Core
disabled.Add(addInName);
MessageService.ShowError("Error removing " + addInName + ":\n" +
ex.Message + "\nThe AddIn will be " +
"removed on the next start of SharpDevelop and is disabled " +
"for now.");
"removed on the next start of " + MessageService.ProductName +
" and is disabled for now.");
return false;
}
}

1
src/Main/Core/Project/Src/AddInTree/CoreStartup.cs

@ -73,6 +73,7 @@ namespace ICSharpCode.Core @@ -73,6 +73,7 @@ namespace ICSharpCode.Core
this.applicationName = applicationName;
propertiesName = applicationName + "Properties";
MessageService.DefaultMessageBoxTitle = applicationName;
MessageService.ProductName = applicationName;
}
public void AddAddInsFromDirectory(string addInDir)

10
src/Main/Core/Project/Src/Services/MessageService/MessageService.cs

@ -179,6 +179,16 @@ namespace ICSharpCode.Core @@ -179,6 +179,16 @@ namespace ICSharpCode.Core
}
static string defaultMessageBoxTitle = "MessageBox";
static string productName = "Application Name";
public static string ProductName {
get {
return productName;
}
set {
productName = value;
}
}
public static string DefaultMessageBoxTitle {
get {

2
src/Main/Core/Project/Src/Services/StringParser/StringParser.cs

@ -172,6 +172,8 @@ namespace ICSharpCode.Core @@ -172,6 +172,8 @@ namespace ICSharpCode.Core
return DateTime.Today.ToShortDateString();
if (propertyName.Equals("TIME", StringComparison.OrdinalIgnoreCase))
return DateTime.Now.ToShortTimeString();
if (propertyName.Equals("ProductName", StringComparison.OrdinalIgnoreCase))
return MessageService.ProductName;
if (customTags != null) {
for (int j = 0; j < customTags.GetLength(0); ++j) {

Loading…
Cancel
Save