Updated the build files to use $(xCP), allows use of mcopy to a mtools disk

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 778d3d8..17616e7 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -52,7 +52,7 @@ $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
        @echo --- LD -o $(BIN)
        @$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt
        @objdump $(BIN) -D > $(BIN).dsm
-       cp $(BIN) $(DISTROOT)
+       $(xCP) $(BIN) $(DISTROOT)
        @wc -l $(SRCFILES) > LineCounts.$(ARCH).txt
        @echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum
 

diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum
index f5a0a80..b4ec2fa 100644 (file)
--- a/Kernel/Makefile.BuildNum
+++ b/Kernel/Makefile.BuildNum
@@ -1 +1 @@
-BUILD_NUM = 1068
+BUILD_NUM = 1073

diff --git a/Makefile.cfg b/Makefile.cfg
index b2cb47d..3a164ee 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -10,6 +10,8 @@ RM = @rm -f
 STRIP = strip
 MKDIR = mkdir
 RMDIR = rm -rf
+lCP = cp
+xCP = mcopy -D o
 
 ARCH = i386
 ARCHDIR = x86
@@ -19,5 +21,6 @@ DRIVERS = ata_x86
 MODULES = FS_Ext2 FDD NE2000 BochsGA
 
 #DISTROOT = /mnt/AcessHDD/Acess2
-DISTROOT = ~/Projects/Acess2/Filesystem
-ACESSDIR = ~/Projects/Acess2
+#DISTROOT = ~/Projects/Acess2/Filesystem
+DISTROOT = a:/Acess2
+ACESSDIR = /home/hodgeja/Projects/Acess2

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index 0ceb783..8a09edb 100644 (file)
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -28,7 +28,7 @@ $(BIN): $(OBJ)
        @$(LD) -T ../link.ld -shared -nostdlib -o $@ $(OBJ)
 #      @$(LD) -shared -nostdlib -o $@ $(OBJ)
        @$(OBJDUMP) -d $(BIN) > $(BIN).dsm
-       cp $@ $(DISTROOT)/Modules/$(NAME).kmd
+       $(xCP) $@ $(DISTROOT)/Modules/$(NAME).kmd
        @echo --- $(LD) -o $(KOBJ)
        @$(CC) -Wl,-r -nostdlib -o $(KOBJ) $(OBJ)
 

