Browse Source

Build system: fixes for paths containing spaces.
The GCC4TI scripts won't mkdir and cd wrong directories, but building in paths containing spaces won't work anyway, because `configure` in binutils and gcc choke on such paths.

git-svn-id: file:///var/svn/tigccpp/trunk@1334 9552661e-59e3-4036-b4f2-dbe53926924f

debrouxl 15 years ago
parent
commit
823125711a

+ 2 - 2
tigcc-linux/scripts/Install

@@ -101,9 +101,9 @@ read AddEnvSettings
 echo
 if [ -z "$AddEnvSettings" -o "x$AddEnvSettings" = xy -o "x$AddEnvSettings" = xY ]
 then
-    TIGCC=$PREFIX_GCC4TI
+    TIGCC="$PREFIX_GCC4TI"
     export TIGCC
-    $PREFIX_GCC4TI/bin/envreg
+    "$PREFIX_GCC4TI/bin/envreg"
     echo "Done. You must restart bash for the new environment settings to take effect."
     exit 0;
 fi

+ 2 - 2
tigcc-linux/scripts/Install_All

@@ -1,8 +1,8 @@
 #! /bin/sh
-if [ -z $PREFIX_GCC4TI ]
+if [ -z "$PREFIX_GCC4TI" ]
  then echo Install_All: error: \$PREFIX_GCC4TI not defined; exit 1
 fi
-mkdir $PREFIX_GCC4TI
+mkdir "$PREFIX_GCC4TI"
 if [ "x$GCC4TIHOST" != "x" ]; then
 echo Compiling GCC4TI on custom host $GCC4TIHOST
 export GCC4TIHOST

+ 2 - 2
tigcc-linux/scripts/Install_All_nopatch

@@ -1,8 +1,8 @@
 #! /bin/sh
-if [ -z $PREFIX_GCC4TI ]
+if [ -z "$PREFIX_GCC4TI" ]
  then echo Install_All_nopatch: error: \$PREFIX_GCC4TI not defined; exit 1
 fi
-mkdir $PREFIX_GCC4TI
+mkdir "$PREFIX_GCC4TI"
 if [ "x$GCC4TIHOST" != "x" ]; then
 echo Compiling GCC4TI on custom host $GCC4TIHOST
 export GCC4TIHOST

+ 2 - 2
tigcc-linux/scripts/Install_step_1

@@ -43,7 +43,7 @@ if test \! -d gcc.ti ; then
 fi
 
 # Binutils
