Mercurial > hg > Members > kono > nitros9-code

changeset 2762:9b29d654db13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added empty_smash.txt and empty_thexder.txt to their respective folders and updated makefile(s) to use these files for their blank ROOT variables. Corrected problem with blackcauldron makefile removing tocgen in disk creation process. Corrected problem with christmas86 makefile removing tocgen in disk creation process.
author drencor-xeen
date Wed, 16 Jan 2013 13:16:05 -0600
parents e88aef1ccaec
children c03464c24b14
files 3rdparty/packages/arcadepak/makefile 3rdparty/packages/arcadepak/smash/empty_smash.txt 3rdparty/packages/arcadepak/smash/makefile 3rdparty/packages/arcadepak/thexder/empty_thexder.txt 3rdparty/packages/arcadepak/thexder/makefile 3rdparty/packages/cc/makefile 3rdparty/packages/sierra/blackcauldron/makefile 3rdparty/packages/sierra/christmas86/makefile ChangeLog
diffstat 9 files changed, 50 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/arcadepak/makefile	Wed Jan 16 10:56:17 2013 -0600
+++ b/3rdparty/packages/arcadepak/makefile	Wed Jan 16 13:16:05 2013 -0600
@@ -12,15 +12,15 @@
 CMDS		= grfdrv runb
 SHELLMODS	= $(CMD)/shell_21 $(CMD)/dir $(CMD)/echo $(CMD)/link $(CMD)/load $(CMD)/mdir
 		
-SMASHCMDS	= $(shell $(CD) smash; make showobjs)
-SMASHSYS	= $(shell $(CD) smash; make showsys)
-SMASHROOT	= $(shell $(CD) smash; make showroot)
-THEXCMDS	= $(shell $(CD) thexder; make showobjs)
-THEXSYS		= $(shell $(CD) thexder; make showsys)
-THEXROOT	= $(shell $(CD) thexder; make showroot)
-SHANGCMDS	= $(shell $(CD) shanghai; make showobjs)
-SHANGSYS	= $(shell $(CD) shanghai; make showsys)
-SHANGROOT	= $(shell $(CD) shanghai; make showroot)
+SMASHCMDS	= $(shell $(CD) smash; make --no-print-directory showobjs)
+SMASHSYS	= $(shell $(CD) smash; make --no-print-directory showsys)
+SMASHROOT	= $(shell $(CD) smash; make --no-print-directory showroot)
+THEXCMDS	= $(shell $(CD) thexder; make --no-print-directory showobjs)
+THEXSYS		= $(shell $(CD) thexder; make --no-print-directory showsys)
+THEXROOT	= $(shell $(CD) thexder; make --no-print-directory showroot)
+SHANGCMDS	= $(shell $(CD) shanghai; make --no-print-directory showobjs)
+SHANGSYS	= $(shell $(CD) shanghai; make --no-print-directory showsys)
+SHANGROOT	= $(shell $(CD) shanghai; make --no-print-directory showroot)
 MD		= $(6809L2)/modules
 
 # We make our own bootfile and kernel track
@@ -61,6 +61,7 @@
 	@$(ECHO) ""
 
 $(DISK_40D): all
+	$(RM) $@
 	$(CD) $(6809L2); make
 	$(OS9FORMAT_DS40) $@ -n"NitrOS-9 Arcade Pack"
 	$(MERGE) $(OS9BOOT_40D)>os9boot
@@ -69,7 +70,6 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $@,CMDS
 	$(CP) shell $@,CMDS
-	$(RM) shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
 	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
@@ -90,6 +90,7 @@
 	$(CPL) startup $@,
 
 $(DISK_80D): all
+	$(RM) $@
 	$(CD) $(6809L2); make
 	$(OS9FORMAT_DS80) $@ -n"NitrOS-9 Arcade Pack"
 	$(MERGE) $(OS9BOOT_80D)>os9boot
@@ -98,7 +99,6 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $@,CMDS
 	$(CP) shell $@,CMDS/shell
-	$(RM) shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
 	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
@@ -119,6 +119,7 @@
 	$(CPL) startup $@,
 
 clean:	dskclean
+	$(RM) shell
 	$(CD) smash; make clean
 	$(CD) thexder; make clean
 	$(CD) shanghai; make clean
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/arcadepak/smash/empty_smash.txt	Wed Jan 16 13:16:05 2013 -0600
@@ -0,0 +1,1 @@
+
--- a/3rdparty/packages/arcadepak/smash/makefile	Wed Jan 16 10:56:17 2013 -0600
+++ b/3rdparty/packages/arcadepak/smash/makefile	Wed Jan 16 13:16:05 2013 -0600
@@ -8,7 +8,8 @@
 CMDS		= smash custom
 
 SYSFILES	= flags.dat ia.fnt smash.dat smash.hsc
