Renumber AutoFullDistro filenames.

src/Misc/Auto/AutoFullDistro0.ZC

@@ -25,7 +25,7 @@ U0 Auto()
 	Free(in_str);
 	in_str = MStrPrint(	"BootHDIns;"
 						"OnceFlush;"
-						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro00\\\";;Auto;\");"
+						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro1\\\";;Auto;\");"
 						"Reboot;");
 	OnceDrive('C', in_str);
 	OutU8(0x501,0x31);

src/Misc/Auto/AutoFullDistro00.ZC

@@ -1,37 +0,0 @@
-U0 Auto()
-{
-	I64			 i, ata_port = -1;
-	CAHCIPort	*port;
-	U8			*in_str;
-
-	for (i = 0; i < AHCI_MAX_PORTS; i++)
-
-	{
-		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
-		{
-			port = &blkdev.ahci_hba->ports[i];
-			if (port->signature == AHCI_PxSIG_ATA)
-			{
-				ata_port = i;
-				break;
-			}
-		}
-	}
-
-	WinMax;
-	BootMHDIns('C');
-	Copy("C:/Tmp/OSBuild/Kernel/KStart16.ZC", "C:/Kernel/");
-	Copy("C:/Tmp/OSBuild/Kernel/KernelA.HH", "C:/Kernel/");
-	in_str = MStrPrint("CC\n%d\n\n\n\n", ata_port);
-	Sleep(700);
-	In(in_str);
-	BootHDIns;
-	OnceFlush;
-	Free(in_str);
-	in_str = MStrPrint(	"OnceFlush;"
-						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro000\\\";;Auto;\");"
-						"Reboot;");
-	OnceDrive('C', in_str);
-	Reboot;
-}
-Auto;

src/Misc/Auto/AutoFullDistro000.ZC

@@ -1,36 +0,0 @@
-U0 Auto()
-{
-	I64			 i, ata_port = -1;
-	CAHCIPort	*port;
-	U8			*in_str;
-
-	for (i = 0; i < AHCI_MAX_PORTS; i++)
-
-	{
-		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
-		{
-			port = &blkdev.ahci_hba->ports[i];
-			if (port->signature == AHCI_PxSIG_ATA)
-			{
-				ata_port = i;
-				break;
-			}
-		}
-	}
-
-	WinMax;
-	BootMHDIns('C');
-	CopyTree("C:/Tmp/OSBuild/Kernel/", "C:/Kernel/");
-	in_str = MStrPrint("CC\n%d\n\n\n\n", ata_port);
-	Sleep(700);
-	In(in_str);
-	BootHDIns;
-	OnceFlush;
-	Free(in_str);
-	in_str = MStrPrint(	"OnceFlush;"
-						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro0000\\\";;Auto;\");"
-						"Reboot;");
-	OnceDrive('C', in_str);
-	Reboot;
-}
-Auto;

src/Misc/Auto/AutoFullDistro1.ZC

@@ -1,4 +1,37 @@
 U0 Auto()
 {
-	PopUp("#include \"/Misc/Auto/AutoFullDistro2\"");
+	I64			 i, ata_port = -1;
+	CAHCIPort	*port;
+	U8			*in_str;
+
+	for (i = 0; i < AHCI_MAX_PORTS; i++)
+
+	{
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
+		{
+			port = &blkdev.ahci_hba->ports[i];
+			if (port->signature == AHCI_PxSIG_ATA)
+			{
+				ata_port = i;
+				break;
+			}
+		}
+	}
+
+	WinMax;
+	BootMHDIns('C');
+	Copy("C:/Tmp/OSBuild/Kernel/KStart16.ZC", "C:/Kernel/");
+	Copy("C:/Tmp/OSBuild/Kernel/KernelA.HH", "C:/Kernel/");
+	in_str = MStrPrint("CC\n%d\n\n\n\n", ata_port);
+	Sleep(700);
+	In(in_str);
+	BootHDIns;
+	OnceFlush;
+	Free(in_str);
+	in_str = MStrPrint(	"OnceFlush;"
+						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro2\\\";;Auto;\");"
+						"Reboot;");
+	OnceDrive('C', in_str);
+	Reboot;
 }
