Changeset 839470f in mainline

Timestamp:

2005-12-07T14:29:42Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45ab770

Parents:

05e2a7ad

Message:

Clean up of build system. Use:
make config
make
make clean

Files:

• Makefile (modified) (3 diffs)
• build (deleted)
• clean (deleted)
• clean.amd64 (deleted)
• clean.ia32 (deleted)
• clean.ia64 (deleted)
• clean.mips32 (deleted)
• clean.ppc32 (deleted)
• clean.sparc64 (deleted)
• configure (deleted)
• doc/build (added)
• tools/build (deleted)
• tools/clean (deleted)
• tools/config.py (modified) (3 diffs)

Makefile

@@ -40 +40 @@
 #
 
-include Makefile.config
+-include Makefile.config
 
 ## Common compiler flags
@@ -57 +57 @@
 #
 
-include arch/$(ARCH)/Makefile.inc
-include genarch/Makefile.inc
+-include arch/$(ARCH)/Makefile.inc
+-include genarch/Makefile.inc
 
 ifeq ($(CONFIG_DEBUG),y)
@@ -139 +139 @@
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
-.PHONY: all clean config depend boot
-
-all: kernel.bin boot disasm
+.PHONY: all clean config links depend boot
+
+all:
+        tools/config.py default
+        $(MAKE) -C . real_all
+
+real_all: kernel.bin boot disasm
+
+config:
+        tools/config.py
 
 -include Makefile.depend
+
+distclean: clean
+        -rm Makefile.config
 
 clean:
         -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
-        find generic/src/ arch/$(ARCH)/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
-        $(MAKE) -C arch/$(ARCH)/boot clean
-
-config:
+        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
+        for arch in arch/*; do \
+            [ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null;\
+            $(MAKE) -C $$arch/boot clean; \
+        done;exit 0
+
+archlinks:
         ln -sfn ../../arch/$(ARCH)/include/ generic/include/arch
         ln -sfn ../../genarch/include/ generic/include/genarch
 
-depend: config
+depend: archlinks
         $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
 

tools/config.py

@@ -138 +138 @@
 
         os.close(outdesc)
-        errout = os.fdopen(indesc,'r')
-        data = errout.read()
-        errout.close()
-            
-        pid,status = os.wait()
+        
+        try:
+            errout = os.fdopen(indesc,'r')
+            data = errout.read()
+            errout.close()
+            pid,status = os.wait()
+        except:
+            os.system('reset') # Reset terminal
+            raise
+        
         if not os.WIFEXITED(status):
+            os.system('reset') # Reset terminal
             raise EOFError
+        
         status = os.WEXITSTATUS(status)
         if status == 255:
@@ -151 +158 @@
         
     def yesno(self, text, default=None):
-        text = text + ':'
+        if text[-1] not in ('?',':'):
+            text = text + ':'
         width = '50'
         height = '5'
@@ -405 +413 @@
         os.unlink(OUTPUT)
     os.rename(TMPOUTPUT, OUTPUT)
-        
+    
+    if not defmode and dlg.yesno('Rebuild kernel?') == 'y':
+        os.execlp('make','make','clean','all')
 
 if __name__ == '__main__':