From 37465c2d2ff1c5c306b130397f66319be62ec871 Mon Sep 17 00:00:00 2001
From: Enrico Fraccaroli <enrico.fraccaroli@univr.it>
Date: Wed, 20 Oct 2021 13:21:03 +0200
Subject: [PATCH] Move doxygen sources to a separate folder.

---
 CMakeLists.txt                           |   2 +-
 doc/{ => doxygen}/CMakeLists.txt         |   8 ++++----
 doc/{Doxygen => doxygen/Doxyfile}        |   2 +-
 doc/{ => doxygen}/doxygen.css            |   0
 doc/{ => doxygen}/doxygen.scss           |   0
 doc/{ => doxygen}/footer.html            |   0
 doc/{ => doxygen}/header.html            |   0
 doc/{ => doxygen}/resources/gdt_bits.png | Bin
 toolchain.cmake                          |  14 --------------
 9 files changed, 6 insertions(+), 20 deletions(-)
 rename doc/{ => doxygen}/CMakeLists.txt (83%)
 rename doc/{Doxygen => doxygen/Doxyfile} (99%)
 rename doc/{ => doxygen}/doxygen.css (100%)
 rename doc/{ => doxygen}/doxygen.scss (100%)
 rename doc/{ => doxygen}/footer.html (100%)
 rename doc/{ => doxygen}/header.html (100%)
 rename doc/{ => doxygen}/resources/gdt_bits.png (100%)
 delete mode 100644 toolchain.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88509f6..773c357 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,7 @@ add_subdirectory(programs/tests)
 add_subdirectory(mentos)
 add_subdirectory(initscp)
 add_subdirectory(libc)
-add_subdirectory(doc)
+add_subdirectory(doc/doxygen)
 
 # =============================================================================
 # Target to generate the initrd filesystem.
diff --git a/doc/CMakeLists.txt b/doc/doxygen/CMakeLists.txt
similarity index 83%
rename from doc/CMakeLists.txt
rename to doc/doxygen/CMakeLists.txt
index c5d3905..aaad4bf 100644
--- a/doc/CMakeLists.txt
+++ b/doc/doxygen/CMakeLists.txt
@@ -2,12 +2,12 @@
 find_package(Doxygen)
 
 if (DOXYGEN_FOUND)
-    set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/doc_doxygen)
+    set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
     set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/html/index.html)
 
     # Replace variables inside @@ with the current values.
-    set(DOXYFILE_IN  ${CMAKE_CURRENT_SOURCE_DIR}/Doxygen)
-    set(DOXYFILE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxygen)
+    set(DOXYFILE_IN  ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
+    set(DOXYFILE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
     configure_file(${DOXYFILE_IN} ${DOXYFILE_OUT} @ONLY)
 
     # Copy the files needd by the documentation.
@@ -26,7 +26,7 @@ if (DOXYGEN_FOUND)
             COMMENT "Generating docs"
     )
     add_custom_target(
-            Doxygen
+            doxygen_doc
             DEPENDS
             ${DOXYGEN_INDEX_FILE}
             ${DOXYFILE_IN}
diff --git a/doc/Doxygen b/doc/doxygen/Doxyfile
similarity index 99%
rename from doc/Doxygen
rename to doc/doxygen/Doxyfile
index a4fcf6d..b1875a1 100644
--- a/doc/Doxygen
+++ b/doc/doxygen/Doxyfile
@@ -1990,7 +1990,7 @@ MAN_LINKS              = NO
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
diff --git a/doc/doxygen.css b/doc/doxygen/doxygen.css
similarity index 100%
rename from doc/doxygen.css
rename to doc/doxygen/doxygen.css
diff --git a/doc/doxygen.scss b/doc/doxygen/doxygen.scss
similarity index 100%
rename from doc/doxygen.scss
rename to doc/doxygen/doxygen.scss
diff --git a/doc/footer.html b/doc/doxygen/footer.html
similarity index 100%
rename from doc/footer.html
rename to doc/doxygen/footer.html
diff --git a/doc/header.html b/doc/doxygen/header.html
similarity index 100%
rename from doc/header.html
rename to doc/doxygen/header.html
diff --git a/doc/resources/gdt_bits.png b/doc/doxygen/resources/gdt_bits.png
similarity index 100%
rename from doc/resources/gdt_bits.png
rename to doc/doxygen/resources/gdt_bits.png
diff --git a/toolchain.cmake b/toolchain.cmake
deleted file mode 100644
index 294635c..0000000
--- a/toolchain.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(CMAKE_SYSTEM_NAME Generic)
-
-if(CMAKE_VERSION VERSION_LESS "3.6.0")
-    INCLUDE(CMakeForceCompiler)
-    CMAKE_FORCE_C_COMPILER(i386-elf-gcc Clang)
-    CMAKE_FORCE_CXX_COMPILER(i386-elf-g++ Clang)
-else()
-    set(CMAKE_C_COMPILER i386-elf-gcc)
-    set(CMAKE_CXX_COMPILER i386-elf-g++)
-    set(CMAKE_AR i386-elf-ar)
-endif()
-
-set(CMAKE_LINKER i386-elf-ld)
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")