[Jmol-commits] CVS: Jmol fixmergeheaders.pl,NONE,1.1 .cvsignore,1.8,1.9 applet.classes,1.23,1.24 build.xml,1.55,1.56 jmol,1.20,1.21

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol
In directory sc8-pr-cvs1:/tmp/cvs-serv20521

Modified Files:
	.cvsignore applet.classes build.xml jmol 
Added Files:
	fixmergeheaders.pl 
Log Message:
merged with b6 branch


--- NEW FILE: fixmergeheaders.pl ---
#!/usr/bin/perl
#
# mth 2003 06 02
#
# cd to the Jmol directory and run me in order to resolve
# cvs conflicts in the headers of .java files after a merge
#
# the "conflict" files generated by CVS are saved as .java.bak
#
# this will probably only work on a Linux/Unix system
#

use strict;

open(CONFLICT, 'find src -name \*.java | xargs grep -l "<<<<<" |');
while (<CONFLICT>) {a
    chop;
    fixConflict($_);
}

sub fixConflict {
    my $filename = $_;
    my $filenameBak = $filename . ".bak";
    rename $filename, $filenameBak;
    open(IN, "<$filenameBak");
    open(OUT, ">$filename");
    my $state = 'lookingForConflict';
    while (<IN>) {
	my $line = $_;
	if ($state eq 'lookingForConflict') {
	    if ($line =~ /^<<<<</) {
		$state = 'discardingBeforeDoubleBar';
		next;
	    }
	    if ($line =~ /\s*(public|private|class)/) {
		$state = 'copyingFile';
	    }
	    print OUT $line;
	    next;
	}
	if ($state eq 'discardingBeforeDoubleBar') {
	    if ($line =~ /^=====/) {
		$state = 'copyingAfterDoubleBar';
	    }
	    next;
	}
	if ($state eq 'copyingAfterDoubleBar') {
	    if ($line =~ /^>>>>>/) {
		$state = 'lookingForConflict';
	    } else {
		print OUT $line;
	    }
	    next;
	}
	print OUT $line;
    }
    close IN;
    close OUT;
}

Index: .cvsignore
===================================================================
RCS file: /cvsroot/jmol/Jmol/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 May 2003 14:04:49 -0000	1.8
+++ .cvsignore	2 Jun 2003 13:34:53 -0000	1.9
@@ -8,3 +8,4 @@
 jmol.jar
 JmolApplet.jar
 packaging/rpm/dist
+.bak

Index: applet.classes
===================================================================
RCS file: /cvsroot/jmol/Jmol/applet.classes,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- applet.classes	11 Feb 2003 12:13:00 -0000	1.23
+++ applet.classes	2 Jun 2003 13:34:53 -0000	1.24
@@ -94,3 +94,4 @@
 org/openscience/jmol/script/Compiler.java
 org/openscience/jmol/script/ScriptException.java
 org/openscience/jmol/util/MathUtil.java
+org/openscience/jmol/ui/JmolPopup.java

Index: build.xml
===================================================================
RCS file: /cvsroot/jmol/Jmol/build.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- build.xml	20 May 2003 14:04:49 -0000	1.55
+++ build.xml	2 Jun 2003 13:34:53 -0000	1.56
@@ -10,7 +10,8 @@
   <property name="deprecation" value="on" />
   <property name="optimization" value="off" />
 
-  <property name="version" value="6" />
+  <property name="version" value="7" />
+
   <property name="source.dir" value="src" />
   <property name="tests.source.dir" value="source-tests" />
   <property name="build.dir" value="build" />
@@ -122,6 +123,7 @@
         <include name="**/*.gif" />
         <include name="**/*.html" />
         <include name="**/*.dtd" />
+	<include name="**/*.properties" />
         <include name="**/Properties/*" />
         <include name="**/Data/*" />
         <include name="**/*.txt" />
@@ -156,6 +158,7 @@
       <fileset dir="${source.dir}">
         <include name="**/*.dtd" />
         <include name="**/*.txt" />
+	<include name="**/ui/*.properties" />
       </fileset>
       <fileset dir="${source.dir}/org/openscience/jmol/applet">
         <include name="Data/AtomTypes.txt" />

Index: jmol
===================================================================
RCS file: /cvsroot/jmol/Jmol/jmol,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jmol	20 May 2003 14:04:49 -0000	1.20
+++ jmol	2 Jun 2003 13:34:53 -0000	1.21
@@ -17,4 +17,4 @@
   echo jmol.jar not found
   exit
 fi
-$command -jar $jarpath
+$command -jar $jarpath $@