diff --git a/Modules/USB/main.c b/Modules/USB/main.c
index 0bdcc24..7276d0e 100644 (file)
--- a/Modules/USB/main.c
+++ b/Modules/USB/main.c
@@ -44,7 +44,7 @@ int USB_Install(char **Arguments)
 {
        UHCI_Initialise();
        Warning("[USB  ] Not Complete - Devel Only");
-       return 0;
+       return 1;
 }
 
 /**

diff --git a/Usermode/Applications/CLIShell_src/Makefile b/Usermode/Applications/CLIShell_src/Makefile
index 93c58f7..ca2d988 100644 (file)
--- a/Usermode/Applications/CLIShell_src/Makefile
+++ b/Usermode/Applications/CLIShell_src/Makefile
@@ -20,7 +20,7 @@ $(BIN): $(COBJ)
        @echo --- $(LD) -o $@\r
        @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt\r
        objdump -d $(BIN) > $(BIN).dsm\r
-       cp $(BIN) $(DISTROOT)/Bin/\r
+       $(xCP) $(BIN) $(DISTROOT)/Bin/\r
 \r
 $(COBJ): %.o: %.c\r
        @echo --- GCC -o $@\r

diff --git a/Usermode/Applications/cat_src/Makefile b/Usermode/Applications/cat_src/Makefile
index bc57a4c..9fe79a6 100644 (file)
--- a/Usermode/Applications/cat_src/Makefile
+++ b/Usermode/Applications/cat_src/Makefile
@@ -1,27 +1,27 @@
-# Project: cat\r
-\r
--include ../Makefile.cfg\r
-\r
+# Project: cat
+
+-include ../Makefile.cfg
+
 COBJ = main.o
-BIN = ../cat\r
-\r
-CFLAGS  += -Wall -fno-builtin -fno-stack-protector\r
-LDFLAGS += \r
-\r
-.PHONY : all clean\r
-\r
-all: $(BIN)\r
-\r
-$(BIN): $(COBJ)\r
-       @echo --- $(LD) -o $@\r
-       @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt\r
-       objdump -d $(BIN) > $(BIN).dsm\r
-       cp $(BIN) $(DISTROOT)/Bin/
-\r
-clean:\r
+BIN = ../cat
+
+CFLAGS  += -Wall -fno-builtin -fno-stack-protector
+LDFLAGS += 
+
+.PHONY : all clean
+
+all: $(BIN)
+
+$(BIN): $(COBJ)
+       @echo --- $(LD) -o $@
+       @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt
+       objdump -d $(BIN) > $(BIN).dsm
+       $(xCP) $(BIN) $(DISTROOT)/Bin/
+
+clean:
        $(RM) $(COBJ) $(BIN) $(BIN).dsm Map.txt
-\r
-$(COBJ): %.o: %.c\r
+
+$(COBJ): %.o: %.c
        @echo --- GCC -o $@
        @$(CC) $(CFLAGS) -c $? -o $@
-\r
+

diff --git a/Usermode/Applications/ifconfig_src/Makefile b/Usermode/Applications/ifconfig_src/Makefile
index 75e9519..8b6ccff 100644 (file)
--- a/Usermode/Applications/ifconfig_src/Makefile
+++ b/Usermode/Applications/ifconfig_src/Makefile
@@ -16,7 +16,7 @@ $(BIN): $(COBJ)
        @echo --- $(LD) -o $@\r
        @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt\r
        @objdump -d $(BIN) > $(BIN).dsm\r
-       cp $(BIN) $(DISTROOT)/Bin/
+       $(xCP) $(BIN) $(DISTROOT)/Bin/
 \r
 clean:\r
        @$(RM) $(COBJ) $(BIN) $(BIN).dsm Map.txt

diff --git a/Usermode/Applications/init_src/Makefile b/Usermode/Applications/init_src/Makefile
index 9331f6e..4541f62 100644 (file)
--- a/Usermode/Applications/init_src/Makefile
+++ b/Usermode/Applications/init_src/Makefile
@@ -20,8 +20,8 @@ $(BIN): $(OBJ) Makefile
        @echo --- ld -o $(BIN)
        @$(LD) $(LDFLAGS) $(OBJ) -o $(BIN)
        $(OBJDUMP) -d $(BIN) > $(BIN).dsm
-       cp $(BIN) $(DISTROOT)/SBin/
+       $(xCP) $(BIN) $(DISTROOT)/SBin/
 
 %.o: %.c
-       @echo --- cc -o $@
+       @echo --- $(CC) -o $@
        @$(CC) $(CFLAGS) -c $< -o $@

diff --git a/Usermode/Applications/login_src/Makefile b/Usermode/Applications/login_src/Makefile
index bd932b9..717a15f 100644 (file)
--- a/Usermode/Applications/login_src/Makefile
+++ b/Usermode/Applications/login_src/Makefile
@@ -21,7 +21,7 @@ clean:
 $(BIN): $(OBJ)
        @echo --- $(LD) -o $@
        @$(LD) $(LDFLAGS) $(OBJ) -o $@
-       cp $(BIN) $(DISTROOT)/SBin/
+       $(xCP) $(BIN) $(DISTROOT)/SBin/
        objdump -d $(BIN) > login.dsm
 
 %.o: %.c Makefile

diff --git a/Usermode/Applications/ls_src/Makefile b/Usermode/Applications/ls_src/Makefile
index efd8834..7565624 100644 (file)
--- a/Usermode/Applications/ls_src/Makefile
+++ b/Usermode/Applications/ls_src/Makefile
@@ -1,27 +1,27 @@
-# Project: cat\r
-\r
--include ../Makefile.cfg\r
-\r
+# Project: cat
+
+-include ../Makefile.cfg
+
 COBJ = main.o
-BIN = ../ls\r
-\r
-CFLAGS  += -Wall -fno-builtin\r
-LDFLAGS +=\r
-\r
-.PHONY : all clean\r
-\r
-all: $(BIN)\r
-\r
-$(BIN): $(COBJ)\r
-       @echo --- $(LD) -o $@\r
-       @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt\r
-       objdump -d $(BIN) > $(BIN).dsm\r
-       cp $(BIN) $(DISTROOT)/Bin/\r
-\r
-clean:\r
+BIN = ../ls
+
+CFLAGS  += -Wall -fno-builtin
+LDFLAGS +=
+
+.PHONY : all clean
+
+all: $(BIN)
+
+$(BIN): $(COBJ)
+       @echo --- $(LD) -o $@
+       @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt
+       objdump -d $(BIN) > $(BIN).dsm
+       $(xCP) $(BIN) $(DISTROOT)/Bin/
+
+clean:
        $(RM) $(COBJ) $(BIN) $(BIN).dsm Map.txt
-\r
-$(COBJ): %.o: %.c\r
+
+$(COBJ): %.o: %.c
        @echo --- GCC -o $@
        @$(CC) $(CFLAGS) -c $? -o $@
-\r
+

diff --git a/Usermode/Applications/mount_src/Makefile b/Usermode/Applications/mount_src/Makefile
index a560017..3f5439d 100644 (file)
--- a/Usermode/Applications/mount_src/Makefile
+++ b/Usermode/Applications/mount_src/Makefile
@@ -1,27 +1,27 @@
-# Project: mount\r
-\r
--include ../Makefile.cfg\r
-\r
+# Project: mount
+
+-include ../Makefile.cfg
+
 COBJ = main.o
-BIN = ../mount\r
-\r
-CFLAGS  += -Wall -fno-builtin -fno-stack-protector\r
-LDFLAGS += \r
-\r
-.PHONY : all clean\r
-\r
-all: $(BIN)\r
-\r
-$(BIN): $(COBJ)\r
-       @echo --- $(LD) -o $@\r
-       @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt\r
-       objdump -d $(BIN) > $(BIN).dsm\r
-       cp $(BIN) $(DISTROOT)/Bin/\r
-\r
-clean:\r
+BIN = ../mount
+
+CFLAGS  += -Wall -fno-builtin -fno-stack-protector
+LDFLAGS += 
+
+.PHONY : all clean
+
+all: $(BIN)
+
+$(BIN): $(COBJ)
+       @echo --- $(LD) -o $@
+       @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt
+       objdump -d $(BIN) > $(BIN).dsm
+       $(xCP) $(BIN) $(DISTROOT)/Bin/
+
+clean:
        $(RM) $(COBJ) $(BIN) Map.txt $(BIN).dsm
-\r
-$(COBJ): %.o: %.c\r
+
+$(COBJ): %.o: %.c
        @echo --- GCC -o $@
        @$(CC) $(CFLAGS) -c $? -o $@
-\r
+

diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile
index 3298402..d0b49a4 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/Usermode/Libraries/ld-acess.so_src/Makefile
@@ -25,7 +25,7 @@ $(BIN): $(AOBJ) $(COBJ)
        @$(LD) $(LDFLAGS) -o $(BIN) $(AOBJ) $(COBJ) > link.txt\r
        $(OBJDUMP) -x $(BIN) > ld-acess.dmp\r
        $(OBJDUMP) -d $(BIN) > ld-acess.dsm\r
-       cp $(BIN) $(DISTROOT)/Libs\r
+       $(xCP) $(BIN) $(DISTROOT)/Libs/
 \r
 $(COBJ): %.o: %.c\r
        @echo $(CC) -o $@\r

diff --git a/Usermode/Libraries/libacess.so_src/Makefile b/Usermode/Libraries/libacess.so_src/Makefile
index 0bb0fe4..5d49668 100644 (file)
--- a/Usermode/Libraries/libacess.so_src/Makefile
+++ b/Usermode/Libraries/libacess.so_src/Makefile
@@ -21,7 +21,7 @@ $(BIN): $(OBJ)
        @echo --- $(LD) -shared -o $@
        @$(LD) $(LDFLAGS) -o $(BIN) $(OBJ)
        @$(STRIP) $(BIN)
-       cp $(BIN) $(DISTROOT)/Libs
+       $(xCP) $(BIN) $(DISTROOT)/Libs
        
 %.ao: %.asm syscalls.inc.asm
        @echo $(AS) -o $@

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index ada3088..bf7b8d1 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -27,7 +27,7 @@ $(BIN): $(OBJ)
        @$(OBJDUMP) -d $@ > libc.so.1.dsm\r
        @$(OBJDUMP) -x -r -R $@ > libc.so.1.dmp\r
        cp ../libc.so.1 ../libc.so\r
-       cp ../libc.so.1 $(DISTROOT)/Libs/\r
+       $(xCP) ../libc.so.1 $(DISTROOT)/Libs/\r
 \r
 # C Runtime 0\r
 ../crt0.o: crt0.asm\r

diff --git a/Usermode/Libraries/libgcc.so_src/Makefile b/Usermode/Libraries/libgcc.so_src/Makefile
index f29038f..5308e7d 100644 (file)
--- a/Usermode/Libraries/libgcc.so_src/Makefile
+++ b/Usermode/Libraries/libgcc.so_src/Makefile
@@ -21,7 +21,7 @@ $(BIN): $(OBJS)
        @echo -- ld -o $@
        @$(LD) $(LDFLAGS) -o $(BIN) $(OBJS)
        @$(OBJDUMP) -d $(BIN) > libgcc.so.dsm
-       cp $(BIN) $(DISTROOT)/Libs
+       $(xCP) $(BIN) $(DISTROOT)/Libs
 
 $(OBJS): %.o: %.c
        @echo -- gcc -o $@