--- loncom/build/Attic/parse.pl	2000/12/09 19:29:16	1.6
+++ loncom/build/Attic/parse.pl	2000/12/21 14:38:31	1.18
@@ -65,6 +65,7 @@ while ($info1=~/\<loncapa\s+(.*?)\>/isg)
     }
     elsif (uc($hash{'TYPE'}) eq "LOCATION") {
         $info{$hash{'TYPE'}}{$hash{'DIST'}}{$hash{'TARGET'}}{'CATEGORY'}=                               $hash{'CATEGORY'};
+        $info{$hash{'TYPE'}}{$hash{'DIST'}}{$hash{'TARGET'}}{'LINKTO'}=                               $hash{'LINKTO'};
         $info{$hash{'TYPE'}}{$hash{'DIST'}}{$hash{'TARGET'}}{'SOURCE'}=                                               $hash{'SOURCE'};
         # get surrounding metagroup information
         my $ckeystring=$keystring; $ckeystring=~s/(SOURCE\=\"[^"]*)\*/$1\\\*/g;
@@ -75,7 +76,7 @@ while ($info1=~/\<loncapa\s+(.*?)\>/isg)
         foreach my $m (@meta) {
 	    if ($data=~/\<($m)\>(.*?)\<\/$m\>/sgi) {
 		my ($key,$value)=($1,$2);
-		$info{$hash{'TYPE'}}{$hash{'DIST'}}{$hash{'TARGET'}}{$key}=
+		$info{$hash{'TYPE'}}{$hash{'DIST'}}{$hash{'TARGET'}}{uc($key)}=
 		                                                    $value;
 	    }
         }
@@ -85,8 +86,9 @@ while ($info1=~/\<loncapa\s+(.*?)\>/isg)
     }
 }
 
-if ($mode eq "ALL" || $mode eq "HTML") {
-    my $a;
+my $a;
+my @directories;
+if ($mode eq "HTML") {
     $a=&begin_description_page;
     print $a;
     $a=&make_rpm_description_block;
@@ -101,8 +103,777 @@ if ($mode eq "ALL" || $mode eq "HTML") {
     $a=&end_description_page;
     print $a;
 }
+elsif ($mode eq "SPEC") {
+    my $out=$info{'RPM'}{'Name'} . '-' . $info{'RPM'}{'Version'} . '.spec';
+    open OUT,">$out";
+    $a=&make_rpm_spec_block;
+    print OUT $a;
+    $a=&make_rpm_build_block;
+    print OUT $a;
+    @directories=&determine_directory_structure;
+    $a=&make_directory_structure_spec_block(\@directories);
+    print OUT $a;
+    $a=&make_directory_and_file_structure_spec_block(\@directories);
+    print OUT $a;
+    $a=&end_spec_page;
+    print OUT $a;
+    close OUT;
+}
+elsif ($mode eq "LCMakefile") {
+    @directories=&determine_directory_structure;
+    $a=&make_directory_LCMakefile_segment(\@directories);
+    print $a;
+    $a=&make_files_LCMakefile_segment(\@directories);
+    print $a;
+    $a=&make_links_LCMakefile_segment(\@directories);
+    print $a;
+}
+elsif ($mode eq "BinaryRoot") {
+    mkdir "BinaryRoot",0755;
+    open OUT,">Makefile.BinaryRoot";
+    @directories=&determine_directory_structure;
+    $a=&make_directory_binaryroot_segment(\@directories);
+    print OUT $a;
+    $a=&make_files_binaryroot_segment(\@directories);
+    print OUT $a;
+    $a=&make_links_binaryroot_segment(\@directories);
+    print OUT $a;
+    close OUT;
+    print `make -f Makefile.BinaryRoot TARGET='BinaryRoot' SOURCE='../..' directories`;
+    print `make -f Makefile.BinaryRoot TARGET='BinaryRoot' SOURCE='../..' files`;
+    print `make -f Makefile.BinaryRoot TARGET='BinaryRoot' SOURCE='../..' links`;
+    open OUT,">base_file_list.txt";
+    $a=&make_file_list(\@directories);
+    print OUT $a;
+    close OUT;
+    
+}
+elsif ($mode eq "status") {
+}
+elsif ($mode eq "update") {
+}
+elsif ($mode eq "configinstall") {
+    @directories=&determine_directory_structure;
+    $a=&make_files_configinstall_segment(\@directories);
+    print $a;
+    $a=&make_files_configpermissions_segment(\@directories);
+    print $a;
+}
+elsif ($mode eq "install") {
+    @directories=&determine_directory_structure;
+    $a=&make_directory_install_segment(\@directories);
+    print $a;
+    $a=&make_files_install_segment(\@directories);
+    print $a;
+    $a=&make_links_install_segment(\@directories);
+    print $a;
+}
+elsif ($mode eq "build") {
+    @directories=&determine_directory_structure;
+    $a=&make_files_build_segment(\@directories);
+    print $a;
+}
+
+# ------------------------------------------------------ a list of file targets
+sub make_file_list {
+    my ($dirs)=@_;
+    my $description;
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# set other values
+	$description.=<<END
+BinaryRoot/$d
+END
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+        }
+	my $pwd=`pwd`; chop $pwd;
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+		my $rot="/".$filesfull[$i];
+		if ($rot=~/\*/) {
+		    $rot=~s/[^\/]+$// if $rot=~/\*/;
+		    my $listing=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'FILES'};
+		    chop $listing;
+		    my @list=split(/\s+/,$listing);
+		    my $rot2;
+		    foreach my $l (@list) {
+			$l=~s/^\s*//; $l=~s/\s*$//;
+			$rot2.="BinaryRoot$rot$l\n" if length($l);
+		    }
+		    chop $rot2;
+		    $rot=$rot2;
+		}
+		else {
+		    $rot="BinaryRoot$rot";
+		}
+		if ($category eq "conf") {
+		    $rot.=" # config";
+		}
+		$description.=<<END;
+$rot
+END
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# --------------------------------- Commands to make BinaryRoot directories
+sub make_directory_binaryroot_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+directories:
+END
+    foreach my $d (@$dirs) {
+	my $category=$info{'DIRECTORY'}{$distribution}{$d}{'CATEGORY'};
+	my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+	my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+	my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+	my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+	my $own=$devchown; $own=~s/\:/\,/;
+	$description.=<<END;
+\tinstall -m $devchmod -d \$(TARGET)/$d
+END
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# --------------------------------------- Commands to make BinaryRoot files
+sub make_files_binaryroot_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+files:
+END
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# set other values
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+	    $description.=<<END;
+\t# $d $dirdescription
+END
+        }
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+		my $rot=$filesfull[$i];
+		$rot=~s/[^\/]+$/\./ if $rot=~/\*/;
+		$description.=<<END if $category ne 'symbolic link';
+\tinstall -m $devchmod \$(SOURCE)/$source \$(TARGET)/$rot
+END
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
 
-# ------------------------------------------------- Begin description page
+# ------------------------------ Commands to make BinaryRoot symbolic links
+sub make_links_binaryroot_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+links:
+END
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $linkto=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'LINKTO'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		$description.=<<END if $category eq 'symbolic link';
+\tln -s /$linkto \$(TARGET)/$filesfull[$i]
+END
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# ------ Installation commands for a Makefile used only by a rpm -ba invocation
+sub make_directory_LCMakefile_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+directories:
+END
+    foreach my $d (@$dirs) {
+	my $category=$info{'DIRECTORY'}{$distribution}{$d}{'CATEGORY'};
+	my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+	my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+	my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+	my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+	my $own=$devchown; $own=~s/\:/\,/;
+	$description.=<<END;
+\tinstall -m $devchmod -d \$(SOURCE)/$d \$(ROOT)/$d
+END
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# ------ Installation commands for a Makefile used only by a rpm -ba invocation
+sub make_files_LCMakefile_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+files:
+END
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# set other values
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+	    $description.=<<END;
+\t# $d $dirdescription
+END
+        }
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $rot=$filesfull[$i];
+		$rot=~s/[^\/]+$/\./ if $rot=~/\*/;
+		$description.=<<END if $category ne 'symbolic link';
+\tinstall -m $devchmod \$(SOURCE)/$filesfull[$i] \$(ROOT)/$rot
+END
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# ------ Installation commands for a Makefile used only by a rpm -ba invocation
+sub make_links_LCMakefile_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+links:
+END
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $linkto=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'LINKTO'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		$description.=<<END if $category eq 'symbolic link';
+\tln -s /$linkto \$(ROOT)/$filesfull[$i]
+END
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# --------------------------------- Installation commands to install directories
+sub make_directory_install_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+directories:
+END
+    foreach my $d (@$dirs) {
+	my $category=$info{'DIRECTORY'}{$distribution}{$d}{'CATEGORY'};
+	my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+	my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+	my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+	my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+	my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+	my ($owner,$group)=split(/\:/,$devchown);
+	my $own=$devchown; $own=~s/\:/\,/;
+	$description.=<<END;
+\tinstall -o $owner -g $group -m $devchmod -d \$(TARGET)/$d
+END
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# ------------------------------------------------------ Commands to build files
+sub make_files_build_segment {
+    my ($dirs)=@_;
+    my $description;
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    my $tab="\t";
+    my $sources="all: ";
+    foreach my $d (@$dirs) {
+	# set other values
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	if (@files) {
+            foreach my $i (0..$#files) {
+		# if has build information, output appropriate something
+		my $build=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'BUILD'};
+		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+		$build=~s/^\s+//; $build=~s/\s+$//;
+		if ($build) {
+		    my $dependencies=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'DEPENDENCIES'};
+		    my $source2=$source;
+		    $source2=~s/^[^\/]+\///;
+ 		    $source2="../" . $source2;
+		    $sources.="$source2 ";
+		    my $directory=$build;
+		    $directory=~s/^[^\/]+\///;
+		    $directory=~s/([^\/]+)$//;
+ 		    $directory="../" . $directory;
+		    my $buildfile=$1;
+		    my $sdir=$source;
+		    $sdir=~s/^[^\/]+\///;
+		    $sdir=~s/([^\/]+)$//;
+ 		    $sdir="../" . $sdir;
+		    $dependencies=~s/\s+$//;
+		    my $depstat="";
+		    if ($dependencies=~s/\s+\[ALWAYS_RUN_BUILD_COMMAND\]//) {
+			$depstat=" alwaysrun";
+		    }
+		    $dependencies=~s/\s+/ $sdir/gs;
+		    $description.=<<END;
+$source2: $dependencies$depstat
+${tab}cd $directory; sh ./$buildfile
+
+END
+		}
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $rot=$filesfull[$i];
+		$rot=~s/[^\/]+$/\./ if $rot=~/\*/;
+#		$description.=<<END if $category ne 'symbolic link';
+#\tinstall -o $owner -g $group -m $devchmod \$(SOURCE)/$source \$(TARGET)/$rot
+#END
+	    }
+	}
+    }
+    $description.=<<END;
+alwaysrun:
+
+END
+    $sources.="\n\n";
+    return ($sources . $description);
+}
+
+# --------------------------------------- Installation commands to install files
+sub make_files_install_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+files:
+END
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# set other values
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+	    $description.=<<END;
+\t# $d $dirdescription
+END
+        }
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $rot=$filesfull[$i];
+		$rot=~s/[^\/]+$/\./ if $rot=~/\*/;
+		my ($owner,$group)=split(/\:/,$devchown);
+		if ($category ne 'conf') {
+		    $description.=<<END if $category ne 'symbolic link';
+\tinstall -o $owner -g $group -m $devchmod \$(SOURCE)/$source \$(TARGET)/$rot
+END
+                }
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# ------ Installation commands to install configuration files (and make backups)
+sub make_files_configinstall_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+configfiles:
+END
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# set other values
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+	    $description.=<<END;
+\t# $d $dirdescription
+END
+        }
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $rot=$filesfull[$i];
+		$rot=~s/[^\/]+$/\./ if $rot=~/\*/;
+		my ($owner,$group)=split(/\:/,$devchown);
+		if ($category eq 'conf') {
+		    $description.=<<END;
+\tinstall -b -S `date +'.\%Y\%m\%d\%H\%M\%S'` -o $owner -g $group -m $devchmod \$(SOURCE)/$source \$(TARGET)/$rot
+END
+                }
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# ------ Commands to enforce configuration file permissions
+sub make_files_configpermissions_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+configpermissions:
+END
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# set other values
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+	    $description.=<<END;
+\t# $d $dirdescription
+END
+        }
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $rot=$filesfull[$i];
+		$rot=~s/[^\/]+$/\./ if $rot=~/\*/;
+		my ($owner,$group)=split(/\:/,$devchown);
+		if ($category eq 'conf') {
+		    $description.=<<END;
+\tchmod $devchmod \$(TARGET)/$rot
+\tchown $devchown \$(TARGET)/$rot
+END
+                }
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    return $description;
+}
+
+# ------------------------------ Installation commands to install symbolic links
+sub make_links_install_segment {
+    my ($dirs)=@_;
+    my $description=<<END;
+links:
+END
+    chop $description;
+    my $description2;
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $linkto=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'LINKTO'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		if ($category eq 'symbolic link') {
+		    $description.=" \$(TARGET)/$filesfull[$i]";
+		    $description2.=<<END;
+\$(TARGET)/$filesfull[$i]:
+\tln -s /$linkto \$(TARGET)/$filesfull[$i]
+
+END
+                }
+	    }
+	}
+    }
+    $description.=<<END;
+
+END
+    $description.=$description2;
+    return $description;
+}
+
+# --------------------------------------------------------- Make RPM .spec block
+sub make_rpm_spec_block {
+    my $pwd=`pwd`; chop $pwd;
+    my $buildroot="$pwd/LON-CAPA-BuildRoot";
+    my $source=$info{'RPM'}{'Name'} . "-" . $info{'RPM'}{'Version'} . '.tar.gz';
+    my $description=<<END;
+Summary: $info{'RPM'}{'Summary'}
+Name: $info{'RPM'}{'Name'}
+Version: $info{'RPM'}{'Version'}
+Release: $info{'RPM'}{'Release'}
+Vendor: $info{'RPM'}{'Vendor'} 
+BuildRoot: $buildroot
+Copyright: $info{'RPM'}{'Copyright'}
+Group: $info{'RPM'}{'Group'}
+Source: $source
+AutoReqProv: $info{'RPM'}{'AutoReqProv'}
+\%description
+$info{'RPM'}{'description'}
+
+END
+    return $description;
+}
+
+# --------------------------------------------------- Make RPM build .spec block
+sub make_rpm_build_block {
+    my $pwd=`pwd`; chop $pwd;
+    my $buildroot="$pwd/LON-CAPA-BuildRoot";
+    my $sourceroot="$pwd/LON-CAPA-SourceRoot";
+    my $description=<<END;
+
+\%prep
+\%setup
+
+\%build
+rm -Rf "$buildroot"
+
+\%install
+make -f LCMakefile ROOT="\$RPM_BUILD_ROOT" SOURCE="$sourceroot" directories
+make -f LCMakefile ROOT="\$RPM_BUILD_ROOT" SOURCE="$sourceroot" files
+make -f LCMakefile ROOT="\$RPM_BUILD_ROOT" SOURCE="$sourceroot" links
+
+\%pre
+$info{'RPM'}{'pre'}
+
+\%post
+\%postun
+
+\%files
+# \%doc README COPYING ChangeLog LICENSE
+END
+    return $description;
+}
+
+# ------------------------------------- Make directory structure RPM .spec block
+sub make_directory_structure_spec_block {
+    my ($dirs)=@_;
+    foreach my $d (@$dirs) {
+	my $category=$info{'DIRECTORY'}{$distribution}{$d}{'CATEGORY'};
+	my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+	my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+	my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+	my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+	my $own=$devchown; $own=~s/\:/\,/;
+	$description.=<<END;
+\%dir \%attr($devchmod,$own) /$d
+END
+    }
+    return $description;
+}
+
+# ---------------------------- Make directory and file structure RPM .spec block
+sub make_directory_and_file_structure_spec_block {
+    my ($dirs)=@_;
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    foreach my $d (@$dirs) {
+	# set other values
+	my $dirdescription=$info{'DIRECTORY'}{$distribution}{$d}{'DESCRIPTION'};
+	$dirdescription="(" . $dirdescription . ")" if $dirdescription;
+	# find files that are contained in this directory
+	my @files;
+	my @filesfull;
+	foreach my $f (@allfiles) {
+	    if ($f=~/^$d\/([^\/]+)$/) {
+		push @files,$1;
+		push @filesfull,$f;
+	    }
+	}
+	# render starting HTML formatting elements
+	if (@files) {
+	    $description.=<<END;
+# $d $dirdescription
+END
+        }
+	if (@files) {
+            foreach my $i (0..$#files) {
+		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
+		my $chown=$info{'OWNERSHIP'}{$category}{'CHOWN'};
+		my $chmod=$info{'OWNERSHIP'}{$category}{'CHMOD'};
+		my $devchown=$info{'DEVOWNERSHIP'}{$category}{'CHOWN'};
+		my $devchmod=$info{'DEVOWNERSHIP'}{$category}{'CHMOD'};
+		my $own=$devchown; $own=~s/\:/\,/;
+		my $config="";
+		$config="\%config " if $category eq 'conf';
+		$devchmod='-' if $category eq 'symbolic link';
+		$description.=<<END;
+$config\%attr($devchmod,$own) /$filesfull[$i]
+END
+	    }
+	}
+    }
+    return $description;
+}
+
+# ----------------------------------------------------------- End RPM .spec page
+sub end_spec_page {
+}
+
+# ------------------------------------------------------- Begin description page
 sub begin_description_page {
     my $description=<<END;
 <HTML>
@@ -118,6 +889,7 @@ sub begin_description_page {
 <LI>About this file
 <LI>Software Package Description
 <LI>Directory Structure
+<LI>File Type Ownership and Permissions
 <LI>File and Directory Structure
 </UL>
 <FONT SIZE=+2>About this file</FONT>
@@ -159,7 +931,6 @@ Group       : $info{'RPM'}{'Group'}
 License     : $info{'RPM'}{'Copyright'}
 Summary     : $info{'RPM'}{'Summary'}
 Description : 
-<PRE>
 $info{'RPM'}{'description'}
 </PRE>
 </TD></TR>
@@ -182,13 +953,27 @@ sub make_directory_structure_description
     my $description=<<END;
 <FONT SIZE=+2>Directory Structure Description, $date</FONT>
 <P>
+The directory structure description below shows only those
+directories which either contain LON-CAPA specific files
+or normally do not exist on a RedHat Linux system (and
+must be generated to allow proper placement of files
+during LON-CAPA run-time operation).
+</P>
+<P>
 <TABLE BORDER=1 CELLPADDING=3 CELLSPACING=0>
 END
     my $maxcount=0;
+    my @allfiles=keys %{$info{'LOCATION'}{$distribution}};
+    my %diraccount; # hash to track which directories are accounted for
+    foreach my $file (@allfiles) {
+	$file=~/^(.*)\/([^\/]+)$/;
+	$diraccount{$1}=1;
+    }
     foreach my $d (@$dirs) {
         my (@matches)=($d=~/\//g);
 	my $count=scalar(@matches);
 	$maxcount=$count if $count>$maxcount;
+	delete $diraccount{$d};
     }
     $description.=<<END;
 <TR>
@@ -197,6 +982,13 @@ END
 <TH ALIGN=LEFT BGCOLOR=#FFFFFF><FONT COLOR=#FF0000>Development<BR>Permissions</FONT></TH>
 END
     $description.="<TH ALIGN=LEFT BGCOLOR=#FFFFFF COLSPAN=".($maxcount+1).">Directory Path</TH>\n";
+    if (keys %diraccount) {
+	$description.= "<TR><TD ALIGN=LEFT BGCOLOR=#FFFFFF COLSPAN=".($maxcount+4)."><I><PRE>Directories that are unaccounted for: \n";
+	foreach my $d (keys %diraccount) {
+	    $description.="$d\n";
+	}
+	$description.="</PRE></I></TH></TR>\n";
+    }
     foreach my $d (@$dirs) {
 	my $dtable=$d;
 	$dtable=~s/\//\<\/TD\>\<TD\>/g;
@@ -270,10 +1062,14 @@ sub make_directory_and_file_structure_de
 <P>
 The icons on the left column correspond to the file type
 specified in the second column.  The last column "Notes" shows compilation,
-dependency, and configuration information.
+dependency, and configuration information.  The CVS location
+shows the location of the binary source file (if applicable) needed to
+be copied to the target.  If the binary source file is not at
+the specified location, then the text is shown in 
+<FONT COLOR=#FF0000>red</FONT>.
 </P>
 <P>
-<TABLE BORDER=1 CELLPADDING=5 WIDTH=60%>
+<TABLE BORDER=1 CELLPADDING=5 WIDTH=500>
 END
     my $counter=0;
     my @colorindex=("#80FF80","#80FFFF","#FFFF80");
@@ -327,7 +1123,38 @@ END
 		my $category=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'CATEGORY'};
 		my $fdescription=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'DESCRIPTION'};
 		my $source=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'SOURCE'};
-		my $notes=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'NOTES'};
+		my $note=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'NOTE'};
+		$note.="<BR>" if $note;
+		my $listing=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'FILES'};
+		my @E=split(/\s+/,$listing);
+		$source=~/(.*)\/[^\/]+$/;
+		my $sd=$1;
+		my $eflag=0;
+		foreach my $e (@E) {
+		    unless (-e "../../$sd/$e") {
+			$e="<FONT COLOR=#FF0000>$e</FONT>";
+			$eflag=1;
+		    }
+		}
+		$listing=join("\n",@E);
+		$listing="<B>listing</B><BR><FONT SIZE=-2>$listing</FONT>" if $listing;
+		$listing.="<BR>" if $listing;
+		my $build=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'BUILD'};
+		$build="<B>build</B><BR>$build" if $build;
+		$build.="<BR>" if $build;
+		my $dependencies=$info{'LOCATION'}{$distribution}{$filesfull[$i]}{'DEPENDENCIES'};
+		$dependencies="<B>dependencies</B><BR>$dependencies" if $dependencies;
+		$dependencies.="<BR>" if $dependencies;
+		unless (-e "../../$source") {
+		    $source=~/([^\/]+)$/;
+		    my $s=$1;
+		    if ($source!~/\*/) {
+			$source="<FONT COLOR=#FF0000>$source</FONT>";
+		    }
+		    elsif ($eflag) {
+			$source="<FONT COLOR=#FF0000>$source</FONT>";
+		    }
+		}
 		$description.=<<END;
 <TR>
 <TD BGCOLOR=#A0A0A0><IMG SRC="$fcm{$category}.gif" ALT="$category"></TD>
@@ -335,7 +1162,7 @@ END
 <TD BGCOLOR=$color>$files[$i]</TD>
 <TD BGCOLOR=$color>$fdescription&nbsp;</TD>
 <TD BGCOLOR=$color>$source</TD>
-<TD BGCOLOR=$color>$notes&nbsp;</TD>
+<TD BGCOLOR=$color>$note$listing$build$dependencies&nbsp;</TD>
 </TR>
 END
 	    }