meta: rename

tools/Makefile

@@ -1,13 +0,0 @@
-TOOL_LIST := e64patch
-
-all:
-	@for prog in $(TOOL_LIST); do \
-		$(MAKE) -s -C $$prog; \
-	done
-
-clean:
-	@for prog in $(TOOL_LIST); do \
-		$(MAKE) -s -C $$prog clean; \
-	done
-
-.PHONY: all clean

tools/bochsrc.bxrc

@@ -10,7 +10,7 @@ floppy_bootsig_check: disabled=0
 floppya: type=1_44
 # no floppyb
 ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
-ata0-master: type=cdrom, path="build/socks-kernel.iso", status=inserted, model="Generic 1234", biosdetect=auto
+ata0-master: type=cdrom, path="build/mango-kernel.iso", status=inserted, model="Generic 1234", biosdetect=auto
 ata0-slave: type=none
 ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15
 ata1-master: type=none

tools/boot-image/grub.cfg

@@ -1,4 +1,4 @@
-menuentry "Socks Kernel" {
-	multiboot /boot/socks_kernel
+menuentry "Mango Kernel" {
+	multiboot /boot/mango_kernel
 	boot
 }

tools/e64patch/Makefile

@@ -1,4 +0,0 @@
-TOOL_NAME := e64patch
-
-include ../tool-config.mk
-include ../tool-template.mk

tools/kernel-debug/debug_session.sh

@@ -5,7 +5,7 @@ lldb_cfg=$2
 shift 2
 
 if command -v gdb &> /dev/null; then
-	printf "    \033[93;1mGDB\033[0m    boot/socks_kernel\n"
+	printf "    \033[93;1mGDB\033[0m    boot/mango_kernel\n"
 	tmux \
 		new-session -d -s hz-debug "sleep 0.3; gdb -tui -x $gdb_cfg" \; \
 		split-window -h -l 80 \; \
@@ -13,7 +13,7 @@ if command -v gdb &> /dev/null; then
 		select-pane -t 1 \; \
 		resize-pane -R 20
 elif command -v lldb &> /dev/null; then
-	printf "    \033[93;1mLLDB\033[0m   boot/socks_kernel\n"
+	printf "    \033[93;1mLLDB\033[0m   boot/mango_kernel\n"
 	tmux \
 		new-session -d -s hz-debug "sleep 0.1; lldb --source $lldb_cfg" \; \
 		split-window -h -l 160 \; \

tools/kernel-debug/gdb_session_init

@@ -1,4 +1,4 @@
 set confirm off
-symbol-file build/socks_kernel.dbg
+symbol-file build/mango_kernel.dbg
 target remote localhost:1234
 set confirm on

tools/kernel-debug/lldb_session_init

@@ -1,2 +1,2 @@
-file build/socks_kernel.dbg
+file build/mango_kernel.dbg
 gdb-remote localhost:1234

tools/make/clang-generic.mk

@@ -1,5 +0,0 @@
-LD := ld.lld
-CC := clang
-
-CFLAGS := -fuse-ld=$(LD) -target x86_64-linux-elf -nostdlib -nostdinc -ffreestanding -Wl,-nostdlib -Wno-unused-command-line-argument
-LDFLAGS := -nostdlib

tools/make/gcc-host.mk

@@ -1,9 +0,0 @@
-LD  := gcc
-CC  := gcc
-CXX := g++
-ASM := gcc
-
-CFLAGS   := -Wall -Werror -pedantic
-CXXFLAGS := $(CFLAGS)
-ASMFLAGS := $(CFLAGS)
-LDFLAGS  := -O2

tools/mango.install-cd

@@ -116,7 +116,7 @@ def choice_options(num_devices):
     return '1-{}'.format(num_devices)
 
 
-if not os.path.isfile('build/socks-kernel.iso'):
+if not os.path.isfile('build/mango-kernel.iso'):
     print('No system ISO image found.')
     print('Please run \'make cd\' to generate an ISO image')
     exit(-1)
@@ -157,7 +157,7 @@ disk_prewrite(devices[choice][0])
 dd_args = [
     'sudo',
     'dd',
-    'if=build/socks-kernel.iso',
+    'if=build/mango-kernel.iso',
     'of={}'.format(devices[choice][0]),
     'bs=1{}'.format('m' if sys.platform == 'darwin' else 'M')
 ]

tools/mango.mkrescue

@@ -7,22 +7,22 @@ import sys
 import os
 import shutil
 
-kernel_src_path = os.path.join('build', 'socks_kernel')
+kernel_src_path = os.path.join('build', 'mango_kernel')
 grub_cfg_src_path = os.path.join('tools', 'boot-image', 'grub.cfg')
-iso_build_dir = os.path.join('build', 'socks-kernel.iso-build')
-iso_path = os.path.join('build', 'socks-kernel.iso')
+iso_build_dir = os.path.join('build', 'mango-kernel.iso-build')
+iso_path = os.path.join('build', 'mango-kernel.iso')
 
 
 def in_source_tree():
-    return os.path.isfile('tools/socks.sync')
+    return os.path.isfile('tools/mango.sync')
 
 
 if not in_source_tree():
-    print('This script must be executed from the root of the Socks source tree')
+    print('This script must be executed from the root of the Mango source tree')
     exit(-1)
 
 if not os.path.isdir('build'):
-    print('Please build the Socks kernel before using this tool')
+    print('Please build the Mango kernel before using this tool')
     exit(-1)
 
 if os.path.isdir(iso_build_dir):
@@ -33,7 +33,7 @@ os.mkdir(iso_build_dir)
 os.mkdir(os.path.join(iso_build_dir, 'boot'))
 os.mkdir(os.path.join(iso_build_dir, 'boot', 'grub'))
 
-shutil.copyfile(kernel_src_path, os.path.join(iso_build_dir, 'boot', 'socks_kernel'))
+shutil.copyfile(kernel_src_path, os.path.join(iso_build_dir, 'boot', 'mango_kernel'))
 shutil.copyfile(grub_cfg_src_path, os.path.join(iso_build_dir, 'boot', 'grub', 'grub.cfg'))
 
 subprocess.run(['grub-mkrescue', '-o', iso_path, iso_build_dir])

tools/mango.sync

@@ -16,7 +16,7 @@ rsync_path = os.getenv('RSYNC_PATH', default = 'rsync')
 
 
 def in_source_tree():
-    return os.path.isfile('tools/socks.sync')
+    return os.path.isfile('tools/mango.sync')
 
 
 def create_sample_config():
@@ -78,7 +78,7 @@ def print_available_targets(targets):
 
 
 if not in_source_tree():
-    print('This script must be executed from the root of the Socks source tree')
+    print('This script must be executed from the root of the Mango source tree')
     exit(-1)
 
 config = read_config()

tools/socks.kexttool

@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-# vim: ft=python
-# -*- mode: python -*-
-
-import glob
-import os
-import sys
-from kexttool import kext, scan, select
-
-
-if len(sys.argv) < 2:
-     print('usage: {} <command>'.format(sys.argv[0]))
-     exit(0)
-
-cmd = sys.argv[1]
-
-commands = {
-     'select': select.select_kexts,
-     'list': scan.list_all
-}
-
-if cmd not in commands:
-     print('E: unknown command \'{}\''.format(cmd))
-     exit(-1)
-
-commands[cmd]()

tools/tool-config.mk

@@ -1,10 +0,0 @@
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-TOOLS_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))
-
-SOCKS_ARCH ?= x86_64
-
-include $(TOOLS_DIR)/make/gcc-host.mk
-SOURCE_ROOT := $(TOOLS_DIR)/..
-
-TOOLS_BUILD_DIR := $(TOOLS_DIR)/../build/tools
-BUILD_DIR := $(TOOLS_BUILD_DIR)/$(TOOL_NAME)

tools/tool-template.mk

@@ -1,22 +0,0 @@
-BUILD_DIR := $(TOOLS_BUILD_DIR)/$(TOOL_NAME)
-
-SRC := $(shell find . -name '*.c')
-OBJ := $(addprefix $(BUILD_DIR)/,$(SRC:.c=.o))
-
-$(BUILD_DIR)/$(TOOL_NAME): $(OBJ)
-	@mkdir -p $(@D)
-
-	@printf "    \033[1;36mHOSTLD\033[0m \033[1mtools/$(TOOL_NAME)\033[0m\n"
-	@$(CC) $^ -o $@ $(CFLAGS) $(LDFLAGS)
-
-$(BUILD_DIR)/%.o: %.c
-	@printf "    \033[1;32mHOSTCC\033[0m $(TOOL_NAME)/$^\n"
-	@mkdir -p $(@D)
-
-	@$(CC) $< -o $@ -c $(CFLAGS)
-
-all: $(TOOL_NAME)
-
-clean:
-	@printf "    \033[1;93mRM\033[0m     Deleting sandbox/$(TOOL_NAME)\n"
-	@rm -rf $(BUILD_DIR)