-if grep TIGCC binutils.ti/gas/* > /dev/null; then
+if grep TIGCC binutils.ti/gas/as.c > /dev/null; then
     echo "BINUTILS: Patch already applied. Skipping."
 else
     echo "Patch binutils..."
@@ -74,7 +74,7 @@ else
 fi
 
 # Gcc
-if grep TIGCC gcc.ti/gcc/* > /dev/null; then
+if grep TIGCC gcc.ti/gcc/gcc.c > /dev/null; then
     echo "GCC: Patch already applied. Skipping."
 else
     echo Patching GCC...

+ 5 - 5
tigcc-linux/scripts/Install_step_2

@@ -4,16 +4,16 @@
 # The download tree must have been patched before doing this.
 #
 ORG_PWD=$PWD/..
-mkdir $ORG_PWD/build; cd $ORG_PWD/build; mkdir binutils; mkdir gcc;
-(cd $ORG_PWD/scripts && ./launch.binutils && ./launch.gcc) || exit 1
-rm -Rf $ORG_PWD/build
+mkdir "$ORG_PWD/build"; cd "$ORG_PWD/build"; mkdir binutils; mkdir gcc;
+(cd "$ORG_PWD/scripts" && ./launch.binutils && ./launch.gcc) || exit 1
+rm -Rf "$ORG_PWD/build"
 if [ "x$GCC4TIHOST" != "x" ]; then
 echo Compiling GCC4TI on custom host $GCC4TIHOST.
 fi
-(cd $ORG_PWD/scripts && ./launch.a68k && ./launch.ld-tigcc &&
+(cd "$ORG_PWD/scripts" && ./launch.a68k && ./launch.ld-tigcc &&
 ./launch.tigcc && ./launch.tprbuilder && ./launch.patcher &&
 ./launch.envreg) || exit 1
 
-rm -f $PREFIX_GCC4TI/bin/parser
+rm -f "$PREFIX_GCC4TI/bin/parser"
 
 exit 0

+ 8 - 8
tigcc-linux/scripts/Install_step_3

@@ -5,17 +5,17 @@
 # files, the other (lib) contains libraries.
 #
 echo GCC4TI script: Installing TIGCCLIB...
-rm -Rf $PREFIX_GCC4TI/include
-cp -Rf ../tigcclib/include $PREFIX_GCC4TI/
+rm -Rf "$PREFIX_GCC4TI/include"
+cp -Rf ../tigcclib/include "$PREFIX_GCC4TI/"
 # only symlink if the file system is case sensitive
 if [ ! -f "$PREFIX_GCC4TI/include/asm/OS.h" ]
-then ln -sf $PREFIX_GCC4TI/include/asm/os.h $PREFIX_GCC4TI/include/asm/OS.h
+then ln -sf "$PREFIX_GCC4TI/include/asm/os.h" "$PREFIX_GCC4TI/include/asm/OS.h"
 fi
-rm -Rf $PREFIX_GCC4TI/lib
-cp -Rf ../tigcclib/lib $PREFIX_GCC4TI
-rm -Rf $PREFIX_GCC4TI/examples
-cp -Rf ../tigcclib/examples $PREFIX_GCC4TI
+rm -Rf "$PREFIX_GCC4TI/lib"
+cp -Rf ../tigcclib/lib "$PREFIX_GCC4TI"
+rm -Rf "$PREFIX_GCC4TI/examples"
+cp -Rf ../tigcclib/examples "$PREFIX_GCC4TI"
 
-#cd ../tigcclib/src; make; make clean; cp tigcc.a $PREFIX_GCC4TI/include/c
+#cd ../tigcclib/src; make; make clean; cp tigcc.a "$PREFIX_GCC4TI/include/c"
 
 exit 0

+ 2 - 2
tigcc-linux/scripts/Install_step_4

@@ -16,8 +16,8 @@ if [ "x$GCC4TIHOST" != "x" ]; then
 echo Compiling TI-68k Developer Utilities on custom host $GCC4TIHOST.
 fi
 ./buildall || exit 1
-${install} -d $PREFIX_GCC4TI/bin || exit 1
-${install} bin/* $PREFIX_GCC4TI/bin || exit 1
+${install} -d "$PREFIX_GCC4TI/bin" || exit 1
+${install} bin/* "$PREFIX_GCC4TI/bin" || exit 1
 ./clean
 echo Done.
 

+ 21 - 19
tigcc-linux/scripts/Install_step_5

@@ -13,35 +13,37 @@ else
         install=ginstall
 fi
 
-${install} -d $PREFIX_GCC4TI/doc || exit 1
-cd ..; ${install} -m 644 AUTHORS BUGS CHANGELOG COPYING DIRECTORIES HOWTO INSTALL README README.linux README.osX $PREFIX_GCC4TI/doc || exit 1
+cd ..
 
-${install} -d $PREFIX_GCC4TI/doc/a68k || exit 1
-cd sources/a68k; ${install} -m 644 Bugs.txt Doc.txt History.txt ToDo.txt $PREFIX_GCC4TI/doc/a68k || exit 1
+${install} -d "$PREFIX_GCC4TI/doc" || exit 1
+${install} -m 644 AUTHORS BUGS CHANGELOG COPYING DIRECTORIES HOWTO INSTALL README README.linux README.osX "$PREFIX_GCC4TI/doc" || exit 1
 
-${install} -d $PREFIX_GCC4TI/doc/tigcc || exit 1
-cd ../tigcc; ${install} -m 644 AUTHORS COPYING ChangeLog README $PREFIX_GCC4TI/doc/tigcc || exit 1
+${install} -d "$PREFIX_GCC4TI/doc/a68k" || exit 1
+cd sources/a68k; ${install} -m 644 Bugs.txt Doc.txt History.txt ToDo.txt "$PREFIX_GCC4TI/doc/a68k" || exit 1
 
-${install} -d $PREFIX_GCC4TI/doc/tprbuilder || exit 1
-cd ../tprbuilder; ${install} -m 644 AUTHORS COPYING ChangeLog README $PREFIX_GCC4TI/doc/tprbuilder || exit 1
+${install} -d "$PREFIX_GCC4TI/doc/tigcc" || exit 1
+cd ../tigcc; ${install} -m 644 AUTHORS COPYING ChangeLog README "$PREFIX_GCC4TI/doc/tigcc" || exit 1
 
-rm -Rf $PREFIX_GCC4TI/doc/parser
+${install} -d "$PREFIX_GCC4TI/doc/tprbuilder" || exit 1
+cd ../tprbuilder; ${install} -m 644 AUTHORS COPYING ChangeLog README "$PREFIX_GCC4TI/doc/tprbuilder" || exit 1
 
-${install} -d $PREFIX_GCC4TI/doc/patcher || exit 1
-cd ../patcher; ${install} -m 644 AUTHORS COPYING ChangeLog README $PREFIX_GCC4TI/doc/patcher || exit 1
+rm -Rf "$PREFIX_GCC4TI/doc/parser"
 
-rm -Rf $PREFIX_GCC4TI/doc/html
-cd ../../tigcclib/doc; cp -Rf html $PREFIX_GCC4TI/doc
-rm -Rf $PREFIX_GCC4TI/doc/tigcclib
-ln -sf $PREFIX_GCC4TI/doc/html $PREFIX_GCC4TI/doc/tigcclib
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+${install} -d "$PREFIX_GCC4TI/doc/patcher" || exit 1
+cd ../patcher; ${install} -m 644 AUTHORS COPYING ChangeLog README "$PREFIX_GCC4TI/doc/patcher" || exit 1
+
+rm -Rf "$PREFIX_GCC4TI/doc/html"
+cd ../../tigcclib/doc; cp -Rf html "$PREFIX_GCC4TI/doc"
+rm -Rf "$PREFIX_GCC4TI/doc/tigcclib"
+ln -sf "$PREFIX_GCC4TI/doc/html" "$PREFIX_GCC4TI/doc/tigcclib"
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
-${install} ../../tigcclib/doc/converter/gcc4tidoc $PREFIX_GCC4TI/bin || exit 1
+${install} ../../tigcclib/doc/converter/gcc4tidoc "$PREFIX_GCC4TI/bin" || exit 1
 fi
 
 echo GCC4TI script: Creating GCC4TI projects folder...
-${install} -d $PREFIX_GCC4TI/projects || exit 1
+${install} -d "$PREFIX_GCC4TI/projects" || exit 1
 
 echo Done.
 

+ 7 - 7
tigcc-linux/scripts/launch.a68k

@@ -20,19 +20,19 @@ fi
 
 echo Installing a68k assembler...
 ORG_PWD=$PWD/..
-cd $ORG_PWD/sources/a68k/
+cd "$ORG_PWD/sources/a68k/"
 ${make} -e || exit 1
-${install} -d $PREFIX_GCC4TI/bin || exit 1
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+${install} -d "$PREFIX_GCC4TI/bin" || exit 1
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
-${install} A68k $PREFIX_GCC4TI/bin/a68k || exit 1
+${install} A68k "$PREFIX_GCC4TI/bin/a68k" || exit 1
 else
-${install} A68k $PREFIX_GCC4TI/bin/a68k.exe || exit 1
+${install} A68k "$PREFIX_GCC4TI/bin/a68k.exe" || exit 1
 fi
 ${make} clean
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 9 - 9
tigcc-linux/scripts/launch.binutils

@@ -21,12 +21,12 @@ fi
 
 echo GCC4TI script: Configuring, compiling and installing binutils...
 ORG_PWD=$PWD/..
-mkdir $ORG_PWD/build; cd $ORG_PWD/build; mkdir binutils; cd binutils
+mkdir "$ORG_PWD/build"; cd "$ORG_PWD/build"; mkdir binutils; cd binutils
 if [ "x$GCC4TIHOST" = "x" ]; then
-../../download/binutils.ti/configure --disable-serial-configure --prefix=$PREFIX_GCC4TI --target=m68k-coff --disable-shared --enable-static --disable-multilib --disable-nls --disable-win32-registry
+../../download/binutils.ti/configure --disable-serial-configure "--prefix=$PREFIX_GCC4TI" --target=m68k-coff --disable-shared --enable-static --disable-multilib --disable-nls --disable-win32-registry
 else
 echo Compiling GCC4TI binutils on custom host $GCC4TIHOST
-../../download/binutils.ti/configure --disable-serial-configure --prefix=$PREFIX_GCC4TI --target=m68k-coff --disable-shared --enable-static --disable-multilib --disable-nls --disable-win32-registry --host=$GCC4TIHOST
+../../download/binutils.ti/configure --disable-serial-configure "--prefix=$PREFIX_GCC4TI" --target=m68k-coff --disable-shared --enable-static --disable-multilib --disable-nls --disable-win32-registry --host=$GCC4TIHOST
 fi
 
 if [ $? -ne 0 ]; then
@@ -86,16 +86,16 @@ if [ $? -ne 0 ]; then
     exit 2
 fi
 
-${install} -d $PREFIX_GCC4TI/bin/ || exit 1
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+${install} -d "$PREFIX_GCC4TI/bin/" || exit 1
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
-${install} gas/as-new $PREFIX_GCC4TI/bin/as || exit 1
+${install} gas/as-new "$PREFIX_GCC4TI/bin/as" || exit 1
 else
-${install} gas/as-new.exe $PREFIX_GCC4TI/bin/as.exe || exit 1
+${install} gas/as-new.exe "$PREFIX_GCC4TI/bin/as.exe" || exit 1
 fi
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 6 - 6
tigcc-linux/scripts/launch.envreg

@@ -18,19 +18,19 @@ else
         install=ginstall
 fi
 
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
 
 echo Installing GCC4TI environment registrator...
 ORG_PWD=$PWD/..
-cd $ORG_PWD/sources/envreg/src/
+cd "$ORG_PWD/sources/envreg/src/"
 ${make} -e || exit 1
-${install} -d $PREFIX_GCC4TI/bin || exit 1
-${install} envreg $PREFIX_GCC4TI/bin || exit 1
+${install} -d "$PREFIX_GCC4TI/bin" || exit 1
+${install} envreg "$PREFIX_GCC4TI/bin" || exit 1
 ${make} clean
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 11 - 13
tigcc-linux/scripts/launch.gcc

@@ -27,12 +27,12 @@ CC_FOR_BUILD="$CC"
 export CC_FOR_BUILD
 
 ORG_PWD=$PWD/..
-mkdir $ORG_PWD/build; cd $ORG_PWD/build; mkdir gcc; cd gcc
+mkdir "$ORG_PWD/build"; cd "$ORG_PWD/build"; mkdir gcc; cd gcc
 if [ "x$GCC4TIHOST" = "x" ]; then
-../../download/gcc.ti/configure --prefix=$PREFIX_GCC4TI --target=m68k-coff --with-gnu-as --disable-nls --disable-multilib --disable-shared --enable-static --disable-threads --disable-win32-registry --disable-checking --disable-werror --disable-pch --disable-mudflap --disable-libssp
+../../download/gcc.ti/configure "--prefix=$PREFIX_GCC4TI" --target=m68k-coff --with-gnu-as --disable-nls --disable-multilib --disable-shared --enable-static --disable-threads --disable-win32-registry --disable-checking --disable-werror --disable-pch --disable-mudflap --disable-libssp
 else
 echo Compiling GCC4TI gcc on custom host $GCC4TIHOST
-../../download/gcc.ti/configure --prefix=$PREFIX_GCC4TI --target=m68k-coff --with-gnu-as --disable-nls --disable-multilib --disable-shared --enable-static --disable-threads --disable-win32-registry --disable-checking --disable-werror --disable-pch --disable-mudflap --disable-libssp --host=$GCC4TIHOST
+../../download/gcc.ti/configure "--prefix=$PREFIX_GCC4TI" --target=m68k-coff --with-gnu-as --disable-nls --disable-multilib --disable-shared --enable-static --disable-threads --disable-win32-registry --disable-checking --disable-werror --disable-pch --disable-mudflap --disable-libssp --host=$GCC4TIHOST
 fi
 
 if [ $? -ne 0 ]; then
@@ -61,21 +61,19 @@ echo all: >`ls -d build-*`/libiberty/testsuite/Makefile
 ${make}
 echo You should have seen an error. This is normal. GCC4TI installation continues.
 
-cd ../../scripts
-
 # Finish gcc installation
-${install} -d $PREFIX_GCC4TI/bin/ || exit 1
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+${install} -d "$PREFIX_GCC4TI/bin/" || exit 1
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
-${install} ../build/gcc/gcc/cc1  $PREFIX_GCC4TI/bin/ || exit 1
-${install} ../build/gcc/gcc/xgcc $PREFIX_GCC4TI/bin/gcc || exit 1
+${install} gcc/cc1  "$PREFIX_GCC4TI/bin/" || exit 1
+${install} gcc/xgcc "$PREFIX_GCC4TI/bin/gcc" || exit 1
 else
-${install} ../build/gcc/gcc/cc1.exe  $PREFIX_GCC4TI/bin/ || exit 1
-${install} ../build/gcc/gcc/xgcc.exe $PREFIX_GCC4TI/bin/gcc.exe || exit 1
+${install} gcc/cc1.exe  "$PREFIX_GCC4TI/bin/" || exit 1
+${install} gcc/xgcc.exe "$PREFIX_GCC4TI/bin/gcc.exe" || exit 1
 fi
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 12 - 14
tigcc-linux/scripts/launch.ld-tigcc

@@ -20,7 +20,7 @@ fi
 
 echo Installing GCC4TI linker...
 ORG_PWD=$PWD/..
-cd $ORG_PWD/sources/ld-tigcc
+cd "$ORG_PWD/sources/ld-tigcc"
 
 # OS X requires a switch to enable nested functions. ld-tigcc doesn't actually
 # require an executable stack, but Apple's compiler is not clever enough to
@@ -36,35 +36,33 @@ then export CFLAGS="$CFLAGS -fnested-functions"
 fi
 
 linkdll=
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" != "x" -o "x$iswin2" != "x" ]; then
 linkdll="link.dll"
 fi
 
 ${make} -e all ${linkdll} || exit 1
-${install} -d $PREFIX_GCC4TI/bin || exit 1
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+${install} -d "$PREFIX_GCC4TI/bin" || exit 1
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
-${install} ld-tigcc $PREFIX_GCC4TI/bin || exit 1
-${install} ar-tigcc $PREFIX_GCC4TI/bin || exit 1
+${install} ld-tigcc "$PREFIX_GCC4TI/bin" || exit 1
+${install} ar-tigcc "$PREFIX_GCC4TI/bin" || exit 1
 else
 if [ -f "ld-tigcc.exe" ]; then
-${install} ld-tigcc.exe $PREFIX_GCC4TI/bin || exit 1
+${install} ld-tigcc.exe "$PREFIX_GCC4TI/bin" || exit 1
 else
-${install} ld-tigcc $PREFIX_GCC4TI/bin/ld-tigcc.exe || exit 1
+${install} ld-tigcc "$PREFIX_GCC4TI/bin/ld-tigcc.exe" || exit 1
 fi
 if [ -f "ar-tigcc.exe" ]; then
-${install} ar-tigcc.exe $PREFIX_GCC4TI/bin || exit 1
+${install} ar-tigcc.exe "$PREFIX_GCC4TI/bin" || exit 1
 else
-${install} ar-tigcc $PREFIX_GCC4TI/bin/ar-tigcc.exe || exit 1
+${install} ar-tigcc "$PREFIX_GCC4TI/bin/ar-tigcc.exe" || exit 1
 fi
-${install} link.dll $PREFIX_GCC4TI/bin || exit 1
+${install} link.dll "$PREFIX_GCC4TI/bin" || exit 1
 fi
 ${make} clean
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 6 - 6
tigcc-linux/scripts/launch.patcher

@@ -18,19 +18,19 @@ else
         install=ginstall
 fi
 
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
 
 echo Installing GCC4TI patcher...
 ORG_PWD=$PWD/..
-cd $ORG_PWD/sources/patcher/src/
+cd "$ORG_PWD/sources/patcher/src/"
 ${make} -e || exit 1
-${install} -d $PREFIX_GCC4TI/bin || exit 1
-${install} patcher $PREFIX_GCC4TI/bin || exit 1
+${install} -d "$PREFIX_GCC4TI/bin" || exit 1
+${install} patcher "$PREFIX_GCC4TI/bin" || exit 1
 ${make} clean
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 6 - 6
tigcc-linux/scripts/launch.tigcc

@@ -18,19 +18,19 @@ else
         install=ginstall
 fi
 
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
 
 echo Installing GCC4TI front-end...
 ORG_PWD=$PWD/..
-cd $ORG_PWD/sources/tigcc/src/
+cd "$ORG_PWD/sources/tigcc/src/"
 ${make} -e || exit 1
-${install} -d $PREFIX_GCC4TI/bin || exit 1
-${install} tigcc $PREFIX_GCC4TI/bin || exit 1
+${install} -d "$PREFIX_GCC4TI/bin" || exit 1
+${install} tigcc "$PREFIX_GCC4TI/bin" || exit 1
 ${make} clean
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 8 - 8
tigcc-linux/scripts/launch.tprbuilder

@@ -20,23 +20,23 @@ fi
 
 echo Installing GCC4TI project builder...
 ORG_PWD=$PWD/..
-cd $ORG_PWD/sources/tprbuilder/src/
+cd "$ORG_PWD/sources/tprbuilder/src/"
 ${make} -e || exit 1
-${install} -d $PREFIX_GCC4TI/bin || exit 1
-iswin1=`echo $GCC4TIHOST | grep -E "msys|mingw|cygwin"`
-iswin2=`uname -a | grep -E "msys|mingw|cygwin"`
+${install} -d "$PREFIX_GCC4TI/bin" || exit 1
+iswin1=`echo $GCC4TIHOST | grep -E -i "msys|mingw|cygwin"`
+iswin2=`uname -a | grep -E -i "msys|mingw|cygwin"`
 if [ "x$iswin1" = "x" -a "x$iswin2" = "x" ]; then
-${install} tprbuilder $PREFIX_GCC4TI/bin || exit 1
+${install} tprbuilder "$PREFIX_GCC4TI/bin" || exit 1
 else
 if [ -f "tprbuilder.exe" ]; then
-${install} tprbuilder.exe $PREFIX_GCC4TI/bin || exit 1
+${install} tprbuilder.exe "$PREFIX_GCC4TI/bin" || exit 1
 else
-${install} tprbuilder $PREFIX_GCC4TI/bin/tprbuilder.exe || exit 1
+${install} tprbuilder "$PREFIX_GCC4TI/bin/tprbuilder.exe" || exit 1
 fi
 fi
 ${make} clean
 
-cd $ORG_PWD/scripts
+cd "$ORG_PWD/scripts"
 
 echo Done.
 

+ 4 - 4
tigcc-linux/scripts/package_bin

@@ -5,7 +5,7 @@
 # Everything must have been built and installed prior to running this script.
 #
 
-if test \! -d $TIGCC ; then
+if test \! -d "$TIGCC" ; then
    echo "Directory TIGCC=$TIGCC not found."
    exit 1
 fi
@@ -20,8 +20,8 @@ else
     exit 2
 fi
 rm -rf /tmp/gcc4ti
-cp -r $TIGCC /tmp/gcc4ti
-cp $MY_PWD/scripts/setup.sh /tmp/gcc4ti
-$MAKESELF --bzip2 /tmp/gcc4ti $MY_PWD/gcc4ti-install.sh "GCC4TI Install" ./setup.sh
+cp -r "$TIGCC" /tmp/gcc4ti
+cp "$MY_PWD/scripts/setup.sh" /tmp/gcc4ti
+$MAKESELF --bzip2 /tmp/gcc4ti "$MY_PWD/gcc4ti-install.sh" "GCC4TI Install" ./setup.sh
 rm -rf /tmp/gcc4ti
 echo Done.

+ 2 - 2
tigcc-linux/scripts/package_src

@@ -8,9 +8,9 @@ OUTDIR=../gcc4ti-sources
 
 echo GCC4TI script: Packaging source:
 echo clamscan...
-clamscan $OUTDIR
+clamscan "$OUTDIR"
 echo tar...
-cd $OUTDIR
+cd "$OUTDIR"
 tar -c --exclude=.svn -f gcc4ti_src.tar scripts sources tigcclib AUTHORS BUGS CHANGELOG COPYING DIRECTORIES HOWTO INSTALL README README.linux README.osX;
 echo bzip2...
 rm -f gcc4ti_src.tar.bz2

+ 2 - 2
tigcc-linux/scripts/setup.sh

@@ -45,9 +45,9 @@ read AddEnvSettings
 echo
 if [ -z "$AddEnvSettings" -o "$AddEnvSettings" = y -o "$AddEnvSettings" = Y ]
 then
-    TIGCC=$PREFIX_GCC4TI
+    TIGCC="$PREFIX_GCC4TI"
     export TIGCC
-    $PREFIX_GCC4TI/bin/envreg
+    "$PREFIX_GCC4TI/bin/envreg"
     echo "Done. You must restart bash for the new environment settings to take effect."
     exit 0;
 fi

+ 25 - 25
tigcc-linux/scripts/updatedoc

@@ -8,56 +8,56 @@ WINDOCDIR=~/.wine/drive_c/docfiles/
 OUTDIR=../gcc4ti-sources
 WINE=wine
 
-mkdir -p $OUTDIR/tigcclib/doc/html
+mkdir -p "$OUTDIR/tigcclib/doc/html"
 
 echo Generating documentation \(will take up to several minutes\)...
 echo Includes
-$WINE $TIGCCDIR/doc/Programs/Update/UpdateInclude.exe
+$WINE "$TIGCCDIR/doc/Programs/Update/UpdateInclude.exe"
 echo Keywords
-$WINE $TIGCCDIR/doc/Programs/Update/UpdateKeywords.exe
+$WINE "$TIGCCDIR/doc/Programs/Update/UpdateKeywords.exe"
 echo Info
-$WINE $TIGCCDIR/doc/Programs/Update/UpdateInfo.exe
+$WINE "$TIGCCDIR/doc/Programs/Update/UpdateInfo.exe"
 echo Index
-$WINE $TIGCCDIR/doc/Programs/Update/UpdateIndex.exe
+$WINE "$TIGCCDIR/doc/Programs/Update/UpdateIndex.exe"
 
 echo Creating documentation source tarball...
-rm -f $OUTDIR/tigcclib/doc/source.tar.bz2
+rm -f "$OUTDIR/tigcclib/doc/source.tar.bz2"
 PWDSAVE=`pwd`
-cd $TIGCCDIR/doc
-tar -c --exclude='*/.[sS][vV][nN]' -f $PWDSAVE/$OUTDIR/tigcclib/doc/source.tar Programs System
-bzip2 -9 $PWDSAVE/$OUTDIR/tigcclib/doc/source.tar
-cp -R converter $PWDSAVE/$OUTDIR/tigcclib/doc/
-cd $PWDSAVE
+cd "$TIGCCDIR/doc"
+tar -c --exclude='*/.[sS][vV][nN]' -f "$PWDSAVE/$OUTDIR/tigcclib/doc/source.tar" Programs System
+bzip2 -9 "$PWDSAVE/$OUTDIR/tigcclib/doc/source.tar"
+cp -R converter "$PWDSAVE/$OUTDIR/tigcclib/doc/"
+cd "$PWDSAVE"
 
 echo Copying documentation files...
 echo -n .
