changeset 3185:4d6cfe82ac3c

Add an underscore between each section of disk image names This makes reading the names much easier. Applies to all ports.
author Bill Pierce <merlinious999@gmail.com>
date Fri, 02 Jun 2017 08:58:17 +0200
parents cbf1ad3c46b1
children 7c917d36ea68
files level1/atari/makefile level1/coco1/makefile level1/corsham/makefile level1/d64/makefile level1/dalpha/makefile level1/mc09/makefile level2/coco3/makefile level2/coco3fpga/makefile level2/mc09l2/makefile level3/coco3/makefile
diffstat 10 files changed, 41 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/level1/atari/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level1/atari/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -4,9 +4,9 @@
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 BOOTFILE	= bootfiles/bootfile
 DIRS		= cmds modules defs sys bootfiles wwwroot
 
--- a/level1/coco1/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level1/coco1/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -4,9 +4,9 @@
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 BOOTFILE_COVDG	= bootfiles/bootfile_covdg
 BOOTFILE_COHR	= bootfiles/bootfile_cohr
 BOOTFILE_CO42	= bootfiles/bootfile_co42
@@ -51,25 +51,25 @@
 STARTUP_DW	= startup.dw
 
 DSKDW           = $(DISTROVER)_dw.dsk
-LDSKDW          = $(DISTRONAME)$(PORT)_dw.dsk
+LDSKDW          = $(DISTRONAME)_$(PORT)_dw.dsk
 DSKDWHEADLESS   = $(DISTROVER)_dw_headless.dsk
-LDSKDWHEADLESS  = $(DISTRONAME)$(PORT)_dw_headless.dsk
+LDSKDWHEADLESS  = $(DISTRONAME)_$(PORT)_dw_headless.dsk
 DSK360K_1       = $(DISTROVER)_40d_1.dsk
-LDSK360K_1      = $(DISTRONAME)$(PORT)_40d_1.dsk
+LDSK360K_1      = $(DISTRONAME)_$(PORT)_40d_1.dsk
 DSK360K_2       = $(DISTROVER)_40d_2.dsk
-LDSK360K_2      = $(DISTRONAME)$(PORT)_40d_2.dsk
+LDSK360K_2      = $(DISTRONAME)_$(PORT)_40d_2.dsk
 DSK720K         = $(DISTROVER)_80d.dsk
-LDSK720K        = $(DISTRONAME)$(PORT)_80d.dsk
+LDSK720K        = $(DISTRONAME)_$(PORT)_80d.dsk
 DSKBECKER	= $(DISTROVER)_becker.dsk
-LDSKBECKER	= $(DISTRONAME)$(PORT)_becker.dsk
+LDSKBECKER	= $(DISTRONAME)_$(PORT)_becker.dsk
 DSKBECKERHEADLESS	= $(DISTROVER)_becker_headless.dsk
-LDSKBECKERHEADLESS	= $(DISTRONAME)$(PORT)_becker_headless.dsk
+LDSKBECKERHEADLESS	= $(DISTRONAME)_$(PORT)_becker_headless.dsk
 DSKARDUINO	= $(DISTROVER)_arduino.dsk
-LDSKARDUINO	= $(DISTRONAME)$(PORT)_arduino.dsk
+LDSKARDUINO	= $(DISTRONAME)_$(PORT)_arduino.dsk
 DSKARDUINOHEADLESS	= $(DISTROVER)_arduino_headless.dsk
-LDSKARDUINOHEADLESS	= $(DISTRONAME)$(PORT)_arduino_headless.dsk
+LDSKARDUINOHEADLESS	= $(DISTRONAME)_$(PORT)_arduino_headless.dsk
 DSKCOCOSDC	= $(DISTROVER)_cocosdc.dsk
-LDSKCOCOSDC	= $(DISTRONAME)$(PORT)_cocosdc.dsk
+LDSKCOCOSDC	= $(DISTRONAME)_$(PORT)_cocosdc.dsk
 
 DSKS		= $(DSKDW) $(DSKDWHEADLESS) $(DSKBECKER) $(DSKBECKERHEADLESS) \
 		$(DSKARDUINO) $(DSKARDUINOHEADLESS) $(DSK360K_1) $(DSK360K_2) \
--- a/level1/corsham/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level1/corsham/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -4,9 +4,9 @@
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 BOOTFILE	= bootfiles/bootfile
 DIRS		= cmds modules defs sys bootfiles
 
--- a/level1/d64/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level1/d64/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -52,9 +52,9 @@
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 
 BOOTFILE_COVDG		= bootfiles/bootfile_covdg_ds40
 BOOTFILE_COHR		= bootfiles/bootfile_cohr_ds40
--- a/level1/dalpha/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level1/dalpha/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -52,9 +52,9 @@
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 
 BOOTFILE_COVDG		= bootfiles/bootfile_covdg_ss80
 BOOTFILE_COHR		= bootfiles/bootfile_cohr_ss80
--- a/level1/mc09/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level1/mc09/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -4,9 +4,9 @@
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 # The BOOTFILE is for 80D (720K) virtual drive on SD, 50Hz timer interrupt
 BOOTFILE_MC09SD	= bootfiles/bootfile_mc09sd
 KERNELFILE	= bootfiles/kernel_mc09sd
@@ -32,7 +32,7 @@
 STARTUP_DW	= startup.dw
 
 DSK720K         = $(DISTROVER)_80d.dsk
-LDSK720K        = $(DISTRONAME)$(PORT)_80d.dsk
+LDSK720K        = $(DISTRONAME)_$(PORT)_80d.dsk
 
 DSKS		= $(DSK720K)
 LDSKS		= $(LDSK720K)
--- a/level2/coco3/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level2/coco3/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -1,8 +1,8 @@
 include port.mak
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 BOOTFILE_DW	= bootfiles/bootfile_dw
 BOOTFILE_BECKER	= bootfiles/bootfile_becker
 BOOTFILE_ARDUINO	= bootfiles/bootfile_arduino
--- a/level2/coco3fpga/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level2/coco3fpga/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -5,9 +5,9 @@
 #WHICHSHELL	= shellplus
 #WHICHSHELL	= shell_21
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 BOOTFILE_COCO3FPGA = bootfiles/bootfile_coco3fpga
 BOOTFILE_COCO3FPGA_SD = bootfiles/bootfile_coco3fpga_sd
 BOOTFILE_COCO3FPGA_SD_RTC = bootfiles/bootfile_coco3fpga_sd_rtc
--- a/level2/mc09l2/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level2/mc09l2/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -1,8 +1,8 @@
 include port.mak
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 # Big BOOTFILE for 80D (720K) virtual drive on SD, 50Hz timer interrupt, extra modules and commands
 BOOTFILE_MC09SDXL = bootfiles/bootfile_mc09sdxl
 # The BOOTFILE is for 80D (720K) virtual drive on SD, 50Hz timer interrupt
--- a/level3/coco3/makefile	Thu Jun 01 23:28:44 2017 +0200
+++ b/level3/coco3/makefile	Fri Jun 02 08:58:17 2017 +0200
@@ -1,8 +1,8 @@
 include port.mak
 
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+DISTRO		= $(CPU)_L$(LEVEL)
+DISTRONAME	= NOS9_$(CPU)_L$(LEVEL)
+DISTROVER	= $(DISTRONAME)_$(NITROS9VER)_$(PORT)
 BOOTFILE_DW	= bootfiles/bootfile_dw
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d