This is the mail archive of the
kawa@sources.redhat.com
mailing list for the Kawa project.
Re: 2 patches
- From: Marco Vezzoli <marco dot vezzoli at st dot com>
- To: kawa at sources dot redhat dot com
- Date: Fri, 09 Aug 2002 11:41:04 +0200
- Subject: Re: 2 patches
- References: <3D536C14.EE8AB13A@st.com>
The same diffs but with the files in the correct order (diff -c old new)
--
(--cafe babe--)
Marco Vezzoli marco.vezzoli@st.com
CR&D Intranet Developement STMicroelectronics
tel. +39 039 603 6852 fax. +39 039 603 5055
*** HTTP.scm.sav Thu Aug 8 13:43:26 2002
--- HTTP.scm Fri Aug 9 09:02:44 2002
***************
*** 26,31 ****
--- 26,37 ----
(define (request-servlet-path) :: <String>
(invoke (get-request) 'getServletPath))
+ (define (request-parameter (name :: <String>)) :: <String>
+ (invoke (get-request) 'getParameter name))
+
+ (define (request-parameters (name :: <String>)) :: <java.util.Vector>
+ (invoke (get-request) 'getParameterValues name))
+
(define (request-query-string)
(let ((query (invoke (get-request) 'getQueryString)))
(if (eq? query #!null) #f query)))
*** build.xml.sav Thu Aug 8 14:10:34 2002
--- build.xml Fri Aug 9 08:58:33 2002
***************
*** 11,17 ****
<property name="debug" value="true" />
<property name="deprecation" value="false" />
<property name="optimize" value="true" />
!
<!--
There was some discussion of using user.dir as a default here.
The most promising use being for dist.dir (and maybe build.dir).
--- 11,21 ----
<property name="debug" value="true" />
<property name="deprecation" value="false" />
<property name="optimize" value="true" />
! <!-- I added this property in order to compile the scheme servlet code
! otherwise the kawa -C command fails to find the jar. MV
! -->
! <property name="jsdk.class.path" value="/HTTP-Server/jakarta-tomcat-4.0.1-src/build/common/lib/servlet.jar"/>
!
<!--
There was some discussion of using user.dir as a default here.
The most promising use being for dist.dir (and maybe build.dir).
***************
*** 70,75 ****
--- 74,80 ----
<include name="gnu/**/*.class"/>
<include name="kawa/**/*.class"/>
</fileset>
+
<!--
These are the files that are preprocessed before compiling.
***************
*** 91,104 ****
<include name="gnu/kawa/xml/Focus.java"/>
<include name="kawa/Version.java"/>
</fileset>
<target name="run" depends="classes">
! <java taskname="kawa" classname="kawa.repl" classpath="${build.classes}" />
</target>
<target name="runw" depends="classes">
<java taskname="kawa" fork="true"
! classname="kawa.repl" classpath="${build.classes}">
<arg value="-w"/>
</java>
</target>
--- 96,123 ----
<include name="gnu/kawa/xml/Focus.java"/>
<include name="kawa/Version.java"/>
</fileset>
+
+ <!-- this is the classpath used by kawa run tasks
+ add here jar (with location attribute) and directories (path att.) MV
+ -->
+ <path id="kawa.class.path">
+ <pathelement path="${build.classes}"/>
+ <pathelement location="${jsdk.class.path}"/>
+ </path>
+ <!-- the 'java' ant task does not support nested filesets and
+ the 'arg' element does not support pathref attribute; modifying
+ these objects could be easy but I do not have enough time so
+ I simply added the jsdk jar path to the kawa compilation tasks
+ -->
+
<target name="run" depends="classes">
! <java taskname="kawa" classname="kawa.repl" classpathref="kawa.class.path" />
</target>
<target name="runw" depends="classes">
<java taskname="kawa" fork="true"
! classname="kawa.repl" classpathref="kawa.class.path">
<arg value="-w"/>
</java>
</target>
***************
*** 182,187 ****
--- 201,207 ----
enable-jemacs=${enable-jemacs}
enable-xml=${enable-xml}
enable-servlet=${enable-servlet}
+ jsdk.class.path=${jsdk.class.path}
</echo>
<!--
***************
*** 478,490 ****
<srcfiles refid="lib-scm-2nd"/>
</uptodate>
</target>
!
<target name="lib-scm-classes"
depends="java-classes, check-lib-scm-classes"
unless="lib-scm-classes-uptodate">
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P kawa.lib. --module-static -C"/>
--- 498,510 ----
<srcfiles refid="lib-scm-2nd"/>
</uptodate>
</target>
!
<target name="lib-scm-classes"
depends="java-classes, check-lib-scm-classes"
unless="lib-scm-classes-uptodate">
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}:${jsdk.class.path}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P kawa.lib. --module-static -C"/>
***************
*** 524,529 ****
--- 544,550 ----
<include name="ppfile.scm"/>
<include name="printf.scm"/>
<include name="readtable.scm"/>
+ <include name="HTTP.scm"/>
</fileset>
<target name="check-slib-scm-classes">
***************
*** 533,544 ****
</uptodate>
</target>
<target name="slib-scm-classes"
! depends="java-classes, check-slib-scm-classes"
unless="slib-scm-classes-uptodate">
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P gnu.kawa.slib. --module-static -C"/>
--- 554,568 ----
</uptodate>
</target>
+ <!-- FIXME I added xml and servlet classes dependencies for HTTP support
+ it should be added in a more conditional way.
+ -->
<target name="slib-scm-classes"
! depends="java-classes, xml-classes, servlet-classes, check-slib-scm-classes"
unless="slib-scm-classes-uptodate">
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}:${jsdk.class.path}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P gnu.kawa.slib. --module-static -C"/>
***************
*** 638,644 ****
unless="jemacs-lisp-classes-uptodate">
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P gnu.jemacs.lang. --module-static -C"/>
--- 662,668 ----
unless="jemacs-lisp-classes-uptodate">
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}:${jsdk.class.path}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P gnu.jemacs.lang. --module-static -C"/>
***************
*** 647,653 ****
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P gnu.jemacs.buffer. --module-static -C"/>
--- 671,677 ----
<apply taskname="kawa" executable="java"
failonerror="true" parallel="true">
! <arg value="-classpath"/> <arg path="${build.classes}:${jsdk.class.path}"/>
<arg value="kawa.repl"/>
<arg value="-d"/> <arg path="${build.classes}"/>
<arg line="-P gnu.jemacs.buffer. --module-static -C"/>