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

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

Revision: 1090
          http://tinyos8051wg.svn.sourceforge.net/tinyos8051wg/?rev=1090&view=rev
Author:   mleopold
Date:     2009-09-26 23:10:33 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
Fix IAR paths

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

Modified: trunk/diku/mcs51/doc/ChangeLog
===================================================================
--- trunk/diku/mcs51/doc/ChangeLog	2009-09-26 20:16:06 UTC (rev 1089)
+++ trunk/diku/mcs51/doc/ChangeLog	2009-09-26 23:10:33 UTC (rev 1090)
@@ -4,6 +4,10 @@
    * fake string.h to handle both Keil, IAR and SDCC varriants
    * leftover comment-in comment in mangleAppC.pl caused havock
    * produce propper interrupt definitions
+   * fixed a bug in constructing the IAR path in the Makefile
+   * updated to project file for IAR Workbench 7 or later depricating prior versions
+ * SDCC support updated
+   * Memory setup was incomplete
  * mangleAppC.pl support MacOS X
  * Baud setting now possible on commandline using
    make baud,B9600 cc2430em

Modified: trunk/diku/mcs51/support/make/mcs51/mcs51.rules
===================================================================
--- trunk/diku/mcs51/support/make/mcs51/mcs51.rules	2009-09-26 20:16:06 UTC (rev 1089)
+++ trunk/diku/mcs51/support/make/mcs51/mcs51.rules	2009-09-26 23:10:33 UTC (rev 1090)
@@ -72,7 +72,7 @@
 ifeq ($(findstring CYGWIN,$(OSNAME)),CYGWIN)
 	MCS51_IAR_PATH:=/cygdrive/c/$(MCS51_IAR_PATH)
 else
-	MCS51_IAR_PATH:=C:$(MCS51_IAR_PATH)
+	MCS51_IAR_PATH:=$(MCS51_IAR_PATH)
 	ifndef MCS51_WINE_IAR_PATH
 	       MCS51_WINE_IAR_PATH := $(HOME)/.wine.iar
 	endif
@@ -126,7 +126,7 @@
 
 iar: mangle builddir
 	cp $(MCS51_MAKE_PATH)/mcs51/iar* $(BUILDDIR)
-	cd $(BUILDDIR) && $(MCS51_WINE_IAR) "$(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
@@ -155,7 +155,7 @@
 # Build to .hex using $(MCS51_KEIL_SCRIPT) from
 
 keil: mangle $(BUILDDIR)/startup.OBJ $(BUILDDIR)/$(KEIL_BAT_SCRIPT)
-	cd $(BUILDDIR) $(OSTYPE) &&   $(MCS51_WINE_KEIL) ./$(MCS51_KEIL_SCRIPT)
+	cd $(BUILDDIR) $(OSTYPE) && $(MCS51_WINE_KEIL) ./$(MCS51_KEIL_SCRIPT)
 	@bash -c "if [ -f $(COMPONENT).s ]; then mv $(COMPONENT).s build/$(PLATFORM)/; fi"
 	@echo "    compiled $(COMPONENT) to a $(PLATFORM) binary"
 	@echo "Code size of app.o"

Modified: trunk/diku/mcs51/support/make/mcs51/mcs51_env_check.sh
===================================================================
--- trunk/diku/mcs51/support/make/mcs51/mcs51_env_check.sh	2009-09-26 20:16:06 UTC (rev 1089)
+++ trunk/diku/mcs51/support/make/mcs51/mcs51_env_check.sh	2009-09-26 23:10:33 UTC (rev 1090)
@@ -44,6 +44,24 @@
     fi
 fi
 
+if [ "$MC" = "sdcc" ]; 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
@@ -68,9 +86,7 @@
     echo "Compiler not found not found ($CP)."
     RETURN=1
 else
-    if [ ! "$VERBOSE" -eq 0 ]; then
-	echo "Keil found ($CP)."
-    fi
+    echo "Compiler check OK ($CP)."
 fi
 
 


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