+Auto;

src/Misc/Auto/AutoFullDistro2.ZC

@@ -1,74 +1,36 @@
-#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n"
+U0 Auto()
-
-U0 MakeMyISO()
 {
-	U8 *_out_iso_filename = "/Tmp/MyDistro.ISO.C";
+	I64			 i, ata_port = -1;
-	U8 *out_iso_filename = FileNameAbs(_out_iso_filename);
+	CAHCIPort	*port;
-	I64 line_count = LineRep("/*", "-r") + LineRep("/System/*") + LineRep("/Compiler/*", "-S+$$") + LineRep("/Kernel/*");
+	U8			*in_str;
+
+	for (i = 0; i < AHCI_MAX_PORTS; i++)
 
-	if (!DriveIsWritable)
 	{
-		"Drive must be writable.	Install on Hard drive, first.\n";
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
-		return;
+		{
+			port = &blkdev.ahci_hba->ports[i];
+			if (port->signature == AHCI_PxSIG_ATA)
+			{
+				ata_port = i;
+				break;
+			}
+		}
 	}
 
-	DocTreeFWrite("/System/Define.ZC", "LineRep", "DefinePrint(\"DD_ZEALOS_LOC\",\"%,d\");\n", line_count);
+	WinMax;
-	DefinePrint("DD_ZEALOS_LOC", "%,d", line_count);
+	BootMHDIns('C');
-
+	CopyTree("C:/Tmp/OSBuild/Kernel/", "C:/Kernel/");
-	"Total LOC:%12,d\n\n", line_count;
+	in_str = MStrPrint("CC\n%d\n\n\n\n", ata_port);
-
+	Sleep(700);
-	DelTree("/Distro");
+	In(in_str);
-	Del(out_iso_filename);
+	BootHDIns;
-
+	OnceFlush;
-	ProgressBarsReset;
+	Free(in_str);
-	progress1_max = 14;
+	in_str = MStrPrint(	"OnceFlush;"
-	StrCopy(progress1_desc, "Copying files to /Distro");
+						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro3\\\";;Auto;\");"
-
+						"Reboot;");
-	DirMake("/Distro");
+	OnceDrive('C', in_str);
-	In(STD_DISTRO_DVD_CONFIG);
+	Reboot;
-	BootDVDIns;
-	progress1++;
-
-	Copy("/*", "/Distro");
-	progress1++;
-	DirMake("/Distro" BOOT_DIR);
-	Move(BOOT_DIR_DVD_KERNEL_ZXE, "/Distro" BOOT_DIR_KERNEL_ZXE);
-	progress1++;
-	CopyTree("/Home", 		"/Distro/Home");
-	progress1++;
-	Del("/Distro/Home/Registry.ZC");
-	CopyTree("/System", 	"/Distro/System");
-	progress1++;
-	CopyTree("/Apps", 		"/Distro/Apps");
-	progress1++;
-	CopyTree("/Compiler",	"/Distro/Compiler");
-	progress1++;
-	CopyTree("/Demo", 		"/Distro/Demo");
-	progress1++;
-	CopyTree("/Doc",		"/Distro/Doc");
-	progress1++;
-	CopyTree("/Kernel", 	"/Distro/Kernel");
-	progress1++;
-	CopyTree("/Misc", 		"/Distro/Misc");
-	progress1++;
-
-	CopyTree("/Downloads", "/Distro/Downloads");
-	progress1++;
-	DirMake("/Distro/Tmp");
-	DirMake("/Distro/Tmp/ScreenShots");
-	progress1++;
-	StrCopy(progress1_desc, "Building ISO");
-	RedSeaISO(out_iso_filename, "/Distro", "/Distro" BOOT_DIR_KERNEL_ZXE);
-	progress1++;
-
-	//If CD-ROM use MT_CD instead of MT_DVD.
-	//DVDImageWrite('T',out_iso_filename,MT_DVD); //Uncomment to burn.
-
-	Copy("/Distro" BOOT_DIR_KERNEL_ZXE, "/Tmp/DVD" KERNEL_ZXE);
-
-	DelTree("/Distro");
-	ProgressBarsReset;
-	Free(out_iso_filename);
 }
