Menu
▾
▴
woc-commit — CVS commit messages are posted to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(132) |
Jul
(50) |
Aug
(172) |
Sep
(87) |
Oct
|
Nov
(1) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(39) |
Oct
(2) |
Nov
|
Dec
|
| 2004 |
Jan
(47) |
Feb
|
Mar
(11) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(9) |
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Egon W. <eg...@us...> - 2002-08-15 14:26:09
|
Update of /cvsroot/woc/woc/data/wml/l
In directory usw-pr-cvs1:/tmp/cvs-serv26594/data/wml/l
Added Files:
.cvsignore Makefile.am
Log Message:
make install for WML files.
--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
--- NEW FILE: Makefile.am ---
wmldir=${prefix}/data/wml/l
wml_DATA=*.xml
CLEANFILES=
|
|
From: Egon W. <eg...@us...> - 2002-08-15 14:26:08
|
Update of /cvsroot/woc/woc/data/wml/k
In directory usw-pr-cvs1:/tmp/cvs-serv26594/data/wml/k
Added Files:
.cvsignore Makefile.am
Log Message:
make install for WML files.
--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
--- NEW FILE: Makefile.am ---
wmldir=${prefix}/data/wml/k
wml_DATA=*.xml
CLEANFILES=
|
|
From: Egon W. <eg...@us...> - 2002-08-15 14:26:08
|
Update of /cvsroot/woc/woc/data/wml/a In directory usw-pr-cvs1:/tmp/cvs-serv26594/data/wml/a Added Files: .cvsignore Log Message: make install for WML files. --- NEW FILE: .cvsignore --- Makefile Makefile.in |
|
From: Egon W. <eg...@us...> - 2002-08-15 13:35:54
|
Update of /cvsroot/woc/woc
In directory usw-pr-cvs1:/tmp/cvs-serv28626
Modified Files:
configure.in
Log Message:
Use target dir as physicalRoot.
Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure.in 15 Aug 2002 13:33:40 -0000 1.10
--- configure.in 15 Aug 2002 13:35:51 -0000 1.11
***************
*** 26,30 ****
dnl set phys path of CVS
! PHYSPATH=`pwd`
AC_SUBST(PHYSPATH)
--- 26,30 ----
dnl set phys path of CVS
! PHYSPATH=${prefix}
AC_SUBST(PHYSPATH)
|
|
From: Egon W. <eg...@us...> - 2002-08-15 13:33:46
|
Update of /cvsroot/woc/woc/data In directory usw-pr-cvs1:/tmp/cvs-serv27419/data Added Files: .cvsignore Makefile.am Log Message: Working towards installing data. --- NEW FILE: .cvsignore --- Makefile Makefile.in --- NEW FILE: Makefile.am --- SUBDIRS= wml |
|
From: Egon W. <eg...@us...> - 2002-08-15 13:33:46
|
Update of /cvsroot/woc/woc
In directory usw-pr-cvs1:/tmp/cvs-serv27419
Modified Files:
Makefile.am configure.in
Log Message:
Working towards installing data.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 15 Aug 2002 11:00:07 -0000 1.2
--- Makefile.am 15 Aug 2002 13:33:39 -0000 1.3
***************
*** 1,4 ****
PREFIX="@prefix@"
! SUBDIRS= bin lib source
EXTRA_DIST= \
--- 1,4 ----
PREFIX="@prefix@"
! SUBDIRS= bin data lib source
EXTRA_DIST= \
Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** configure.in 15 Aug 2002 12:02:06 -0000 1.9
--- configure.in 15 Aug 2002 13:33:40 -0000 1.10
***************
*** 88,91 ****
--- 88,93 ----
bin/wml2html/make-groups
bin/wml2html/insert-item
+ data/Makefile
+ data/wml/Makefile
lib/Makefile
lib/java/Makefile
|
|
From: Egon W. <eg...@us...> - 2002-08-15 13:10:55
|
Update of /cvsroot/woc/woc In directory usw-pr-cvs1:/tmp/cvs-serv14919 Modified Files: INSTALL Log Message: Added some info about installing the software. Index: INSTALL =================================================================== RCS file: /cvsroot/woc/woc/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** INSTALL 20 Jul 2002 09:34:26 -0000 1.1 --- INSTALL 15 Aug 2002 13:10:53 -0000 1.2 *************** *** 0 **** --- 1,7 ---- + To install this sofware do: + + 1. ./configure --prefix=/some/dir + 2. make + 3. make install + + If the --prefix option is omitted it uses /usr/local as default. |
|
From: Egon W. <eg...@us...> - 2002-08-15 13:05:44
|
Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv12648
Modified Files:
Makefile.am
Log Message:
Silenced jar.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am 15 Aug 2002 12:02:06 -0000 1.3
--- Makefile.am 15 Aug 2002 13:05:41 -0000 1.4
***************
*** 24,26 ****
jar: classes
! cd build; ${JAR} cvf ../wocjava.jar com/*
--- 24,26 ----
jar: classes
! cd build; ${JAR} cf ../wocjava.jar com/*
|
|
From: Egon W. <eg...@us...> - 2002-08-15 12:02:11
|
Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv16680/source/wocjava
Modified Files:
Makefile.am
Log Message:
Added scripts to convert wml 2 html. And fixed some things along the way.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 15 Aug 2002 11:00:10 -0000 1.2
--- Makefile.am 15 Aug 2002 12:02:06 -0000 1.3
***************
*** 1,5 ****
--- 1,10 ----
alljardir=${prefix}/lib/java
+ reposdir=${prefix}/bin/wml2html
alljar_DATA= wocjava.jar
+
+ repos_DATA= repository_def.xml
+
+ CLEANFILES= repository_def.xml wocjava.jar
JAVAC=${JAVA_HOME}/bin/javac
|
|
From: Egon W. <eg...@us...> - 2002-08-15 12:02:11
|
Update of /cvsroot/woc/woc/bin/wml2html
In directory usw-pr-cvs1:/tmp/cvs-serv16680/bin/wml2html
Modified Files:
.cvsignore Makefile.am
Added Files:
Makefile.in insert-item.in make-groups.in make-items.in
make-woord.in
Log Message:
Added scripts to convert wml 2 html. And fixed some things along the way.
--- NEW FILE: Makefile.in ---
# Makefile.in generated automatically by automake 1.5 from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
AMTAR = @AMTAR@
AWK = @AWK@
DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PATHTOGCJ = @PATHTOGCJ@
PATHTOGUNZIP = @PATHTOGUNZIP@
PATHTOJAR = @PATHTOJAR@
PATHTOJAVA = @PATHTOJAVA@
PATHTOJAVAC = @PATHTOJAVAC@
PATHTOLIREL2R = @PATHTOLIREL2R@
PATHTOLIRERUN = @PATHTOLIRERUN@
PATHTOPERL = @PATHTOPERL@
PATHTOSH = @PATHTOSH@
PATHTOXSLTPROC = @PATHTOXSLTPROC@
PHYSPATH = @PHYSPATH@
SERVER_HOSTNAME = @SERVER_HOSTNAME@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
bindir = ${prefix}/bin/wml2html
bin_SCRIPTS = \
make-items \
make-groups \
make-woord \
insert-item
CLEANFILES = WMLreport.txt ${bin_SCRIPTS}
subdir = bin/wml2html
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = make-items make-woord make-groups insert-item
SCRIPTS = $(bin_SCRIPTS)
DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in insert-item.in make-groups.in \
make-items.in make-woord.in
all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu bin/wml2html/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
make-items: $(top_builddir)/config.status make-items.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
make-woord: $(top_builddir)/config.status make-woord.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
make-groups: $(top_builddir)/config.status make-groups.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
insert-item: $(top_builddir)/config.status insert-item.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f="`echo $$p|sed '$(transform)'`"; \
if test -f $$p; then \
echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
elif test -f $(srcdir)/$$p; then \
echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f="`echo $$p|sed '$(transform)'`"; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done
uninstall-info-am:
tags: TAGS
TAGS:
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ../..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
$(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
cp -pR $$d/$$file $(distdir) \
|| exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(SCRIPTS)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
info: info-am
info-am:
install-data-am:
install-exec-am: install-binSCRIPTS
install-info: install-info-am
install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
uninstall-am: uninstall-binSCRIPTS uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am info info-am install \
install-am install-binSCRIPTS install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
install-man install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic uninstall uninstall-am \
uninstall-binSCRIPTS uninstall-info-am
# 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:
--- NEW FILE: insert-item.in ---
#! /bin/sh
if (test $# = 1)
then
:
else
echo "syntax: insert-item <item.xml>"
exit 1
fi
prefix="@prefix@"
JAVA=@PATHTOJAVA@
PERL=@PATHTOPERL@
JARS=`ls -1 ../../lib/java/*.jar | ${PERL} -ne "s/\n|\r/:/g; print;"`
OPTIONS="-r woc -R ${prefix}/bin/wml2html/repository_def.xml"
${JAVA} -cp ${JARS} com.egonw.woc.tools.SimpleAddItem ${OPTIONS} $1
--- NEW FILE: make-groups.in ---
#! /bin/sh
JAVA=@PATHTOJAVA@
PERL=@PATHTOPERL@
JARS=`ls -1 ../../lib/java/*.jar | ${PERL} -ne "s/\n|\r/:/g; print;"`
OPTIONS="-r ./repository_def.xml"
${JAVA} -cp ${JARS} com.egonw.woc.tools.GroupFiles ${OPTIONS}
--- NEW FILE: make-items.in ---
#! /bin/sh
JAVA=@PATHTOJAVA@
PERL=@PATHTOPERL@
JARS=`ls -1 ../../lib/java/*.jar | ${PERL} -ne "s/\n|\r/:/g; print;"`
OPTIONS="-r `pwd`/repository_def.xml"
${JAVA} -cp ${JARS} com.egonw.woc.tools.MaakLosseItems ${OPTIONS}
--- NEW FILE: make-woord.in ---
#! /bin/sh
JAVA=@PATHTOJAVA@
PERL=@PATHTOPERL@
JARS=`ls -1 ../../lib/java/*.jar | ${PERL} -ne "s/\n|\r/:/g; print;"`
OPTIONS="-r `pwd`/repository_def.xml"
${JAVA} -cp ${JARS} com.egonw.woc.tools.Woord ${OPTIONS}
Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** .cvsignore 15 Aug 2002 10:57:22 -0000 1.2
--- .cvsignore 15 Aug 2002 12:02:06 -0000 1.3
***************
*** 2,3 ****
--- 2,7 ----
Makefile.in
WMLreport.txt
+ make-items
+ make-woord
+ make-groups
+ insert-item
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 15 Aug 2002 11:00:09 -0000 1.2
--- Makefile.am 15 Aug 2002 12:02:06 -0000 1.3
***************
*** 1,18 ****
! CLEANFILES= WMLreport.txt
! JAVA=@JAVA@
! JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
!
! OPTIONS=-R `pwd`/repository_def.xml
!
! all: items woord
!
! items:
! ${JAVA} -cp ${JARS} com.egonw.woc.tools.MaakLosseItems ${OPTIONS}
!
! woord:
! ${JAVA} -cp ${JARS} com.egonw.woc.tools.Woord ${OPTIONS}
!
! groups:
! ${JAVA} -cp ${JARS} com.egonw.woc.tools.GroupFiles ${OPTIONS}
--- 1,9 ----
! bindir=${prefix}/bin/wml2html
! bin_SCRIPTS = \
! make-items \
! make-groups \
! make-woord \
! insert-item
! CLEANFILES= WMLreport.txt ${bin_SCRIPTS}
|
|
From: Egon W. <eg...@us...> - 2002-08-15 12:02:11
|
Update of /cvsroot/woc/woc/bin/download In directory usw-pr-cvs1:/tmp/cvs-serv16680/bin/download Modified Files: Makefile.in Log Message: Added scripts to convert wml 2 html. And fixed some things along the way. Index: Makefile.in =================================================================== RCS file: /cvsroot/woc/woc/bin/download/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile.in 15 Aug 2002 11:00:08 -0000 1.5 --- Makefile.in 15 Aug 2002 12:02:06 -0000 1.6 *************** *** 63,66 **** --- 63,69 ---- PATHTOGCJ = @PATHTOGCJ@ PATHTOGUNZIP = @PATHTOGUNZIP@ + PATHTOJAR = @PATHTOJAR@ + PATHTOJAVA = @PATHTOJAVA@ + PATHTOJAVAC = @PATHTOJAVAC@ PATHTOLIREL2R = @PATHTOLIREL2R@ PATHTOLIRERUN = @PATHTOLIRERUN@ |
|
From: Egon W. <eg...@us...> - 2002-08-15 12:02:11
|
Update of /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools
In directory usw-pr-cvs1:/tmp/cvs-serv16680/source/wocjava/source/com/egonw/woc/tools
Modified Files:
MaakLosseItems.java SimpleAddItem.java
Log Message:
Added scripts to convert wml 2 html. And fixed some things along the way.
Index: MaakLosseItems.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/MaakLosseItems.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MaakLosseItems.java 8 Jun 2002 20:29:03 -0000 1.1
--- MaakLosseItems.java 15 Aug 2002 12:02:07 -0000 1.2
***************
*** 11,17 ****
import com.egonw.woc.predicate.*;
import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
class MaakLosseItems {
--- 11,17 ----
import com.egonw.woc.predicate.*;
import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
class MaakLosseItems {
***************
*** 52,56 ****
// setting default repository
String url = "file://" + reposdeffile;
! repository = new Path("woc", url);
WocEngine we = new WocEngine(repository);
--- 52,56 ----
// setting default repository
String url = "file://" + reposdeffile;
! repository = new Path(repos, url);
WocEngine we = new WocEngine(repository);
Index: SimpleAddItem.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/SimpleAddItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SimpleAddItem.java 8 Jun 2002 20:29:03 -0000 1.1
--- SimpleAddItem.java 15 Aug 2002 12:02:07 -0000 1.2
***************
*** 1,19 ****
package com.egonw.woc.tools;
!
! import com.objectspace.jgl.*;
! import com.objectspace.jgl.algorithms.*;
! import com.objectspace.jgl.predicates.*;
! import java.io.*;
! import java.util.*;
! import com.egonw.woc.*;
! import com.egonw.woc.files.*;
! import com.egonw.woc.util.*;
! import com.egonw.woc.predicate.*;
! import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
!
! class SimpleAddItem {
private static final String pClass = "org.apache.xerces.parsers.SAXParser";
--- 1,19 ----
package com.egonw.woc.tools;
!
! import com.objectspace.jgl.*;
! import com.objectspace.jgl.algorithms.*;
! import com.objectspace.jgl.predicates.*;
! import java.io.*;
! import java.util.*;
! import com.egonw.woc.*;
! import com.egonw.woc.files.*;
! import com.egonw.woc.util.*;
! import com.egonw.woc.predicate.*;
! import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
!
! class SimpleAddItem {
private static final String pClass = "org.apache.xerces.parsers.SAXParser";
***************
*** 29,32 ****
--- 29,36 ----
System.out.println(title + " v." + version + " (" + date + ")");
int length = args.length;
+
+ String reposdeffile = "file:///vol/www/woc/bin/repository_def.xml";
+ String repos = "woc";
+
if (length > 0) {
String f = "";
***************
*** 35,63 ****
for (int i = 0; i < length; i++) {
if (args[i].equals("-r") && ((i+1) < length)) {
! i++;
! repository = new Path(args[i]);
System.out.println(" repository: " + args[i]);
! } else if (args[i].equals("-m") && ((i+1) < length)) {
! i++;
module = args[i];
! System.out.println(" module: " + args[i]);
}
}
! // file is considered the last argument
! f = args[length-1];
} else {
f = args[0];
}
! // setting default repository
! if (repository == null) {
! repository = new Path("woc");
! }
WocEngine we = new WocEngine(repository);
we.setWoordTable(new WoordTable());
try {
! we.setWocReportFile(new WocReportFile("WMLreport.txt"));
} catch (IOException e) {
! System.out.println(e);
}
System.out.println("Reading data...");
--- 39,71 ----
for (int i = 0; i < length; i++) {
if (args[i].equals("-r") && ((i+1) < length)) {
! i++;
System.out.println(" repository: " + args[i]);
! repos = args[i];
! } else if (args[i].equals("-R") && ((i+1) < length)) {
! i++;
! reposdeffile = args[i];
! System.out.println(" reposdeffile: " + reposdeffile);
! } else if (args[i].equals("-m") && ((i+1) < length)) {
! i++;
module = args[i];
! System.out.println(" module: " + args[i]);
}
}
! // file is considered the last argument
! f = args[length-1];
} else {
f = args[0];
}
!
! // setting default repository
! String url = "file://" + reposdeffile;
! repository = new Path(repos, url);
WocEngine we = new WocEngine(repository);
we.setWoordTable(new WoordTable());
try {
! we.setWocReportFile(new WocReportFile("WMLreport.txt"));
} catch (IOException e) {
! System.out.println(e);
}
System.out.println("Reading data...");
***************
*** 69,109 ****
we.read();
! System.out.println("Downloading DADML database definitions...");
! DBDEFLIST dbdeflist = new DBDEFLIST();
! DBLIST dblist = new DBLIST();
! String superXML = "http://www.sci.kun.nl/woc/super.xml";
! try {
! System.err.println("Downloading: " + superXML);
! dblist = DBLISTFileReader.read(superXML, pClass);
} catch (Exception supererror) {
! System.err.println(supererror.toString());
! return;
! }
! Enumeration dbases = dblist.databases();
! while (dbases.hasMoreElements()) {
! DATABASE db = (DATABASE)dbases.nextElement();
! String dburl = db.getURL()+db.getDefinition();
! DBDEF dbdef = new DBDEF();
! try {
! System.err.println("Downloading: " + dburl);
! dbdef = DBDEFFileReader.read(dburl, pClass);
! dbdeflist.addDBDEF(dbdef);
! } catch (Exception deferror) {
! System.err.println(deferror.toString());
! return;
! }
! }
!
!
! System.out.println("Expanding item...");
! we.setConvertAble(new Expander());
! we.convert();
!
! // System.out.println("Marking up items...");
! // if (module.length() > 0) {
! // try {
! // Class c = Woord.class.getClassLoader().loadClass("com.egonw.woc.util." + module);
! // we.setConvertAble((ConvertAble)c.newInstance());
! // we.convert();
// } catch (ClassCastException e) {
// System.out.println("Object " + module + " is not a module!");
--- 77,117 ----
we.read();
! System.out.println("Downloading DADML database definitions...");
! DBDEFLIST dbdeflist = new DBDEFLIST();
! DBLIST dblist = new DBLIST();
! String superXML = "http://www.sci.kun.nl/woc/super.xml";
! try {
! System.err.println("Downloading: " + superXML);
! dblist = DBLISTFileReader.read(superXML, pClass);
} catch (Exception supererror) {
! System.err.println(supererror.toString());
! return;
! }
! Enumeration dbases = dblist.databases();
! while (dbases.hasMoreElements()) {
! DATABASE db = (DATABASE)dbases.nextElement();
! String dburl = db.getURL()+db.getDefinition();
! DBDEF dbdef = new DBDEF();
! try {
! System.err.println("Downloading: " + dburl);
! dbdef = DBDEFFileReader.read(dburl, pClass);
! dbdeflist.addDBDEF(dbdef);
! } catch (Exception deferror) {
! System.err.println(deferror.toString());
! return;
! }
! }
!
!
! System.out.println("Expanding item...");
! we.setConvertAble(new Expander());
! we.convert();
!
! // System.out.println("Marking up items...");
! // if (module.length() > 0) {
! // try {
! // Class c = Woord.class.getClassLoader().loadClass("com.egonw.woc.util." + module);
! // we.setConvertAble((ConvertAble)c.newInstance());
! // we.convert();
// } catch (ClassCastException e) {
// System.out.println("Object " + module + " is not a module!");
|
|
From: Egon W. <eg...@us...> - 2002-08-15 12:02:11
|
Update of /cvsroot/woc/woc/bin In directory usw-pr-cvs1:/tmp/cvs-serv16680/bin Modified Files: Makefile.am Log Message: Added scripts to convert wml 2 html. And fixed some things along the way. Index: Makefile.am =================================================================== RCS file: /cvsroot/woc/woc/bin/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile.am 21 Jul 2002 15:47:12 -0000 1.5 --- Makefile.am 15 Aug 2002 12:02:06 -0000 1.6 *************** *** 1,4 **** PREFIX="@prefix@" ! SUBDIRS= cas check download index lire EXTRA_DIST= --- 1,4 ---- PREFIX="@prefix@" ! SUBDIRS= cas check download index lire wml2html EXTRA_DIST= |
|
From: Egon W. <eg...@us...> - 2002-08-15 12:02:11
|
Update of /cvsroot/woc/woc
In directory usw-pr-cvs1:/tmp/cvs-serv16680
Modified Files:
configure.in
Log Message:
Added scripts to convert wml 2 html. And fixed some things along the way.
Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** configure.in 15 Aug 2002 11:00:07 -0000 1.8
--- configure.in 15 Aug 2002 12:02:06 -0000 1.9
***************
*** 83,86 ****
--- 83,91 ----
bin/lire/Makefile
bin/lire/report.pl
+ bin/wml2html/Makefile
+ bin/wml2html/make-items
+ bin/wml2html/make-woord
+ bin/wml2html/make-groups
+ bin/wml2html/insert-item
lib/Makefile
lib/java/Makefile
|
|
From: Egon W. <eg...@us...> - 2002-08-15 11:02:44
|
Update of /cvsroot/woc/woc/lib In directory usw-pr-cvs1:/tmp/cvs-serv23711/lib Added Files: .cvsignore Makefile.am Log Message: Added some missing files. Ignore some autogenerated files. --- NEW FILE: .cvsignore --- Makefile Makefile.in --- NEW FILE: Makefile.am --- PREFIX="@prefix@" SUBDIRS= java EXTRA_DIST= |
|
From: Egon W. <eg...@us...> - 2002-08-15 11:02:44
|
Update of /cvsroot/woc/woc/lib/java
In directory usw-pr-cvs1:/tmp/cvs-serv23711/lib/java
Modified Files:
.cvsignore
Added Files:
Makefile.am
Log Message:
Added some missing files. Ignore some autogenerated files.
--- NEW FILE: Makefile.am ---
## Process this file with automake to produce Makefile.in
## $Id: Makefile.am,v 1.1 2002/08/15 11:02:41 egonw Exp $
JARLIBS= dadml.jar \
jgl3.1.0.jar \
wocutil.jar \
xalan-2.1.0.jar \
xerces-1.4.3.jar \
xt2.jar
EXTRA_DIST= ${JARLIBS}
CLEANFILES=
alljardir = ${prefix}/lib/java
alljar_DATA = ${JARLIBS}
Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/lib/java/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .cvsignore 8 Jun 2002 20:45:57 -0000 1.1
--- .cvsignore 15 Aug 2002 11:02:41 -0000 1.2
***************
*** 1 ****
--- 1,3 ----
+ Makefile
+ Makefile.in
wocjava.jar
|
|
From: Egon W. <eg...@us...> - 2002-08-15 11:02:44
|
Update of /cvsroot/woc/woc/source/wocjava In directory usw-pr-cvs1:/tmp/cvs-serv23711/source/wocjava Modified Files: .cvsignore Log Message: Added some missing files. Ignore some autogenerated files. Index: .cvsignore =================================================================== RCS file: /cvsroot/woc/woc/source/wocjava/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** .cvsignore 15 Aug 2002 10:35:38 -0000 1.5 --- .cvsignore 15 Aug 2002 11:02:41 -0000 1.6 *************** *** 3,4 **** --- 3,5 ---- build repository_def.xml + wocjava.jar |
|
From: Egon W. <eg...@us...> - 2002-08-15 11:00:45
|
Update of /cvsroot/woc/woc/bin/download In directory usw-pr-cvs1:/tmp/cvs-serv22759/bin/download Modified Files: Makefile.in Log Message: More changes. Index: Makefile.in =================================================================== RCS file: /cvsroot/woc/woc/bin/download/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile.in 15 Aug 2002 10:27:56 -0000 1.4 --- Makefile.in 15 Aug 2002 11:00:08 -0000 1.5 *************** *** 61,65 **** --- 61,68 ---- OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PATHTOGCJ = @PATHTOGCJ@ PATHTOGUNZIP = @PATHTOGUNZIP@ + PATHTOLIREL2R = @PATHTOLIREL2R@ + PATHTOLIRERUN = @PATHTOLIRERUN@ PATHTOPERL = @PATHTOPERL@ PATHTOSH = @PATHTOSH@ |
|
From: Egon W. <eg...@us...> - 2002-08-15 11:00:45
|
Update of /cvsroot/woc/woc
In directory usw-pr-cvs1:/tmp/cvs-serv22759
Modified Files:
Makefile.am configure.in
Log Message:
More changes.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 20 Jul 2002 09:34:26 -0000 1.1
--- Makefile.am 15 Aug 2002 11:00:07 -0000 1.2
***************
*** 1,4 ****
PREFIX="@prefix@"
! SUBDIRS= bin
EXTRA_DIST= \
--- 1,4 ----
PREFIX="@prefix@"
! SUBDIRS= bin lib source
EXTRA_DIST= \
Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** configure.in 15 Aug 2002 10:35:38 -0000 1.7
--- configure.in 15 Aug 2002 11:00:07 -0000 1.8
***************
*** 29,32 ****
--- 29,38 ----
AC_SUBST(PHYSPATH)
+ dnl checking for Java tools
+ AC_PATH_PROGS(PATHTOJAVA, java, no)
+ AC_PATH_PROGS(PATHTOJAVAC, javac, no)
+ AC_PATH_PROGS(PATHTOJAR, jar, no)
+ AC_PATH_PROGS(PATHTOGCJ, gcj, no)
+
dnl checking for XML tools
AC_PATH_PROGS(PATHTOXSLTPROC, xsltproc, no)
***************
*** 77,80 ****
--- 83,88 ----
bin/lire/Makefile
bin/lire/report.pl
+ lib/Makefile
+ lib/java/Makefile
source/Makefile
source/wocjava/Makefile
|
|
From: Egon W. <eg...@us...> - 2002-08-15 11:00:12
|
Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv22759/source/wocjava
Modified Files:
Makefile.am
Log Message:
More changes.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 15 Aug 2002 10:35:38 -0000 1.1
--- Makefile.am 15 Aug 2002 11:00:10 -0000 1.2
***************
*** 1,2 ****
--- 1,6 ----
+ alljardir=${prefix}/lib/java
+
+ alljar_DATA= wocjava.jar
+
JAVAC=${JAVA_HOME}/bin/javac
JAR=${JAVA_HOME}/bin/jar
***************
*** 5,10 ****
JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
- OPTIONS=-R /home/egonw/data/Projects/Woc/wocjava/repository_def.xml
-
all: jar
--- 9,12 ----
***************
*** 17,19 ****
jar: classes
! cd build; ${JAR} cvf ../../../lib/java/wocjava.jar com/*
--- 19,21 ----
jar: classes
! cd build; ${JAR} cvf ../wocjava.jar com/*
|
|
From: Egon W. <eg...@us...> - 2002-08-15 11:00:12
|
Update of /cvsroot/woc/woc/bin/wml2html
In directory usw-pr-cvs1:/tmp/cvs-serv22759/bin/wml2html
Modified Files:
Makefile.am
Log Message:
More changes.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 15 Aug 2002 10:57:22 -0000 1.1
--- Makefile.am 15 Aug 2002 11:00:09 -0000 1.2
***************
*** 1,3 ****
! JAVA=${JAVA_HOME}/bin/java
JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
--- 1,5 ----
! CLEANFILES= WMLreport.txt
!
! JAVA=@JAVA@
JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
|
|
From: Egon W. <eg...@us...> - 2002-08-15 10:57:25
|
Update of /cvsroot/woc/woc/bin/wml2html
In directory usw-pr-cvs1:/tmp/cvs-serv21778
Modified Files:
.cvsignore
Added Files:
Makefile.am
Removed Files:
Makefile repository_def.xml
Log Message:
Getting to install wml2html scripts (to generate choline.html).
--- NEW FILE: Makefile.am ---
JAVA=${JAVA_HOME}/bin/java
JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
OPTIONS=-R `pwd`/repository_def.xml
all: items woord
items:
${JAVA} -cp ${JARS} com.egonw.woc.tools.MaakLosseItems ${OPTIONS}
woord:
${JAVA} -cp ${JARS} com.egonw.woc.tools.Woord ${OPTIONS}
groups:
${JAVA} -cp ${JARS} com.egonw.woc.tools.GroupFiles ${OPTIONS}
Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .cvsignore 8 Jun 2002 20:52:25 -0000 1.1
--- .cvsignore 15 Aug 2002 10:57:22 -0000 1.2
***************
*** 1 ****
--- 1,3 ----
+ Makefile
+ Makefile.in
WMLreport.txt
--- Makefile DELETED ---
--- repository_def.xml DELETED ---
|
|
From: Egon W. <eg...@us...> - 2002-08-15 10:35:42
|
Update of /cvsroot/woc/woc
In directory usw-pr-cvs1:/tmp/cvs-serv13148
Modified Files:
configure.in
Log Message:
Fixed finding of Lire.
More work on getting things installed.
Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** configure.in 8 Aug 2002 11:06:48 -0000 1.6
--- configure.in 15 Aug 2002 10:35:38 -0000 1.7
***************
*** 32,35 ****
--- 32,41 ----
AC_PATH_PROGS(PATHTOXSLTPROC, xsltproc, no)
+ dnl checking for Lire
+ AC_PATH_PROGS(PATHTOLIRERUN, lr_run, no)
+ AC_PATH_PROGS(PATHTOLIREL2R, lr_log2report, no)
+ AC_SUBST(PATHTOLIRERUN)
+ AC_SUBST(PATHTOLIREL2R)
+
AC_OUTPUT([
Makefile
***************
*** 71,74 ****
--- 77,82 ----
bin/lire/Makefile
bin/lire/report.pl
+ source/Makefile
+ source/wocjava/Makefile
source/wocjava/repository_def.xml
])
|
|
From: Egon W. <eg...@us...> - 2002-08-15 10:35:42
|
Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv13148/source/wocjava
Modified Files:
.cvsignore
Added Files:
Makefile.am
Removed Files:
Makefile
Log Message:
Fixed finding of Lire.
More work on getting things installed.
--- NEW FILE: Makefile.am ---
JAVAC=${JAVA_HOME}/bin/javac
JAR=${JAVA_HOME}/bin/jar
JAVA=${JAVA_HOME}/java
JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
OPTIONS=-R /home/egonw/data/Projects/Woc/wocjava/repository_def.xml
all: jar
classes:
mkdir -p build
${JAVAC} -classpath ${JARS} -d build -O `find source/com -name "*.java"`
clean:
cd build; rm -fR *
jar: classes
cd build; ${JAR} cvf ../../../lib/java/wocjava.jar com/*
Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** .cvsignore 8 Aug 2002 11:06:48 -0000 1.4
--- .cvsignore 15 Aug 2002 10:35:38 -0000 1.5
***************
*** 1,2 ****
--- 1,4 ----
+ Makefile.in
+ Makefile
build
repository_def.xml
--- Makefile DELETED ---
|
|
From: Egon W. <eg...@us...> - 2002-08-15 10:35:41
|
Update of /cvsroot/woc/woc/source In directory usw-pr-cvs1:/tmp/cvs-serv13148/source Added Files: .cvsignore Makefile.am Log Message: Fixed finding of Lire. More work on getting things installed. --- NEW FILE: .cvsignore --- Makefile Makefile.in --- NEW FILE: Makefile.am --- PREFIX="@prefix@" SUBDIRS= wocjava EXTRA_DIST= |
