Permalink
Browse files

Most of this I did yesterday. ISP pulled a brainfart and switched a few

thousand customers including me to a brocken ras.

I've forgotten. basically I walked through linux rh71, solaris 2.6 and winNT4
and fixed compile/runtime issues.  This should be the uucp lock contrib and
nanosleep fixes on Solaris.  Compile fixes to match on win32 and linux.
update Documentation and merge with 1.5 docs as best as possible.

The should be a solid base to sync into.  there will be minor bug fixes as we
go.  I'll make a relase of this on rxtx.org tonight.
  • Loading branch information...
1 parent 375481b commit 0928af18f90dd4db4fe206eb455f9733f625f570 jarvi committed Sep 21, 2001
Showing with 1,088 additions and 444 deletions.
  1. +8 −0 .cvsignore
  2. +24 −12 ChangeLog
  3. +52 −1 INSTALL
  4. +7 −6 Makefile.am
  5. +9 −7 Makefile.in
  6. +166 −143 Makefile.mingw32
  7. +102 −58 configure
  8. +101 −58 configure.in
  9. +588 −152 src/SerialImp.c
  10. +14 −3 src/SerialImp.h
  11. +8 −0 src/gnu/io/RXTXCommDriver.java
  12. +2 −3 src/termios.c
  13. +7 −1 src/win32termios.h
