[Dotgnu-libs-commits] CVS: dotgnu-base/DotGNU DotGNU.build,NONE,1.1 Makefile.am,NONE,1.1 Makefile.in,NONE,1.1 ByteParser.cs,1.2,1.3 Matrix.cs,1.1,1.2 StdError.cs,1.1,1.2 StdIn.cs,1.1,1.2 StdOut.cs,1.1,1.2 TODOAttribute.cs,1.2,1.3

[Peter Minten <address@hidden>]

Update of /cvsroot/dotgnu-libs/dotgnu-base/DotGNU
In directory subversions:/tmp/cvs-serv4858/DotGNU

Modified Files:
        ByteParser.cs Matrix.cs StdError.cs StdIn.cs StdOut.cs 
        TODOAttribute.cs 
Added Files:
        DotGNU.build Makefile.am Makefile.in 
Log Message:
Fixed bugs, implemented standard build system.


--- NEW FILE ---
<?xml version="1.0"?>
<project name="DotGNU-Base library" default="all">
        <target name="all">

                <!-- Build the dotgnu.base.dll library -->
                <compile output="dotgnu.base.dll"
                                 target="library"
                                 unsafe="false"
                                 optimize="true"
                                 debug="true"
                                 sanewarnings="true">

                        <sources>
                                <includes name="**/*.cs"/>
                        </sources>

                        <references>
                                <file name="System.dll"/>
                        </references>

                        <resources>
                                <file 
name="../resources/${pnet.language}/DotGNU/DotGNU.resources"/>
                        </resources>

                </compile>

                <!-- Build the DotGNU.xml documentation file -->
                <csdoc output="DotGNU.xml" library="DotGNU">

                        <sources>
                                <includes name="**/*.cs"/>
                        </sources>

                </csdoc>

        </target>
</project>

--- NEW FILE ---
COMPONENT_NAME = DotGNU
COMPONENT_DESCRIPTION = DotGNU-Base Classes
COMPONENT_INSTALL_DIR = $(libdir)/cscc/lib

include $(top_srcdir)/m4/make/pnet_library.am
--- NEW FILE ---
# Makefile.in generated automatically by automake 1.4 from Makefile.am

# Copyright (C) 1994, 1995-8, 1999 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.



SHELL = @SHELL@

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@

bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include

DESTDIR =

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@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@

NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
AWK = @AWK@
CC = @CC@
CSANT = @CSANT@
CSANT_FLAGS = @CSANT_FLAGS@
CSDOC = @CSDOC@
CSDOC2HTML = @CSDOC2HTML@
CSHARP_COMPILER = @CSHARP_COMPILER@
EXEEXT = @EXEEXT@
ILRUN = @ILRUN@
ILRUN_FLAGS = @ILRUN_FLAGS@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PNET_LANGUAGE = @PNET_LANGUAGE@
PNET_PATH = @PNET_PATH@
RESGEN = @RESGEN@
RESGEN_FLAGS = @RESGEN_FLAGS@
VERSION = @VERSION@
X_int = @X_int@
X_long = @X_long@
X_uint = @X_uint@
X_ulong = @X_ulong@

COMPONENT_NAME = DotGNU
COMPONENT_DESCRIPTION = DotGNU-Base Classes
COMPONENT_INSTALL_DIR = $(libdir)/cscc/lib

DOCOUT = $(top_builddir)/doc/$(COMPONENT_NAME)

CLEANFILES = $(COMPONENT_NAME).dll                       $(COMPONENT_NAME).xml

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = 
DIST_COMMON =  Makefile.am Makefile.in


DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am 
$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/make/pnet_library.am
        cd $(top_srcdir) && $(AUTOMAKE) --gnu DotGNU/Makefile

Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

tags: TAGS
TAGS:


distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

subdir = DotGNU

distdir: $(DISTFILES)
        here=`cd $(top_builddir) && pwd`; \
        top_distdir=`cd $(top_distdir) && pwd`; \
        distdir=`cd $(distdir) && pwd`; \
        cd $(top_srcdir) \
          && $(AUTOMAKE) --include-deps --build-dir=$$here 
--srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu DotGNU/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
            cp -pr $$/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
            || cp -p $$d/$$file $(distdir)/$$file || :; \
          fi; \
        done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am

install-data-am: install-data-local
install-data: install-data-am

install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-local
uninstall: uninstall-am
all-am: Makefile all-local
all-redirect: all-am
install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:


mostlyclean-generic:

clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*

maintainer-clean-generic:
mostlyclean-am:  mostlyclean-generic

mostlyclean: mostlyclean-am

clean-am:  clean-generic mostlyclean-am clean-local

clean: clean-am

distclean-am:  distclean-generic clean-am

distclean: distclean-am

maintainer-clean-am:  maintainer-clean-generic distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."

maintainer-clean: maintainer-clean-am

.PHONY: tags distdir info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-am install-exec \
install-data-local install-data-am install-data install-am install \
uninstall-local uninstall-am uninstall all-local all-redirect all-am \
all installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean


.PHONY: csant-local

all-local: $(COMPONENT_EXTRAS_BEFORE) csant-local $(DOCOUT)/index.html \
                   $(COMPONENT_EXTRAS_AFTER)

csant-local:
        "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
                        -Dpnet.language=$(PNET_LANGUAGE) \
                        -f "$(srcdir)/$(COMPONENT_NAME).build" all

$(DOCOUT)/index.html: $(DOCOUT) $(COMPONENT_NAME).xml
        $(CSDOC2HTML) -o "$(DOCOUT)" -ftitle="$(COMPONENT_DESCRIPTION)" \
                -fmulti-file $(COMPONENT_NAME).xml

$(DOCOUT):
        $(mkinstalldirs) "$(DOCOUT)"

clean-local:
        -rm -rf "$(DOCOUT)"

install-data-local:
        @$(NORMAL_INSTALL)
        @if test -n "$(COMPONENT_INSTALL_DIR)" ; then \
                echo $(mkinstalldirs) $(COMPONENT_INSTALL_DIR) ; \
                $(mkinstalldirs) $(COMPONENT_INSTALL_DIR) ; \
                echo $(INSTALL_DATA) $(COMPONENT_NAME).dll 
$(DESTDIR)$(COMPONENT_INSTALL_DIR)/$(COMPONENT_NAME).dll ; \
                $(INSTALL_DATA) $(COMPONENT_NAME).dll 
$(DESTDIR)$(COMPONENT_INSTALL_DIR)/$(COMPONENT_NAME).dll ; \
        fi

uninstall-local:
        @$(NORMAL_UNINSTALL)
        @if test -n "$(COMPONENT_INSTALL_DIR)" ; then \
                echo rm -f 
$(DESTDIR)$(COMPONENT_INSTALL_DIR)/$(COMPONENT_NAME).dll ; \
                rm -f $(DESTDIR)$(COMPONENT_INSTALL_DIR)/$(COMPONENT_NAME).dll 
; \
        fi

# 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: ByteParser.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu-base/DotGNU/ByteParser.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ByteParser.cs       27 Jul 2002 14:30:16 -0000      1.2
--- ByteParser.cs       28 Jul 2002 15:56:34 -0000      1.3
***************
*** 7,11 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   *
--- 7,11 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2.1 of the License, or
   * (at your option) any later version.
   *
***************
*** 30,34 ****
  public class ByteParser
  {
!       ///<summary>Parses an 2 bytes into an UInt16.</summary> 
        /// <param name="input"> The byte array data in BigEndian format 
</param>
        /// <param name="offset">starting offset of the data in input</param>
--- 30,36 ----
  public class ByteParser
  {
! /*    ///<summary>Parses an 2 bytes array into an UInt16.</summary>
!       ///<param name="input">The array to parse.</param>
!       ///<summary>Parses an 2 bytes into an UInt16.</summary>
        /// <param name="input"> The byte array data in BigEndian format 
</param>
        /// <param name="offset">starting offset of the data in input</param>
***************
*** 263,269 ****
--- 265,276 ----
        {
                return encoding.GetBytes(input);
+ 
+       }
+ */            
+ 
        }       
  
  #endif
+ 
  }; // class ByteParser
  

