From 9159609191e29d60f2a9507253ac3b2cb33a8fb6 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Thu, 25 Jul 2002 20:54:57 +0000
Subject: [PATCH] moved so that buzz.pl is used from bagel, so changes can be
 made in one place

---
 app/buzz.pl           | 293 ------------------------------------------
 build/macosx/make.sh  |   2 +-
 build/windows/make.sh |   2 +-
 3 files changed, 2 insertions(+), 295 deletions(-)
 delete mode 100644 app/buzz.pl

diff --git a/app/buzz.pl b/app/buzz.pl
deleted file mode 100644
index 421c87cc8..000000000
--- a/app/buzz.pl
+++ /dev/null
@@ -1,293 +0,0 @@
-#!/usr/bin/perl
-
-# needs to make a temporary directory, compile into that
-# clear out contents of temporary directory at begin of compile
-# create temp directory if it doesn't exist
-
-# should take arguments for the compiler:
-# jikes -d classes *.java
-# instead looks like
-# buzz "jikes -d classes" *.java
-# maybe everything always goes in /tmp? 
-# (no, don't want to leave code around)
-
-$blank_line = "\n";
-
-
-$separator = '/';
-$path_separator = ':';
-
-# tell me about this here system
-#if ($ENV{'WINDIR'} ne '') {
-#    if ($ENV{'TERM'} eq 'cygwin') {
-#	$separator = "/";
-#	$path_separator = ':';
-#	$platform = 'windows'; #'cygwin';
-#    } else {
-#	$separator = "\\";
-#	$path_separator = ';';
-# need path to mkdir for win32, because 'mkdir' defaults to the
-# crappy dos version.. need to use cygwin instead
-#	#$mkdir_path = 'd:\\cygwin\\bin\\mkdir';
-#	$mkdir_path = 'mkdir';
-#	$platform = 'windows';
-#    }
-#} else {
-#    $separator = '/';
-#    $path_separator = ':';
-#    $mkdir_path = '/bin/mkdir';
-#    $platform = 'unix';
-#}
-# something else needed here for macosx
-# maybe something with OSTYPE or HOSTTYPE (esp OSTYPE)
-# e.g. OSTYPE=linux-gnu HOSTTYPE=i386
-
-
-# create the temporary directory
-$temp_dir = "buzztemp";
-if (-d $temp_dir) {
-    `rm -rf $temp_dir`;
-}
-mkdirs($temp_dir, 0777) || die $!;
-
-#die "buzz.pl received @ARGV\n";
-
-#print "args = @ARGV\n";
-$command = shift(@ARGV);
-
-if ($command eq '') {
-    die "buzz.pl: received no arguments";
-#    print "buzz.pl: perl is misconfigured.. no args passed in.. can't run\n";
-#    print "         cygwin perl seems to have problems, use activestate\n";
-#    exit;
-}
-
-#if ($command =~ /-classpath/) {
-#    die "cannot set classpath using this version of buzz";
-#}
-
-$classpath = $ENV{"CLASSPATH"};
-if ($classpath eq '') {
-    die "must set classpath before using buzz.pl";
-}
-#$classpath =~ s/\\/\//g;
-#$classpath =~ s/\;/\:/g;
-
-#    # find java in the path
-#    if ($platform eq 'windows') {
-#	print "path is $ENV{'PATH'}\n";
-#	exit;
-#	@elements = split(';', $ENV{"PATH"});
-#	foreach $element (@elements) {
-#	    #print "trying $element\\java.exe\n";
-#	    if (-f "$element\\java.exe") {
-#		$classpath = "$element\\..\\lib\\classes.zip";
-#		print "found java: $element\\java.exe\n";
-#		last;
-#	    }
-#	}
-#	if ($classpath eq "") {
-#	    die "java.exe is not in your path, and classpath not set";
-#	}
-#
-#    } elsif ($platform eq 'unix') {
-#	die "code for searching path not written for unix\nset environment varilable for CLASSPATH before using.\n";
-#
-#    } elsif ($platform eq 'macosx') {
-#    }
-#}
-
-
-# if target directory, -d, option is used, add it to CLASSPATH
-if ($command =~ /\-d\s(\S*)/) {
-    $classpath = "$1$path_separator$classpath";
-}
-
-
-foreach $arg (@ARGV) {
-    if ($arg =~ /^-d(.*)/) {
-	$params{$1} = 1;
-    #} elsif ($arg =~/^-c(.*)/) {
-	#$compiler = $1;
-
-    } elsif ($arg =~ /\.java$/) {
-
-	# this only gets hit under windows, because *.java won't be
-	# expanded under the command line.. 
-	if ($arg =~ /(.*)\*\.java$/) {
-	    # gotta expand * to all matching
-	    #print "expanding *.java from \"$1\"\n";
-	    $dir = $1;
-	    if ($dir eq "") {
-		$dir = '.';
-	    } else {
-		#print "creating dir $temp_dir$separator$dir\n";
-		mkdirs("$temp_dir$separator$dir", 0777) || die "$temp_dir$separator$dir $!";
-	    }
-	    opendir(DIR, $dir) || die "$! for $dir";
-	    @dcontents = readdir(DIR);
-	    closedir(DIR);
-	    foreach $file (@dcontents) {
-		if ($file =~ /\.java$/) {
-		    if ($dir eq '.') {
-			$fullname = "$file";
-		    } else {
-			$fullname = "$dir$file";
-		    }
-		    #print "adding $fullname\n";
-		    unshift @file_list, "$fullname";
-		}
-	    }
-	    
-	} else {
-	    # make the directory that this file is in, in case it's 
-	    # buried more than one level deep. this is especially 
-	    # important under unix, because the above mkdir stuff won't
-	    # get hit due to *.java being expanded on the cmd line
-	    #$arg =~ /(.*)$separator([\w\d]+\.java)/;
-	    $arg =~ /(.*)${separator}.*\.java/;
-	    $file_path = $1;
-	    #$file_name = $2;  # ignored
-	    if ($file_path ne '') {
-		#print "_${file_path}_ and _${file_name}_\n";
-		#if (!(-d $file_path)) {
-		mkdirs("$temp_dir$separator$file_path", 0777);
-		#}
-	    }
-
-	    unshift @file_list, $arg;	
-	}
-    }
-}
-
-# support: define, ifdef, ifndef, else, endif
-# no support: defined(x), elif, #define blah 12, nesting
-#exit; # testing why bagel dir is getting created
-
-print "processing...\n";
-foreach $file (@file_list) {
-    open(FILE, "$file") || die "error with $file, $!";
-    @contents = <FILE>;
-    close(FILE);
-
-    @new_contents = ();
-    &read_positive;
-
-    #printf "try to make $temp_dir$separator$file\n";
-    open(OUTPUT, ">$temp_dir$separator$file") || die "$! ($temp_dir$separator$file)";
-    print OUTPUT reverse(@new_contents);
-    close(OUTPUT);
-    unshift(@new_file_list, "$temp_dir$separator$file");
-}
-
-print "compiling...\n";
-$files = join(' ', @new_file_list);
-#$compile_command = "$command -classpath $classpath $files";
-$compile_command = "$command $files";
-#print "$compile_command\n";
-print `$compile_command`;
-
-# clean up
-print "cleaning...\n";
-`rm -rf $temp_dir`;
-
-# finished
-print "done.\n\n";
-
-
-# reads until else or endif, adding what it finds
-# to the new output file
-sub read_positive {
-    my $line;
-    while ($line = shift(@contents)) {
-	if ($line =~ /$\#if(\w*)def\s+(\S+)/) {
-	    unshift(@new_contents, $blank_line);
-	    if ((($1 eq "") && ($params{$2} == 1)) ||   #ifdef found
-		(($1 eq "n") && ($params{$2} != 1))) {  #ifndef found
-		# include until endif/else
-		&read_positive;
-		#return;
-
-	    } else {
-		# exclude until endif/else
-		&read_negative(0);
-                #return;
-	    }
-	} elsif ($line =~ /$\#else/) {  
-	    unshift(@new_contents, $blank_line);
-	    &read_negative(0);
-	    return;
-
-        } elsif ($line =~ /$\#endif/) {
-	    unshift(@new_contents, $blank_line);
-	    return;
-
-	} elsif ($line =~ /$\#define\s+(\S+)/) {
-	    $params{$1} = 1;
-	    unshift(@new_contents, $blank_line); # maintain lf count
-
-	} else {
-	    unshift(@new_contents, $line);  # no change
-	}
-    }
-}
-
-
-# excludes everything until an else or an endif
-sub read_negative {
-    my ($inside_negative) = @_[0];
-    #print "checking @_[0] $_[0]\n";
-    my $line;
-    while ($line = shift(@contents)) {
-	if ($line =~ /$\#if(\w*)def\s+(\S+)/) {
-	    unshift(@new_contents, $blank_line);
-	    if ((($1 eq "") && ($params{$2} == 1)) ||   #ifdef found
-		(($1 eq "n") && ($params{$2} != 1))) {  #ifndef found
-		#&read_positive;
-		&read_negative(1);
-		
-	    } else {
-		# exclude until endif/else
-		&read_negative(1);
-	    }
-	} elsif ($line =~ /$\#else/) {
-	    unshift(@new_contents, $blank_line);
-	    if ($inside_negative) {
-		&read_negative(1);
-	    } else {
-		&read_positive;
-	    }
-	    return;
-		 
-        } elsif ($line =~ /$\#endif/) {
-	    unshift(@new_contents, $blank_line);
-	    return;
-
-	#} elsif ($line =~ /$\#define\s+(\S+)/) {
-	#   unshift(@new_contents, $blank_line); # maintain lf count
-
-	} else {
-	    # blank line, maintain lf count
-	    unshift(@new_contents, $blank_line);
-	}
-    }
-}
-
-
-# recursively make directories if they don't yet exist
-# this turned into a hack because i was lazy
-sub mkdirs {
-    my $d = @_[0];
-#    print "making dir $d\n";
-    `mkdir -p $d`;
-
-#    if ($platform ne 'windows') {
-#	$d =~ s/\\/\//g; # make backslashes into fwd slashes
-	#my $result = `$mkdir_path -p $d`;
-#	print `$mkdir_path -p $d`;
-#    } else {
-	#print $result = `$mkdir_path $d`;
-#        print `$mkdir_path $d`;
-#    }
-    return 1;
-}
diff --git a/build/macosx/make.sh b/build/macosx/make.sh
index 4bdc0be6a..1fd290d5a 100755
--- a/build/macosx/make.sh
+++ b/build/macosx/make.sh
@@ -66,7 +66,7 @@ echo Building PDE for JDK 1.3
 
 CLASSPATH=build/macosx/work/classes:build/macosx/work/lib/kjc.jar:build/macosx/work/lib/oro.jar:$MACOSX_CLASSPATH
 
-perl buzz.pl "jikes +D -classpath $CLASSPATH -d build/macosx/work/classes" -dJDK13 *.java
+perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d build/macosx/work/classes" -dJDK13 *.java
 
 cd build/macosx/work/classes
 rm -f ../lib/pde.jar
diff --git a/build/windows/make.sh b/build/windows/make.sh
index 064162338..2e8b9b617 100755
--- a/build/windows/make.sh
+++ b/build/windows/make.sh
@@ -68,7 +68,7 @@ echo Building PDE for JDK 1.3
 
 CLASSPATH=build/windows/work/classes:build/windows/work/lib/kjc.jar:build/windows/work/lib/oro.jar:build/windows/work/java/lib/rt.jar:build/windows/work/java/lib/ext/comm.jar
 
-perl buzz.pl "jikes +D -classpath $CLASSPATH -d build/windows/work/classes" -dJDK13 *.java 
+perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d build/windows/work/classes" -dJDK13 *.java 
 
 cd build/windows/work/classes
 rm -f ../lib/pde.jar