Move apps into a top-level Applications/ directory.

abyesilyurt · Feb 10, 2019 · 2cf1dd5 · 2cf1dd5
1 parent 29f2a22
commit 2cf1dd5
Show file tree

Hide file tree

Showing 27 changed files with 30 additions and 26 deletions.
diff --git a/Clock/.gitignore → Applications/Clock/.gitignore b/Clock/.gitignore → Applications/Clock/.gitignore
diff --git a/Clock/ClockWidget.cpp → Applications/Clock/ClockWidget.cpp b/Clock/ClockWidget.cpp → Applications/Clock/ClockWidget.cpp
diff --git a/Clock/ClockWidget.h → Applications/Clock/ClockWidget.h b/Clock/ClockWidget.h → Applications/Clock/ClockWidget.h
diff --git a/Clock/Makefile → Applications/Clock/Makefile b/Clock/Makefile → 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 → Applications/Clock/main.cpp b/Clock/main.cpp → Applications/Clock/main.cpp
diff --git a/FileManager/.gitignore → Applications/FileManager/.gitignore b/FileManager/.gitignore → Applications/FileManager/.gitignore
diff --git a/FileManager/DirectoryView.cpp → Applications/FileManager/DirectoryView.cpp b/FileManager/DirectoryView.cpp → Applications/FileManager/DirectoryView.cpp
diff --git a/FileManager/DirectoryView.h → Applications/FileManager/DirectoryView.h b/FileManager/DirectoryView.h → Applications/FileManager/DirectoryView.h
diff --git a/FileManager/Makefile → Applications/FileManager/Makefile b/FileManager/Makefile → 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 → Applications/FileManager/main.cpp b/FileManager/main.cpp → Applications/FileManager/main.cpp
diff --git a/FontEditor/.gitignore → Applications/FontEditor/.gitignore b/FontEditor/.gitignore → Applications/FontEditor/.gitignore
diff --git a/FontEditor/FontEditor.cpp → Applications/FontEditor/FontEditor.cpp b/FontEditor/FontEditor.cpp → Applications/FontEditor/FontEditor.cpp
diff --git a/FontEditor/FontEditor.h → Applications/FontEditor/FontEditor.h b/FontEditor/FontEditor.h → Applications/FontEditor/FontEditor.h
diff --git a/FontEditor/Makefile → Applications/FontEditor/Makefile b/FontEditor/Makefile → 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 → Applications/FontEditor/main.cpp b/FontEditor/main.cpp → Applications/FontEditor/main.cpp
diff --git a/Launcher/.gitignore → Applications/Launcher/.gitignore b/Launcher/.gitignore → Applications/Launcher/.gitignore
diff --git a/Launcher/Makefile → Applications/Launcher/Makefile b/Launcher/Makefile → 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 → Applications/Launcher/main.cpp b/Launcher/main.cpp → Applications/Launcher/main.cpp
diff --git a/Terminal/.gitignore → Applications/Terminal/.gitignore b/Terminal/.gitignore → Applications/Terminal/.gitignore
diff --git a/Terminal/Makefile → Applications/Terminal/Makefile b/Terminal/Makefile → 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 → Applications/Terminal/Terminal.cpp b/Terminal/Terminal.cpp → Applications/Terminal/Terminal.cpp
diff --git a/Terminal/Terminal.h → Applications/Terminal/Terminal.h b/Terminal/Terminal.h → Applications/Terminal/Terminal.h
diff --git a/Terminal/XtermColors.h → Applications/Terminal/XtermColors.h b/Terminal/XtermColors.h → Applications/Terminal/XtermColors.h
diff --git a/Terminal/main.cpp → Applications/Terminal/main.cpp b/Terminal/main.cpp → Applications/Terminal/main.cpp
diff --git 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
@@ -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
@@ -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