-rm -f $OUTDIR/tigcclib/doc/html/[a-e]*
+rm -f "$OUTDIR"/tigcclib/doc/html/[a-e]*
 echo -n .
-rm -f $OUTDIR/tigcclib/doc/html/[f-j]*
+rm -f "$OUTDIR"/tigcclib/doc/html/[f-j]*
 echo -n .
-rm -f $OUTDIR/tigcclib/doc/html/[k-o]*
+rm -f "$OUTDIR"/tigcclib/doc/html/[k-o]*
 echo -n .
-rm -f $OUTDIR/tigcclib/doc/html/[p-t]*
+rm -f "$OUTDIR"/tigcclib/doc/html/[p-t]*
 echo -n .
-rm -f $OUTDIR/tigcclib/doc/html/[u-z]*
+rm -f "$OUTDIR"/tigcclib/doc/html/[u-z]*
 echo -n .
-cp -pf $WINDOCDIR/CHMFiles/[a-e]*.html $OUTDIR/tigcclib/doc/html/
+cp -pf "$WINDOCDIR"/CHMFiles/[a-e]*.html "$OUTDIR/tigcclib/doc/html/"
 echo -n .
-cp -pf $WINDOCDIR/CHMFiles/[f-j]*.html $OUTDIR/tigcclib/doc/html/
+cp -pf "$WINDOCDIR"/CHMFiles/[f-j]*.html "$OUTDIR/tigcclib/doc/html/"
 echo -n .
