Skip to content

Commit 4fec405

Browse files
Wayne Rasbanddscho
Wayne Rasband
authored and
dscho
committed
Daily build 13 October 2009
1 parent e4783c0 commit 4fec405

File tree

212 files changed

+50699
-53565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+50699
-53565
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.class
2+
*.jar
3+
*~

‎Fakefile

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
JAVAVERSION=1.4
2+
all <- ij.jar
3+
4+
MAINCLASS(ij.jar)=ij.ImageJ
5+
ij.jar <- ij/**/*.java \
6+
icon.gif[images/icon.gif] aboutja.jpg[images/aboutja.jpg] plugins/*.java \
7+
plugins/JavaScriptEvaluator.class plugins/MacAdapter.class \
8+
IJ_Props.txt macros/*.txt
9+
10+
JARSIGNEROPTS=-signedjar signed-ij.jar ij.jar dscho
11+
signed-ij.jar[jarsigner $JARSIGNEROPTS] <- ij.jar

‎IJ_Props.txt

+392-392
Large diffs are not rendered by default.

‎MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Main-Class: ij.ImageJ
2-
1+
Main-Class: ij.ImageJ
2+

‎Makefile

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
JAVAS=$(wildcard ij/*.java ij/*/*.java ij/*/*/*.java)
2+
CLASSES=$(patsubst %.java,%.class,$(JAVAS))
3+
ALLCLASSES=ij/*.class ij/*/*.class ij/*/*/*.class
4+
COPYFILES=icon.gif aboutja.jpg plugins/*.class
5+
TEXTFILES=IJ_Props.txt $(wildcard macros/*.txt)
6+
7+
ifeq ($(JAVA_HOME),)
8+
JAVA_HOME=$(shell ../fiji --print-java-home)/..
9+
endif
10+
11+
ifeq ($(shell javac > /dev/null 2>&1; echo $$?),127)
12+
PATH:=$(PATH):$(JAVA_HOME)/bin
13+
endif
14+
15+
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
16+
ifeq ($(uname_O),Cygwin)
17+
PLUGINSHOME=$(shell cygpath --mixed "$(shell pwd)")
18+
CPSEP=\;
19+
TOOLSCP=$(shell cygpath --mixed "$(JAVA_HOME)")/lib/tools.jar
20+
else
21+
PLUGINSHOME=$(shell pwd)
22+
CPSEP=:
23+
TOOLSCP=$(JAVA_HOME)/lib/tools.jar
24+
endif
25+
CLASSPATH=../jars/javac.jar$(CPSEP)$(TOOLSCP)$(CPSEP)$(PLUGINSHOME)/../ImageJ/ij.jar$(CPSEP)$(PLUGINSHOME)/jzlib-1.0.7.jar$(CPSEP).
26+
JAVACOPTS=-O -classpath "$(CLASSPATH)" -source 1.3 -target 1.3
27+
28+
ij.jar: $(COPYFILES) $(CLASSES) $(TEXTFILES)
29+
jar cvmf MANIFEST.MF ij.jar $(COPYFILES) $(ALLCLASSES) $(TEXTFILES)
30+
31+
signed-ij.jar: ij.jar
32+
jarsigner -signedjar signed-ij.jar $(shell cat .jarsignerrc) ij.jar dscho
33+
34+
icon.gif aboutja.jpg: %: images/%
35+
cp $< $@
36+
37+
%.class: %.java
38+
javac $(JAVACOPTS) $(JAVAS)
39+
40+
clean:
41+
rm -f $(COPYFILES) $(ALLCLASSES)
42+

‎aREADME.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
The ant utility (http://ant.apache.org/) will compile and run ImageJ using
2-
the build file (build.xml) in this directory. There is a version of ant at
3-
4-
http://rsb.info.nih.gov/ij/download/tools/ant/ant.zip
5-
6-
set up to use the JVM distributed with the Windows version of ImageJ.
7-
The README included in the ZIP archive has more information.
1+
The ant utility (http://ant.apache.org/) will compile and run ImageJ using
2+
the build file (build.xml) in this directory. There is a version of ant at
3+
4+
http://rsb.info.nih.gov/ij/download/tools/ant/ant.zip
5+
6+
set up to use the JVM distributed with the Windows version of ImageJ.
7+
The README included in the ZIP archive has more information.

‎applet.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<!-- Runs ImageJ as an Applet -->
2-
3-
<html>
4-
<head>
5-
<title>ImageJ Applet</title>
6-
</head>
7-
<body>
8-
9-
<applet codebase="." code="ij.ImageJApplet.class" archive="ij.jar" width=0 height=0>
10-
</applet>
11-
12-
</body>
13-
</html>
1+
<!-- Runs ImageJ as an Applet -->
2+
3+
<html>
4+
<head>
5+
<title>ImageJ Applet</title>
6+
</head>
7+
<body>
8+
9+
<applet codebase="." code="ij.ImageJApplet.class" archive="ij.jar" width=0 height=0>
10+
</applet>
11+
12+
</body>
13+
</html>

‎build.xml

+73-73
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
1-
<!-- Ant makefile for ImageJ -->
2-
3-
<project name="ImageJ" default="run">
4-
5-
<target name="compile" description="Compile everything.">
6-
<!-- First, ensure the build directory exists. -->
7-
<mkdir dir="build" />
8-
<!-- Build everything; add debug="on" to debug -->
9-
<javac srcdir="." destdir="build" optimize="on" source="1.4" target="1.4" debug="on">
10-
<!-- The plugins directory only needs to be
11-
present at runtime, not at build time. -->
12-
<exclude name="plugins/**"/>
13-
</javac>
14-
</target>
15-
16-
17-
<target name="build" depends="compile" description="Build ij.jar.">
18-
<!-- Copy needed files into the build directory. -->
19-
<copy file="IJ_Props.txt" todir="build" />
20-
<copy file="images/microscope.gif" tofile="build/microscope.gif" />
21-
<copy file="images/about.jpg" tofile="build/about.jpg" />
22-
<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
23-
<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" />
24-
<copy todir="build/macros"><fileset dir="macros"/></copy>
25-
<!-- Build ij.jar. -->
26-
<jar jarfile="ij.jar" basedir="build"
27-
manifest="MANIFEST.MF" />
28-
</target>
29-
30-
31-
<target name="clean" description="Delete the build files.">
32-
<delete dir="build" />
33-
<delete file="ij.jar" />
34-
</target>
35-
36-
37-
<target name="run" depends="build" description="Build and run ImageJ.">
38-
<copy file="ij.jar" toDir=".." />
39-
<java maxmemory="640m" jar="ij.jar" fork="yes" />
40-
</target>
41-
42-
43-
<target name="run2" depends="build" description="Build and run ImageJ.">
44-
<!-- Run in ImageJ directory -->
45-
<copy file="ij.jar" toDir=".." />
46-
<java maxmemory="640m" dir=".." jar="ij.jar" fork="yes" />
47-
</target>
48-
49-
<target name="zip" depends="clean" description="Build zrc.zip.">
50-
<zip zipfile="../src.zip"
51-
basedir=".."
52-
includes="source/**"
53-
/>
54-
</target>
55-
56-
57-
<target name="javadocs" description="Build the JavaDocs.">
58-
<delete dir="../api" />
59-
<mkdir dir="../api" />
60-
<javadoc
61-
sourcepath="."
62-
packagenames="ij.*"
63-
destdir="../api"
64-
author="true"
65-
version="true"
66-
use="true"
67-
windowtitle="ImageJ API">
68-
</javadoc>
69-
</target>
70-
71-
72-
</project>
73-
1+
<!-- Ant makefile for ImageJ -->
2+
3+
<project name="ImageJ" default="run">
4+
5+
<target name="compile" description="Compile everything.">
6+
<!-- First, ensure the build directory exists. -->
7+
<mkdir dir="build" />
8+
<!-- Build everything; add debug="on" to debug -->
9+
<javac srcdir="." destdir="build" optimize="on" source="1.4" target="1.4" debug="on">
10+
<!-- The plugins directory only needs to be
11+
present at runtime, not at build time. -->
12+
<exclude name="plugins/**"/>
13+
</javac>
14+
</target>
15+
16+
17+
<target name="build" depends="compile" description="Build ij.jar.">
18+
<!-- Copy needed files into the build directory. -->
19+
<copy file="IJ_Props.txt" todir="build" />
20+
<copy file="images/microscope.gif" tofile="build/microscope.gif" />
21+
<copy file="images/about.jpg" tofile="build/about.jpg" />
22+
<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
23+
<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" />
24+
<copy todir="build/macros"><fileset dir="macros"/></copy>
25+
<!-- Build ij.jar. -->
26+
<jar jarfile="ij.jar" basedir="build"
27+
manifest="MANIFEST.MF" />
28+
</target>
29+
30+
31+
<target name="clean" description="Delete the build files.">
32+
<delete dir="build" />
33+
<delete file="ij.jar" />
34+
</target>
35+
36+
37+
<target name="run" depends="build" description="Build and run ImageJ.">
38+
<copy file="ij.jar" toDir=".." />
39+
<java maxmemory="640m" jar="ij.jar" fork="yes" />
40+
</target>
41+
42+
43+
<target name="run2" depends="build" description="Build and run ImageJ.">
44+
<!-- Run in ImageJ directory -->
45+
<copy file="ij.jar" toDir=".." />
46+
<java maxmemory="640m" dir=".." jar="ij.jar" fork="yes" />
47+
</target>
48+
49+
<target name="zip" depends="clean" description="Build zrc.zip.">
50+
<zip zipfile="../src.zip"
51+
basedir=".."
52+
includes="source/**"
53+
/>
54+
</target>
55+
56+
57+
<target name="javadocs" description="Build the JavaDocs.">
58+
<delete dir="../api" />
59+
<mkdir dir="../api" />
60+
<javadoc
61+
sourcepath="."
62+
packagenames="ij.*"
63+
destdir="../api"
64+
author="true"
65+
version="true"
66+
use="true"
67+
windowtitle="ImageJ API">
68+
</javadoc>
69+
</target>
70+
71+
72+
</project>
73+

‎compile.bat

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
javac ij\ImageJ.java
2+
javac ij\plugin\*.java
3+
javac ij\plugin\filter\*.java
4+
javac ij\plugin\frame\*.java
5+
java ij.ImageJ

‎compile.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
echo "Cleaning up ... "
3+
ant clean
4+
echo "Building ImageJA ..."
5+
ant

‎ij/CommandListener.java

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1 @@
1-
package ij;
2-
3-
/** Plugins that implement this interface are notified when ImageJ
4-
is about to run a menu command. There is an example plugin at
5-
http://rsb.info.nih.gov/ij/plugins/download/misc/Command_Listener.java
6-
*/
7-
public interface CommandListener {
8-
9-
/* The method is called when ImageJ is about to run a menu command,
10-
where 'command' is the name of the command. Return this string
11-
and ImageJ will run the command, return a different command name
12-
and ImageJ will run that command, or return null to not run a command.
13-
*/
14-
public String commandExecuting(String command);
15-
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);}

0 commit comments

Comments
 (0)