Commit b0f667a0 authored by Christian Kniss's avatar Christian Kniss
Browse files

Merge branch 'bugfix/serial_lib' into 'develop'

Setze externe libs auf das bisher verwendete nrjavaserial, lösche überflüssige Binärdateien.

Closes #2

See merge request ERZ/SWE_de.bsvrz.kex.tls.osi2osi3!3
parents 173554a6 4284e017
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Versionsverlauf

## [Noch nicht veröffentlicht]

- Ersetzung der RXTX-Bibliothek durch das kompatible und weiter entwickelte NRJavaSerial

## [Version 3.9.7]

+4 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
// NERZ-SWE-Plugin
//--------------------------------------------------------------------
plugins {
  id "de.bsvrz.gradle.nerzswe" version "0.7.2"
  id "de.bsvrz.gradle.nerzswe" version "0.9.0"
}

//--------------------------------------------------------------------
@@ -22,11 +22,10 @@ nerzswe {
//--------------------------------------------------------------------
// Abhängigkeiten
//--------------------------------------------------------------------
String kernsoftware_version = '3.9.7'
String kernsoftware_version = '3.10.0'
dependencies {
  compile group: 'de.bsvrz.dav', name: 'de.bsvrz.dav.daf', version: kernsoftware_version

  //compile group: 'org.rxtx', name: 'rxtx', version: '2.1.7'
  //compile group: 'org.bidib.jbidib.org.qbang.rxtx', name: 'rxtxcomm', version: '2.2'
  compile files('src/main/dist/lib/rxtx-2.2pre2-bins/RXTXcomm.jar')
  // Kompatible RXTX-Weiterentwicklung, die ohne lose Binärdateien auskommt.
  compile group: 'com.neuronrobotics', name: 'nrjavaserial', version: '3.13.0'
}
+0 −65
Original line number Diff line number Diff line
Wed Feb  4 20:13:07 EST 2009 Rxtx-2.2pre2

Build Solaris with ../configure cc='gcc -static-libgcc'

More 64 bit fixes.

Maintain DTR=false during setSerialPortParams

Tried adjusting the header files for win32/64.  The pin events are getting lost.  Still need to check if
this fixed it.  Cross compiling works but I'm fixing the native w32 MSVC builds.

Tue Dec 30 22:02:44 EST 2008 Rxtx-2.2pre1

For information on how to use these files, please see the installation page on
http://rxtx.qbang.org

This is the rxtx-2.2pre1.  The purpose is to expose any problems with the
builds on as many platforms as we can.

To reproduce these files, download the source.  For all platforms except
windows, the following was used to build:

cd rxtx-2.2pre1
mkdir build
cd build
../configure && build

For Windows, the following was done in a Visual Studio command prompt:

cd rxtx-2.2pre1
mdkir build
copy Makefile.msvc build\Makefile
nmake


Feel free to add additional information if you run into or solve a problem.


The files:

mac-10.4/librxtxSerial.jnilib:               Mach-O universal binary with 2 architectures
mac-10.4/librxtxSerial.jnilib (for architecture i386):  Mach-O bundle i386
mac-10.4/librxtxSerial.jnilib (for architecture ppc):   Mach-O bundle ppc

mac-10.5/librxtxSerial.jnilib:               Mach-O universal binary with 3 architectures
mac-10.5/librxtxSerial.jnilib (for architecture i386):  Mach-O bundle i386
mac-10.5/librxtxSerial.jnilib (for architecture x86_64):        Mach-O 64-bit bundle x86_64
mac-10.5/librxtxSerial.jnilib (for architecture ppc7400):       Mach-O bundle ppc

win32/rxtxParallel.dll:                      MS-DOS executable PE  for MS Windows (DLL) (GUI) Intel 80386 32-bit
win32/rxtxSerial.dll:                        MS-DOS executable PE  for MS Windows (DLL) (GUI) Intel 80386 32-bit

win64/rxtxParallel.dll:                      MS-DOS executable PE  for MS Windows (DLL) (GUI)
win64/rxtxSerial.dll:                        MS-DOS executable PE  for MS Windows (DLL) (GUI)

i686-pc-linux-gnu/librxtxParallel.so:        ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), not stripped
i686-pc-linux-gnu/librxtxSerial.so:          ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), not stripped

x86_64-unknown-linux-gnu/librxtxParallel.so: ELF 64-bit LSB shared object, AMD x86-64, version 1 (SYSV), not stripped
x86_64-unknown-linux-gnu/librxtxSerial.so:   ELF 64-bit LSB shared object, AMD x86-64, version 1 (SYSV), not stripped

sparc-sun-solaris2.10/librxtxSerial.so: ELF 64-bit MSB dynamic lib SPARCV9 Version 1, dynamically linked, not stripped

sparc-sun-solaris2.6/librxtxSerial.so:  ELF 32-bit MSB shared object, SPARC, version 1 (SYSV), not stripped
−59.4 KiB

File deleted.

−44.2 KiB

File deleted.

Loading