From 7795f00bdb9888a6e958e7794e67d6535e37fed9 Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Wed, 17 Jan 2001 18:05:00 +0000 Subject: [PATCH] improved autoconfiguration and other small fixes, this module is about to be dismissed --- helm/xsltd/Makefile.in | 11 ++-- helm/xsltd/Makefile.old | 5 +- helm/xsltd/cadet | 11 ---- helm/xsltd/configure.in | 52 +++++++++++-------- ..._xsltd-0.0.1-1.spec => helm_xsltd.spec.in} | 7 +-- helm/xsltd/isterix | 10 ---- helm/xsltd/start-xaland.in | 23 ++++++++ helm/xsltd/xaland-java-DOM/xaland_DOM.java | 23 ++++++++ helm/xsltd/xaland-java/rompi.java | 23 ++++++++ helm/xsltd/xaland-java/sped.java | 23 ++++++++ helm/xsltd/xaland-java/xaland.java | 23 ++++++++ helm/xsltd/xaland-java2/xaland2.java | 23 ++++++++ helm/xsltd/xaland-uwobo/xaland_uwobo.java | 12 ++--- 13 files changed, 188 insertions(+), 58 deletions(-) delete mode 100755 helm/xsltd/cadet rename helm/xsltd/{helm_xsltd-0.0.1-1.spec => helm_xsltd.spec.in} (88%) delete mode 100755 helm/xsltd/isterix diff --git a/helm/xsltd/Makefile.in b/helm/xsltd/Makefile.in index 1dde997e7..1d43f9c18 100644 --- a/helm/xsltd/Makefile.in +++ b/helm/xsltd/Makefile.in @@ -1,13 +1,16 @@ + +BIN_DIR=@BIN_DIR@ HELM_LIB_DIR=@HELM_LIB_DIR@ -HELM_BIN_DIR=@HELM_BIN_DIR@ + +all: install: + cp start-xaland $(BIN_DIR) cp xaland.class $(HELM_LIB_DIR) - cp start-xaland $(HELM_BIN_DIR) distclean: rm -f Makefile configure config.log config.cache config.status \ etc/configuration.xml etc/helm-math-engine-configuration.xml \ - lib/configuration.pl + lib/configuration.pl *.spec start-xaland -.PHONY: install distclean +.PHONY: all install distclean diff --git a/helm/xsltd/Makefile.old b/helm/xsltd/Makefile.old index bd50ad7cc..a56803cc5 100644 --- a/helm/xsltd/Makefile.old +++ b/helm/xsltd/Makefile.old @@ -1,3 +1,6 @@ +JAVADIR = /opt/java/jdk1.3/bin +HELM_STYLES_DIR = file:/home/lpadovan/miohelm/style + start-xaland: java -ss1024K -oss8192K \ xaland 12345 12346 \ @@ -30,7 +33,7 @@ start-xaland-old: $(HELM_STYLES_DIR)/style_prima_del_linguaggio_naturale/theory_pres.xsl start-xaland-uwobo: - java -ss1024K -oss8192K \ + $(JAVADIR)/java -ss1024K -oss8192K \ xaland_uwobo 12345 12346 12347 \ $(HELM_STYLES_DIR)/rootcontent.xsl \ $(HELM_STYLES_DIR)/annotatedpres.xsl \ diff --git a/helm/xsltd/cadet b/helm/xsltd/cadet deleted file mode 100755 index ac2b3b7b9..000000000 --- a/helm/xsltd/cadet +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh - -export PATH=~/HELM/installation/jdk118/bin:$PATH - -#export CLASSPATH=/home/cadet/sacerdot/xalan-j_1_1/xalan.jar:/home/cadet/sacerdot/xalan-j_1_1/xerces.jar:. -export CLASSPATH=~/HELM/installation/xalan-j_1_2/xalan.jar:~/HELM/installation/xalan-j_1_2/xerces.jar:. -#export CLASSPATH=~/HELM/installation/xalan-j_1_2_1/xalan.jar:~/HELM/installation/xalan-j_1_2_1/xerces.jar:. -#export CLASSPATH=/home/cadet/sacerdot/xalan-j_2_0_D01/bin/xalan.jar:/home/cadet/sacerdot/xalan-j_2_0_D01/bin/xerces.jar:. - -export HELM_STYLES_DIR=../style -#export HELM_STYLES_DIR=../style diff --git a/helm/xsltd/configure.in b/helm/xsltd/configure.in index 9d1f8bea4..b3462712e 100644 --- a/helm/xsltd/configure.in +++ b/helm/xsltd/configure.in @@ -1,5 +1,11 @@ AC_INIT(xaland.class) +PACKAGE=helm_xsltd +MAJOR_VERSION=0 +MINOR_VERSION=0 +MICRO_VERSION=1 +VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION + if test "x$prefix" != xNONE; then RESOLVED_PREFIX=$prefix else @@ -12,31 +18,31 @@ else RESOLVED_EXEC_PREFIX=$RESOLVED_PREFIX fi -dnl General -AC_MSG_CHECKING("for the bin dir") -HELM_BIN_DIR=$RESOLVED_EXEC_PREFIX/bin -AC_MSG_RESULT($HELM_BIN_DIR) - -AC_MSG_CHECKING("for the lib/helm dir") -HELM_LIB_DIR=$RESOLVED_PREFIX/lib/helm -AC_MSG_RESULT($HELM_LIB_DIR) - -AC_MSG_CHECKING("for the stylesheets\' dir") -RES="" -AC_CACHE_VAL(helm_cv_HELM_STYLES_DIR, - echo "Where should I find the stylesheets? Note: your answer must be the path of the directory in which the stylesheets in the helm_data package have been installed." - read helm_cv_HELM_STYLES_DIR - RES="Asked" -) -HELM_STYLES_DIR=$helm_cv_HELM_STYLES_DIR -if test "$RES" != "Asked" ; then - HELM_STYLES_DIR=`eval "echo $HELM_STYLES_DIR"` - AC_MSG_RESULT($HELM_STYLES_DIR) +BIN_DIR=$RESOLVED_EXEC_PREFIX/bin + +AC_CHECK_PROG(HAVE_HELM_CONFIG, helm-config, yes, no) +if test $HAVE_HELM_CONFIG = no; then + AC_MSG_ERROR(Could not fing helm-config) +fi + +HELM_LIB_DIR=`helm-config --lib-dir` +if test ! -d $HELM_LIB_DIR; then + AC_MSG_ERROR(Could not find HELM lib directory, please check your installation) +fi + +HELM_STYLES_DIR=`helm-config --style-dir` +if test ! -d $HELM_STYLES_DIR; then + AC_MSG_ERROR(Could not find stylesheet directory, please check your installation) fi -AC_CACHE_SAVE +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) +AC_SUBST(BIN_DIR) AC_SUBST(HELM_LIB_DIR) -AC_SUBST(HELM_BIN_DIR) AC_SUBST(HELM_STYLES_DIR) -AC_OUTPUT([Makefile start-xaland], chmod +x start-xaland) +AC_OUTPUT([ + Makefile + start-xaland + helm_xsltd.spec +], chmod +x start-xaland) diff --git a/helm/xsltd/helm_xsltd-0.0.1-1.spec b/helm/xsltd/helm_xsltd.spec.in similarity index 88% rename from helm/xsltd/helm_xsltd-0.0.1-1.spec rename to helm/xsltd/helm_xsltd.spec.in index 2f11b6faa..9d9dafedd 100644 --- a/helm/xsltd/helm_xsltd-0.0.1-1.spec +++ b/helm/xsltd/helm_xsltd.spec.in @@ -1,13 +1,13 @@ Summary: The UDP-based XSLTD daemon for project HELM. -Name: helm_xsltd -Version: 0.0.1 +Name: @PACKAGE@ +Version: @VERSION@ Release: 1 Copyright: GPL URL: http://www.cs.unibo.it/helm Packager: Claudio Sacerdoti Coen Requires: helm_configuration = 0.0.1, helm_data = 0.0.1, helm_http_getter = 0.0.1 Group: Applications/Publishing -Source: www.cs.unibo.it:/~lpadovan/mml-widget/helm_xsltd-0.0.1-1.tar.gz +Source: www.cs.unibo.it:/helm/@PACKAGE@-@VERSION@-1.tar.gz %description HELM (Hypertextual Electronic Library of Mathematics) is a project aimed at the creation of tools for the development and exploitation of a huge @@ -21,6 +21,7 @@ For more information see http://www.cs.unibo.it/helm %build cp config.cache.pkg config.cache ./configure +make %install make install diff --git a/helm/xsltd/isterix b/helm/xsltd/isterix deleted file mode 100755 index c807ee109..000000000 --- a/helm/xsltd/isterix +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -export PATH=$PATH:/opt/java/jdk118/bin/ - -export CLASSPATH=. -export CLASSPATH=$CLASSPATH:/home/lpadovan/helm/shared/libraries/java/xalan_1_1/xalan.jar -export CLASSPATH=$CLASSPATH:/home/lpadovan/helm/shared/libraries/java/xalan_1_1/xerces.jar -export CLASSPATH=$CLASSPATH:/home/lpadovan/helm/shared/libraries/java/saxon-5.3.2/saxon.jar - -export HELM_STYLES_DIR=../style diff --git a/helm/xsltd/start-xaland.in b/helm/xsltd/start-xaland.in index 36aacaa2a..c1d2e63b0 100755 --- a/helm/xsltd/start-xaland.in +++ b/helm/xsltd/start-xaland.in @@ -1,5 +1,28 @@ #!/bin/bash +# Copyright (C) 2000, HELM Team. +# +# This file is part of HELM, an Hypertextual, Electronic +# Library of Mathematics, developed at the Computer Science +# Department, University of Bologna, Italy. +# +# HELM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# HELM is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with HELM; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# For details, see the HELM World-Wide-Web page, +# http://cs.unibo.it/helm/. + ########################################################################## # BEGIN OF THE PART TO CONFIGURE BEFORE USING THE SCRIPT # ########################################################################## diff --git a/helm/xsltd/xaland-java-DOM/xaland_DOM.java b/helm/xsltd/xaland-java-DOM/xaland_DOM.java index 898f1f88e..354f3b213 100644 --- a/helm/xsltd/xaland-java-DOM/xaland_DOM.java +++ b/helm/xsltd/xaland-java-DOM/xaland_DOM.java @@ -1,3 +1,26 @@ +// Copyright (C) 2000, HELM Team. +// +// This file is part of HELM, an Hypertextual, Electronic +// Library of Mathematics, developed at the Computer Science +// Department, University of Bologna, Italy. +// +// HELM is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// HELM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with HELM; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// For details, see the HELM World-Wide-Web page, +// http://cs.unibo.it/helm/. + import org.apache.xalan.xslt.*; import org.w3c.dom.Document; import java.net.*; diff --git a/helm/xsltd/xaland-java/rompi.java b/helm/xsltd/xaland-java/rompi.java index 6a633dbc9..721b9b2ad 100644 --- a/helm/xsltd/xaland-java/rompi.java +++ b/helm/xsltd/xaland-java/rompi.java @@ -1,3 +1,26 @@ +// Copyright (C) 2000, HELM Team. +// +// This file is part of HELM, an Hypertextual, Electronic +// Library of Mathematics, developed at the Computer Science +// Department, University of Bologna, Italy. +// +// HELM is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// HELM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with HELM; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// For details, see the HELM World-Wide-Web page, +// http://cs.unibo.it/helm/. + import java.net.*; public class rompi { diff --git a/helm/xsltd/xaland-java/sped.java b/helm/xsltd/xaland-java/sped.java index 9d96610d4..8082020ee 100644 --- a/helm/xsltd/xaland-java/sped.java +++ b/helm/xsltd/xaland-java/sped.java @@ -1,3 +1,26 @@ +// Copyright (C) 2000, HELM Team. +// +// This file is part of HELM, an Hypertextual, Electronic +// Library of Mathematics, developed at the Computer Science +// Department, University of Bologna, Italy. +// +// HELM is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// HELM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with HELM; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// For details, see the HELM World-Wide-Web page, +// http://cs.unibo.it/helm/. + import java.net.*; public class sped { diff --git a/helm/xsltd/xaland-java/xaland.java b/helm/xsltd/xaland-java/xaland.java index 0ad6783f3..b32106cf0 100644 --- a/helm/xsltd/xaland-java/xaland.java +++ b/helm/xsltd/xaland-java/xaland.java @@ -1,3 +1,26 @@ +// Copyright (C) 2000, HELM Team. +// +// This file is part of HELM, an Hypertextual, Electronic +// Library of Mathematics, developed at the Computer Science +// Department, University of Bologna, Italy. +// +// HELM is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// HELM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with HELM; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// For details, see the HELM World-Wide-Web page, +// http://cs.unibo.it/helm/. + import org.apache.xalan.xslt.*; import java.net.*; import java.io.*; diff --git a/helm/xsltd/xaland-java2/xaland2.java b/helm/xsltd/xaland-java2/xaland2.java index 9d91d37fb..fc5e20b86 100644 --- a/helm/xsltd/xaland-java2/xaland2.java +++ b/helm/xsltd/xaland-java2/xaland2.java @@ -1,3 +1,26 @@ +// Copyright (C) 2000, HELM Team. +// +// This file is part of HELM, an Hypertextual, Electronic +// Library of Mathematics, developed at the Computer Science +// Department, University of Bologna, Italy. +// +// HELM is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// HELM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with HELM; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// For details, see the HELM World-Wide-Web page, +// http://cs.unibo.it/helm/. + import java.net.*; import java.io.*; diff --git a/helm/xsltd/xaland-uwobo/xaland_uwobo.java b/helm/xsltd/xaland-uwobo/xaland_uwobo.java index d0ed630ae..97f8cdf09 100644 --- a/helm/xsltd/xaland-uwobo/xaland_uwobo.java +++ b/helm/xsltd/xaland-uwobo/xaland_uwobo.java @@ -1,4 +1,4 @@ -import org.apache.xalan.xslt.*; +//import org.apache.xalan.xslt.*; import java.net.*; import java.io.*; @@ -19,7 +19,7 @@ public class xaland_uwobo { uwobo_socket.receive(rcv); } - public static void main(String argv[]) throws java.io.IOException, java.net.MalformedURLException, org.xml.sax.SAXException + public static void main(String argv[]) throws java.io.IOException, java.net.MalformedURLException//, org.xml.sax.SAXException { int port = Integer.parseInt(argv[0]); int port2 = Integer.parseInt(argv[1]); @@ -53,19 +53,19 @@ public class xaland_uwobo { int first = received.indexOf(' '); int last = received.lastIndexOf(' '); - String mode = received.substring(0,first); + String mode = received.substring(0,first-1); String input = received.substring(first+1,last); String output = received.substring(last+1); System.out.println("request received! Parameters are"); - System.out.println("Mode: " + mode + " "); + System.out.println("Mode: \"" + mode + "\""); System.out.println("Input file: \"" + input + "\""); System.out.println("Output file: \"" + output + "\"\n"); if (mode == "cic") - send_to_uwobo("apply ciccontent cicpres " + input + " " + output); + send_to_uwobo("apply " + input + " " + output + " ciccontent cicpres"); else - send_to_uwobo("apply theorycontent theorypres " + input + " " + output); + send_to_uwobo("apply " + input + " " + output + " theorycontent theorypres"); InetAddress address = InetAddress.getLocalHost(); DatagramSocket socket2 = new DatagramSocket(); -- 2.39.2