File lejos-paths.patch of Package lejos

Overview Repositories Revisions Requests Users Attributes Meta

File lejos-paths.patch of Package lejos (Revision d7f7583066c48d410e1d9359d9007fcb)

Currently displaying revision d7f7583066c48d410e1d9359d9007fcb , Show latest

diff -up ./lejos/Makefile.config.orig ./lejos/Makefile.config
--- ./lejos/Makefile.config.orig	2006-02-06 12:28:49.000000000 +0100
+++ ./lejos/Makefile.config	2011-11-28 18:31:14.858749953 +0100
@@ -2,7 +2,7 @@
 ## You only need to modify this if you're
 ## going to rebuild tinyvm.srec.
 
-BINDIR = /usr/local/bin
+BINDIR = /usr/bin
 BINPREFIX = h8300-hms-
 JAVA = java
 
diff -up ./lejos/Makefile.orig ./lejos/Makefile
--- ./lejos/Makefile.orig	2006-09-27 02:16:41.000000000 +0200
+++ ./lejos/Makefile	2011-11-28 18:31:58.466204786 +0100
@@ -5,7 +5,7 @@
 SHELL=/bin/sh
 
 ANT=ant
-TEMP=/usr/tmp
+TEMP=/var/tmp
 
 # OSTYPE is not set by default on Mac OS X
 ifndef OSTYPE
diff -up ./lejos/bin/firmdl.orig ./lejos/bin/firmdl
--- ./lejos/bin/firmdl.orig	2005-12-10 14:18:17.000000000 +0100
+++ ./lejos/bin/firmdl	2011-11-28 18:45:37.603964156 +0100
@@ -9,8 +9,6 @@ if [ -z "$LEJOS_HOME" ]; then
   LEJOS_HOME="$(dirname $(dirname $0))"
 fi
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LEJOS_HOME/bin
-
 if [ $OSTYPE == "cygwin" ]; then
   SEP=";"
 else
@@ -19,5 +17,5 @@ fi
 
 THIRDPARTY_LIBS="$LEJOS_HOME/3rdparty/lib"
 
-java -Djava.library.path="$LEJOS_HOME/bin" -classpath "$THIRDPARTY_LIBS/commons-cli-1.0.jar$SEP$LEJOS_HOME/lib/jtools.jar$SEP$LEJOS_HOME/lib/pcrcxcomm.jar" js.tools.Firmdl --tty ${RCXTTY:-usb} "$@"
+java -classpath "$THIRDPARTY_LIBS/commons-cli-1.0.jar$SEP$LEJOS_HOME/lib/jtools.jar$SEP$LEJOS_HOME/lib/pcrcxcomm.jar" js.tools.Firmdl --tty ${RCXTTY:-usb} "$@"
 
diff -up ./lejos/bin/lejos.orig ./lejos/bin/lejos
--- ./lejos/bin/lejos.orig	2006-09-20 10:34:15.000000000 +0200
+++ ./lejos/bin/lejos	2011-11-28 18:46:11.766537065 +0100
@@ -15,8 +15,6 @@ else
   SEP=":"
 fi
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LEJOS_HOME/bin
-
 THIRDPARTY_LIBS="$LEJOS_HOME/3rdparty/lib"
 LINK_CLASSPATH=.$SEP$THIRDPARTY_LIBS/bcel-5.1.jar$SEP$THIRDPARTY_LIBS/commons-cli-1.0.jar$SEP$LEJOS_HOME/lib/jtools.jar$SEP$LEJOS_HOME/lib/classes.jar$SEP$LEJOS_HOME/lib/rcxcomm.jar$SEP$LEJOS_HOME/lib/pcrcxcomm.jar
 
diff -up ./lejos/bin/lejosdl.orig ./lejos/bin/lejosdl
--- ./lejos/bin/lejosdl.orig	2005-12-10 14:18:17.000000000 +0100
+++ ./lejos/bin/lejosdl	2011-11-28 18:46:34.084258054 +0100
@@ -9,8 +9,6 @@ if [ -z "$LEJOS_HOME" ]; then
   LEJOS_HOME="$(dirname $(dirname $0))"
 fi
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LEJOS_HOME/bin
-
 if [ $OSTYPE == "cygwin" ]; then
   SEP=";"
 else
@@ -19,4 +17,4 @@ fi
 
 THIRDPARTY_LIBS="$LEJOS_HOME/3rdparty/lib"
 
-java -Djava.library.path="$LEJOS_HOME/bin" -classpath "$THIRDPARTY_LIBS/commons-cli-1.0.jar$SEP$LEJOS_HOME/lib/jtools.jar$SEP$LEJOS_HOME/lib/pcrcxcomm.jar" js.tools.Lejosdl --tty ${RCXTTY:-usb} "$@"
+java -classpath "$THIRDPARTY_LIBS/commons-cli-1.0.jar$SEP$LEJOS_HOME/lib/jtools.jar$SEP$LEJOS_HOME/lib/pcrcxcomm.jar" js.tools.Lejosdl --tty ${RCXTTY:-usb} "$@"
diff -up ./lejos/build.properties.orig ./lejos/build.properties
--- ./lejos/build.properties.orig	2006-03-15 15:04:36.000000000 +0100
+++ ./lejos/build.properties	2011-12-01 14:13:28.000000000 +0100
@@ -8,8 +8,8 @@ lejos.ostype=linux
 lejos.compiler=gcc
 
 #switch this to build C parts with trace
-trace=-DTRACE
-#trace=
+#trace=-DTRACE
+trace=
 
 # uncomment this to create firmware from scratch also (optional, might require a particular system configuration)
 #build.lejos.firmware

Places

File lejos-paths.patch of Package lejos (Revision d7f7583066c48d410e1d9359d9007fcb)

Places