Fixes Mono Deploy to actually work.

ThadHouse · ThadHouse · commit bc1879a25ce0 · 2015-12-05T00:47:10.000-08:00
Will need to upload the zip file, but otherwise it's good.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@
 *.sln.docstates
 
 #Upload user file only for the extension
-!FRC Extension.csproj.user
+!FRC-Extension.csproj.user
 
 # Build results
 [Dd]ebug/
diff --git a/FRC-Extension/Buttons/DownloadMonoButton.cs b/FRC-Extension/Buttons/DownloadMonoButton.cs
@@ -44,11 +44,7 @@ public override async void ButtonCallback(object sender, EventArgs e)
                         return;
                     }
 
-                    string monoFolder = WPILibFolderStructure.CreateMonoFolder();
-
-                    string monoFile = monoFolder + Path.DirectorySeparatorChar + DeployProperties.MonoVersion;
-
-                    m_monoFile.FileName = monoFile;
+                    m_monoFile.ResetToDefaultDirectory();
 
                     bool downloadNew = !m_monoFile.CheckFileValid();
 
diff --git a/FRC-Extension/Buttons/InstallMonoButton.cs b/FRC-Extension/Buttons/InstallMonoButton.cs
@@ -31,6 +31,7 @@ public override async void ButtonCallback(object sender, EventArgs e)
             {
                 try
                 {
+                    m_monoFile.ResetToDefaultDirectory();
                     bool properFileExists = true;
 
                     properFileExists = m_monoFile.CheckFileValid();
@@ -51,6 +52,7 @@ public override async void ButtonCallback(object sender, EventArgs e)
 
                         if (!string.IsNullOrEmpty(retVal))
                         {
+                            m_monoFile.FileName = retVal;
                             //Check for valid file.
                             properFileExists = m_monoFile.CheckFileValid();
 
diff --git a/FRC-Extension/FRC-Extension.csproj.user b/FRC-Extension/FRC-Extension.csproj.user
@@ -0,0 +1,13 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <StartAction>Program</StartAction>
+    <StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix Exp</StartArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <StartAction>Program</StartAction>
+    <StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix Exp</StartArguments>
+  </PropertyGroup>
+</Project>
diff --git a/FRC-Extension/MonoCode/MonoDeploy.cs b/FRC-Extension/MonoCode/MonoDeploy.cs
@@ -53,7 +53,7 @@ internal async Task DeployMono()
 
                     await RoboRIOConnection.RunCommand($"mkdir -p {DeployProperties.RoboRioOpgkLocation}", ConnectionUser.Admin);
 
-                    writer.WriteLine("m_deploying Mono Files");
+                    writer.WriteLine("Deploying Mono Files");
 
                     success = await RoboRIOConnection.DeployFiles(deployFiles, DeployProperties.RoboRioOpgkLocation, ConnectionUser.Admin);
 
@@ -67,8 +67,9 @@ internal async Task DeployMono()
                     var monoRet = await RoboRIOConnection.RunCommand(DeployProperties.OpkgInstallCommand, ConnectionUser.Admin);
 
                     //Check for success.
+                    bool monoSuccess = await m_deployManager.CheckMonoInstall();
 
-                    if (await m_deployManager.CheckMonoInstall())
+                    if (monoSuccess)
                     {
                         writer.WriteLine("Mono Installed Successfully");
                     }
@@ -77,9 +78,10 @@ internal async Task DeployMono()
                         writer.WriteLine("Mono not installed successfully");
                     }
 
-                    //TODO : Cleanup files on RIO
-
+                    //Removing ipk files from the RoboRIO
                     await RoboRIOConnection.RunCommand($"rm -rf {DeployProperties.RoboRioOpgkLocation}", ConnectionUser.Admin);
+
+                    writer.WriteLine("Done. You may now deploy code to your robot.");
                 }
                 else
                 {
diff --git a/FRC-Extension/MonoCode/MonoFile.cs b/FRC-Extension/MonoCode/MonoFile.cs
@@ -27,6 +27,12 @@ public MonoFile(string fileName)
             m_extractPath = monoFolder + Path.DirectorySeparatorChar + "temp";
         }
 
+        public void ResetToDefaultDirectory()
+        {
+            string monoFolder = WPILibFolderStructure.CreateMonoFolder();
+            FileName = monoFolder + Path.DirectorySeparatorChar + DeployProperties.MonoVersion;
+        }
+
         private string Md5Sum()
         {
             byte[] fileMd5Sum = null;
@@ -72,6 +78,7 @@ public static string SelectMonoFile()
         public bool CheckFileValid()
         {
             string fileSum = Md5Sum();
+            OutputWriter.Instance.WriteLine(fileSum);
 
             return fileSum != null && fileSum.Equals(DeployProperties.MonoMd5);
         }
diff --git a/FRC-Extension/RoboRIOCode/DeployManager.cs b/FRC-Extension/RoboRIOCode/DeployManager.cs
@@ -294,8 +294,7 @@ public async Task UploadCode(string robotName, SettingsPageGrid page, bool debug
             }
 
             //Must be run as admin, so is seperate
-            //Check to see if the thing below is in the official extension.
-            //await RoboRIOConnection.RunCommand("killall netconsole-host", ConnectionUser.Admin);
+            await RoboRIOConnection.RunCommand("killall netconsole-host", ConnectionUser.Admin);
 
             //Combining all other commands, since they should be safe running together.
             List<string> commands = new List<string>();
diff --git a/FRC-Extension/RoboRIOCode/DeployProperties.cs b/FRC-Extension/RoboRIOCode/DeployProperties.cs
@@ -49,26 +49,23 @@ public static class DeployProperties
 
         public const string CommandDir = "/home/lvuser";
 
-        public static readonly string RobotCommandDebug =
-            "env LD_LIBRARY_PATH=/usr/local/frc/rpath-lib/ /usr/local/frc/bin/netconsole-host mono --debug \"" + DeployDir + "/{0}\"";
+        public const string RobotCommandDebug = "env LD_LIBRARY_PATH=/usr/local/frc/rpath-lib/ /usr/local/frc/bin/netconsole-host mono --debug \"" + DeployDir + "/{0}\"";
 
         public const string RobotCommandDebugFileName = "robotDebugCommand";
 
-        public static readonly string RobotCommand =
-            "env LD_LIBRARY_PATH=/usr/local/frc/rpath-lib/ /usr/local/frc/bin/netconsole-host mono \"" + DeployDir + "/{0}\"";
+        public const string RobotCommand = "env LD_LIBRARY_PATH=/usr/local/frc/rpath-lib/ /usr/local/frc/bin/netconsole-host mono \"" + DeployDir + "/{0}\"";
 
         public const string RobotCommandFileName = "robotCommand";
 
-        public const string MonoMd5 = "145126881924420175520132501465663102223";
+        public const string MonoMd5 = "1852022171552091945152452461853193134197150";
 
-        public const string MonoVersion = "Mono4.0.1.zip";
+        public const string MonoVersion = "Mono4.2.1.zip";
 
         public const string MonoUrl = "https://dl.bintray.com/robotdotnet-admin/Mono/";
 
-
         public const string RoboRioOpgkLocation = "/home/admin/opkg";
 
-        public const string OpkgInstallCommand = "opgk install *.ipk";
+        public static readonly string OpkgInstallCommand = $"opkg install {RoboRioOpgkLocation}/*.ipk";
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public override async void ButtonCallback(object sender, EventArgs e)`
`31`	`31`	`{`
`32`	`32`	`try`
`33`	`33`	`{`
	`34`	`+ m_monoFile.ResetToDefaultDirectory();`
`34`	`35`	`bool properFileExists = true;`
`35`	`36`
`36`	`37`	`properFileExists = m_monoFile.CheckFileValid();`
`@@ -51,6 +52,7 @@ public override async void ButtonCallback(object sender, EventArgs e)`
`51`	`52`
`52`	`53`	`if (!string.IsNullOrEmpty(retVal))`
`53`	`54`	`{`
	`55`	`+ m_monoFile.FileName = retVal;`
`54`	`56`	`//Check for valid file.`
`55`	`57`	`properFileExists = m_monoFile.CheckFileValid();`
`56`	`58`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ internal async Task DeployMono()`
`53`	`53`
`54`	`54`	`await RoboRIOConnection.RunCommand($"mkdir -p {DeployProperties.RoboRioOpgkLocation}", ConnectionUser.Admin);`
`55`	`55`
`56`		`- writer.WriteLine("m_deploying Mono Files");`
	`56`	`+ writer.WriteLine("Deploying Mono Files");`
`57`	`57`
`58`	`58`	`success = await RoboRIOConnection.DeployFiles(deployFiles, DeployProperties.RoboRioOpgkLocation, ConnectionUser.Admin);`
`59`	`59`
`@@ -67,8 +67,9 @@ internal async Task DeployMono()`
`67`	`67`	`var monoRet = await RoboRIOConnection.RunCommand(DeployProperties.OpkgInstallCommand, ConnectionUser.Admin);`
`68`	`68`
`69`	`69`	`//Check for success.`
	`70`	`+ bool monoSuccess = await m_deployManager.CheckMonoInstall();`
`70`	`71`
`71`		`- if (await m_deployManager.CheckMonoInstall())`
	`72`	`+ if (monoSuccess)`
`72`	`73`	`{`
`73`	`74`	`writer.WriteLine("Mono Installed Successfully");`
`74`	`75`	`}`
`@@ -77,9 +78,10 @@ internal async Task DeployMono()`
`77`	`78`	`writer.WriteLine("Mono not installed successfully");`
`78`	`79`	`}`
`79`	`80`
`80`		`- //TODO : Cleanup files on RIO`
`81`		`-`
	`81`	`+ //Removing ipk files from the RoboRIO`
`82`	`82`	`await RoboRIOConnection.RunCommand($"rm -rf {DeployProperties.RoboRioOpgkLocation}", ConnectionUser.Admin);`
	`83`	`+`
	`84`	`+ writer.WriteLine("Done. You may now deploy code to your robot.");`
`83`	`85`	`}`
`84`	`86`	`else`
`85`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,12 @@ public MonoFile(string fileName)`
`27`	`27`	`m_extractPath = monoFolder + Path.DirectorySeparatorChar + "temp";`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ public void ResetToDefaultDirectory()`
	`31`	`+ {`
	`32`	`+ string monoFolder = WPILibFolderStructure.CreateMonoFolder();`
	`33`	`+ FileName = monoFolder + Path.DirectorySeparatorChar + DeployProperties.MonoVersion;`
	`34`	`+ }`
	`35`	`+`
`30`	`36`	`private string Md5Sum()`
`31`	`37`	`{`
`32`	`38`	`byte[] fileMd5Sum = null;`
`@@ -72,6 +78,7 @@ public static string SelectMonoFile()`
`72`	`78`	`public bool CheckFileValid()`
`73`	`79`	`{`
`74`	`80`	`string fileSum = Md5Sum();`
	`81`	`+ OutputWriter.Instance.WriteLine(fileSum);`
`75`	`82`
`76`	`83`	`return fileSum != null && fileSum.Equals(DeployProperties.MonoMd5);`
`77`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,7 @@ public async Task UploadCode(string robotName, SettingsPageGrid page, bool debug`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`//Must be run as admin, so is seperate`
`297`		`- //Check to see if the thing below is in the official extension.`
`298`		`- //await RoboRIOConnection.RunCommand("killall netconsole-host", ConnectionUser.Admin);`
	`297`	`+ await RoboRIOConnection.RunCommand("killall netconsole-host", ConnectionUser.Admin);`
`299`	`298`
`300`	`299`	`//Combining all other commands, since they should be safe running together.`
`301`	`300`	`List<string> commands = new List<string>();`