View
@@ -16,3 +16,11 @@ gnu
WIN32
CROSSCOMPILE
COPYING.CYGNUS
+Makefile.in
+aclocal.m4
+config.guess
+config.h.in
+config.sub
+configure
+ltconfig
+ltmain.sh
View
@@ -3,14 +3,32 @@ This is ChangeLog Wed Jun 20 10:47:21 MDT 2001
rxtx-1.5 and rxtx-1.4 changes are kept in the same file. skip to the version
you downloaded.
+1.5-6 win32 fixes <wroberts1@home.com>
+ Initial Solaris port
+ initial Mac OS X port
+ Joseph Goldstone <joseph@lp.com>
+ Paul Tokarchuk <ptokarchuk@sympatico.ca>
+ package renamed to gnu.io
+ Memory leak Cleanups
+ cross-compile fixes
+ more windows fixes.
+ more ioctl support for windows
+ more fcntl suppport for windows
+ misc changes to windows
+ Makefile for building on mingw32 systems in DOS
+ uucp_lock file support
+ Many thanks to Mathworks for Making it happen.
+ symbolic link lock files now work (Mandrake)
+ peter.beelen@philips.com
+ Configure.in fixes for permission issues
+ Vadim Tkachenko <vt@freehold.crocodile.org>
+ Closed memleaks on open()/close()
+ registered port support.
+ Joseph Goldstone <joseph@lp.com>
1.5-5 Jun 28, 2001 Merged with rxtx-1.4
- Working Mac OS X port
+ More work on Mac OS X port
Joseph Goldstone <joseph@lp.com>
minor cleanups
- Many win32 fixes
- Many Solaris fixes
- uucp lock files
- symbolic link lock files now work (Mandrake)
1.5-4 Jan 26, 2001 Irix build fixes (still needs CFLAGS fixed?)
Michael Delgadillo <delgadil@ymi.com>
Windows build support with lcc
@@ -38,13 +56,7 @@ you downloaded.
Stallion Card support
Greg Luck <gluck@tempo-services.com.au>
CommPort enumeration with rxtx's comm.jar
-1.4-10 Aug 31, 2001 Follow symbolic links with lock files
- peter.beelen@philips.com
- Configure.in fixes for permission issues
- Vadim Tkachenko <vt@freehold.crocodile.org>
- Closed memleaks on open()/close()
- Joseph Goldstone <joseph@lp.com>
- registered port support.
+1.4-10 Aug 31, 2001 see rxtx-1.5-6
1.4-9 Jun 21, 2001 Steve Drach <drach@eng.sun.com>
Minor fix of error reporting in lockfiles
Mac OS X port Joseph Goldstone <joseph@lp.com>
View
53 INSTALL
@@ -243,7 +243,58 @@ A. Japanese
is provided for people that may have demanding needs and coding
ability.
- Instructions unique to win32 builds.
+ There is only serial port code at this time.
+
+ Three ways of compiling win32 libraries are offered:
+
+ mingw32 tools in DOS
+ lcc tools in DOS
+ cross-compiling from Linux
+
+ ----------------- mingw32 tools in DOS -----------------------
+
+ Install mingw32 http://www.mingw.org
+ Install a jdk http://java.sun.com/j2se
+ Make sure the ming32\bin and jdk\bin directories are in your
+ path.
+ In the rxtx top directory to the following:
+ mkdir build
+ copy Makefile.mingw32 build\Makefile
+ cd build
+ edit the Makefile and make sure the directories are correct.
+ execute the following:
+ make
+ make install
+
+ ----------------- lcc tools in DOS ---------------------------
+
+ Install a jdk http://java.sun.com/j2se
+ Install lcc http://www.cs.virginia.edu/~lcc-win32/
+
+ A make file (Makefile.lcc) for compiling rxtx with lcc
+ contributed by Valentin Pavlov
+
+ You will need a config.h file in the src directory. Other
+ builds usually generate them automatically. The following
+ should work.
+
+ #define HAVE_FCNTL_H
+ #define HAVE_SIGNAL_H
+ #undef HAVE_SYS_FCNTL_H
+ #undef HAVE_SYS_FILE_H
+ #undef HAVE_SYS_SIGNAL_H
+ #undef HAVE_TERMIOS_H
+ #undef HAVE_SYS_TIME_H
+
+ if you know how to create the above in a dos Makefile send in the changes.
+
+ the following commands should then work fine on the command
+ line.
+
+ cd src
+ make -f ..\Makefile.lcc
+
+ ----------------- cross-compiling from Linux -----------------
Grab ming32:
View
@@ -40,17 +40,18 @@ javahfiles = $(patsubst $(SPATH)/%.java,%,$(wildcard $(SPATH)/*.java))
#######################
CLEANFILES = $(TOP)/*.class $(TOP)/$(CLASSDEST)/*.class $(TOP)/$(JARTARGET)
-# compile src/SerialImp.c and simular files into libraries.
+# compile src/SerialImp.c and similar files into libraries.
# LIBTOOL_FIX handles problems encountered on some OS's. See configure.in
# If a LIBTOOL_FIX is added be sure to provide a trailing ';' in configure.in
-$(target_alias)/lib%.la: $(SPATH)/%Imp.@EXTENSION@ $(CLASSES)
- @( \
- $(LIBTOOL_FIX) \
- cd $(DEST); \
+
+$(target_alias)/lib%.la: $(SPATH)/%Imp.@EXTENSION@ $(CLASSES) $(SPATH)/%Imp.h
+ @( \
+ $(LIBTOOL_FIX) \
+ cd $(DEST); \
$(LIBTOOLC) ../$(SPATH)/$*Imp.@EXTENSION@ -o $(TOP)/$(DEST)/$*Imp.lo; \
$(LINK) -o lib$*.la -rpath $(RXTX_PATH) $(TOP)/$(DEST)/$*Imp.lo)
-# compile src/RXTXPort.java and simular files into classes
+# compile src/RXTXPort.java and similar files into classes
# then create the .jar file
$(CLASSES): $(javafiles) $(TOP)/Makefile
$(JAVAH_FIX)
View
@@ -104,6 +104,7 @@ JAVADOC = @JAVADOC@
JAVAH = @JAVAH@
JAVAH_FIX = @JAVAH_FIX@
JAVAINCLUDE = @JAVAINCLUDE@
+JAVAINCLUDEDIR = @JAVAINCLUDEDIR@
JAVANATINC = @JAVANATINC@
JAVA_CLASS_PATH = @JAVA_CLASS_PATH@
JAVA_CLASS_VERSION = @JAVA_CLASS_VERSION@
@@ -270,7 +271,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -344,17 +345,18 @@ distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
-# compile src/SerialImp.c and simular files into libraries.
+# compile src/SerialImp.c and similar files into libraries.
# LIBTOOL_FIX handles problems encountered on some OS's. See configure.in
# If a LIBTOOL_FIX is added be sure to provide a trailing ';' in configure.in
-$(target_alias)/lib%.la: $(SPATH)/%Imp.@EXTENSION@ $(CLASSES)
- @( \
- $(LIBTOOL_FIX) \
- cd $(DEST); \
+
+$(target_alias)/lib%.la: $(SPATH)/%Imp.@EXTENSION@ $(CLASSES) $(SPATH)/%Imp.h
+ @( \
+ $(LIBTOOL_FIX) \
+ cd $(DEST); \
$(LIBTOOLC) ../$(SPATH)/$*Imp.@EXTENSION@ -o $(TOP)/$(DEST)/$*Imp.lo; \
$(LINK) -o lib$*.la -rpath $(RXTX_PATH) $(TOP)/$(DEST)/$*Imp.lo)
-# compile src/RXTXPort.java and simular files into classes
+# compile src/RXTXPort.java and similar files into classes
# then create the .jar file
$(CLASSES): $(javafiles) $(TOP)/Makefile
$(JAVAH_FIX)
Oops, something went wrong.

0 comments on commit 0928af1

Please sign in to comment.