Daily build 13 October 2009

imagej · Oct 14, 2009 · 4fec405 · 4fec405
1 parent e4783c0
commit 4fec405
Show file tree

Hide file tree

Showing 212 changed files with 50,699 additions and 53,565 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.class
+*.jar
+*~
diff --git a/Fakefile b/Fakefile
@@ -0,0 +1,11 @@
+JAVAVERSION=1.4
+all <- ij.jar
+
+MAINCLASS(ij.jar)=ij.ImageJ
+ij.jar <- ij/**/*.java \
+	icon.gif[images/icon.gif] aboutja.jpg[images/aboutja.jpg] plugins/*.java \
+	plugins/JavaScriptEvaluator.class plugins/MacAdapter.class \
+	IJ_Props.txt macros/*.txt
+
+JARSIGNEROPTS=-signedjar signed-ij.jar ij.jar dscho
+signed-ij.jar[jarsigner $JARSIGNEROPTS] <- ij.jar
diff --git a/IJ_Props.txt b/IJ_Props.txt
diff --git a/MANIFEST.MF b/MANIFEST.MF
@@ -1,2 +1,2 @@
-Main-Class: ij.ImageJ
-
+Main-Class: ij.ImageJ
+
diff --git a/Makefile b/Makefile
@@ -0,0 +1,42 @@
+JAVAS=$(wildcard ij/*.java ij/*/*.java ij/*/*/*.java)
+CLASSES=$(patsubst %.java,%.class,$(JAVAS))
+ALLCLASSES=ij/*.class ij/*/*.class ij/*/*/*.class
+COPYFILES=icon.gif aboutja.jpg plugins/*.class
+TEXTFILES=IJ_Props.txt $(wildcard macros/*.txt)
+
+ifeq ($(JAVA_HOME),)
+	JAVA_HOME=$(shell ../fiji --print-java-home)/..
+endif
+
+ifeq ($(shell javac > /dev/null 2>&1; echo $$?),127)
+	PATH:=$(PATH):$(JAVA_HOME)/bin
+endif
+
+uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
+ifeq ($(uname_O),Cygwin)
+PLUGINSHOME=$(shell cygpath --mixed "$(shell pwd)")
+CPSEP=\;
+TOOLSCP=$(shell cygpath --mixed "$(JAVA_HOME)")/lib/tools.jar
+else
+PLUGINSHOME=$(shell pwd)
+CPSEP=:
+TOOLSCP=$(JAVA_HOME)/lib/tools.jar
+endif
+CLASSPATH=../jars/javac.jar$(CPSEP)$(TOOLSCP)$(CPSEP)$(PLUGINSHOME)/../ImageJ/ij.jar$(CPSEP)$(PLUGINSHOME)/jzlib-1.0.7.jar$(CPSEP).
+JAVACOPTS=-O -classpath "$(CLASSPATH)" -source 1.3 -target 1.3
+
+ij.jar: $(COPYFILES) $(CLASSES) $(TEXTFILES)
+	jar cvmf MANIFEST.MF ij.jar $(COPYFILES) $(ALLCLASSES) $(TEXTFILES)
+
+signed-ij.jar: ij.jar
+	jarsigner -signedjar signed-ij.jar $(shell cat .jarsignerrc) ij.jar dscho
+
+icon.gif aboutja.jpg: %: images/%
+	cp $< $@
+
+%.class: %.java
+	javac $(JAVACOPTS) $(JAVAS)
+
+clean:
+	rm -f $(COPYFILES) $(ALLCLASSES)
+
diff --git a/aREADME.txt b/aREADME.txt
@@ -1,7 +1,7 @@
-The ant utility (http://ant.apache.org/) will compile and run ImageJ using 
-the build file (build.xml) in this directory. There is a version of ant at   
-
-    http://rsb.info.nih.gov/ij/download/tools/ant/ant.zip
-
-set up to use the JVM distributed with the Windows version of ImageJ.
-The README included in the ZIP archive has more information.
+The ant utility (http://ant.apache.org/) will compile and run ImageJ using 
+the build file (build.xml) in this directory. There is a version of ant at   
+
+    http://rsb.info.nih.gov/ij/download/tools/ant/ant.zip
+    
+set up to use the JVM distributed with the Windows version of ImageJ.
+The README included in the ZIP archive has more information.
diff --git a/applet.html b/applet.html
@@ -1,13 +1,13 @@
-<!-- Runs ImageJ as an Applet -->
-
-<html>
-<head>
-<title>ImageJ Applet</title>
-</head>
-<body>
-
-<applet codebase="." code="ij.ImageJApplet.class" archive="ij.jar" width=0 height=0>
-</applet>
-
-</body>
-</html>
+<!-- Runs ImageJ as an Applet -->
+
+<html>
+<head>
+<title>ImageJ Applet</title>
+</head>
+<body>
+
+<applet codebase="." code="ij.ImageJApplet.class" archive="ij.jar" width=0 height=0>
+</applet>
+
+</body>
+</html>
diff --git a/build.xml b/build.xml
@@ -1,73 +1,73 @@
-<!-- Ant makefile for ImageJ -->
-
-<project name="ImageJ" default="run">
-
-  <target name="compile" description="Compile everything.">
-    <!-- First, ensure the build directory exists. -->
-    <mkdir dir="build" />
-    <!-- Build everything; add debug="on" to debug -->
-    <javac srcdir="." destdir="build" optimize="on" source="1.4" target="1.4" debug="on">
-      <!-- The plugins directory only needs to be 
-             present at runtime, not at build time. -->
-      <exclude name="plugins/**"/>
-    </javac>
-  </target>
-
-
-  <target name="build" depends="compile" description="Build ij.jar.">
-    <!-- Copy needed files into the build directory. -->
-    <copy file="IJ_Props.txt" todir="build" />
-    <copy file="images/microscope.gif" tofile="build/microscope.gif" />
-    <copy file="images/about.jpg" tofile="build/about.jpg" />
-	<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
-	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> 
-    <copy todir="build/macros"><fileset dir="macros"/></copy>
-    <!-- Build ij.jar. -->
-    <jar jarfile="ij.jar" basedir="build"
-         manifest="MANIFEST.MF" />
-  </target>
-
-
-  <target name="clean" description="Delete the build files.">
-    <delete dir="build" />
-    <delete file="ij.jar" />
-  </target>
-
-
-  <target name="run" depends="build" description="Build and run ImageJ.">
-    <copy file="ij.jar" toDir=".." />
-    <java maxmemory="640m" jar="ij.jar" fork="yes" />
-  </target>
-
-
-  <target name="run2" depends="build" description="Build and run ImageJ.">
-    <!-- Run in ImageJ directory -->
-    <copy file="ij.jar" toDir=".." />
-    <java maxmemory="640m" dir=".." jar="ij.jar" fork="yes" />
-  </target>
-
-  <target name="zip" depends="clean" description="Build zrc.zip.">
-    <zip zipfile="../src.zip"
-       basedir=".."
-       includes="source/**"
-    />
-  </target>
-
-
-  <target name="javadocs" description="Build the JavaDocs.">
-    <delete dir="../api" />
-    <mkdir dir="../api" />
-    <javadoc 
-           sourcepath="."
-           packagenames="ij.*"
-           destdir="../api"
-           author="true"
-           version="true"
-           use="true"
-           windowtitle="ImageJ API">
-    </javadoc>
-  </target>
-
-
-   </project>
-
+<!-- Ant makefile for ImageJ -->
+
+<project name="ImageJ" default="run">
+
+  <target name="compile" description="Compile everything.">
+    <!-- First, ensure the build directory exists. -->
+    <mkdir dir="build" />
+    <!-- Build everything; add debug="on" to debug -->
+    <javac srcdir="." destdir="build" optimize="on" source="1.4" target="1.4" debug="on">
+      <!-- The plugins directory only needs to be 
+             present at runtime, not at build time. -->
+      <exclude name="plugins/**"/>
+    </javac>
+  </target>
+
+
+  <target name="build" depends="compile" description="Build ij.jar.">
+    <!-- Copy needed files into the build directory. -->
+    <copy file="IJ_Props.txt" todir="build" />
+    <copy file="images/microscope.gif" tofile="build/microscope.gif" />
+    <copy file="images/about.jpg" tofile="build/about.jpg" />
+	<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
+	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> 
+    <copy todir="build/macros"><fileset dir="macros"/></copy>
+    <!-- Build ij.jar. -->
+    <jar jarfile="ij.jar" basedir="build"
+         manifest="MANIFEST.MF" />
+  </target>
+
+
+  <target name="clean" description="Delete the build files.">
+    <delete dir="build" />
+    <delete file="ij.jar" />
+  </target>
+
+
+  <target name="run" depends="build" description="Build and run ImageJ.">
+    <copy file="ij.jar" toDir=".." />
+    <java maxmemory="640m" jar="ij.jar" fork="yes" />
+  </target>
+
+
+  <target name="run2" depends="build" description="Build and run ImageJ.">
+    <!-- Run in ImageJ directory -->
+    <copy file="ij.jar" toDir=".." />
+    <java maxmemory="640m" dir=".." jar="ij.jar" fork="yes" />
+  </target>
+
+  <target name="zip" depends="clean" description="Build zrc.zip.">
+    <zip zipfile="../src.zip"
+       basedir=".."
+       includes="source/**"
+    />
+  </target>
+
+
+  <target name="javadocs" description="Build the JavaDocs.">
+    <delete dir="../api" />
+    <mkdir dir="../api" />
+    <javadoc 
+           sourcepath="."
+           packagenames="ij.*"
+           destdir="../api"
+           author="true"
+           version="true"
+           use="true"
+           windowtitle="ImageJ API">
+    </javadoc>
+  </target>
+
+
+   </project>
+
diff --git a/compile.bat b/compile.bat
@@ -0,0 +1,5 @@
+javac ij\ImageJ.java
+javac ij\plugin\*.java
+javac ij\plugin\filter\*.java
+javac ij\plugin\frame\*.java
+java ij.ImageJ
diff --git a/compile.sh b/compile.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo "Cleaning up ... "
+ant clean 
+echo "Building ImageJA ..."
+ant
diff --git a/ij/CommandListener.java b/ij/CommandListener.java
@@ -1,16 +1 @@
-package ij;
-
-	/** Plugins that implement this interface are notified when ImageJ
-		is about to run a menu command. There is an example plugin at
-		http://rsb.info.nih.gov/ij/plugins/download/misc/Command_Listener.java
-	*/
-	public interface CommandListener {
-
-	/*	The method is called when ImageJ is about to run a menu command, 
-		where 'command' is the name of the command. Return this string 
-		and ImageJ will run the command, return a different command name
-		and ImageJ will run that command, or return null to not run a command.
-	*/
-	public String commandExecuting(String command);
-
-}
+package ij;	/** Plugins that implement this interface are notified when ImageJ		is about to run a menu command. There is an example plugin at		http://rsb.info.nih.gov/ij/plugins/download/misc/Command_Listener.java	*/	public interface CommandListener {	/*	The method is called when ImageJ is about to run a menu command, 		where 'command' is the name of the command. Return this string 		and ImageJ will run the command, return a different command name		and ImageJ will run that command, or return null to not run a command.	*/	public String commandExecuting(String command);}