X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FFilesystems%2FInitRD%2FGenerateInitRD.php;h=52377e6fed5179eec5558f67ce8f3e45e61e4fef;hb=85362e8a4c919b58cd261345d29f26bae4ad75e2;hp=ca7be3d5d3527f37847f2d08c418d8a90dce3be2;hpb=f9264a48d59a22682229cf6e2e19615140001abc;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php b/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
index ca7be3d5..52377e6f 100644
--- a/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
+++ b/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
@@ -1,4 +1,6 @@
 <?php
+date_default_timezone_set("UTC");
+
 $lGenDate = date("Y-m-d H:i");
 $gOutput = <<<EOF
 /*
@@ -10,6 +12,8 @@ $gOutput = <<<EOF
 
 EOF;
 
+define("DEBUG_ENABLED", false);
+
 $ACESSDIR = getenv("ACESSDIR");
 $ARCH = getenv("ARCH");
 
@@ -28,30 +32,63 @@ $lStack = array( array("",array()) );
 foreach($lines as $line)
 {
 	$line = trim($line);
-	if($line[0] == "#")	continue;
+	if($line == "" || $line[0] == "#")	continue;
 	// Directory
 	if(preg_match('/^Dir\s+"([^"]+)"\s+{$/', $line, $matches))
 	{
 		$new = array($matches[1], array());
 		array_push($lStack, $new);
 		$lDepth ++;
-		continue;
 	}
 	// End of a block
-	if($line == "}")
+	elseif($line == "}")
 	{
 		$lDepth --;
 		$lStack[$lDepth][1][] = array_pop($lStack);
-		continue;
 	}
 	// File
-	if(preg_match('/^File\s+"([^"]+)"\s+"([^"]+)"$/', $line, $matches))
+	elseif(preg_match('/^((?:Opt)?)File\s+"([^"]+)"(?:\s+"([^"]+)")?$/', $line, $matches))
+	{
+		$isOptional = $matches[1];
+		$dstfile = $matches[2];
+		$path = isset($matches[3]) ? $matches[3] : "";
+		
+		if( $path == "" ) {
+			$path = $dstfile;
+			$dstfile = basename($dstfile);
+		}
+		
+		// Parse path components
+		$path = str_replace("__EXT__", "$ACESSDIR/Externals/Output/$ARCH", $path);
+		$path = str_replace("__BIN__", "$ACESSDIR/Usermode/Output/$ARCH", $path);
+		$path = str_replace("__FS__", "$ACESSDIR/Usermode/Filesystem", $path);
+		$path = str_replace("__SRC__", "$ACESSDIR", $path);
+
+		$gDependencies[] = $path;
+		
+		if( !file_exists($path) )
+		{
+			if( $isOptional == "" )
+			{
+				// Oops
+				echo "ERROR: '{$path}' does not exist\n", 
+				exit(1);
+			}
+			else
+			{
+				// optional file
+			}
+		}
+		else
+		{
+			$lStack[$lDepth][1][] = array($dstfile, $path, $isOptional);
+		}
+	}
+	else
 	{
-		$lStack[$lDepth][1][] = array($matches[1], $matches[2]);
-		continue;
+		echo "ERROR: $line\n";
+		exit(0);
 	}
-	echo "ERROR: $line\n";
-	exit(0);
 }
 
 function hd($fp)
@@ -108,51 +145,13 @@ EOF;
 		{
 			$path = $item[1];
 			
-			// Parse path components
-			$path = str_replace("__BIN__", "$ACESSDIR/Usermode/Output/$ARCH", $path);
-			$path = str_replace("__FS__", "$ACESSDIR/Usermode/Filesystem", $path);
-			$path = str_replace("__SRC__", "$ACESSDIR", $path);
-			echo $path,"\n";
-			// ---
-			
-			$gDependencies[] = $path;
-
-			if(!file_exists($path)) {
-				echo "ERROR: '{$path}' does not exist\n", 
-				exit(1);
-			}
+			if( DEBUG_ENABLED )
+				echo $path,"\n";
 			$size = filesize($path);
 	
-/*		
-			$_sym = $prefix."_".$i."_data";
-			$fp = fopen($path, "rb");
-			
-			$gOutput .= "Uint8 $_sym[] = {\n";
-			for( $j = 0; $j + 16 < $size; $j += 16 ) {
-				$gOutput .= "\t";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",\n";
-			}
-			$gOutput .= "\t";
-			for( ; $j < $size; $j ++ ) {
-				if( $j & 15 )	$gOutput .= ",";
-				$gOutput .= hd8($fp);
-			}
-			fclose($fp);
-			$gOutput .= "\n};\n";
-*/
-			
-//*
-			$_sym = "_binary_".str_replace(array("/","-","."), "_", $path)."_start";
+			$_sym = "_binary_".str_replace(array("/","-",".","+"), "_", $path)."_start";
 			$gOutput .= "extern Uint8 {$_sym}[];";
 			$gSymFiles[] = $path;
-//*/
 			$gOutput .= <<<EOF
 tVFS_Node {$prefix}_{$i} = {
 	.NumACLs = 1,
@@ -238,8 +237,10 @@ fclose($fp);
 if($gDepFile !== false)
 {
 	$fp = fopen($gDepFile, "w");
-	$line = $gOutputFile.":\t".implode(" ", $gDependencies);
+	$line = $gOutputFile.":\t".implode(" ", $gDependencies)."\n";
 	fputs($fp, $line);
+	foreach( $gDependencies as $dep )
+		fputs($fp, "$dep: \n");
 	fclose($fp);
 }