-cp -pf $WINDOCDIR/CHMFiles/[k-o]*.html $OUTDIR/tigcclib/doc/html/
+cp -pf "$WINDOCDIR"/CHMFiles/[k-o]*.html "$OUTDIR/tigcclib/doc/html/"
 echo -n .
-cp -pf $WINDOCDIR/CHMFiles/[p-t]*.html $OUTDIR/tigcclib/doc/html/
+cp -pf "$WINDOCDIR"/CHMFiles/[p-t]*.html "$OUTDIR/tigcclib/doc/html/"
 echo -n .
-cp -pf $WINDOCDIR/CHMFiles/[u-z]*.html $OUTDIR/tigcclib/doc/html/
+cp -pf "$WINDOCDIR"/CHMFiles/[u-z]*.html "$OUTDIR/tigcclib/doc/html/"
 echo -n .
-cp -pf $WINDOCDIR/CHMFiles/*.css $WINDOCDIR/CHMFiles/*.gif \
- $WINDOCDIR/CHMFiles/Contents.hhc $WINDOCDIR/CHMFiles/Index.hhk \
- $OUTDIR/tigcclib/doc/html/
+cp -pf "$WINDOCDIR"/CHMFiles/*.css "$WINDOCDIR"/CHMFiles/*.gif \
+ "$WINDOCDIR/CHMFiles/Contents.hhc" "$WINDOCDIR/CHMFiles/Index.hhk" \
+ "$OUTDIR/tigcclib/doc/html/"
 echo .
 
 echo Converting CHM documentation to Qt DCF/ADP format \(will take several minutes\)...
-cd $OUTDIR/tigcclib/doc/html
+cd "$OUTDIR/tigcclib/doc/html"
 ../converter/chm2dcf
 ../converter/dcf2adp
 echo Done.

+ 61 - 61
tigcc-linux/scripts/updatesrc

@@ -10,108 +10,108 @@ TIGCCLINUXDIR=../../tigcc-linux
 OUTDIR=../gcc4ti-sources
 
 echo Updating source tree...
-mkdir -p $OUTDIR/tigcclib
-mkdir -p $OUTDIR/sources
+mkdir -p "$OUTDIR/tigcclib"
+mkdir -p "$OUTDIR/sources"
 
 # TIGCCLIB components
 echo Updating archive \(tigcclib/src\)...
-rm -rf $OUTDIR/tigcclib/src
-cp -prf $TIGCCDIR/archive $OUTDIR/tigcclib/src
-rm -Rf $OUTDIR/tigcclib/src/*.a
+rm -rf "$OUTDIR/tigcclib/src"
+cp -prf "$TIGCCDIR/archive" "$OUTDIR/tigcclib/src"
+rm -Rf "$OUTDIR"/tigcclib/src/*.a
 
 echo Updating examples...
-rm -rf $OUTDIR/tigcclib/examples
-cp -prf $TIGCCDIR/examples $OUTDIR/tigcclib/examples
+rm -rf "$OUTDIR/tigcclib/examples"
+cp -prf "$TIGCCDIR/examples" "$OUTDIR/tigcclib/examples"
 
 echo Updating hsf2rc...
-rm -rf $OUTDIR/tigcclib/hsf2rc
-cp -prf $TIGCCDIR/hsf2rc $OUTDIR/tigcclib/hsf2rc
+rm -rf "$OUTDIR/tigcclib/hsf2rc"
+cp -prf "$TIGCCDIR/hsf2rc" "$OUTDIR/tigcclib/hsf2rc"
 
 echo Updating include...
-rm -rf $OUTDIR/tigcclib/include
-mkdir $OUTDIR/tigcclib/include
-cp -prf $TIGCCDIR/include/C $OUTDIR/tigcclib/include/c
-cp -prf $TIGCCDIR/include/ASM $OUTDIR/tigcclib/include/asm
-cp -prf $TIGCCDIR/include/S $OUTDIR/tigcclib/include/s
-rm -rf $OUTDIR/tigcclib/include/c/Completion
+rm -rf "$OUTDIR/tigcclib/include"
+mkdir "$OUTDIR/tigcclib/include"
+cp -prf "$TIGCCDIR/include/C" "$OUTDIR/tigcclib/include/c"
+cp -prf "$TIGCCDIR/include/ASM" "$OUTDIR/tigcclib/include/asm"
+cp -prf "$TIGCCDIR/include/S" "$OUTDIR/tigcclib/include/s"
+rm -rf "$OUTDIR/tigcclib/include/c/Completion"
 
 echo Updating starters...
-rm -rf $OUTDIR/tigcclib/starters
-cp -prf $TIGCCDIR/starters $OUTDIR/tigcclib/starters
-rm -rf $OUTDIR/tigcclib/starters/build $OUTDIR/tigcclib/starters/test
+rm -rf "$OUTDIR/tigcclib/starters"
+cp -prf "$TIGCCDIR/starters" "$OUTDIR/tigcclib/starters"
+rm -rf "$OUTDIR/tigcclib/starters/build" "$OUTDIR/tigcclib/starters/test"
 
 
 # Toolchain components
 echo Updating gcc \(TIGCC patches\)...
-rm -rf $OUTDIR/sources/gcc
-cp -prf $TIGCCDIR/gcc $OUTDIR/sources/gcc
+rm -rf "$OUTDIR/sources/gcc"
+cp -prf "$TIGCCDIR/gcc" "$OUTDIR/sources/gcc"
 
 echo Updating ld-tigcc...
-rm -rf $OUTDIR/sources/ld-tigcc
-cp -prf $TIGCCDIR/ld-tigcc $OUTDIR/sources/ld-tigcc
-rm -f $OUTDIR/sources/ld-tigcc/*.o $OUTDIR/sources/ld-tigcc/ar/*.o \
-      $OUTDIR/sources/ld-tigcc/ar/export/*.o $OUTDIR/sources/ld-tigcc/ar/import/*.o \
-      $OUTDIR/sources/ld-tigcc/bincode/*.o  $OUTDIR/sources/ld-tigcc/export/*.o \
-      $OUTDIR/sources/ld-tigcc/formats/*.o $OUTDIR/sources/ld-tigcc/import/*.o \
-      $OUTDIR/sources/ld-tigcc/insert/*.o $OUTDIR/sources/ld-tigcc/insert/model/*.o \
-      $OUTDIR/sources/ld-tigcc/ar-tigcc $OUTDIR/sources/ld-tigcc/ld-tigcc \
-      $OUTDIR/sources/ld-tigcc/link.dll
+rm -rf "$OUTDIR/sources/ld-tigcc"
+cp -prf "$TIGCCDIR/ld-tigcc" "$OUTDIR/sources/ld-tigcc"
+rm -f "$OUTDIR"/sources/ld-tigcc/*.o "$OUTDIR"/sources/ld-tigcc/ar/*.o \
+      "$OUTDIR"/sources/ld-tigcc/ar/export/*.o "$OUTDIR"/sources/ld-tigcc/ar/import/*.o \
+      "$OUTDIR"/sources/ld-tigcc/bincode/*.o  "$OUTDIR"/sources/ld-tigcc/export/*.o \
+      "$OUTDIR"/sources/ld-tigcc/formats/*.o "$OUTDIR"/sources/ld-tigcc/import/*.o \
+      "$OUTDIR"/sources/ld-tigcc/insert/*.o "$OUTDIR"/sources/ld-tigcc/insert/model/*.o \
+      "$OUTDIR/sources/ld-tigcc/ar-tigcc" "$OUTDIR/sources/ld-tigcc/ld-tigcc" \
+      "$OUTDIR/sources/ld-tigcc/link.dll"
 
 echo Updating tprbuilder...
-rm -rf $OUTDIR/sources/tprbuilder
-cp -prf $TIGCCDIR/tprbuilder $OUTDIR/sources/tprbuilder
+rm -rf "$OUTDIR/sources/tprbuilder"
+cp -prf "$TIGCCDIR/tprbuilder" "$OUTDIR/sources/tprbuilder"
 
 
 # Other components
 echo Updating readme...
-rm -f $OUTDIR/README
-cp -pf $TIGCCDIR/readme/Readme.txt $OUTDIR/README
+rm -f "$OUTDIR/README"
+cp -pf "$TIGCCDIR/readme/Readme.txt" "$OUTDIR/README"
 
 echo Updating TI-68k developer utilities \(formerly TIGCC Tools Suite\)...
-rm -rf $OUTDIR/sources/tools
-cp -prf $TIGCCDIR/tools $OUTDIR/sources/tools
-rm -rf $OUTDIR/sources/tools/bin
+rm -rf "$OUTDIR/sources/tools"
+cp -prf "$TIGCCDIR/tools" "$OUTDIR/sources/tools"
+rm -rf "$OUTDIR/sources/tools/bin"
 
 echo Updating lib...
-rm -rf $OUTDIR/tigcclib/lib
-mkdir $OUTDIR/tigcclib/lib
-cp -pf $TIGCCDIR/archive/tigcc.a $TIGCCDIR/archive/flashos.a \
-       $TIGCCDIR/starters/build/pstarter.o $OUTDIR/tigcclib/lib/
+rm -rf "$OUTDIR/tigcclib/lib"
+mkdir "$OUTDIR/tigcclib/lib"
+cp -pf "$TIGCCDIR/archive/tigcc.a" "$TIGCCDIR/archive/flashos.a" \
+       "$TIGCCDIR/starters/build/pstarter.o" "$OUTDIR/tigcclib/lib/"
 
 echo Updating a68k...
-rm -rf $OUTDIR/sources/a68k
-mkdir -p $OUTDIR/sources/a68k
-cp -pf $A68KSRCDIR/* $OUTDIR/sources/a68k
+rm -rf "$OUTDIR/sources/a68k"
+mkdir -p "$OUTDIR/sources/a68k"
+cp -pf "$A68KSRCDIR"/* "$OUTDIR/sources/a68k"
 
 # Components in Linux/*nix
 echo Updating envreg...
-rm -rf $OUTDIR/sources/envreg
-cp -prf $TIGCCLINUXDIR/sources/envreg $OUTDIR/sources/envreg
+rm -rf "$OUTDIR/sources/envreg"
+cp -prf "$TIGCCLINUXDIR/sources/envreg" "$OUTDIR/sources/envreg"
 
 echo Updating patcher...
-rm -rf $OUTDIR/sources/patcher
-cp -prf $TIGCCLINUXDIR/sources/patcher $OUTDIR/sources/patcher
+rm -rf "$OUTDIR/sources/patcher"
+cp -prf "$TIGCCLINUXDIR/sources/patcher" "$OUTDIR/sources/patcher"
 
 echo Updating tigcc...
-rm -rf $OUTDIR/sources/tigcc
-cp -prf $TIGCCLINUXDIR/sources/tigcc $OUTDIR/sources/tigcc
+rm -rf "$OUTDIR/sources/tigcc"
+cp -prf "$TIGCCLINUXDIR/sources/tigcc" "$OUTDIR/sources/tigcc"
 
 echo Updating source directory list...
-cp -prf $TIGCCLINUXDIR/sources/DIRECTORIES $OUTDIR/sources/
+cp -prf "$TIGCCLINUXDIR/sources/DIRECTORIES" "$OUTDIR/sources/"
 
 echo Updating text documentation...
-cp -prf $TIGCCLINUXDIR/AUTHORS $OUTDIR/
-cp -prf $TIGCCLINUXDIR/BUGS $OUTDIR/
-cp -prf $TIGCCLINUXDIR/CHANGELOG $OUTDIR/
-cp -prf $TIGCCLINUXDIR/COPYING $OUTDIR/
-cp -prf $TIGCCLINUXDIR/DIRECTORIES $OUTDIR/
-cp -prf $TIGCCLINUXDIR/HOWTO $OUTDIR/
-cp -prf $TIGCCLINUXDIR/INSTALL $OUTDIR/
-cp -prf $TIGCCLINUXDIR/README.linux $OUTDIR/
-cp -prf $TIGCCLINUXDIR/README.osX $OUTDIR/
+cp -prf "$TIGCCLINUXDIR/AUTHORS" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/BUGS" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/CHANGELOG" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/COPYING" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/DIRECTORIES" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/HOWTO" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/INSTALL" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/README.linux" "$OUTDIR/"
+cp -prf "$TIGCCLINUXDIR/README.osX" "$OUTDIR/"
 
 echo Updating scripts...
-cp -prf $TIGCCLINUXDIR/scripts/ $OUTDIR/
-chmod +x $OUTDIR/scripts/[^S]*
+cp -prf "$TIGCCLINUXDIR/scripts/" "$OUTDIR/"
+chmod +x "$OUTDIR"/scripts/[^S]*
 
 echo Done.