projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4f63a0b
)
fixed bug 460
author
adam
<adam@megacz.com>
Sat, 14 Feb 2004 05:52:15 +0000
(
05:52
+0000)
committer
adam
<adam@megacz.com>
Sat, 14 Feb 2004 05:52:15 +0000
(
05:52
+0000)
darcs-hash:
20040214055215
-5007d-
474199d28f41a8c7bc7840b2a582ab77a70724a3
.gz
Makefile
patch
|
blob
|
history
Makefile.upstream
patch
|
blob
|
history
src/org/ibex/Ibex.java
patch
|
blob
|
history
src/org/ibex/Template.java
patch
|
blob
|
history
src/org/ibex/util/Log.java
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
af934a3
..
6752dc4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-206,9
+206,9
@@
build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.
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
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/%=%)
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/%=%)
diff --git
a/Makefile.upstream
b/Makefile.upstream
index
3c53424
..
c531107
100644
(file)
--- a/
Makefile.upstream
+++ b/
Makefile.upstream
@@
-82,12
+82,14
@@
configure_WindowMaker-0.80.2_$(target) += --host=i686-pc-linux-gnu --x-librarie
configure_jode-1.1.1_java := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac
ifeq ($(shell uname),Darwin)
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/
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
# 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
diff --git
a/src/org/ibex/Ibex.java
b/src/org/ibex/Ibex.java
index
225b4bc
..
1b55939
100644
(file)
--- a/
src/org/ibex/Ibex.java
+++ b/
src/org/ibex/Ibex.java
@@
-28,7
+28,7
@@
public final class Ibex extends JS.Cloneable {
str = str.substring(str.indexOf('.') + 1);
ret = (JS)ret.get(path);
}
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;
}
return ret;
}
diff --git
a/src/org/ibex/Template.java
b/src/org/ibex/Template.java
index
ed91cd3
..
154de72
100644
(file)
--- a/
src/org/ibex/Template.java
+++ b/
src/org/ibex/Template.java
@@
-181,8
+181,8
@@
public class Template {
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());
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:
state = STATE_IN_ROOT_NODE;
return;
case STATE_IN_ROOT_NODE:
@@
-207,15
+207,16
@@
public class Template {
}
Hash urimap = c.getUriMap();
}
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();
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;
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++;
}
t.urivals[ii] = val;
ii++;
}
diff --git
a/src/org/ibex/util/Log.java
b/src/org/ibex/util/Log.java
index
1766be9
..
2046b77
100644
(file)
--- a/
src/org/ibex/util/Log.java
+++ b/
src/org/ibex/util/Log.java
@@
-73,7
+73,7
@@
public class Log {
private static String lastClassName = null;
private static synchronized void log(Object o, Object message, int level) {
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, "==========================================================================="));
if (firstMessage && !logDates) {
firstMessage = false;
logstream.println(colorize(GREEN, false, "==========================================================================="));