builtin_src := $(shell find src/org/ibex/builtin -name '*.*' \! -name '*.xcf')
build/res/fonts/vera: .download_vera-1.10
mkdir -p build/res/fonts/vera
- cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
- cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
- cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+ cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+ cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+ cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
@echo -e "\n\033[1mzipping res/* -> .jar: builtin.jar\033[0m"
cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
configure_jode-1.1.1_java := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac
ifeq ($(shell uname),Darwin)
-environment_jode-1.1.1_java := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.1/Classes/classes.jar
+environment_jode-1.1.1_java := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar
else
environment_jode-1.1.1_java := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar
endif
environment_jode-1.1.1_java += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/
+#environment_gcc-3.3_i686-pc-linux-gnu += CFLAGS="-Wl,-ldl"
+
# libjpeg's configury doesn't obey --target
environment_jpeg-6b_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
environment_jpeg-6b_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
str = str.substring(str.indexOf('.') + 1);
ret = (JS)ret.get(path);
}
- ret = (JS)ret.get(str);
+ if (!"".equals(str)) ret = (JS)ret.get(str);
return ret;
}
throw new XML.Exn("root element was not <ibex>", XML.Exn.SCHEMA, getLine(), getCol());
if (c.getAttrLen() != 0)
throw new XML.Exn("root element must not have attributes", XML.Exn.SCHEMA, getLine(), getCol());
- if (c.getUri("ui") == null) c.addUri("ui", "ibex://ui");
- if (c.getUri("") == null) c.addUri("", initial_uri);
+ if (c.getUri("ui") == null || "".equals(c.getUri("ui"))) c.addUri("ui", "ibex://ui");
+ if (c.getUri("") == null || "".equals(c.getUri(""))) c.addUri("", initial_uri);
state = STATE_IN_ROOT_NODE;
return;
case STATE_IN_ROOT_NODE:
}
Hash urimap = c.getUriMap();
- t.urikeys = new String[urimap.size()];
- t.urivals = new String[urimap.size()];
+ t.urikeys = new String[urimap.size() - (urimap.get("ui") == null ? 0 : 1)];
+ t.urivals = new String[urimap.size() - (urimap.get("ui") == null ? 0 : 1)];
Enumeration uriEnumeration = urimap.keys();
int ii = 0;
while(uriEnumeration.hasMoreElements()) {
String key = (String)uriEnumeration.nextElement();
+ if (key.equals("ui")) continue;
String val = (String)urimap.get(key);
t.urikeys[ii] = key;
- if (val.charAt(0) == '.') val = val.substring(1);
+ if (val.length() > 0 && val.charAt(0) == '.') val = val.substring(1);
t.urivals[ii] = val;
ii++;
}
private static String lastClassName = null;
private static synchronized void log(Object o, Object message, int level) {
- if (level > Log.level) return;
+ if (level < Log.level) return;
if (firstMessage && !logDates) {
firstMessage = false;
logstream.println(colorize(GREEN, false, "==========================================================================="));