-ROOTFILES	= 
+
+ROOTFILES	= empty_smash.txt
 
 ALLOBJS		= $(CMDS)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/arcadepak/thexder/empty_thexder.txt	Wed Jan 16 13:16:05 2013 -0600
@@ -0,0 +1,1 @@
+
--- a/3rdparty/packages/arcadepak/thexder/makefile	Wed Jan 16 10:56:17 2013 -0600
+++ b/3rdparty/packages/arcadepak/thexder/makefile	Wed Jan 16 13:16:05 2013 -0600
@@ -9,6 +9,8 @@
 
 SYSFILES	= ia.fnt
 
+ROOTFILES	= empty_thexder.txt
+
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
--- a/3rdparty/packages/cc/makefile	Wed Jan 16 10:56:17 2013 -0600
+++ b/3rdparty/packages/cc/makefile	Wed Jan 16 13:16:05 2013 -0600
@@ -33,7 +33,7 @@
 	$(CP) $(CMDS) $(DISK),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(CPL) defs/*.h $(DISK),DEFS
-	$(CP) lib/*.l LIB/*.r $(DISK),LIB
+	$(CP) lib/*.l lib/*.r $(DISK),LIB
 	$(CPL) sources/*.c $(DISK),SOURCES
 	$(CPL) sources/*.a $(DISK),SOURCES/SYS
 
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Wed Jan 16 10:56:17 2013 -0600
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Wed Jan 16 13:16:05 2013 -0600
@@ -152,8 +152,9 @@
 	$(CPL) $(TEXTFILES) $(DSK_DW3),.
 	$(OS9RENAME) $(DSK_DW3),tOC_40d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DSK_DW3),.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW3),tOC.txt $(DSK_DW3),tOC
+	$(MOVE) toctmp tocgen
 
 dsk_dw3_becker:	all
 	$(RM) $(DSK_DW3_BECKER)
@@ -174,8 +175,9 @@
 	$(CPL) $(TEXTFILES) $(DSK_DW3_BECKER),.
 	$(OS9RENAME) $(DSK_DW3_BECKER),tOC_40d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DSK_DW3_BECKER),.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW3_BECKER),tOC.txt $(DSK_DW3_BECKER),tOC
+	$(MOVE) toctmp tocgen
 
 
 dsk:	dsk_40d dsk_80d dsk_dw3 dsk_dw3_becker
--- a/3rdparty/packages/sierra/christmas86/makefile	Wed Jan 16 10:56:17 2013 -0600
+++ b/3rdparty/packages/sierra/christmas86/makefile	Wed Jan 16 13:16:05 2013 -0600
@@ -106,8 +106,9 @@
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
 $(DSK_DW3_BECKER):	all
@@ -127,8 +128,9 @@
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
--- a/ChangeLog	Wed Jan 16 10:56:17 2013 -0600
+++ b/ChangeLog	Wed Jan 16 13:16:05 2013 -0600
@@ -2,6 +2,29 @@
 
 ----------------------------------------------------------
 2013/01/16 David Ladd
+M 3rdparty/packages/arcadepak/makefile
+M 3rdparty/packages/arcadepak/smash/makefile
+M 3rdparty/packages/arcadepak/thexder/makefile
+M 3rdparty/packages/cc/makefile
+M 3rdparty/packages/sierra/blackcauldron/makefile
+M 3rdparty/packages/sierra/christmas86/makefile
+M ChangeLog
+A 3rdparty/packages/arcadepak/smash/empty_smash.txt
+A 3rdparty/packages/arcadepak/thexder/empty_thexder.txt
+
+Found a problem with with the makefile related to the
+arcadepak not building from the chained make.  Found the
+"--no-print-directory" was missing from the make statement
+to get the filenames for the sub folders.  Also found empty
+labels so created a empty_smash.txt and a empty_thexder.txt
+to correct for odd errors when dealing with the empty labels.
+
+Corrected blackcauldron and christmas86 makefile(s) related
+to disk creation.  Found that tocgen was being removed by
+some of the disk image sections. This has been corrected.
+
+----------------------------------------------------------
+2013/01/16 David Ladd
 M ChangeLog
 M 3rdparty/packages/arcadepak/shanghai/makefile
 M 3rdparty/packages/arcadepak/smash/makefile