[Tinyos8051wg-commit] SF.net SVN: tinyos8051wg:[1091] trunk/diku

[<mle...@us...>]

Revision: 1091
          http://tinyos8051wg.svn.sourceforge.net/tinyos8051wg/?rev=1091&view=rev
Author:   mleopold
Date:     2009-09-27 09:38:20 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
More IAR path cleanup

Modified Paths:
--------------
    trunk/diku/env
    trunk/diku/mcs51/support/make/mcs51/mcs51.rules
    trunk/diku/mcs51/support/make/mcs51/mcs51_env_check.sh

Modified: trunk/diku/env
===================================================================
--- trunk/diku/env	2009-09-26 23:10:33 UTC (rev 1090)
+++ trunk/diku/env	2009-09-27 09:38:20 UTC (rev 1091)
@@ -13,4 +13,4 @@
 export MCS51_WINE_KEIL_PATH=$HOME/.wine.keil
 
 # If using IAR set the path to the executable
-export MCS51_IAR_PATH=Program\ Files/IAR\ Systems/Embedded\ Workbench\ 4.0\ Evaluation\ version/common/bin/
+export MCS51_IAR_PATH=Program\ Files/IAR\ Systems/Embedded\ Workbench\ 5.3\ Evaluation\ version/common/bin/

Modified: trunk/diku/mcs51/support/make/mcs51/mcs51.rules
===================================================================
--- trunk/diku/mcs51/support/make/mcs51/mcs51.rules	2009-09-26 23:10:33 UTC (rev 1090)
+++ trunk/diku/mcs51/support/make/mcs51/mcs51.rules	2009-09-27 09:38:20 UTC (rev 1091)
@@ -126,7 +126,7 @@
 
 iar: mangle builddir
 	cp $(MCS51_MAKE_PATH)/mcs51/iar* $(BUILDDIR)
-	cd $(BUILDDIR) && $(MCS51_WINE_IAR) "C:$(MCS51_IAR_PATH)/iarbuild.exe" iar-app-project.ewp -build Debug
+	cd $(BUILDDIR) && $(MCS51_WINE_IAR) "c:$(MCS51_IAR_PATH)/iarbuild.exe" iar-app-project.ewp -build Debug
 	@grep "SEGMENTS IN ADDRESS ORDER" -B 3 -A 20 $(BUILDDIR)/Debug/List/iar-app-project.map
 	@grep "END OF CROSS REFERENCE" -A 8 $(BUILDDIR)/Debug/List/iar-app-project.map | grep memory 
 	cp $(BUILDDIR)/Debug/Exe/iar-app-project.a51 $(BUILDDIR)/app.hex

Modified: trunk/diku/mcs51/support/make/mcs51/mcs51_env_check.sh
===================================================================
--- trunk/diku/mcs51/support/make/mcs51/mcs51_env_check.sh	2009-09-26 23:10:33 UTC (rev 1090)
+++ trunk/diku/mcs51/support/make/mcs51/mcs51_env_check.sh	2009-09-27 09:38:20 UTC (rev 1091)
@@ -27,7 +27,7 @@
 
 MC=`echo $MCS51_COMPILER | tr "[:upper:]" "[:lower:]"`
 CP=''
-if [ "$MC"=="keil" ]; then
+if [ $MC == "keil" ]; then
     if [ -z $ISCYGWIN ]; then
 	if [ -z "$MCS51_WINE_KEIL_PATH" ]; then
 	    echo "MCS51_WINE_KEIL_PATH not set (using $MCS51_WINE_KEIL_PATH_DEFAULT)"
@@ -40,30 +40,12 @@
 	fi
 	CP=$CP/dosdevices/c:/Keil
     else
-	CP="c:/Keil"
+	CP="c:Keil"
     fi
 fi
 
-if [ "$MC" = "sdcc" ]; then
+if [ $MC = "iar" ]; then
     if [ -z $ISCYGWIN ]; then
-	if [ ! -z "$MCS51_WINE_SDCC_PATH" ]; then
-	    if [ ! "$VERBOSE" -eq 0 ]; then
-		echo "MCS51_WINE_SDCC_PATH=$MCS51_WINE_SDCC_PATH"
-	    fi
-	    CP=$MCS51_WINE_SDCC_PATH
-	else
-	    echo "MCS51_WINE_SDCC_PATH not set (using $MCS51_WINE_SDCC_PATH_DEFAULT)"
-	    CP=$MCS51_WINE_SDCC_PATH_DEFAULT
-	fi
-	CP=$CP/dosdevices/c:/$MCS51_SDCC_PATH
-    else
-	CP=c:/$MCS51_SDCC_PATH
-    fi
-fi
-
-
-if [ "$MC" = "iar" ]; then
-    if [ -z $ISCYGWIN ]; then
 	if [ ! -z "$MCS51_WINE_IAR_PATH" ]; then
 	    if [ ! "$VERBOSE" -eq 0 ]; then
 		echo "MCS51_WINE_IAR_PATH=$MCS51_WINE_IAR_PATH"
@@ -73,9 +55,9 @@
 	    echo "MCS51_WINE_IAR_PATH not set (using $MCS51_WINE_IAR_PATH_DEFAULT)"
 	    CP=$MCS51_WINE_IAR_PATH_DEFAULT
 	fi
-	CP=$CP/dosdevices/c:/$MCS51_IAR_PATH
+	CP=$CP/dosdevices/c\:/$MCS51_IAR_PATH
     else
-	CP=c:/$MCS51_IAR_PATH
+	CP="c:$MCS51_IAR_PATH"
     fi
 fi
 
@@ -89,9 +71,6 @@
     echo "Compiler check OK ($CP)."
 fi
 
-
-
-
 if [ ! "$VERBOSE" -eq 0 ]; then
    if [ ! "$RETURN" -eq "0" ]; then
        echo "Environment check FAILED"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.