Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1619] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2008-04-08 04:09:28
|
Revision: 1619
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1619&view=rev
Author: and-81
Date: 2008-04-07 21:09:23 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj
trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx
trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2008-04-08 04:09:23 UTC (rev 1619)
@@ -80,10 +80,12 @@
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
<Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
<Name>IrssComms</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.groupBoxSetup = new System.Windows.Forms.GroupBox();
this.comboBoxComputer = new System.Windows.Forms.ComboBox();
this.labelServerAddress = new System.Windows.Forms.Label();
@@ -276,6 +277,7 @@
this.Controls.Add(this.groupBoxMapAbstract);
this.Controls.Add(this.groupBoxSetup);
this.Controls.Add(this.groupBoxStatus);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "MainForm";
this.Text = "Abstract Remote Map Creator";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx 2008-04-08 04:09:23 UTC (rev 1619)
@@ -117,4 +117,81 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AACwnC3/r5st/6+bLf+vmy3/r5st/7GdLf+xnS3/r5st/6+bLf+vmy3/sJwt/6+bLf+vmy3/r5st/66a
+ LP+vmy3/sJwt/66aLP+vmy3/r5st/6+bLf+wnC3/r5st/6+bLf+vmy3/sZ0t/7GdLf+vmy3/r5st/6+b
+ Lf+vmy3/sJwt/7CcLf+vmy3/q5gs/6yZLP+yni3/rZos/5iHKP+kkSr/rZos/7KeLf+vmy3/sJwt/6+b
+ Lf+vmy3/sJwt/6+bLf+vmy3/sJwt/6+bLf+vmy3/sJwt/6+bLf+yni3/rZos/6SRKv+Yhyj/rZos/7Ke
+ Lf+smSz/q5gs/6+bLf+wnC3/sJwt/6+bLf+vmy3/sZ0t/6aTK/+kkSr/2Mhs/8y4Rv+umiz/q5gs/7Gd
+ Lf+wnC3/rpos/7CcLf+vmy3/r5st/7CcLf+vmy3/sJwt/66aLP+wnC3/sZ0t/6uYLP+umiz/zLhG/9jI
+ bP+kkSr/ppMr/7GdLf+vmy3/r5st/7CcLf+wnC3/sJwt/7CcLf+qlyv/oY4p/8y4Rf///v3/9fHZ/8Wv
+ Mv+olSv/rpos/7CcLf+vmy3/r5st/7CcLf+wnC3/rpos/7CcLf+vmy3/r5st/7CcLf+umiz/qJUr/8Wv
+ Mv/18dn///79/8y4Rf+hjin/qpcr/7CcLf+wnC3/sJwt/7CcLf+xnS3/rZos/5uJKP+8pi//8+7Q////
+ ///3893/xK4y/6iVK/+wnC3/r5st/7CcLf+vmy3/sJwt/7CcLf+vmy3/sJwt/6+bLf+wnC3/r5st/7Cc
+ Lf+olSv/xK4y//fz3f//////8+7Q/7ymL/+biSj/rZos/7GdLf+wnC3/sJwt/7GdLf+qlyv/pJEq/9nK
+ cP//////+fbl/9G/Vv+mkyv/qJUr/7GdLf+vmy3/rJks/66aLP+vmy3/r5st/6+bLf+vmy3/rpos/6yZ
+ LP+vmy3/sZ0t/6iVK/+mkyv/0b9W//n25f//////2cpw/6SRKv+qlyv/sZ0t/7CcLf+wnC3/sJwt/6OQ
+ Kv+3oi7/7ue8///+/f/q4a3/tqEt/6yZLP+umiz/qZYr/6uYLP+smSz/p5Qr/62aLP+wnC3/sJwt/62a
+ LP+nlCv/rJks/6uYLP+pliv/rpos/6yZLP+2oS3/6uGt///+/f/u57z/t6Iu/6OQKv+wnC3/sJwt/6+b
+ Lf+tmiz/oI0p/866S////////v77/8m0Pf+hjin/q5gs/7CcLf+eiyn/sp4t//Lsyv/g04j/tKAt/62a
+ LP+pliv/tKAt/+DTiP/y7Mr/sp4t/56LKf+wnC3/q5gs/6GOKf/JtD3//v77///////Oukv/oI0p/62a
+ LP+vmy3/sJwt/6uYLP+Zhyj/39KE///////18dj/pJEq/6qXK/+vmy3/ppMr/6yZLP/f0ob///79//v5
+ 7//KtkH/sJwt/6iVK//KtkH/+/nv///+/f/f0ob/rJks/6aTK/+vmy3/qpcr/6SRKv/18dj//////9/S
+ hP+Zhyj/q5gs/7CcLf+wnC3/qJUr/62ZLP/x6sb//////+LWjv+WhSf/sp4t/62aLP+Zhyj/yLI5//r4
+ 6v/+/vv/7+i+/8CqMP+tmiz/ppMr/8CqMP/v6L7//v77//r46v/Isjn/mYco/62aLP+yni3/loUn/+LW
+ jv//////8erG/62ZLP+olSv/sJwt/6+bLf+diyj/0L1T///////7+vD/yLI5/56LKf+umiz/rJks/6SR
+ Kv/bzXj///////n25f/JtD3/pJEq/6yZLP+kkSr/pJEq/8m0Pf/59uX//////9vNeP+kkSr/rJks/66a
+ LP+eiyn/yLI5//v68P//////0L1T/52LKP+vmy3/rZos/5GBJv/i1o7//////+rir/+smSz/qZYr/7Cc
+ Lf+pliv/s58t/+zjs///////7OS0/6mWK/+mkyv/r5st/6WSKv+mkyv/qZYr/+zktP//////7OOz/7Of
+ Lf+pliv/sJwt/6mWK/+smSz/6uKv///////i1o7/kYEm/62aLP+yni3/l4Yo/+TZmf//////5dud/56L
+ Kf+qlyv/sJwt/5+MKf/BqzD/+PXj///////f0ob/oo8q/6aTK/+wnC3/r5su/6aTK/+ijyr/39KG////
+ ///49eP/wasw/5+MKf+wnC3/qpcr/56LKf/l253//////+TZmf+Xhij/sp4t/6yZLP+ijyr/6+Ox////
+ ///j2JT/oY4p/6iVK/+wnC3/mYco/9C8Uf//////+/rw/8SuM/+kkjD/n447/5eGR/+Sgkz/l4dD/6CO
+ Nf/DrjT/+/rw///////QvFH/mYco/7CcLf+olSv/oY4p/+PYlP//////6+Ox/6KPKv+smSz/qZYr/6uY
+ LP/w6sT//////9nKcv+hjin/r5st/7CcLf+biSj/28x2///////079L/ppM1/5CASv9xZGn/WU+H/09G
+ kf9gVXv/hndU/6OSN//079L//////9vMdv+biSj/sJwt/6+bLf+hjin/2cpy///////w6sT/q5gs/6mW
+ K/+smSz/rZos//Lsyv//////18Zo/6GOKf+vmy3/r5st/5eGKP/g1Ir//////+zlwf+SgUL/Z1x0/zYw
+ qf8cGcf/FhTM/yomtf9fVX3/kIBF/+zlwf//////4NSK/5eGKP+vmy3/r5st/6GOKf/Xxmj///////Ls
+ yv+tmiz/rJks/7CcLf+tmiz/8erG///////YyGz/n4wp/6qXK/+vmy3/lYQn/9/ShP//////7ObJ/4V1
+ S/9PRo7/GRbI/wYF3f8EBN//FBLN/0hAlv+Cc0//7ObJ///////f0oT/lYQn/6+bLf+qlyv/n4wp/9jI
+ bP//////8erG/62aLP+wnC3/rZos/62ZLP/x6sb//////9jIbP+fjCn/qpcr/6+bLf+diyj/2814////
+ ///z7tr/jHxG/1lPhP8gHcD/CQja/wYG3f8WFMr/SkKT/4V1Tv/x7Nv//////9vNeP+diyj/r5st/6qX
+ K/+fjCn/2Mhs///////x6sb/rZks/62aLP+qlyv/qJUr//Dpwv//////2st0/6GOKf+wnC3/r5st/5yK
+ KP/ay3T///////Lszv+slzv/emxe/0tDk/8pJbn/Ix+//zkzp/9mW3T/oo9F//Dqz///////2st0/5yK
+ KP+vmy3/sJwt/6GOKf/ay3T///////Dpwv+olSv/qpcr/7CcLf+diyj/6N+o///////i1pD/mIco/6uY
+ LP+wnC3/mIco/9LAWv//////+vjq/8eyQv+aiDz/gnNZ/2pedv9lWXv/dWhm/45+Sf/BrUf/+vjq////
+ ///SwFr/mIco/7CcLf+rmCz/mIco/+LWkP//////6N+o/52LKP+wnC3/sp4t/5SDJ//k2Jb//////+ng
+ q/+diyj/q5gs/7CcLf+lkir/wqww//j14///////3c9+/6KPLP+hjzT/n40//52LQf+fjTf/n40v/9zO
+ f///////+PXj/8KsMP+lkir/sJwt/6uYLP+diyj/6eCr///////k2Jb/lIMn/7KeLf+yni3/k4Mn/9nK
+ cP//////8+3O/7eiLv+kkSr/r5st/6qXK/+rmCz/5tyh///////v6L7/r5st/6WSKv+rmCz/pZIq/6WS
+ Kv+vmy3/7+i+///////m3KH/q5gs/6qXK/+vmy3/pJEq/7eiLv/z7c7//////9nKcP+Tgyf/sp4t/7Cc
+ Lf+eiyn/x7E3//n25v//////1cRi/5eGKP+xnS3/qpcr/6CNKf/Uw2D///////z79P/YyW7/rZos/62a
+ LP+pliv/rZos/9jJbv/8+/T//////9TDYP+gjSn/qpcr/7GdLf+Xhij/1cRi///////59ub/x7E3/56L
+ Kf+wnC3/sJwt/6iVK/+umiz/6eCr///////q4a3/mYco/6+bLf+vmy3/oI0p/7ulL//z7tD//////+7m
+ uv+9py//r5st/6mWK/+9py//7ua6///////z7tD/u6Uv/6CNKf+vmy3/r5st/5mHKP/q4a3//////+ng
+ q/+umiz/qJUr/7CcLf+wnC3/qJUr/5+MKf/cznr///////Ltzv+0oC3/qZYr/6+bLf+pliv/q5gs/9zO
+ ev/7+vD/5tyh/8CqMP+wnC3/qZYr/8CqMP/m3KH/+/rw/9zOev+rmCz/qZYr/6+bLf+pliv/tKAt//Lt
+ zv//////3M56/5+MKf+olSv/sJwt/7CcLf+xnS3/m4ko/8y4R//+/vv/+/rw/9TCXv+diyj/qZYr/66a
+ LP+hjin/taAt/9jIbP+7pS//rpos/6+bLf+vmy3/rpos/7ulL//YyGz/taAt/6GOKf+umiz/qZYr/52L
+ KP/Uwl7/+/rw//7++//MuEf/m4ko/7GdLf+wnC3/sJwt/7KeLf+kkSr/sJwt/+7muv//////7OS0/7mj
+ Lv+olSv/rZos/62aLP+pliv/rZks/6yZLP+tmiz/r5st/6+bLf+tmiz/rJks/62ZLP+pliv/rZos/62a
+ LP+olSv/uaMu/+zktP//////7ua6/7CcLf+kkSr/sp4t/7CcLf+wnC3/sJwt/6+bLf+eiyn/zblJ///+
+ /f///v3/4NOI/7ahLf+smSz/sp4t/6+bLf+nlCv/r5st/7CcLf+wnC3/sJwt/7CcLf+vmy3/p5Qr/6+b
+ Lf+yni3/rJks/7ahLf/g04j///79///+/f/NuUn/nosp/6+bLf+wnC3/sJwt/7CcLf+vmy3/tKAt/6CN
+ Kf+pliv/5tuf//7++//j2JX/uqQu/6uYLP+umiz/sJwt/6+bLf+vmy3/r5st/6+bLf+wnC3/r5st/6+b
+ Lf+vmy3/sJwt/66aLP+rmCz/uqQu/+PYlf/+/vv/5tuf/6mWK/+gjSn/tKAt/6+bLf+wnC3/sJwt/7Cc
+ Lf+xnS3/q5gs/6eUK/+4oi7/2st0/8WvMv+umiz/rZos/7CcLf+umiz/sJwt/6+bLf+vmy3/r5st/6+b
+ LP+vmy3/r5st/7CcLf+umiz/sJwt/62aLP+umiz/xa8y/9rLdP+4oi7/p5Qr/6uYLP+xnS3/sJwt/7Cc
+ Lf+umiz/sJwt/6+bLf+xnS3/rJks/6eUK/+qlyv/rJks/66aLP+vmy3/r5st/7CcLf+umiz/sJwt/7Cc
+ Lf+wnC3/sJwt/7CcLf+wnC3/rpos/7CcLf+vmy3/r5st/66aLP+smSz/qpcr/6eUK/+smSz/sZ0t/6+b
+ Lf+wnC3/rpos/7CcLf+vmy3/r5st/6+bLf+vmy3/sZ0t/66aLP+wnC3/r5st/6+bLf+wnC3/sJwt/7Cc
+ Lf+vmy3/sJwt/7CcLf+vmy3/sJwt/6+bLf+wnC3/sJwt/7CcLf+vmy3/r5st/7CcLf+umiz/sZ0t/6+b
+ Lf+vmy3/r5st/6+bLf+wnC3/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -114,6 +114,23 @@
#endregion Constructors
+ #region Implementation
+
+ /// <summary>
+ /// Imports the specified configuration into this configuration.
+ /// </summary>
+ /// <param name="config">The configuration to merge in.</param>
+ public void Import(Configuration config)
+ {
+ // TODO: Improve import logic ...
+
+ _mappedEvents.AddRange(config.Events);
+ _programSettings.AddRange(config.Programs);
+ _systemWideMappings.AddRange(config.SystemWideMappings);
+ }
+
+ #endregion Implementation
+
#region Static Methods
/// <summary>
@@ -122,7 +139,7 @@
/// <param name="config">Configuration to save.</param>
/// <param name="fileName">File to save to.</param>
/// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns>
- internal static bool Save(Configuration config, string fileName)
+ public static bool Save(Configuration config, string fileName)
{
try
{
@@ -144,7 +161,7 @@
/// </summary>
/// <param name="fileName">File to load from.</param>
/// <returns>Loaded Configuration.</returns>
- internal static Configuration Load(string fileName)
+ public static Configuration Load(string fileName)
{
try
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -4,6 +4,7 @@
using System.Windows.Forms;
using IrssUtils;
+using IrssUtils.Exceptions;
namespace Translator
{
@@ -156,7 +157,7 @@
if (windowHandle != IntPtr.Zero)
Win32.SendWindowsMessage(windowHandle, (int)Win32.WindowsMessage.WM_COPYDATA, IntPtr.Zero, Win32.VarPtr(copyData));
else
- MessageBox.Show("Couldn't find target");
+ throw new CommandExecutionException("Could not find running Translator instance to send message to");
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -1137,16 +1137,11 @@
if (openFileDialog.ShowDialog(this) == DialogResult.OK)
{
Configuration newConfig = Configuration.Load(openFileDialog.FileName);
-
if (newConfig == null)
return;
- // TODO: Improve import logic ...
+ Program.Config.Import(newConfig);
- Program.Config.Events.AddRange(newConfig.Events);
- Program.Config.Programs.AddRange(newConfig.Programs);
- Program.Config.SystemWideMappings.AddRange(newConfig.SystemWideMappings);
-
RefreshProgramList();
RefreshButtonList();
RefreshEventList();
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -17,6 +17,7 @@
using IrssComms;
using IrssUtils;
+using IrssUtils.Exceptions;
namespace Translator
{
@@ -26,7 +27,7 @@
#region Constants
- internal static readonly string ConfigFile = Path.Combine(Common.FolderAppData, "Translator\\Translator.xml");
+ static readonly string DefaultConfigFile = Path.Combine(Common.FolderAppData, "Translator\\Translator.xml");
internal static readonly string FolderMacros = Path.Combine(Common.FolderAppData, "Translator\\Macro");
@@ -49,6 +50,8 @@
#region Variables
+ static string _configFile;
+
static string _learnIRFilename;
static bool _registered;
@@ -68,6 +71,12 @@
#region Properties
+ internal static string ConfigFile
+ {
+ get { return _configFile; }
+ set { _configFile = value; }
+ }
+
internal static Configuration Config
{
get { return _config; }
@@ -100,18 +109,27 @@
[STAThread]
static void Main(string[] args)
{
+ _configFile = DefaultConfigFile;
+
if (args.Length > 0)
{
try
{
- ProcessCommandLine(args);
+ if (ProcessCommandLine(args))
+ return;
}
+ catch (CommandExecutionException ex)
+ {
+ MessageBox.Show(ex.Message, "Translator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ catch (CommandStructureException ex)
+ {
+ MessageBox.Show(ex.Message, "Translator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "Translator - Error processing command line", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
-
- return;
}
// Check for multiple instances.
@@ -137,10 +155,10 @@
_variables = new VariableList();
// Load configuration ...
- _config = Configuration.Load(ConfigFile);
+ _config = Configuration.Load(_configFile);
if (_config == null)
{
- IrssLog.Warn(String.Format("Failed to load configuration file ({0}), creating new configuration", ConfigFile));
+ IrssLog.Warn("Failed to load configuration file ({0}), creating new configuration", _configFile);
_config = new Configuration();
}
@@ -259,8 +277,10 @@
IrssLog.Error(e.Exception);
}
- static void ProcessCommandLine(string[] args)
+ static bool ProcessCommandLine(string[] args)
{
+ bool dontRun = true;
+
for (int index = 0; index < args.Length; index++)
{
string command = args[index].ToUpperInvariant();
@@ -271,21 +291,21 @@
if (args.Length > index + 2)
CopyDataWM.SendCopyDataMessage(Common.CmdPrefixBlast + args[++index] + '|' + args[++index]);
else
- Console.WriteLine("Blast command requires two parameters.");
+ throw new CommandStructureException("Blast command requires two parameters (IR file, Port)");
continue;
case "-MACRO":
if (args.Length > index + 1)
CopyDataWM.SendCopyDataMessage(Common.CmdPrefixMacro + args[++index]);
else
- Console.WriteLine("Macro command requires a parameter.");
+ throw new CommandStructureException("Macro command requires a parameter (Macro file)");
continue;
case "-EJECT":
if (args.Length > index + 1)
CopyDataWM.SendCopyDataMessage(Common.CmdPrefixEject + args[++index]);
else
- Console.WriteLine("Eject command requires a parameter.");
+ throw new CommandStructureException("Eject command requires a parameter (Drive)");
continue;
case "-SHUTDOWN":
@@ -328,15 +348,28 @@
}
else
{
- Console.WriteLine("Channel command requires three parameters.");
+ throw new CommandStructureException("Channel command requires three parameters (Channel, Padding, Port)");
}
continue;
}
+ case "-CONFIG":
+ if (args.Length > index + 1)
+ _configFile = args[++index];
+ else
+ throw new CommandStructureException("Config command requires a parameter (Config file path)");
+
+ dontRun = false;
+ continue;
+
+
//TODO: Add more command line options.
+
}
}
+
+ return dontRun;
}
static void ShowOSD()
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-08 04:09:23 UTC (rev 1619)
@@ -63,4 +63,8 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>CALL "%25VS80COMNTOOLS%25vsvars32.bat"
+gacutil.exe /i $(TargetFileName)</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-08 04:09:23 UTC (rev 1619)
@@ -373,4 +373,8 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>CALL "%25VS80COMNTOOLS%25vsvars32.bat"
+gacutil.exe /i $(TargetFileName)</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
