Mercurial > hg > Members > kono > nitros9-code
view level1/atari/makefile @ 2898:28ed72477814 lwtools-port
Dummy merge of default branch into lwtools
hg -y merge --tool=internal:fail default
hg revert --all --no-backup --rev .
hg resolve -a -m
This dummy merge discards any changes from the default branch
so that the result is the same as what lwtools already had.
When merging back to default branch later, the discarded
changes will be discarded there also, so the result
will be that the default branch will contain what
the lwtools branch had before these merges.
Only scripts/burst was "rescued" from default branch.
author | Tormod Volden <debian.tormod@gmail.com> |
---|---|
date | Sat, 11 Jan 2014 18:40:44 +0100 |
parents | d5220b220313 1addfd8c9d5f |
children | 62c91ac49d72 |
line wrap: on
line source
include port.mak # Level 1 - Specify which shell should be used #WHICHSHELL = shellplus WHICHSHELL = shell_21 DISTRO = $(CPU)L$(LEVEL) DISTRONAME = nos9$(CPU)l$(LEVEL) DISTROVER = $(DISTRONAME)$(NITROS9VER)$(PORT) BOOTFILE = bootfiles/bootfile DIRS = cmds modules defs sys bootfiles wwwroot CMDS = $(shell $(CD) cmds; make --no-print-directory showobjs_dw) CMDS_DEMO = $(shell $(CD) cmds; make --no-print-directory showobjs_demo) SYS = $(shell $(CD) sys; make --no-print-directory showobjs) WWWROOT = $(shell $(CD) wwwroot; make --no-print-directory showobjs) DEFS = $(shell $(CD) defs; make --no-print-directory showobjs) STARTUP = startup PACKAGENAME = $(DISTROVER).zip DSK = $(DISTROVER).dsk DSK_DEMO = ataridemo.dsk DSKS = $(DSK) $(DSK_DEMO) # Make all components all: @$(ECHO) "**************************************************" @$(ECHO) "*" @$(ECHO) "* NitrOS-9/$(CPU) Level $(LEVEL) $(PORTNAME)" @$(ECHO) "*" @$(ECHO) "**************************************************" $(foreach dir, $(DIRS), ($(CD) $(dir); make);) # Clean all components clean: dskclean $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: $(RM) $(PACKAGENAME) $(DSKS) dsk: all $(PACKAGENAME) dskcopy: dsk $(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) $@ $(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 1" $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS $(MAKDIR) $@,DEFS $(MAKDIR) $@,WWWROOT $(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) $(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell $(CD) sys; $(CPL) $(SYS) ../$@,SYS $(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file)) $(CD) wwwroot; $(OS9COPY) $(WWWROOT) ../$@,WWWROOT $(OS9ATTR_TEXT) $(foreach file,$(WWWROOT),$@,WWWROOT/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file)) $(CPL) $(STARTUP) $@,startup $(OS9ATTR_TEXT) $@,startup $(DSK_DEMO): $(RM) $@ $(OS9FORMAT_DW) -q $@ -n"NitrOS-9 Atari Demo Disk" $(MAKDIR) $@,CMDS $(CD) cmds; $(OS9COPY) $(CMDS_DEMO) ../$@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(CMDS_DEMO),$@,CMDS/$(file)) info: @echo "*** NitrOS-9/6809 Level 1 for the Atari XL/XE ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)