From a33a61fca9ec0c1c103b2fd274ee4a0aee6428cc Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Wed, 28 Apr 2021 15:02:00 +0300 Subject: [PATCH] sdk: renamed `setvars.sh` and `setvars.bat` into `setenv.sh` and `setenv.bat` * common.mk, setenv.sh, setenv.bat: renamed `ZXUNOSDK` variable to more general `ZXSDK` as there're no special cases to use specific one for ZX-Uno project --- firmware/firmloader.bat | 2 +- firmware/generaflash_multi.bat | 2 +- firmware/make.bat | 2 +- firmware/scroll/scroll.bat | 2 +- hardware/kartusho/amstrad/manic.bat | 2 +- hardware/kartusho/roms/_make.bat | 2 +- hardware/kartusho/snapshots/makev4.bat | 2 +- hardware/kartusho/snapshots/makevROM.bat | 2 +- modflash/addcores.bat | 2 +- modflash/addroms.bat | 2 +- sdk/README.md | 14 +++++++------- sdk/common.mk | 10 +++++----- sdk/{setvars.bat => setenv.bat} | 10 +++++----- sdk/{setvars.sh => setenv.sh} | 10 +++++----- 14 files changed, 32 insertions(+), 32 deletions(-) rename sdk/{setvars.bat => setenv.bat} (50%) rename sdk/{setvars.sh => setenv.sh} (65%) diff --git a/firmware/firmloader.bat b/firmware/firmloader.bat index 4717545..6bafc0d 100644 --- a/firmware/firmloader.bat +++ b/firmware/firmloader.bat @@ -1,4 +1,4 @@ -@call ..\sdk\setvars.bat +@call ..\sdk\setenv.bat sjasmplus firmware.asm zx7b firmware_strings.rom firmware.rom.zx7b sjasmplus bootloader.asm diff --git a/firmware/generaflash_multi.bat b/firmware/generaflash_multi.bat index 20b9360..259070d 100644 --- a/firmware/generaflash_multi.bat +++ b/firmware/generaflash_multi.bat @@ -1,4 +1,4 @@ -@call ..\sdk\setvars.bat +@call ..\sdk\setenv.bat set output=\Google Drive\Proyecto ZX-Uno\cores_%2\ echo define version %1 > version.asm call make.bat diff --git a/firmware/make.bat b/firmware/make.bat index 0c170c6..c793054 100644 --- a/firmware/make.bat +++ b/firmware/make.bat @@ -1,4 +1,4 @@ -@call ..\sdk\setvars.bat +@call ..\sdk\setenv.bat echo define version 1 > version.asm sjasmplus firmware.asm fcut firmware_strings.rom 7e00 -7e00 strings.bin diff --git a/firmware/scroll/scroll.bat b/firmware/scroll/scroll.bat index 2540a9e..27fe7b4 100644 --- a/firmware/scroll/scroll.bat +++ b/firmware/scroll/scroll.bat @@ -1,4 +1,4 @@ -@call ..\..\sdk\setvars.bat +@call ..\..\sdk\setenv.bat FuenteABin Png2Rcs fondo.png fondo.rcs -a fondo.atr sjasmplus scroll.asm diff --git a/hardware/kartusho/amstrad/manic.bat b/hardware/kartusho/amstrad/manic.bat index b392bbd..2394d9e 100644 --- a/hardware/kartusho/amstrad/manic.bat +++ b/hardware/kartusho/amstrad/manic.bat @@ -1,4 +1,4 @@ -@call ..\..\..\sdk\setvars.bat +@call ..\..\..\sdk\setenv.bat rem 51F0-A4FF ep 6e3f rem b900-bf7f fcut Manic.sna 52F0 4a30 Manic.bin diff --git a/hardware/kartusho/roms/_make.bat b/hardware/kartusho/roms/_make.bat index ff65177..db09fac 100644 --- a/hardware/kartusho/roms/_make.bat +++ b/hardware/kartusho/roms/_make.bat @@ -1,4 +1,4 @@ -@call ..\..\..\sdk\setvars.bat +@call ..\..\..\sdk\setenv.bat genMenu rcs screen.scr screen.rcs fcut screen.rcs 0 1800 screen.cut diff --git a/hardware/kartusho/snapshots/makev4.bat b/hardware/kartusho/snapshots/makev4.bat index 8a27b0f..64b3b86 100644 --- a/hardware/kartusho/snapshots/makev4.bat +++ b/hardware/kartusho/snapshots/makev4.bat @@ -1,4 +1,4 @@ -@call ..\..\..\sdk\setvars.bat +@call ..\..\..\sdk\setenv.bat genMenu 1 rcs screen.scr screen.rcs fcut screen.rcs 0 1000 screen.cut diff --git a/hardware/kartusho/snapshots/makevROM.bat b/hardware/kartusho/snapshots/makevROM.bat index b759207..cbde3e1 100644 --- a/hardware/kartusho/snapshots/makevROM.bat +++ b/hardware/kartusho/snapshots/makevROM.bat @@ -1,4 +1,4 @@ -@call ..\..\..\sdk\setvars.bat +@call ..\..\..\sdk\setenv.bat genMenu 0 rcs screen.scr screen.rcs fcut screen.rcs 0 1000 screen.cut diff --git a/modflash/addcores.bat b/modflash/addcores.bat index 0cf2fb0..06df1e6 100644 --- a/modflash/addcores.bat +++ b/modflash/addcores.bat @@ -5,7 +5,7 @@ rem SPDX-FileNotice: Based on code by Antonio Villena <_@antoniovillena.es> rem rem SPDX-License-Identifier: GPL-3.0-or-later -call ..\sdk\setvars.bat +call ..\sdk\setenv.bat set /a i=2 for /f "eol=# tokens=1,2,3 delims=;" %%a in (cores.txt) do call :AddCore %%a %%b %%c diff --git a/modflash/addroms.bat b/modflash/addroms.bat index 62f5835..0850c5c 100644 --- a/modflash/addroms.bat +++ b/modflash/addroms.bat @@ -5,7 +5,7 @@ rem SPDX-FileNotice: Based on code by Antonio Villena <_@antoniovillena.es> rem rem SPDX-License-Identifier: GPL-3.0-or-later -call ..\sdk\setvars.bat +call ..\sdk\setenv.bat set /a i=0 for /f "eol=# tokens=1,2,3 delims=;" %%a in (roms.txt) do call :AddROM %%a %%b %%c diff --git a/sdk/README.md b/sdk/README.md index 14216d5..a34c95c 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -135,23 +135,23 @@ include ../sdk/common.mk Remember to specify correct relative path to it. -This will set `ZXUNOSDK` environment variable (on first inclusion only) and update your `PATH` environment variable to point to SDK's tools. +This will set `ZXSDK` environment variable (on first inclusion only) and update your `PATH` environment variable to point to SDK's tools. These changes are actual for current invocation of `make` utility and all child processes. ### 2.4.2. In Bash scripts Bash scripts are supposed to be invoked from Makefiles where the correct environment is already prepared by `make` utility so nothing must be done for such scripts. -In other cases you must source `setvars.sh` file in a Bash script like this: +In other cases you must source `setenv.sh` file in a Bash script like this: ```bash -source ../sdk/setvars.sh +source ../sdk/setenv.sh ``` or ```bash -. ../sdk/setvars.sh +. ../sdk/setenv.sh ``` Remember to specify correct relative path to it. @@ -247,15 +247,15 @@ You should manually download precompiled binaries of SJAsmPlus and Z88DK from In ## 4.2. In batch scripts -To use these tools in a batch script just call `setvars.bat` file at the beginning of one like this: +To use these tools in a batch script just call `setenv.bat` file at the beginning of one like this: ```batch -call ..\sdk\setvars.bat +call ..\sdk\setenv.bat ``` Remember to specify correct relative path to it. -This will set `ZXUNOSDK` environment variable (on first call only) and update your `PATH` environment variable to point to SDK's tools. +This will set `ZXSDK` environment variable (on first call only) and update your `PATH` environment variable to point to SDK's tools. These changes are actual for current invocation of command shell and all child processes. # References diff --git a/sdk/common.mk b/sdk/common.mk index c1ea14b..d54157a 100644 --- a/sdk/common.mk +++ b/sdk/common.mk @@ -8,12 +8,12 @@ # * GNU on Linux, FreeBSD etc. # * GNU on Windows NT (using MinGW/MSYS/Cygwin/WSL) -ifndef ZXUNOSDK +ifndef ZXSDK -ZXUNOSDK := $(patsubst %/,%,$(abspath $(dir $(lastword $(MAKEFILE_LIST))))) -Z88DK := $(ZXUNOSDK)/src/z88dk +ZXSDK := $(patsubst %/,%,$(abspath $(dir $(lastword $(MAKEFILE_LIST))))) +Z88DK := $(ZXSDK)/src/z88dk ZCCCFG := $(Z88DK)/lib/config -PATH := $(ZXUNOSDK)/bin:$(Z88DK)/bin:$(PATH) +PATH := $(ZXSDK)/bin:$(Z88DK)/bin:$(PATH) # Fix paths under Cygwin for z88dk on Windows ifeq ($(OS),Windows_NT) @@ -22,7 +22,7 @@ ZCCCFG := $(shell cygpath -m $(ZCCCFG)) endif endif -export ZXUNOSDK +export ZXSDK export ZCCCFG export PATH diff --git a/sdk/setvars.bat b/sdk/setenv.bat similarity index 50% rename from sdk/setvars.bat rename to sdk/setenv.bat index be3b30a..078d380 100644 --- a/sdk/setvars.bat +++ b/sdk/setenv.bat @@ -3,9 +3,9 @@ rem SPDX-FileCopyrightText: 2021 Ivan Tatarinov rem rem SPDX-License-Identifier: GPL-3.0-or-later -if not x%ZXUNOSDK% == x exit /b -set ZXUNOSDK=%~dp0 -set ZXUNOSDK=%ZXUNOSDK:~0,-1% -set Z88DK=%ZXUNOSDK%\src\z88dk +if not x%ZXSDK% == x exit /b +set ZXSDK=%~dp0 +set ZXSDK=%ZXSDK:~0,-1% +set Z88DK=%ZXSDK%\src\z88dk set ZCCCFG=%Z88DK%\lib\config -set PATH=%ZXUNOSDK%\bin;%Z88DK%\bin;%PATH% +set PATH=%ZXSDK%\bin;%Z88DK%\bin;%PATH% diff --git a/sdk/setvars.sh b/sdk/setenv.sh similarity index 65% rename from sdk/setvars.sh rename to sdk/setenv.sh index ab5831b..82e0237 100644 --- a/sdk/setvars.sh +++ b/sdk/setenv.sh @@ -3,15 +3,15 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -if [[ "x$ZXUNOSDK" == x ]]; then - ZXUNOSDK=$(dirname $(realpath "$BASH_SOURCE")) - Z88DK=$ZXUNOSDK/src/z88dk +if [[ "x$ZXSDK" == x ]]; then + ZXSDK=$(dirname $(realpath "$BASH_SOURCE")) + Z88DK=$ZXSDK/src/z88dk ZCCCFG=$Z88DK/lib/config - PATH=$ZXUNOSDK/bin:$Z88DK/bin:$PATH + PATH=$ZXSDK/bin:$Z88DK/bin:$PATH # Fix paths under Cygwin for z88dk on Windows if [[ x$OS == xWindows_NT && x$OSTYPE == xcygwin ]]; then ZCCCFG=`cygpath -m $ZCCCFG` fi - export ZXUNOSDK + export ZXSDK export ZCCCFG fi