Mercurial > hg > Members > kono > nitros9-code
changeset 3098:c2030762022b
makefiles: Remove uploading of zip archives
These zip files are not particularly useful for anyone. People
can download single disk images for their machine.
If they had several flavours for one type of machine they could have
been useful. Instead they have one flavour for many types of machines...
Fix "dsk" targets so disk images get build on "make dsk". They were
built as a side-effect of the zip archives.
https://sourceforge.net/p/nitros9/bugs/24/
| author | Tormod Volden <debian.tormod@gmail.com> |
|---|---|
| date | Sun, 28 Feb 2016 21:37:23 +0100 |
| parents | cbc0e47bafbc |
| children | 61225db57f19 |
| files | level1/atari/makefile level1/coco1/makefile level1/d64/makefile level1/dalpha/makefile level2/coco3/makefile level3/coco3/makefile makefile |
| diffstat | 7 files changed, 20 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/level1/atari/makefile Sun Feb 28 21:37:21 2016 +0100 +++ b/level1/atari/makefile Sun Feb 28 21:37:23 2016 +0100 @@ -18,9 +18,8 @@ DEFS = $(shell $(CD) defs; make --no-print-directory showobjs) STARTUP = startup -PACKAGENAME = $(DISTROVER).zip -DSK = $(DISTROVER).dsk -DSK_DEMO = ataridemo.dsk +DSK = $(DISTROVER).dsk +DSK_DEMO = ataridemo.dsk DSKS = $(DSK) $(DSK_DEMO) @@ -38,19 +37,13 @@ $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: - $(RM) $(PACKAGENAME) $(DSKS) + $(RM) $(DSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - # $(OS9GEN) $@ -b=$(BOOTFILE) $(DSK): $(RM) $@
--- a/level1/coco1/makefile Sun Feb 28 21:37:21 2016 +0100 +++ b/level1/coco1/makefile Sun Feb 28 21:37:23 2016 +0100 @@ -47,7 +47,6 @@ STARTUP = startup STARTUP_DW = startup.dw -PACKAGENAME = $(DISTROVER).zip DSKDW = $(DISTROVER)_dw.dsk LDSKDW = $(DISTRONAME)$(PORT)_dw.dsk DSKDWHEADLESS = $(DISTROVER)_dw_headless.dsk @@ -90,19 +89,13 @@ $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: - $(RM) $(PACKAGENAME) $(DSKS) $(LDSKS) + $(RM) $(DSKS) $(LDSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - $(DSKDW): $(RM) $@ $(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
--- a/level1/d64/makefile Sun Feb 28 21:37:21 2016 +0100 +++ b/level1/d64/makefile Sun Feb 28 21:37:23 2016 +0100 @@ -90,7 +90,6 @@ DEFS = $(shell $(CD) defs; make --no-print-directory showobjs) ROOTFILES = startup -PACKAGENAME = $(DISTROVER).zip DSK360K_1 = $(DISTROVER)_40d_1.dsk LDSK360K_1 = $(DISTRONAME)_40d_1.dsk DSK360K_2 = $(DISTROVER)_40d_2.dsk @@ -118,19 +117,13 @@ $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: - $(RM) $(PACKAGENAME) $(DSKS) $(LDSKS) + $(RM) $(DSKS) $(LDSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - #Dragon 64/32+ $(DSK360K_1):
--- a/level1/dalpha/makefile Sun Feb 28 21:37:21 2016 +0100 +++ b/level1/dalpha/makefile Sun Feb 28 21:37:23 2016 +0100 @@ -85,7 +85,6 @@ DEFS = $(shell $(CD) defs; make --no-print-directory showobjs) ROOTFILES = startup -PACKAGENAME = $(DISTROVER).zip DSK360K_1 = $(DISTROVER)_80s_1.dsk LDSK360K_1 = $(DISTRONAME)_80s_1.dsk DSK360K_2 = $(DISTROVER)_80s_2.dsk @@ -110,19 +109,13 @@ $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: - $(RM) $(PACKAGENAME) $(DSKS) $(LDSKS) + $(RM) $(DSKS) $(LDSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - #Dragon Alpha internal drives are Single sided 80 track $(DSK360K_1):
--- a/level2/coco3/makefile Sun Feb 28 21:37:21 2016 +0100 +++ b/level2/coco3/makefile Sun Feb 28 21:37:23 2016 +0100 @@ -50,7 +50,6 @@ SYSGO = sysgo_dd CCBKRN = ccbkrn -PACKAGENAME = $(DISTROVER).zip DSKDW = $(DISTROVER)_dw.dsk LDSKDW = $(DISTRONAME)_dw.dsk DSKDWHEADLESS = $(DISTROVER)_dw_headless.dsk @@ -101,19 +100,13 @@ $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: - $(RM) $(PACKAGENAME) $(DSKS) $(LDSKS) + $(RM) $(DSKS) $(LDSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - $(DSKDW): $(RM) $@ $(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
--- a/level3/coco3/makefile Sun Feb 28 21:37:21 2016 +0100 +++ b/level3/coco3/makefile Sun Feb 28 21:37:23 2016 +0100 @@ -38,7 +38,6 @@ STARTUP = startup SYSGO = sysgo_dd -PACKAGENAME = $(DISTROVER).zip DSKDW = $(DISTROVER)_dw.dsk LDSKDW = $(DISTRONAME)_dw.dsk DSK360K_1 = $(DISTROVER)_40d_1.dsk @@ -70,19 +69,13 @@ $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: - $(RM) $(PACKAGENAME) $(DSKS) $(LDSKS) + $(RM) $(DSKS) $(LDSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - $(DSKDW): $(RM) $@ $(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
--- a/makefile Sun Feb 28 21:37:21 2016 +0100 +++ b/makefile Sun Feb 28 21:37:23 2016 +0100 @@ -56,20 +56,6 @@ dskclean: $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskclean &&) : -# DriveWire DSK images -dwdsk = $(LEVEL1)/coco/nos96809l1coco1_dw.dsk $(LEVEL1)/coco/nos96809l1coco2_dw.dsk \ - $(LEVEL2)/coco3/nos96809l2_dw.dsk $(LEVEL2)/coco3_6309/nos96309l2_dw.dsk - -dw: dsk - $(ARCHIVE) nitros9_drivewire3.zip $(dwdsk) - -# DriveWire Becker DSK Images -beckerdsk = $(LEVEL1)/coco/nos96809l1coco_becker.dsk \ - $(LEVEL2)/coco3/nos96809l2_becker.dsk $(LEVEL2)/coco3_6309/nos96309l2_becker.dsk - -becker: dsk - $(ARCHIVE) nitros9_becker.zip $(beckerdsk) - info: @$(foreach dir,$(dirs), $(MAKE) --no-print-directory -C $(dir) info &&) :