output.bin is now Cosmos.bin

fuqi0340 · Jun 25, 2012 · 630c457 · 630c457
1 parent db5fb69
commit 630c457
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/Build/ISO/isolinux.cfg b/Build/ISO/isolinux.cfg
@@ -1,7 +1,7 @@
 default cosmos
 label cosmos
 	kernel mboot.c32
-	append output.bin
+	append Cosmos.bin
 
 prompt 0
 

diff --git a/Build/PXE/pxelinux.cfg/default b/Build/PXE/pxelinux.cfg/default
@@ -2,4 +2,4 @@ DEFAULT Cosmos
 
 LABEL Cosmos
   KERNEL mboot.c32
-  APPEND output.bin
+  APPEND Cosmos.bin
diff --git a/Build/USB/syslinux.cfg b/Build/USB/syslinux.cfg
@@ -2,4 +2,4 @@ DEFAULT Cosmos
 
 LABEL Cosmos
   KERNEL mboot.c32
-  APPEND output.bin
+  APPEND Cosmos.bin
diff --git a/source2/Build/Cosmos.Build.Common/IsoMaker.cs b/source2/Build/Cosmos.Build.Common/IsoMaker.cs
@@ -18,9 +18,9 @@ static public void Generate(string aBuildPath, string xInputPathname, string aIs
       string xPath = Path.Combine(aBuildPath, @"ISO");
       RemoveFile(aIsoPathname);
 
-      // We copy and rename in the process to output.bin becaue the .cfg is currently
-      // hardcoded to output.bin.
-      string xOutputBin = Path.Combine(xPath, "output.bin");
+      // We copy and rename in the process to Cosmos.bin becaue the .cfg is currently
+      // hardcoded to Cosmos.bin.
+      string xOutputBin = Path.Combine(xPath, "Cosmos.bin");
       RemoveFile(xOutputBin);
       File.Copy(xInputPathname, xOutputBin);
 
@@ -33,7 +33,7 @@ static public void Generate(string aBuildPath, string xInputPathname, string aIs
         BootFileName = xIsoLinux,
         BootInfoTable = true
       };
-      // TODO - Use move or see if we can do this without copying first the output.bin as they will start to get larger
+      // TODO - Use move or see if we can do this without copying first the Cosmos.bin as they will start to get larger
       xOptions.IncludeFiles.Add(xPath);
 
       var xISO = new Iso9660Generator(xOptions);

diff --git a/source2/Build/Cosmos.Build.Common/UsbMaker.cs b/source2/Build/Cosmos.Build.Common/UsbMaker.cs
@@ -17,18 +17,21 @@ static public void Generate() {
       string aDrive = "G";
 
       //string xPath = BuildPath + @"C:\Users\Atmoic\AppData\Roaming\Cosmos User Kit\Build\USB";
-      string xPath = @"D:\source\Cosmos\Build\USB";
+      string xPath =  @"C:\Users\Atmoic\AppData\Roaming\Cosmos User Kit\Build\USB";
 
       // Why do we copy it twice???
-      RemoveFile(Path.Combine(xPath, "output.bin"));
-      //File.Copy(xBuildPath + @"output.bin", xPath + @"output.bin");
+      RemoveFile(Path.Combine(xPath, "Cosmos.bin"));
+      File.Copy(@"d:\source\Cosmos\source2\Demos\Guess\bin\Debug\Guess.obj", Path.Combine(xPath, "Cosmos.bin"));
+
       // Copy to USB device
-      RemoveFile(aDrive + @":\output.bin");
-      //File.Copy(xPath + @"output.bin", aDrive + @":\output.bin");
+      RemoveFile(aDrive + @":\Cosmos.bin");
+      File.Copy(Path.Combine(xPath, "Cosmos.bin"), aDrive + @":\Cosmos.bin");
+
       RemoveFile(aDrive + @":\mboot.c32");
-      //File.Copy(xPath + @"mboot.c32", aDrive + @":\mboot.c32");
+      File.Copy(Path.Combine(xPath, "mboot.c32"), aDrive + @":\mboot.c32");
+
       RemoveFile(aDrive + @":\syslinux.cfg");
-      //File.Copy(xPath + @"syslinux.cfg", aDrive + @":\syslinux.cfg");
+      File.Copy(Path.Combine(xPath, "syslinux.cfg"), aDrive + @":\syslinux.cfg");
 
       // Set MBR
       //TODO: Hangs on Windows 2008 - maybe needs admin permissions? Or maybe its not compat?