Index: Matrix.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu-base/DotGNU/Matrix.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Matrix.cs   27 Jul 2002 10:36:01 -0000      1.1
--- Matrix.cs   28 Jul 2002 15:56:34 -0000      1.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   *
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2.1 of the License, or
   * (at your option) any later version.
   *
***************
*** 87,96 ****
        public static Matrix operator+ (Matrix a, Matrix b)
        {
!               if (!((a.Width == b.Width) && (a.Length == b.Length)))
                        throw new ArgumentOutOfRangeException();
                
!               Matrix returnmat = new Matrix(new Int64[a.Width,a.Length]);
                        
!               for(int x = 0; x == a.Length; x++)
                {
                        for (int y = 0; y == a.Width; y++)
--- 87,96 ----
        public static Matrix operator+ (Matrix a, Matrix b)
        {
!               if (!((a.Width == b.Width) && (a.Width == b.Width)))
                        throw new ArgumentOutOfRangeException();
                
!               Matrix returnmat = new Matrix(new Int64[a.Width,a.Width]);
                        
!               for(int x = 0; x == a.Width; x++)
                {
                        for (int y = 0; y == a.Width; y++)
***************
*** 99,102 ****
--- 99,104 ----
                        }
                }
+               
+               return returnmat;
        }
  
***************
*** 108,117 ****
        public static Matrix operator- (Matrix a, Matrix b)
        {
!               if (!((a.Width == b.Width) && (a.Length == b.Length)))
                        throw new ArgumentOutOfRangeException();
                
!               Matrix returnmat = new Matrix(new Int64[a.Width,a.Length]);
                        
!               for(int x = 0; x == a.Length; x++)
                {
                        for (int y = 0; y == a.Width; y++)
--- 110,119 ----
        public static Matrix operator- (Matrix a, Matrix b)
        {
!               if (!((a.Width == b.Width) && (a.Height == b.Height)))
                        throw new ArgumentOutOfRangeException();
                
!               Matrix returnmat = new Matrix(new Int64[a.Width,a.Height]);
                        
!               for(int x = 0; x == a.Height; x++)
                {
                        for (int y = 0; y == a.Width; y++)
***************
*** 120,123 ****
--- 122,127 ----
                        }
                }
+               
+               return returnmat;
        }
  
***************
*** 129,133 ****
        public static Matrix operator* (Matrix a, Matrix b)
        {
!               int point;
  
                if (a.Width != b.Height)
--- 133,137 ----
        public static Matrix operator* (Matrix a, Matrix b)
        {
!               Int64 point;
  
                if (a.Width != b.Height)
***************
*** 155,158 ****
--- 159,164 ----
                        }
                }
+               
+               return returnmat;
        }
  

Index: StdError.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu-base/DotGNU/StdError.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StdError.cs 27 Jul 2002 10:36:01 -0000      1.1
--- StdError.cs 28 Jul 2002 15:56:34 -0000      1.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   *
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2.1 of the License, or
   * (at your option) any later version.
   *
***************
*** 38,42 ****
        //boot time and shut down by the kernel too, thus we don't open it
        //though the method name is confusing.
!       static System.IO.Stream outstream = Console.OpenStandardError();
  
        //No constructor needed since this class only offers static methods.
--- 38,42 ----
        //boot time and shut down by the kernel too, thus we don't open it
        //though the method name is confusing.
!       static System.IO.Stream errstream = Console.OpenStandardError();
  
        //No constructor needed since this class only offers static methods.
***************
*** 47,51 ****
        public static void Write(String buffer)
        {
!               return Stream.Write(this, buffer);
        }
  
--- 47,52 ----
        public static void Write(String buffer)
        {
!               Stream.Write(errstream, buffer);
!               return;
        }
  
***************
*** 56,60 ****
        public static void Write(String buffer, Encoding encoding)
        {
!               return Stream.Write(this, buffer, encoding);
        }
  
--- 57,62 ----
        public static void Write(String buffer, Encoding encoding)
        {
!               Stream.Write(errstream, buffer, encoding);
!               return;
        }
  
***************
*** 69,72 ****
--- 71,75 ----
        {
                a.Write(b, 0, b.Length);
+               return null;
        }
  
***************
*** 76,80 ****
        public static Stream operator<< (System.IO.Stream a, String b)
        {
!               Write(a, b);
        }        
                        
--- 79,84 ----
        public static Stream operator<< (System.IO.Stream a, String b)
        {
!               DotGNU.IO.Stream.Write(a, b);
!               return null;
        }        
                        

Index: StdIn.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu-base/DotGNU/StdIn.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StdIn.cs    27 Jul 2002 10:36:01 -0000      1.1
--- StdIn.cs    28 Jul 2002 15:56:34 -0000      1.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   *
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2.1 of the License, or
   * (at your option) any later version.
   *
***************
*** 53,57 ****
        public static void Read (String buffer)
        {
!               return Stream.Read(this, buffer);
        }
        
--- 53,58 ----
        public static void Read (String buffer)
        {
!               Stream.Read(instream, buffer);
!               return;
        }
        
***************
*** 62,66 ****
        public static void Read (String buffer, Encoding encoding)
        {
!               return Stream.Read(this, buffer, encoding);
        }
  
--- 63,68 ----
        public static void Read (String buffer, Encoding encoding)
        {
!               Stream.Read(instream, buffer, encoding);
!               return;
        }
  
***************
*** 75,78 ****
--- 77,81 ----
        {
                a.Read(b, 0, b.Length);
+               return null;
        }
                                  
***************
*** 83,87 ****
        public static Stream operator>> (System.IO.Stream a, String b)
        {
!               Read(a, b);
        }
                        
--- 86,91 ----
        public static Stream operator>> (System.IO.Stream a, String b)
        {
!               DotGNU.IO.Stream.Read(a, b);
!               return null;
        }
                        

Index: StdOut.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu-base/DotGNU/StdOut.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StdOut.cs   27 Jul 2002 10:36:01 -0000      1.1
--- StdOut.cs   28 Jul 2002 15:56:34 -0000      1.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   *
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2.1 of the License, or
   * (at your option) any later version.
   *
***************
*** 47,51 ****
        public static void Write(String buffer)
        {
!               return Stream.Write(this, buffer);
        }
  
--- 47,52 ----
        public static void Write(String buffer)
        {
!               Stream.Write(outstream, buffer);
!               return;
        }
  
***************
*** 56,60 ****
        public static void Write(String buffer, Encoding encoding)
        {
!               return Stream.Write(this, buffer, encoding);
        }
  
--- 57,62 ----
        public static void Write(String buffer, Encoding encoding)
        {
!               Stream.Write(outstream, buffer, encoding);
!               return;
        }
  
***************
*** 69,72 ****
--- 71,75 ----
        {
                a.Write(b, 0, b.Length);
+               return null;
        }
  
***************
*** 76,80 ****
        public static Stream operator<< (System.IO.Stream a, String b)
        {
!               Write(a, b);
        }        
                
--- 79,84 ----
        public static Stream operator<< (System.IO.Stream a, String b)
        {
!               DotGNU.IO.Stream.Write(a, b);
!               return null;
        }        
                

Index: TODOAttribute.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu-base/DotGNU/TODOAttribute.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TODOAttribute.cs    27 Jul 2002 10:36:01 -0000      1.2
--- TODOAttribute.cs    28 Jul 2002 15:56:34 -0000      1.3
***************
*** 7,11 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   *
--- 7,11 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
!  * the Free Software Foundation; either version 2.1 of the License, or
   * (at your option) any later version.
   *