|
|
Author: eliot
Date: 2011-11-08 16:20:29 -0800 (Tue, 08 Nov 2011)
New Revision: 2507
Modified:
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
branches/Cog/platforms/unix/config/bin.squeak.sh.in
branches/Cog/platforms/unix/config/squeak.sh.in
branches/Cog/scripts/mkvmarchives
branches/Cog/scripts/versionInfoPlist
Log:
Make the unix launch script include /lib & /usr/lib in LD_LIBRARY_PATH if
LD_LIBRARY_PATH is unset. Modify the invocations of ex in the editing scripts
to not read ~/.exrc, and hence not be confused by e.g. set ignorecase.
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Nov 7 10:27:44 PST 2011
+ Tue Nov 8 16:18:41 PST 2011
Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-11-07 18:28:00 UTC (rev 2506)
+++ branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-11-09 00:20:29 UTC (rev 2507)
@@ -11,5 +11,6 @@
*) PLUGINS="`pwd`/$BIN"
esac
# prepending is less flexible but safer because it ensures we find the plugins
-# in the same directory as the VM.
-LD_LIBRARY_PATH=$PLUGINS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} exec "$BIN/squeak" "$@"
+# in the same directory as the VM. We must include at least /lib and /usr/lib
+# if libraries there-in are to be found. These directories are not implicit.
+LD_LIBRARY_PATH=$PLUGINS$:{LD_LIBRARY_PATH:-/lib:/usr/lib} exec "$BIN/squeak" "$@"
Modified: branches/Cog/platforms/unix/config/squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/squeak.sh.in 2011-11-07 18:28:00 UTC (rev 2506)
+++ branches/Cog/platforms/unix/config/squeak.sh.in 2011-11-09 00:20:29 UTC (rev 2507)
@@ -11,5 +11,6 @@
*) PLUGINS="`pwd`/$BIN"
esac
# prepending is less flexible but safer because it ensures we find the plugins
-# in the same directory as the VM.
-LD_LIBRARY_PATH=$PLUGINS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} exec "$BIN/squeak" "$@"
+# in the same directory as the VM. We must include at least /lib and /usr/lib
+# if libraries there-in are to be found. These directories are not implicit.
+LD_LIBRARY_PATH=$PLUGINS$:{LD_LIBRARY_PATH:-/lib:/usr/lib} exec "$BIN/squeak" "$@"
Modified: branches/Cog/scripts/mkvmarchives
===================================================================
--- branches/Cog/scripts/mkvmarchives 2011-11-07 18:28:00 UTC (rev 2506)
+++ branches/Cog/scripts/mkvmarchives 2011-11-09 00:20:29 UTC (rev 2507)
@@ -88,11 +88,11 @@
if [ -n "$NL" ]; then
if [ -f nsvmlinux/squeak ]; then
mv nsvmlinux/squeak nsvmlinux/nsvm
- ex "+g/squeak/s/squeak/nsvm/g" +w +q nsvmlinux/nsvm
+ ex -u NONE "+g/squeak/s/squeak/nsvm/g" +w +q nsvmlinux/nsvm
fi
if [ -f nsvmlinux/bin/squeak ]; then
mv nsvmlinux/bin/squeak nsvmlinux/bin/nsvm
- ex "+g/squeak/s/squeak/nsvm/g" +w +q nsvmlinux/bin/nsvm
+ ex -u NONE "+g/squeak/s/squeak/nsvm/g" +w +q nsvmlinux/bin/nsvm
fi
test -d nsvmlinux/lib/squeak && mv nsvmlinux/lib/squeak nsvmlinux/lib/nsvm
LIBDIR="`echo nsvmlinux/lib/nsvm/[0-9.-]*`"
Modified: branches/Cog/scripts/versionInfoPlist
===================================================================
--- branches/Cog/scripts/versionInfoPlist 2011-11-07 18:28:00 UTC (rev 2506)
+++ branches/Cog/scripts/versionInfoPlist 2011-11-09 00:20:29 UTC (rev 2507)
@@ -16,5 +16,5 @@
| sed 's/^[ ]*\(.*\)<!--version-->/\1/' \
| sed 's./.\\\\/.g'` # double up for ex command below
do
- ex "+g/$p/s/0\([< ]\)/$REV\1/" +w +q "$3"
+ ex -u NONE "+g/$p/s/0\([< ]\)/$REV\1/" +w +q "$3"
done
|
Locked
