--- loncom/build/Attic/parse.pl	2000/12/11 19:02:48	1.12
+++ loncom/build/Attic/parse.pl	2000/12/13 21:43:18	1.15
@@ -121,11 +121,11 @@ elsif ($mode eq "SPEC") {
 }
 elsif ($mode eq "LCMakefile") {
     @directories=&determine_directory_structure;
-    $a=&make_directory_install_segment(\@directories);
+    $a=&make_directory_LCMakefile_segment(\@directories);
     print $a;
-    $a=&make_files_install_segment(\@directories);
+    $a=&make_files_LCMakefile_segment(\@directories);
     print $a;
-    $a=&make_links_install_segment(\@directories);
+    $a=&make_links_LCMakefile_segment(\@directories);
     print $a;
 }
 elsif ($mode eq "BinaryRoot") {
@@ -152,7 +152,19 @@ elsif ($mode eq "status") {
 }
 elsif ($mode eq "update") {
 }
-elsif ($mode eq "freshinstall") {
+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
@@ -202,6 +214,9 @@ sub make_file_list {
 		else {
 		    $rot="BinaryRoot$rot";
 		}
+		if ($category eq "conf") {
+		    $rot.=" # config";
+		}
 		$description.=<<END;
 $rot
 END
@@ -323,6 +338,114 @@ 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)=@_;
@@ -331,13 +454,14 @@ 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 $own=$devchown; $own=~s/\:/\,/;
 	$description.=<<END;
-\tinstall -m $devchmod -d \$(SOURCE)/$d \$(ROOT)/$d
+\tinstall -m $devchmod -d \$(TARGET)/$d
 END
     }
     $description.=<<END;
@@ -346,6 +470,81 @@ 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 -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)=@_;
@@ -375,15 +574,18 @@ 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=~/\*/;
-		$description.=<<END if $category ne 'symbolic link';
-\tinstall -m $devchmod \$(SOURCE)/$filesfull[$i] \$(ROOT)/$rot
+		if ($category ne 'conf') {
+		    $description.=<<END if $category ne 'symbolic link';
+\tinstall -m $devchmod \$(SOURCE)/$source \$(TARGET)/$rot
 END
+                }
 	    }
 	}
     }
@@ -420,7 +622,7 @@ END
 		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]
+\tln -s /$linkto \$(TARGET)/$filesfull[$i]
 END
 	    }
 	}