-MakeMyISO;
+Auto;
-OutU8(0x501,0x31);

src/Misc/Auto/AutoFullDistro3.ZC

@@ -25,7 +25,7 @@ U0 Auto()
 	In(in_str);
 	BootHDIns;
 	OnceFlush;
-	in_str = MStrPrint("#include \"/Misc/Auto/AutoFullDistro1\";;Auto;;");
+	in_str = MStrPrint("#include \"/Misc/Auto/AutoFullDistro4\";;Auto;;");
 	OnceDrive('C', in_str);
 	DelTree("C:/Tmp/OSBuild");
 	Reboot;

src/Misc/Auto/AutoFullDistro4.ZC

@@ -0,0 +1,4 @@
+U0 Auto()
+{
+	PopUp("#include \"/Misc/Auto/AutoFullDistro5\"");
+}

src/Misc/Auto/AutoFullDistro5.ZC

@@ -0,0 +1,74 @@
+#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n"
+
+U0 MakeMyISO()
+{
+	U8 *_out_iso_filename = "/Tmp/MyDistro.ISO.C";
+	U8 *out_iso_filename = FileNameAbs(_out_iso_filename);
+	I64 line_count = LineRep("/*", "-r") + LineRep("/System/*") + LineRep("/Compiler/*", "-S+$$") + LineRep("/Kernel/*");
+
+	if (!DriveIsWritable)
+	{
+		"Drive must be writable.	Install on Hard drive, first.\n";
+		return;
+	}
+
+	DocTreeFWrite("/System/Define.ZC", "LineRep", "DefinePrint(\"DD_ZEALOS_LOC\",\"%,d\");\n", line_count);
+	DefinePrint("DD_ZEALOS_LOC", "%,d", line_count);
+
+	"Total LOC:%12,d\n\n", line_count;
+
+	DelTree("/Distro");
+	Del(out_iso_filename);
+
+	ProgressBarsReset;
+	progress1_max = 14;
+	StrCopy(progress1_desc, "Copying files to /Distro");
+
+	DirMake("/Distro");
+	In(STD_DISTRO_DVD_CONFIG);
+	BootDVDIns;
+	progress1++;
+
+	Copy("/*", "/Distro");
+	progress1++;
+	DirMake("/Distro" BOOT_DIR);
+	Move(BOOT_DIR_DVD_KERNEL_ZXE, "/Distro" BOOT_DIR_KERNEL_ZXE);
+	progress1++;
+	CopyTree("/Home", 		"/Distro/Home");
+	progress1++;
+	Del("/Distro/Home/Registry.ZC");
+	CopyTree("/System", 	"/Distro/System");
+	progress1++;
+	CopyTree("/Apps", 		"/Distro/Apps");
+	progress1++;
+	CopyTree("/Compiler",	"/Distro/Compiler");
+	progress1++;
+	CopyTree("/Demo", 		"/Distro/Demo");
+	progress1++;
+	CopyTree("/Doc",		"/Distro/Doc");
+	progress1++;
+	CopyTree("/Kernel", 	"/Distro/Kernel");
+	progress1++;
+	CopyTree("/Misc", 		"/Distro/Misc");
+	progress1++;
+
+	CopyTree("/Downloads", "/Distro/Downloads");
+	progress1++;
+	DirMake("/Distro/Tmp");
+	DirMake("/Distro/Tmp/ScreenShots");
+	progress1++;
+	StrCopy(progress1_desc, "Building ISO");
+	RedSeaISO(out_iso_filename, "/Distro", "/Distro" BOOT_DIR_KERNEL_ZXE);
+	progress1++;
+
+	//If CD-ROM use MT_CD instead of MT_DVD.
+	//DVDImageWrite('T',out_iso_filename,MT_DVD); //Uncomment to burn.
+
+	Copy("/Distro" BOOT_DIR_KERNEL_ZXE, "/Tmp/DVD" KERNEL_ZXE);
+
+	DelTree("/Distro");
+	ProgressBarsReset;
+	Free(out_iso_filename);
+}
+MakeMyISO;
+OutU8(0x501,0x31);