This is the mail archive of the
kawa@sourceware.org
mailing list for the Kawa project.
Re: Kawa build.xml patch for Android
On 07/03/2012 11:39 AM, craven@gmx.net wrote:
On Tue, 03 Jul 2012 11:28:24 -0700, Per Bothner <per@bothner.com> wrote:
Could you try the attached patch?
It seems good, however it fails because gnu.kawa.slib.gui still
references the models. Just looking into how to disable building that
file too for android..
Could you try the updated patch?
--
--Per Bothner
per@bothner.com http://per.bothner.com/
Index: build.xml
===================================================================
--- build.xml (revision 7263)
+++ build.xml (working copy)
@@ -483,7 +483,7 @@
<include name="gnu/kawa/xml/"/>
<include name="gnu/xml/"/>
<patternset refid="with-awt-${with-awt}"/>
- <include name="gnu/kawa/models/"/>
+ <include name="gnu/kawa/models/" if="${with-awt}"/>
<include name="gnu/kawa/swingviews/" if="${with-swing}"/>
</javac>
</target>
@@ -569,8 +569,7 @@
<include name="readtable.scm"/>
<include name="cut.scm"/>
<include name="enums.scm"/>
- <include name="gui.scm"/>
- <include name="XML.scm"/>
+ <include name="gui.scm" if="${with-awt}"/>
<include name="swing.scm" if="${with-swing}"/>
<include name="syntaxutils.scm"/>
<include name="Streams.scm"/>
Index: gnu/kawa/models/Makefile.am
===================================================================
--- gnu/kawa/models/Makefile.am (revision 7263)
+++ gnu/kawa/models/Makefile.am (working copy)
@@ -28,4 +28,7 @@
PACKAGE_FNAME = gnu-kawa-models
GCJ_INPUTS = $(java_Java)
-all: Makefile java-classes.stamp $(@GCJ_COMPILED_SELECTED@)
+if WITH_AWT
+ALL = java-classes.stamp $(@GCJ_COMPILED_SELECTED@)
+endif
+all: Makefile $(ALL)
Index: gnu/kawa/models/Makefile.in
===================================================================
--- gnu/kawa/models/Makefile.in (revision 7263)
+++ gnu/kawa/models/Makefile.in (working copy)
@@ -208,6 +208,7 @@
PACKAGE_FNAME = gnu-kawa-models
GCJ_INPUTS = $(java_Java)
+@WITH_AWT_TRUE@ALL = java-classes.stamp $(@GCJ_COMPILED_SELECTED@)
all: all-am
.SUFFIXES:
@@ -425,9 +426,8 @@
$(KAWA_COMPILER) --elisp -C $?
echo timestamp > elisp-classes.stamp
echo timestamp > $(TO_TOPDIR)/kawa-jar.stamp
+all: Makefile $(ALL)
-all: Makefile java-classes.stamp $(@GCJ_COMPILED_SELECTED@)
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: gnu/kawa/slib/Makefile.am
===================================================================
--- gnu/kawa/slib/Makefile.am (revision 7263)
+++ gnu/kawa/slib/Makefile.am (working copy)
@@ -7,10 +7,14 @@
if ENABLE_XML
XML_SCM = XML.scm XStrings.scm
+endif
if WITH_SWING
SWING_SCM = swing.scm
endif
+
+if WITH_AWT
+AWT_SCM = gui.scm
endif
# NOTE if this list is changed, also update build.xml.
@@ -20,7 +24,7 @@
srfi37.scm srfi69.scm pregexp.scm \
Streams.scm StreamsDerived.scm StreamsPrimitive.scm StreamsType.scm \
genwrite.scm pp.scm ppfile.scm printf.scm syntaxutils.scm \
- cut.scm testing.scm $(XML_SCM) gui.scm $(SWING_SCM)
+ cut.scm testing.scm $(XML_SCM) $(AWT_SCM) $(SWING_SCM)
EXTRA_DIST = $(java_SCM) XML.scm swing.scm
SCM_COMPILE_FLAGS = --warn-undefined-variable --warn-unknown-member --warn-as-error
Index: gnu/kawa/slib/Makefile.in
===================================================================
--- gnu/kawa/slib/Makefile.in (revision 7263)
+++ gnu/kawa/slib/Makefile.in (working copy)
@@ -186,7 +186,8 @@
PACKAGE_FNAME = gnu-kawa-slib
EXTRA_GCJ_INPUTS = *.class
@ENABLE_XML_TRUE@XML_SCM = XML.scm XStrings.scm
-@ENABLE_XML_TRUE@@WITH_SWING_TRUE@SWING_SCM = swing.scm
+@WITH_SWING_TRUE@SWING_SCM = swing.scm
+@WITH_AWT_TRUE@AWT_SCM = gui.scm
# NOTE if this list is changed, also update build.xml.
java_SCM = DefineRecordType.scm enums.scm readtable.scm \
@@ -195,7 +196,7 @@
srfi37.scm srfi69.scm pregexp.scm \
Streams.scm StreamsDerived.scm StreamsPrimitive.scm StreamsType.scm \
genwrite.scm pp.scm ppfile.scm printf.scm syntaxutils.scm \
- cut.scm testing.scm $(XML_SCM) gui.scm $(SWING_SCM)
+ cut.scm testing.scm $(XML_SCM) $(AWT_SCM) $(SWING_SCM)
EXTRA_DIST = $(java_SCM) XML.scm swing.scm
SCM_COMPILE_FLAGS = --warn-undefined-variable --warn-unknown-member --warn-as-error