From: <ree...@us...> - 2011-05-16 04:51:59
|
Revision: 4131 http://reprap.svn.sourceforge.net/reprap/?rev=4131&view=rev Author: reece-arnott2 Date: 2011-05-16 04:51:52 +0000 (Mon, 16 May 2011) Log Message: ----------- Added in Linux 64 bit libraries and changed the shell script to set the library path based on the machine type returned by 'uname -m'. To do this I needed to put the 32 bit and 64 bit libraries in seperate subfolders (lib-i686 and lib-x86_64). Also changed host-package-release to go up an additional folder when including machine-type (darwin/mendel/etc.) and electronics folders as folder structure seems to have changed since last time it was used. Modified Paths: -------------- trunk/software/host/host-package-release trunk/software/host/lib/system-dependent/linux-i386/reprap Added Paths: ----------- trunk/software/host/lib/system-dependent/linux-i386/lib-i686/ trunk/software/host/lib/system-dependent/linux-i386/lib-i686/libj3dcore-ogl-cg.so trunk/software/host/lib/system-dependent/linux-i386/lib-i686/libj3dcore-ogl.so trunk/software/host/lib/system-dependent/linux-i386/lib-i686/librxtxParallel.so trunk/software/host/lib/system-dependent/linux-i386/lib-i686/librxtxSerial.so trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/ trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/libj3dcore-ogl-cg.so trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/libj3dcore-ogl.so trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/librxtxSerial.so Removed Paths: ------------- trunk/software/host/lib/system-dependent/linux-i386/libj3dcore-ogl-cg.so trunk/software/host/lib/system-dependent/linux-i386/libj3dcore-ogl.so trunk/software/host/lib/system-dependent/linux-i386/librxtxParallel.so trunk/software/host/lib/system-dependent/linux-i386/librxtxSerial.so Modified: trunk/software/host/host-package-release =================================================================== --- trunk/software/host/host-package-release 2011-05-11 21:10:40 UTC (rev 4130) +++ trunk/software/host/host-package-release 2011-05-16 04:51:52 UTC (rev 4131) @@ -21,7 +21,7 @@ # Where are all the other non-host-software files we need to include? DESIGNFILES="" -for i in ../$MACHINE ../electronics ../firmware +for i in ../../$MACHINE ../../electronics ../firmware do if [ -d "$i" ] then @@ -61,7 +61,7 @@ # Copy files into binary package directory for F in $FILELIST do - cp -p $F "$BASENAME" + cp -rp $F "$BASENAME" done echo "Executable created." @@ -85,14 +85,14 @@ mkdir -p "$SRCFILENAME"/lib for F in $LIBFILES do - cp -pr $F "$SRCFILENAME"/lib + cp -rp $F "$SRCFILENAME"/lib done echo "Sources copied." for F in $DESIGNFILES do - cp -pr $F "$BASENAME" + cp -rp $F "$BASENAME" done #Remove local configuration files Added: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/libj3dcore-ogl-cg.so =================================================================== (Binary files differ) Property changes on: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/libj3dcore-ogl-cg.so ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/libj3dcore-ogl.so =================================================================== (Binary files differ) Property changes on: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/libj3dcore-ogl.so ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/librxtxParallel.so =================================================================== (Binary files differ) Property changes on: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/librxtxParallel.so ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/librxtxSerial.so =================================================================== (Binary files differ) Property changes on: trunk/software/host/lib/system-dependent/linux-i386/lib-i686/librxtxSerial.so ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/libj3dcore-ogl-cg.so =================================================================== (Binary files differ) Property changes on: trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/libj3dcore-ogl-cg.so ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/libj3dcore-ogl.so =================================================================== (Binary files differ) Property changes on: trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/libj3dcore-ogl.so ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/librxtxSerial.so =================================================================== (Binary files differ) Property changes on: trunk/software/host/lib/system-dependent/linux-i386/lib-x86_64/librxtxSerial.so ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/software/host/lib/system-dependent/linux-i386/libj3dcore-ogl-cg.so =================================================================== (Binary files differ) Deleted: trunk/software/host/lib/system-dependent/linux-i386/libj3dcore-ogl.so =================================================================== (Binary files differ) Deleted: trunk/software/host/lib/system-dependent/linux-i386/librxtxParallel.so =================================================================== (Binary files differ) Deleted: trunk/software/host/lib/system-dependent/linux-i386/librxtxSerial.so =================================================================== (Binary files differ) Modified: trunk/software/host/lib/system-dependent/linux-i386/reprap =================================================================== --- trunk/software/host/lib/system-dependent/linux-i386/reprap 2011-05-11 21:10:40 UTC (rev 4130) +++ trunk/software/host/lib/system-dependent/linux-i386/reprap 2011-05-16 04:51:52 UTC (rev 4131) @@ -6,6 +6,12 @@ cd $REPRAP_DIR +MACHINE=`uname -m` + +# put the directory with the native RXTX and j3d libs in the library path +LD_LIBRARY_PATH=`pwd`/lib-${MACHINE}:${LD_LIBRARY_PATH} +export LD_LIBRARY_PATH + # build up classpath # when we move to OpenJDK/Java-6 these next few can be replaced with wildcard # *.jar and we will not need swing-layout any more. @@ -19,4 +25,4 @@ CLASSPATH=$CLASSPATH:. # invoke the code -java -cp $CLASSPATH -Xmx$REPRAP_RAM_SIZE -Djava.library.path=. org.reprap.Main +java -cp $CLASSPATH -Xmx$REPRAP_RAM_SIZE org.reprap.Main This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |