find upstream -name config.cache -exec rm {} \;
JVM: build/JVM/xwt.jar
-Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext --static"
+Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext"
Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
include Makefile.upstream
# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
+java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/util/Preprocessor.java'))
all_java_sources := $(java_sources)
-nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources))
+nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) build/java/org/xwt/translators/Freetype.java build/java/org/xwt/translators/MSPack.java build/java/org/xwt/translators/MIPSApps.java
plat_java_sources := $(filter build/java/org/xwt/plat/%, $(java_sources))
build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips build/class/org/xwt/mips/Compiler.class
build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
@echo -e "\n\033[1marchiving .o -> .a\033[0m"
mkdir -p build/$(platform)
+ rm -f $@
upstream/install/$(target)/bin/ar rc $@ $?
upstream/install/$(target)/bin/ranlib $@
public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
- private static Task current = null;
- public static Task current() { return current; }
+ private static Task currentTask = null;
+ public static Task current() { return currentTask; }
/** synchronizd so that we can safely call it from an event-delivery thread, in-context */
private static volatile boolean rendering = false;
protected static Queue runnable = new Queue(50);
public void defaultRun() {
while(true) {
- current = (Task)runnable.remove(true);
+ currentTask = (Task)runnable.remove(true);
try {
synchronized(this) {
for(int i=0; i<Surface.allSurfaces.size(); i++) {
Surface s = (Surface)Surface.allSurfaces.elementAt(i);
- if (current instanceof JSFunction) {
+ if (currentTask instanceof JSFunction) {
s._mousex = Integer.MAX_VALUE;
s._mousey = Integer.MAX_VALUE;
} else {
s._mousey = s.mousey;
}
}
- current.perform();
+ currentTask.perform();
}
renderAll();
} catch (JSExn e) {
objects.setSize(0);
}
} catch (final JSExn e) {
- Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(e); }});
+ final Exception e2 = e;
+ Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(e2); }});
} catch (final IOException e) {
- Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(new JSExn(e)); }});
+ final Exception e2 = e;
+ Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(new JSExn(e2)); }});
} catch (final XML.Exn e) {
- Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(new JSExn(e)); }});
+ final Exception e2 = e;
+ Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(new JSExn(e2)); }});
}
}
}
public class ELFException extends IOException { ELFException(String s) { super(s); } }
private class MyRandomAccessFile extends RandomAccessFile {
- MyRandomAccessFile(String f,String m) throws FileNotFoundException { super(f,m); }
+ MyRandomAccessFile(String f,String m) throws IOException { super(f,m); }
}
private class SectionInputStream extends InputStream {