From 2cf1dd5b6f10b898f24203c879290d665531a989 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 10 Feb 2019 08:35:01 +0100 Subject: [PATCH] Move apps into a top-level Applications/ directory. --- {Clock => Applications/Clock}/.gitignore | 0 {Clock => Applications/Clock}/ClockWidget.cpp | 0 {Clock => Applications/Clock}/ClockWidget.h | 0 {Clock => Applications/Clock}/Makefile | 2 +- {Clock => Applications/Clock}/main.cpp | 0 .../FileManager}/.gitignore | 0 .../FileManager}/DirectoryView.cpp | 0 .../FileManager}/DirectoryView.h | 0 .../FileManager}/Makefile | 2 +- .../FileManager}/main.cpp | 0 .../FontEditor}/.gitignore | 0 .../FontEditor}/FontEditor.cpp | 0 .../FontEditor}/FontEditor.h | 0 .../FontEditor}/Makefile | 2 +- .../FontEditor}/main.cpp | 0 .../Launcher}/.gitignore | 0 {Launcher => Applications/Launcher}/Makefile | 2 +- {Launcher => Applications/Launcher}/main.cpp | 0 .../Terminal}/.gitignore | 0 {Terminal => Applications/Terminal}/Makefile | 2 +- .../Terminal}/Terminal.cpp | 0 .../Terminal}/Terminal.h | 0 .../Terminal}/XtermColors.h | 0 {Terminal => Applications/Terminal}/main.cpp | 0 Kernel/makeall.sh | 20 +++++++++---------- Kernel/makeuserland.sh | 16 +++++++++------ Kernel/sync.sh | 10 +++++----- 27 files changed, 30 insertions(+), 26 deletions(-) rename {Clock => Applications/Clock}/.gitignore (100%) rename {Clock => Applications/Clock}/ClockWidget.cpp (100%) rename {Clock => Applications/Clock}/ClockWidget.h (100%) rename {Clock => Applications/Clock}/Makefile (95%) rename {Clock => Applications/Clock}/main.cpp (100%) rename {FileManager => Applications/FileManager}/.gitignore (100%) rename {FileManager => Applications/FileManager}/DirectoryView.cpp (100%) rename {FileManager => Applications/FileManager}/DirectoryView.h (100%) rename {FileManager => Applications/FileManager}/Makefile (95%) rename {FileManager => Applications/FileManager}/main.cpp (100%) rename {FontEditor => Applications/FontEditor}/.gitignore (100%) rename {FontEditor => Applications/FontEditor}/FontEditor.cpp (100%) rename {FontEditor => Applications/FontEditor}/FontEditor.h (100%) rename {FontEditor => Applications/FontEditor}/Makefile (95%) rename {FontEditor => Applications/FontEditor}/main.cpp (100%) rename {Launcher => Applications/Launcher}/.gitignore (100%) rename {Launcher => Applications/Launcher}/Makefile (95%) rename {Launcher => Applications/Launcher}/main.cpp (100%) rename {Terminal => Applications/Terminal}/.gitignore (100%) rename {Terminal => Applications/Terminal}/Makefile (95%) rename {Terminal => Applications/Terminal}/Terminal.cpp (100%) rename {Terminal => Applications/Terminal}/Terminal.h (100%) rename {Terminal => Applications/Terminal}/XtermColors.h (100%) rename {Terminal => Applications/Terminal}/main.cpp (100%) diff --git a/Clock/.gitignore b/Applications/Clock/.gitignore similarity index 100% rename from Clock/.gitignore rename to Applications/Clock/.gitignore diff --git a/Clock/ClockWidget.cpp b/Applications/Clock/ClockWidget.cpp similarity index 100% rename from Clock/ClockWidget.cpp rename to Applications/Clock/ClockWidget.cpp diff --git a/Clock/ClockWidget.h b/Applications/Clock/ClockWidget.h similarity index 100% rename from Clock/ClockWidget.h rename to Applications/Clock/ClockWidget.h diff --git a/Clock/Makefile b/Applications/Clock/Makefile similarity index 95% rename from Clock/Makefile rename to Applications/Clock/Makefile index 60431e8279..13d43b94f4 100644 --- a/Clock/Makefile +++ b/Applications/Clock/Makefile @@ -10,7 +10,7 @@ USERLAND_FLAGS = -ffreestanding -fno-stack-protector -fno-ident WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings FLAVOR_FLAGS = -march=i386 -m32 -fno-exceptions -fno-rtti -fmerge-all-constants -fno-unroll-loops -fno-pie -fno-pic OPTIMIZATION_FLAGS = -Oz -fno-asynchronous-unwind-tables -INCLUDE_FLAGS = -I.. -I. -I../LibC +INCLUDE_FLAGS = -I../.. -I. -I../../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND diff --git a/Clock/main.cpp b/Applications/Clock/main.cpp similarity index 100% rename from Clock/main.cpp rename to Applications/Clock/main.cpp diff --git a/FileManager/.gitignore b/Applications/FileManager/.gitignore similarity index 100% rename from FileManager/.gitignore rename to Applications/FileManager/.gitignore diff --git a/FileManager/DirectoryView.cpp b/Applications/FileManager/DirectoryView.cpp similarity index 100% rename from FileManager/DirectoryView.cpp rename to Applications/FileManager/DirectoryView.cpp diff --git a/FileManager/DirectoryView.h b/Applications/FileManager/DirectoryView.h similarity index 100% rename from FileManager/DirectoryView.h rename to Applications/FileManager/DirectoryView.h diff --git a/FileManager/Makefile b/Applications/FileManager/Makefile similarity index 95% rename from FileManager/Makefile rename to Applications/FileManager/Makefile index d66690d5b7..1fd1842e8e 100644 --- a/FileManager/Makefile +++ b/Applications/FileManager/Makefile @@ -10,7 +10,7 @@ USERLAND_FLAGS = -ffreestanding -fno-stack-protector -fno-ident WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings FLAVOR_FLAGS = -march=i386 -m32 -fno-exceptions -fno-rtti -fmerge-all-constants -fno-unroll-loops -fno-pie -fno-pic OPTIMIZATION_FLAGS = -Oz -fno-asynchronous-unwind-tables -INCLUDE_FLAGS = -I.. -I. -I../LibC +INCLUDE_FLAGS = -I../.. -I. -I../../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND diff --git a/FileManager/main.cpp b/Applications/FileManager/main.cpp similarity index 100% rename from FileManager/main.cpp rename to Applications/FileManager/main.cpp diff --git a/FontEditor/.gitignore b/Applications/FontEditor/.gitignore similarity index 100% rename from FontEditor/.gitignore rename to Applications/FontEditor/.gitignore diff --git a/FontEditor/FontEditor.cpp b/Applications/FontEditor/FontEditor.cpp similarity index 100% rename from FontEditor/FontEditor.cpp rename to Applications/FontEditor/FontEditor.cpp diff --git a/FontEditor/FontEditor.h b/Applications/FontEditor/FontEditor.h similarity index 100% rename from FontEditor/FontEditor.h rename to Applications/FontEditor/FontEditor.h diff --git a/FontEditor/Makefile b/Applications/FontEditor/Makefile similarity index 95% rename from FontEditor/Makefile rename to Applications/FontEditor/Makefile index e80b0620ea..eafdbb0266 100644 --- a/FontEditor/Makefile +++ b/Applications/FontEditor/Makefile @@ -10,7 +10,7 @@ USERLAND_FLAGS = -ffreestanding -fno-stack-protector -fno-ident WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings FLAVOR_FLAGS = -march=i386 -m32 -fno-exceptions -fno-rtti -fmerge-all-constants -fno-unroll-loops -fno-pie -fno-pic OPTIMIZATION_FLAGS = -Oz -fno-asynchronous-unwind-tables -INCLUDE_FLAGS = -I.. -I. -I../LibC +INCLUDE_FLAGS = -I../.. -I. -I../../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND diff --git a/FontEditor/main.cpp b/Applications/FontEditor/main.cpp similarity index 100% rename from FontEditor/main.cpp rename to Applications/FontEditor/main.cpp diff --git a/Launcher/.gitignore b/Applications/Launcher/.gitignore similarity index 100% rename from Launcher/.gitignore rename to Applications/Launcher/.gitignore diff --git a/Launcher/Makefile b/Applications/Launcher/Makefile similarity index 95% rename from Launcher/Makefile rename to Applications/Launcher/Makefile index 60c143b40b..05ee7ea0ba 100644 --- a/Launcher/Makefile +++ b/Applications/Launcher/Makefile @@ -9,7 +9,7 @@ USERLAND_FLAGS = -ffreestanding -fno-stack-protector -fno-ident WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings FLAVOR_FLAGS = -march=i386 -m32 -fno-exceptions -fno-rtti -fmerge-all-constants -fno-unroll-loops -fno-pie -fno-pic OPTIMIZATION_FLAGS = -Oz -fno-asynchronous-unwind-tables -INCLUDE_FLAGS = -I.. -I. -I../LibC +INCLUDE_FLAGS = -I../.. -I. -I../../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND diff --git a/Launcher/main.cpp b/Applications/Launcher/main.cpp similarity index 100% rename from Launcher/main.cpp rename to Applications/Launcher/main.cpp diff --git a/Terminal/.gitignore b/Applications/Terminal/.gitignore similarity index 100% rename from Terminal/.gitignore rename to Applications/Terminal/.gitignore diff --git a/Terminal/Makefile b/Applications/Terminal/Makefile similarity index 95% rename from Terminal/Makefile rename to Applications/Terminal/Makefile index 9b448b9055..bb7f277265 100644 --- a/Terminal/Makefile +++ b/Applications/Terminal/Makefile @@ -10,7 +10,7 @@ USERLAND_FLAGS = -ffreestanding -fno-stack-protector -fno-ident WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings FLAVOR_FLAGS = -march=i386 -m32 -fno-exceptions -fno-rtti -fmerge-all-constants -fno-unroll-loops -fno-pie -fno-pic OPTIMIZATION_FLAGS = -Oz -fno-asynchronous-unwind-tables -INCLUDE_FLAGS = -I.. -I. -I../LibC +INCLUDE_FLAGS = -I../.. -I. -I../../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND diff --git a/Terminal/Terminal.cpp b/Applications/Terminal/Terminal.cpp similarity index 100% rename from Terminal/Terminal.cpp rename to Applications/Terminal/Terminal.cpp diff --git a/Terminal/Terminal.h b/Applications/Terminal/Terminal.h similarity index 100% rename from Terminal/Terminal.h rename to Applications/Terminal/Terminal.h diff --git a/Terminal/XtermColors.h b/Applications/Terminal/XtermColors.h similarity index 100% rename from Terminal/XtermColors.h rename to Applications/Terminal/XtermColors.h diff --git a/Terminal/main.cpp b/Applications/Terminal/main.cpp similarity index 100% rename from Terminal/main.cpp rename to Applications/Terminal/main.cpp diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index bde081dd65..3a688d3065 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -8,16 +8,16 @@ make -C ../LibGUI clean && \ make -C ../LibGUI && \ make -C ../Userland clean && \ make -C ../Userland && \ -make -C ../Terminal clean && \ -make -C ../Terminal && \ -make -C ../FontEditor clean && \ -make -C ../FontEditor && \ -make -C ../Clock clean && \ -make -C ../Clock && \ -make -C ../Launcher clean && \ -make -C ../Launcher && \ -make -C ../FileManager clean && \ -make -C ../FileManager && \ +make -C ../Application/Terminal clean && \ +make -C ../Application/Terminal && \ +make -C ../Application/FontEditor clean && \ +make -C ../Application/FontEditor && \ +make -C ../Application/Clock clean && \ +make -C ../Application/Clock && \ +make -C ../Application/Launcher clean && \ +make -C ../Application/Launcher && \ +make -C ../Application/FileManager clean && \ +make -C ../Application/FileManager && \ make clean &&\ make && \ sudo ./sync.sh diff --git a/Kernel/makeuserland.sh b/Kernel/makeuserland.sh index 1a227dfc30..7d030dccb7 100755 --- a/Kernel/makeuserland.sh +++ b/Kernel/makeuserland.sh @@ -6,12 +6,16 @@ make -C ../LibC clean && \ make -C ../LibC && \ make -C ../LibGUI clean && \ make -C ../LibGUI && \ -make -C ../Terminal clean && \ -make -C ../Terminal && \ -make -C ../Clock clean && \ -make -C ../Clock && \ -make -C ../Launcher clean && \ -make -C ../Launcher && \ +make -C ../Applications/Terminal clean && \ +make -C ../Applications/Terminal && \ +make -C ../Applications/Clock clean && \ +make -C ../Applications/Clock && \ +make -C ../Applications/Launcher clean && \ +make -C ../Applications/Launcher && \ +make -C ../Applications/FileManager clean && \ +make -C ../Applications/FileManager && \ +make -C ../Applications/FontEditor clean && \ +make -C ../Applications/FontEditor && \ make -C ../Userland clean && \ make -C ../Userland && \ sudo ./sync.sh diff --git a/Kernel/sync.sh b/Kernel/sync.sh index 0d99d8b160..9818dbc984 100755 --- a/Kernel/sync.sh +++ b/Kernel/sync.sh @@ -52,15 +52,15 @@ cp -v ../Userland/cp mnt/bin/cp cp -v ../Userland/guitest mnt/bin/guitest cp -v ../Userland/guitest2 mnt/bin/guitest2 cp -v ../Userland/sysctl mnt/bin/sysctl -cp -v ../Terminal/Terminal mnt/bin/Terminal -cp -v ../FontEditor/FontEditor mnt/bin/FontEditor -cp -v ../Launcher/Launcher mnt/bin/Launcher -cp -v ../Clock/Clock mnt/bin/Clock -cp -v ../FileManager/FileManager mnt/bin/FileManager cp -v ../Userland/pape mnt/bin/pape cp -v ../Userland/dmesg mnt/bin/dmesg cp -v ../Userland/chmod mnt/bin/chmod cp -v ../Userland/top mnt/bin/top +cp -v ../Applications/Terminal/Terminal mnt/bin/Terminal +cp -v ../Applications/FontEditor/FontEditor mnt/bin/FontEditor +cp -v ../Applications/Launcher/Launcher mnt/bin/Launcher +cp -v ../Applications/Clock/Clock mnt/bin/Clock +cp -v ../Applications/FileManager/FileManager mnt/bin/FileManager cp -v kernel.map mnt/ sh sync-local.sh umount mnt