[ros-diffs] [cfinck] 31401: - Add "make" to the list of updated tools in RosBE-Unix 1.1. - NASM 2.0 has problems, when it's compiled in a dedicated build directory, so extract the source into one directory and build NASM in the same one. - Use a better method for expanding variables in pathes. - Also expand variables in pathes in "createshortcut.sh". - Add "scut" to the list printed by the "help" command.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Sat Dec 22 21:31:04 2007
New Revision: 31401

URL: http://svn.reactos.org/svn/reactos?rev=31401&view=rev
Log:
- Add "make" to the list of updated tools in RosBE-Unix 1.1.
- NASM 2.0 has problems, when it's compiled in a dedicated build directory, so extract the source into one directory and build NASM in the same one.
- Use a better method for expanding variables in pathes.
- Also expand variables in pathes in "createshortcut.sh".
- Add "scut" to the list printed by the "help" command.

Modified:
    trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh
    trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh
    trunk/tools/RosBE/RosBE-Unix/scripts/help.sh

Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh?rev=31401&r1=31400&r2=31401&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh (original)
+++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh Sat Dec 22 21:31:04 2007
@@ -186,6 +186,9 @@
 	if [ "$installdir" = "" ]; then
 		installdir=$DEFAULT_INSTALL_DIR
 	fi
+
+	# Make sure we have the absolute path to the installation directory
+	installdir=`eval echo $installdir`
 
 	# Check if the installation directory already exists
 	if [ -f "$installdir" ]; then
@@ -254,10 +257,6 @@
 	fi
 done
 
-# Make sure we have the absolute path to the installation directory
-cd "$installdir"
-installdir="$PWD"
-
 # Ready to start
 boldmsg "Ready to start"
 
@@ -302,6 +301,7 @@
 					process_w32api=true
 					process_binutils=true
 					process_gcc=true
+					process_make=true
 					process_nasm=true
 					process_scut=true
 					;;
@@ -469,16 +469,14 @@
 # nasm
 if $process_nasm; then
 	rm -rf "nasm"
-	rm -rf "nasm-build"
 
 	echo -n "Extracting nasm... "
 	tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log"
 	checkrun "tar"
 
 	echo -n "Configuring nasm... "
-	mkdir "nasm-build"
-	cd "nasm-build"
-	../nasm/configure --prefix="$installdir" --target=mingw32  >& "$SCRIPTDIR/configure.log"
+	cd "nasm"
+	./configure --prefix="$installdir" --target=mingw32  >& "$SCRIPTDIR/configure.log"
 	checkrun "configure"
 
 	echo -n "Building nasm... "
@@ -491,7 +489,6 @@
 
 	echo -n "Cleaning up nasm... "
 	cd "$SOURCEDIR"
-	rm -rf "nasm-build"
 	rm -rf "nasm"
 	checkrun
 fi

Modified: trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh?rev=31401&r1=31400&r2=31401&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh (original)
+++ trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh Sat Dec 22 21:31:04 2007
@@ -37,6 +37,9 @@
 sourcedir=""
 while [ "$sourcedir" = "" ]; do
 	read -p "Directory: " sourcedir
+
+	# Make sure we have the absolute path to the source directory
+	sourcedir=`eval echo $sourcedir`
 
 	if ! [ -d "$sourcedir" ]; then
 		echo "The entered path is no directory. Please enter the right path to the ReactOS sources."

Modified: trunk/tools/RosBE/RosBE-Unix/scripts/help.sh
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/help.sh?rev=31401&r1=31400&r2=31401&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Unix/scripts/help.sh (original)
+++ trunk/tools/RosBE/RosBE-Unix/scripts/help.sh Sat Dec 22 21:31:04 2007
@@ -14,9 +14,12 @@
 echo " makex [OPTIONS] - Same as 'make' but automatically determines the"
 echo "                   number of CPUs in the system and uses -j with"
 echo "                   the appropriate number."
+echo " basedir         - Switch back to the ReactOS source directory."
 echo " clean           - Fully clean the ReactOS source directory."
 echo " help            - Display the available commands."
+echo " scut [OPTIONS]  - List, add, edit, remove, switch and default to"
+echo "                   shortcutted ReactOS source directories."
 echo " version         - Show information about the tool versions."
-echo " basedir         - Switch back to the ReactOS source directory."
+
 echo