update scripts for the new file locations

tenbaht · tenbaht · commit 9216817db74e · 2019-01-14T13:49:15.000+01:00
diff --git a/board-manager/Makefile.core b/board-manager/Makefile.core
@@ -18,7 +18,7 @@ COREDIR?=release/v$(COREVERSION)
 PARTSDIR?=parts
 
 # subtree of the repository to be included in the archive
-SUBTREE=sduino/hardware/sduino/stm8
+SUBTREE=sduino/stm8
 
 #
 ### No user serviceable part below here. ################################
diff --git a/board-manager/Makefile.tools b/board-manager/Makefile.tools
@@ -14,7 +14,7 @@ endif
 
 
 # Where to find the tools directory
-BASEDIR=../sduino/hardware/sduino
+BASEDIR=../sduino
 
 # Ignore all files matching one of these shell patterns:
 IGNORE=*~ *bak x build-* *.orig *.rej
diff --git a/board-manager/gen_platform_entry.sh b/board-manager/gen_platform_entry.sh
@@ -49,7 +49,7 @@ list_boards()
 {
 	echo -n "    \"boards\": ["
 	n=0
-	sed -n "s/.*\.name=//p" ../sduino/hardware/sduino/stm8/boards.txt |\
+	sed -n "s/.*\.name=//p" ../sduino/stm8/boards.txt |\
 	while read line; do
 		if [ $n -ne 0 ]; then echo -n ","; fi
 		echo
diff --git a/sduino/stm8/sduino.mk b/sduino/stm8/sduino.mk
@@ -1,10 +1,6 @@
 
 MCU_FLAG_NAME	= mstm8 -D
 
-#ALTERNATE_CORE    = sduino
-#ARDUINO_VAR_PATH  = ../../sduino
-#ARDUINO_CORE_PATH = ../../sduino
-
 
 all:
 
@@ -63,17 +59,19 @@ endif
 ifeq ($(OS),Windows_NT)
     ifndef SDCC_PATH
         # for Windows always assume the tools to be in this dir tree
-        SDCC_PATH := $(ARDUINO_DIR)/hardware/sduino/tools/sdcc/bin
+        SDCC_PATH := $(ARDUINO_DIR)/../tools/sdcc/bin
+	AVR_TOOLS_DIR = $(ARDUINO_DIR)/../tools/sdcc
     endif
-    SHELL := $(ARDUINO_DIR)/hardware/sduino/tools/win/busybox.exe
+    SHELL := $(ARDUINO_DIR)/../tools/win/busybox.exe
     .SHELLFLAGS=ash -c
-    SIZE := $(ARDUINO_DIR)/hardware/sduino/tools/wrapper/sdsize.sh
-#    PATH  := $(realpath $(ARDUINO_DIR)/hardware/sduino/tools/win):$(PATH)
+    SIZE := $(ARDUINO_DIR)/../tools/wrapper/sdsize.sh
+#    PATH  := $(realpath $(ARDUINO_DIR)/../tools/win):$(PATH)
 else
     # Linux (and Mac): expect SDCC to be in /opt/sdcc
     ifndef SDCC_PATH
         # for Windows always assume the tools to be in this dir tree
         SDCC_PATH := /opt/sdcc/bin
+	AVR_TOOLS_DIR = /opt/sdcc
     endif
 endif
 
@@ -85,15 +83,21 @@ OVERRIDE_EXECUTABLES=yes
     SIZE    ?= /usr/bin/size
 
 
+# avoid using the regular paths starting at $(ARDUINO_DIR)/hardware/$(VENDOR)
+# as our makefile is now part of the core archive
+ARDUINO_VERSION = 186
+ALTERNATE_CORE    = sduino
+ALTERNATE_CORE_PATH = $(ARDUINO_DIR)
+
 ARDUINO_SKETCHBOOK	= /tmp	# temporarly, to prevent usage of the real libs
 ARDMK_VENDOR	= sduino
 ARCHITECTURE	= stm8
 CPPFLAGS	+= -Ddouble=float -DUSE_STDINT \
-	-I. -I$(ARDUINO_DIR)/hardware/sduino/stm8/STM8S_StdPeriph_Driver/inc \
+	-I. -I$(ARDUINO_DIR)/STM8S_StdPeriph_Driver/inc \
 	-I/opt/sdcc/share/sdcc/include/
 #CFLAGS		= -I ../STM8S_StdPeriph_Driver/inc
 #LDFLAGS		= --out-fmt-elf 
-LDFLAGS		+= -L $(ARDUINO_DIR)/hardware/sduino/stm8/STM8S_StdPeriph_Driver/lib -L/opt/sdcc/share/sdcc/lib/stm8
+LDFLAGS		+= -L $(ARDUINO_DIR)/STM8S_StdPeriph_Driver/lib -L/opt/sdcc/share/sdcc/lib/stm8
 
 
 
diff --git a/test/make-test.sh b/test/make-test.sh
@@ -3,7 +3,7 @@
 CURDIR=$(pwd)
 SRCREV=$(git describe --tags --match="v*" --dirty)
 LOGFILE=${CURDIR}/logs/test-${SRCREV}.log
-BASEDIR=../sduino/hardware/sduino/stm8/libraries/
+BASEDIR=../sduino/stm8/libraries/
 
 # count the number of CPUs and use them for parallel compiling
 THREADS=$(grep processor  /proc/cpuinfo |wc -l)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ COREDIR?=release/v$(COREVERSION)`
`18`	`18`	`PARTSDIR?=parts`
`19`	`19`
`20`	`20`	`# subtree of the repository to be included in the archive`
`21`		`-SUBTREE=sduino/hardware/sduino/stm8`
	`21`	`+SUBTREE=sduino/stm8`
`22`	`22`
`23`	`23`	`#`
`24`	`24`	`### No user serviceable part below here. ################################`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ list_boards()`
`49`	`49`	`{`
`50`	`50`	`echo -n " \"boards\": ["`
`51`	`51`	`n=0`
`52`		`- sed -n "s/.*\.name=//p" ../sduino/hardware/sduino/stm8/boards.txt \|\`
	`52`	`+ sed -n "s/.*\.name=//p" ../sduino/stm8/boards.txt \|\`
`53`	`53`	`while read line; do`
`54`	`54`	`if [ $n -ne 0 ]; then echo -n ","; fi`
`55`	`55`	`echo`