From 3593a7fabd17dbd056dd98a79f58b0c6c9a89d33 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 6 Jul 2021 19:50:50 -0700 Subject: [PATCH] Filename Case Problems In order to get the Linux/Mac and Windows builds to result in a binary identical result, I have changed the case of some filenames. Windows and Linux handle directory sorting differently for upper/lower case in filenames. --- Source/Apps/Build.cmd | 16 ++++++++-------- Source/Apps/FAT/Build.cmd | 2 +- Source/Apps/FAT/Makefile | 4 ++-- Source/Apps/FAT/{FAT.com => fat.com} | Bin Source/Apps/FDU/Build.cmd | 6 +++--- Source/Apps/FDU/Makefile | 4 ++-- Source/Apps/FDU/{FDU.asm => fdu.asm} | 0 Source/Apps/FDU/{FDU.txt => fdu.txt} | 0 Source/Apps/MBC/{LEDs2.asm => leds2.asm} | 0 Source/Apps/Makefile | 8 ++++---- Source/Apps/Tune/Build.cmd | 8 ++++---- Source/Apps/Tune/Makefile | 16 ++++++++-------- Source/Apps/Tune/{Tune.asm => tune.asm} | 0 Source/Apps/{Assign.asm => assign.asm} | 0 Source/Apps/{Decode.asm => decode.asm} | 0 Source/Apps/{Encode.asm => encode.asm} | 0 Source/Apps/{Format.asm => format.asm} | 0 Source/Apps/{IntTest.asm => inttest.asm} | 0 Source/Apps/{Mode.asm => mode.asm} | 0 Source/Apps/{RTC.asm => rtc.asm} | 0 Source/Apps/{RTCds7.asm => rtcds7.asm} | 0 Source/Apps/{RTChb.asm => rtchb.asm} | 0 Source/Apps/{Startup.asm => startup.asm} | 0 Source/Apps/{Survey.asm => survey.asm} | 0 Source/Apps/{SysCopy.asm => syscopy.asm} | 0 Source/Apps/{SysGen.z80 => sysgen.z80} | 0 Source/Apps/{Talk.asm => talk.asm} | 0 Source/Apps/{Timer.asm => timer.asm} | 0 28 files changed, 32 insertions(+), 32 deletions(-) rename Source/Apps/FAT/{FAT.com => fat.com} (100%) rename Source/Apps/FDU/{FDU.asm => fdu.asm} (100%) rename Source/Apps/FDU/{FDU.txt => fdu.txt} (100%) rename Source/Apps/MBC/{LEDs2.asm => leds2.asm} (100%) rename Source/Apps/Tune/{Tune.asm => tune.asm} (100%) rename Source/Apps/{Assign.asm => assign.asm} (100%) rename Source/Apps/{Decode.asm => decode.asm} (100%) rename Source/Apps/{Encode.asm => encode.asm} (100%) rename Source/Apps/{Format.asm => format.asm} (100%) rename Source/Apps/{IntTest.asm => inttest.asm} (100%) rename Source/Apps/{Mode.asm => mode.asm} (100%) rename Source/Apps/{RTC.asm => rtc.asm} (100%) rename Source/Apps/{RTCds7.asm => rtcds7.asm} (100%) rename Source/Apps/{RTChb.asm => rtchb.asm} (100%) rename Source/Apps/{Startup.asm => startup.asm} (100%) rename Source/Apps/{Survey.asm => survey.asm} (100%) rename Source/Apps/{SysCopy.asm => syscopy.asm} (100%) rename Source/Apps/{SysGen.z80 => sysgen.z80} (100%) rename Source/Apps/{Talk.asm => talk.asm} (100%) rename Source/Apps/{Timer.asm => timer.asm} (100%) diff --git a/Source/Apps/Build.cmd b/Source/Apps/Build.cmd index fbfc5073..ac3ed35c 100644 --- a/Source/Apps/Build.cmd +++ b/Source/Apps/Build.cmd @@ -12,14 +12,14 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -call :asm SysCopy || goto :eof -call :asm Assign || goto :eof -call :asm Format || goto :eof -call :asm Talk || goto :eof -call :asm Mode || goto :eof -call :asm RTC || goto :eof -call :asm Timer || goto :eof -call :asm180 IntTest || goto :eof +call :asm syscopy || goto :eof +call :asm assign || goto :eof +call :asm format || goto :eof +call :asm talk || goto :eof +call :asm mode || goto :eof +call :asm rtc || goto :eof +call :asm timer || goto :eof +call :asm180 inttest || goto :eof call :asm rtcds7 || goto :eof call :asm rtchb || goto :eof call :asm ppidetst || goto :eof diff --git a/Source/Apps/FAT/Build.cmd b/Source/Apps/FAT/Build.cmd index 34e25577..d4e7878d 100644 --- a/Source/Apps/FAT/Build.cmd +++ b/Source/Apps/FAT/Build.cmd @@ -4,4 +4,4 @@ setlocal REM FAT.com is currently distributed as a binary application, so REM it is not built here. -copy /Y FAT.com ..\..\..\Binary\Apps\ +copy /Y fat.com ..\..\..\Binary\Apps\ diff --git a/Source/Apps/FAT/Makefile b/Source/Apps/FAT/Makefile index 245385f2..2aef1f19 100644 --- a/Source/Apps/FAT/Makefile +++ b/Source/Apps/FAT/Makefile @@ -1,5 +1,5 @@ -OBJECTS = FAT.com -NODELETE = FAT.com +OBJECTS = fat.com +NODELETE = fat.com DEST = ../../../Binary/Apps TOOLS=../../../Tools diff --git a/Source/Apps/FAT/FAT.com b/Source/Apps/FAT/fat.com similarity index 100% rename from Source/Apps/FAT/FAT.com rename to Source/Apps/FAT/fat.com diff --git a/Source/Apps/FDU/Build.cmd b/Source/Apps/FDU/Build.cmd index a7b9b9dd..414b1e49 100644 --- a/Source/Apps/FDU/Build.cmd +++ b/Source/Apps/FDU/Build.cmd @@ -5,9 +5,9 @@ set TOOLS=../../../Tools set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -t80 -b -fFF FDU.asm FDU.com FDU.lst +tasm -t80 -b -fFF fdu.asm fdu.com fdu.lst if errorlevel 1 goto :eof -copy /Y FDU.com ..\..\..\Binary\Apps\ -copy /Y FDU.txt ..\..\..\Doc\ \ No newline at end of file +copy /Y fdu.com ..\..\..\Binary\Apps\ +copy /Y fdu.txt ..\..\..\Doc\ \ No newline at end of file diff --git a/Source/Apps/FDU/Makefile b/Source/Apps/FDU/Makefile index ade7444a..caeb2ea3 100644 --- a/Source/Apps/FDU/Makefile +++ b/Source/Apps/FDU/Makefile @@ -1,5 +1,5 @@ -OBJECTS = FDU.com -DOCS = FDU.txt +OBJECTS = fdu.com +DOCS = fdu.txt DEST = ../../../Binary/Apps DOCDEST = ../../../Doc TOOLS = ../../../Tools diff --git a/Source/Apps/FDU/FDU.asm b/Source/Apps/FDU/fdu.asm similarity index 100% rename from Source/Apps/FDU/FDU.asm rename to Source/Apps/FDU/fdu.asm diff --git a/Source/Apps/FDU/FDU.txt b/Source/Apps/FDU/fdu.txt similarity index 100% rename from Source/Apps/FDU/FDU.txt rename to Source/Apps/FDU/fdu.txt diff --git a/Source/Apps/MBC/LEDs2.asm b/Source/Apps/MBC/leds2.asm similarity index 100% rename from Source/Apps/MBC/LEDs2.asm rename to Source/Apps/MBC/leds2.asm diff --git a/Source/Apps/Makefile b/Source/Apps/Makefile index dd0ae956..88caf898 100644 --- a/Source/Apps/Makefile +++ b/Source/Apps/Makefile @@ -1,6 +1,6 @@ -OBJECTS = SysGen.com Survey.com \ - SysCopy.com Assign.com Format.com Talk.com Mode.com RTC.com \ - Timer.com IntTest.com RTCds7.com RTChb.com +OBJECTS = sysgen.com survey.com \ + syscopy.com assign.com format.com talk.com mode.com rtc.com \ + timer.com inttest.com rtcds7.com rtchb.com ppidetst.com tstdskng.com OTHERS = *.hex *.com SUBDIRS = XM FDU FAT Tune DEST = ../../Binary/Apps @@ -10,5 +10,5 @@ include $(TOOLS)/Makefile.inc USETASM = 1 -Survey.com: USETASM=0 +survey.com: USETASM=0 diff --git a/Source/Apps/Tune/Build.cmd b/Source/Apps/Tune/Build.cmd index 82fa4c33..98901a70 100644 --- a/Source/Apps/Tune/Build.cmd +++ b/Source/Apps/Tune/Build.cmd @@ -5,11 +5,11 @@ set TOOLS=../../../Tools set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -t180 -g3 -fFF -dWBW Tune.asm Tune.com Tune.lst -tasm -t180 -g3 -fFF -dZX Tune.asm Tunezx.com Tunezx.lst -tasm -t180 -g3 -fFF -dMSX Tune.asm Tunemsx.com Tunemsx.lst +tasm -t180 -g3 -fFF -dWBW tune.asm tune.com tune.lst +tasm -t180 -g3 -fFF -dZX tune.asm tunezx.com tunezx.lst +tasm -t180 -g3 -fFF -dMSX tune.asm tunemsx.com tunemsx.lst if errorlevel 1 goto :eof -copy /Y Tune*.com ..\..\..\Binary\Apps\ +copy /Y tune*.com ..\..\..\Binary\Apps\ copy /Y Tunes\*.* ..\..\..\Binary\Apps\Tunes\ \ No newline at end of file diff --git a/Source/Apps/Tune/Makefile b/Source/Apps/Tune/Makefile index 3f6c8fdb..e01b796e 100644 --- a/Source/Apps/Tune/Makefile +++ b/Source/Apps/Tune/Makefile @@ -1,19 +1,19 @@ -OBJECTS = Tune.com Tunezx.com Tunemsx.com +OBJECTS = tune.com tunezx.com tunemsx.com DEST = ../../../Binary/Apps TOOLS = ../../../Tools include $(TOOLS)/Makefile.inc -DEPS := Tune.asm $(shell find . -name '*.inc') +DEPS := tune.asm $(shell find . -name '*.inc') -Tune.com: $(DEPS) - $(TASM) -dWBW Tune.asm Tune.com Tune.lst +tune.com: $(DEPS) + $(TASM) -dWBW tune.asm tune.com tune.lst -Tunezx.com: $(DEPS) - $(TASM) -dZX Tune.asm Tunezx.com Tunezx.lst +tunezx.com: $(DEPS) + $(TASM) -dZX tune.asm tunezx.com tunezx.lst -Tunemsx.com: $(DEPS) - $(TASM) -dMSX Tune.asm Tunemsx.com Tunemsx.lst +tunemsx.com: $(DEPS) + $(TASM) -dMSX tune.asm tunemsx.com tunemsx.lst all:: mkdir -p $(DEST)/Tunes diff --git a/Source/Apps/Tune/Tune.asm b/Source/Apps/Tune/tune.asm similarity index 100% rename from Source/Apps/Tune/Tune.asm rename to Source/Apps/Tune/tune.asm diff --git a/Source/Apps/Assign.asm b/Source/Apps/assign.asm similarity index 100% rename from Source/Apps/Assign.asm rename to Source/Apps/assign.asm diff --git a/Source/Apps/Decode.asm b/Source/Apps/decode.asm similarity index 100% rename from Source/Apps/Decode.asm rename to Source/Apps/decode.asm diff --git a/Source/Apps/Encode.asm b/Source/Apps/encode.asm similarity index 100% rename from Source/Apps/Encode.asm rename to Source/Apps/encode.asm diff --git a/Source/Apps/Format.asm b/Source/Apps/format.asm similarity index 100% rename from Source/Apps/Format.asm rename to Source/Apps/format.asm diff --git a/Source/Apps/IntTest.asm b/Source/Apps/inttest.asm similarity index 100% rename from Source/Apps/IntTest.asm rename to Source/Apps/inttest.asm diff --git a/Source/Apps/Mode.asm b/Source/Apps/mode.asm similarity index 100% rename from Source/Apps/Mode.asm rename to Source/Apps/mode.asm diff --git a/Source/Apps/RTC.asm b/Source/Apps/rtc.asm similarity index 100% rename from Source/Apps/RTC.asm rename to Source/Apps/rtc.asm diff --git a/Source/Apps/RTCds7.asm b/Source/Apps/rtcds7.asm similarity index 100% rename from Source/Apps/RTCds7.asm rename to Source/Apps/rtcds7.asm diff --git a/Source/Apps/RTChb.asm b/Source/Apps/rtchb.asm similarity index 100% rename from Source/Apps/RTChb.asm rename to Source/Apps/rtchb.asm diff --git a/Source/Apps/Startup.asm b/Source/Apps/startup.asm similarity index 100% rename from Source/Apps/Startup.asm rename to Source/Apps/startup.asm diff --git a/Source/Apps/Survey.asm b/Source/Apps/survey.asm similarity index 100% rename from Source/Apps/Survey.asm rename to Source/Apps/survey.asm diff --git a/Source/Apps/SysCopy.asm b/Source/Apps/syscopy.asm similarity index 100% rename from Source/Apps/SysCopy.asm rename to Source/Apps/syscopy.asm diff --git a/Source/Apps/SysGen.z80 b/Source/Apps/sysgen.z80 similarity index 100% rename from Source/Apps/SysGen.z80 rename to Source/Apps/sysgen.z80 diff --git a/Source/Apps/Talk.asm b/Source/Apps/talk.asm similarity index 100% rename from Source/Apps/Talk.asm rename to Source/Apps/talk.asm diff --git a/Source/Apps/Timer.asm b/Source/Apps/timer.asm similarity index 100% rename from Source/Apps/Timer.asm rename to Source/Apps/timer.asm