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 (parent:
acec042
)
2002/07/19 05:26:04
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:15 +0000
(06:49 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:15 +0000
(06:49 +0000)
darcs-hash:
20040130064915
-2ba56-
a0b8817f34d132c6ebd44ecb700f3484cbf36565
.gz
CHANGES
patch
|
blob
|
history
src/org/xwt/plat/GCJ.xml
patch
|
blob
|
history
diff --git
a/CHANGES
b/CHANGES
index
f61670d
..
d00e4d4
100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-290,3
+290,5
@@
18-Jul megacz AWT.java: boosted font size by 2 points on Java12
18-Jul megacz AWT.java: boosted font size by 2 points on Java12
+18-Jul megacz GCJ.xml: builtin.xwar support
+
diff --git
a/src/org/xwt/plat/GCJ.xml
b/src/org/xwt/plat/GCJ.xml
index
55bb86d
..
fae6954
100644
(file)
--- a/
src/org/xwt/plat/GCJ.xml
+++ b/
src/org/xwt/plat/GCJ.xml
@@
-55,9
+55,16
@@
</apply>
<echo message='wrapping .xwar -> .o'/>
</apply>
<echo message='wrapping .xwar -> .o'/>
- <bash>
- ${gcc-path}/bin/${gcc-target}gcj --resource org/xwt/builtin.xwar -c bin/org/xwt/builtin.xwar -o bin-${plat}/org/xwt/builtin.o
- </bash>
+ <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}/'>
+ <fileset dir='bin/' includes='**/*.xwar'/>
+ <arg value='--resource'/>
+ <arg value='org/xwt/builtin.xwar'/>
+ <arg value='-c'/>
+ <srcfile/>
+ <arg value='-o'/>
+ <targetfile/>
+ <mapper type='glob' from='*.xwar' to='*.o'/>
+ </apply>
<echo message='linking .o -> ${binaryname}'/>
<uptodate property="linked" targetfile="bin-${plat}/${binaryname}">
<echo message='linking .o -> ${binaryname}'/>
<uptodate property="linked" targetfile="bin-${plat}/${binaryname}">