refac: flattened structure, changed directory names, and removed free… (

#1807)

* refac: flattened structure, changed directory names, and removed freetype from mac builds

* chore: delete duplicate directory

* chore: delete duplicate directory

* fix: ci pipelines

* fix: ci builds for linux/mac

* fix: ci builds for linux/mac

* add debug info to ci

* again

* fix: static analysis

* Update CMakeLists.txt

.gitattributes

@@ -25,13 +25,12 @@
 .gitignore     export-ignore
 
 # generated code
-DearPyGui/dearpygui/dearpygui.py      linguist-generated
-DearPyGui/dearpygui/_dearpygui.pyi    linguist-generated
-DearPyGui/dearpygui/_dearpygui_RTD.py linguist-generated
+dearpygui/dearpygui.py      linguist-generated
+dearpygui/_dearpygui.pyi    linguist-generated
+dearpygui/_dearpygui_RTD.py linguist-generated
 
 # vendored code
-DearPyGui/vendor/* linguist-vendored
-Dependencies/* linguist-vendored
+thirdparty/* linguist-vendored
 
 # documentation
 docs/* linguist-documentation

.github/CODEOWNERS

@@ -1,28 +1,26 @@
 # default owners
-*                                   @hoffstadt
+*                       @hoffstadt
 
 # directories
-/Dependencies/                      @hoffstadt
-/Scripts/                           @hoffstadt
-/DearPyGui/                         @hoffstadt @Pcothren
-/ImGuiTesting/                      @hoffstadt @Pcothren
-/Tools/*                            @hoffstadt @Pcothren
-/docs/*                             @hoffstadt @Pcothren
+/thirdparty/            @hoffstadt
+/scripts/               @hoffstadt
+/src/                   @hoffstadt @Pcothren
+/docs/*                 @hoffstadt @Pcothren
 
 # specific files
-/DearPyGui/cmake/distribution.cmake @hoffstadt
-/DearPyGui/cmake/embedded.cmake     @hoffstadt
-/DearPyGui/CMakeLists.txt           @hoffstadt
-/DearPyGui/.gitignore               @hoffstadt
-CMakeLists.txt                      @hoffstadt
-CMakeSettings.json                  @hoffstadt
-setup.py                            @hoffstadt
-.gitattributes                      @hoffstadt
-.gitignore                          @hoffstadt
-.gitmodules                         @hoffstadt
-.readthedocs.yaml                   @hoffstadt @Pcothren
+/src/distribution.cmake @hoffstadt
+/src/embedded.cmake     @hoffstadt
+/src/CMakeLists.txt     @hoffstadt
+/src/.gitignore         @hoffstadt
+CMakeLists.txt          @hoffstadt
+CMakeSettings.json      @hoffstadt
+setup.py                @hoffstadt
+.gitattributes          @hoffstadt
+.gitignore              @hoffstadt
+.gitmodules             @hoffstadt
+.readthedocs.yaml       @hoffstadt @Pcothren
 
 # no owners
 README.md
 /docs/source/
-/Resources
+/assets

.github/workflows/Deployment.yml

@@ -51,8 +51,8 @@ jobs:
     - name: Retrieve submodules
       shell: cmd
       run: |
-        git submodule update --init --recursive ./Dependencies/imgui
-        git submodule update --init --recursive ./Dependencies/freetype
+        git submodule update --init --recursive ./thirdparty/imgui
+        git submodule update --init --recursive ./thirdparty/freetype
       
     - name: Mark Versions
       shell: cmd
@@ -93,9 +93,8 @@ jobs:
 
     - name: Retrieve submodules
       run: |
-        git submodule update --init --recursive ./Dependencies/imgui
-        git submodule update --init --recursive ./Dependencies/freetype
-        git submodule update --init --recursive ./Dependencies/glfw
+        git submodule update --init --recursive ./thirdparty/imgui
+        git submodule update --init --recursive ./thirdparty/glfw
     
     - name: Mark Versions
       run: |
@@ -136,13 +135,10 @@ jobs:
 
     - name: Retrieve submodules/Dependencies
       run: |
-        git submodule update --init --recursive ./Dependencies/imgui
-        git submodule update --init --recursive ./Dependencies/freetype
-        git submodule update --init --recursive ./Dependencies/glfw
+        git submodule update --init --recursive ./thirdparty/imgui
+        git submodule update --init --recursive ./thirdparty/glfw
         sudo apt-get update
         sudo apt-get install libglu1-mesa-dev libgl1-mesa-dev xorg-dev libxrandr-dev -y
-        sudo apt-get install libfreetype6-dev -y
-        sudo apt-get install libharfbuzz-dev -y
     
     - name: Mark Versions
       run: |

.github/workflows/EmbeddedBuild.yml

@@ -14,9 +14,8 @@ on:
 
     paths-ignore:
       - 'docs/**'
-      - 'Resources/**'
-      - 'Scripts/**'
-      - 'Tools/**'
+      - 'assets/**'
+      - 'scripts/**'
 
   pull_request:
 
@@ -42,7 +41,7 @@ jobs:
       shell: cmd
       run: |
         cd %GITHUB_WORKSPACE%
-        cd Scripts
+        cd scripts
         call BuildPythonForWindows.bat --ci
         
     - name: Build DearPyGui
@@ -78,8 +77,9 @@ jobs:
     - name: Build Python
       run: |
         cd $GITHUB_WORKSPACE
-        cd Dependencies/cpython
+        cd thirdparty/cpython
         mkdir -p build/debug
+        chmod +x configure
         cd build/debug
         ../../configure --with-pydebug --enable-shared --prefix=$(pwd) LDFLAGS=-Wl,-rpath,$(pwd)
         make
@@ -113,13 +113,14 @@ jobs:
       run: |
         cd $GITHUB_WORKSPACE
         sudo apt-get update 
-        sudo apt-get install libgl1-mesa-dev xorg-dev libfreetype6-dev
+        sudo apt-get install libgl1-mesa-dev xorg-dev
     
     - name: Build Python
       run: |
         cd $GITHUB_WORKSPACE
-        cd Dependencies/cpython
+        cd thirdparty/cpython
         mkdir -p build/debug
+        chmod +x configure
         cd build/debug
         ../../configure --with-pydebug --enable-shared
         make

.github/workflows/static-analysis.yml

@@ -10,9 +10,8 @@ on:
 
     paths-ignore:
       - 'docs/**'
-      - 'Resources/**'
-      - 'Scripts/**'
-      - 'Tools/**'
+      - 'assets/**'
+      - 'scripts/**'
 
   pull_request:
   workflow_dispatch:
@@ -49,8 +48,8 @@ jobs:
           sudo apt-get update
           sudo apt-get install libgl1-mesa-dev
           sudo apt-get install xorg-dev
-          sudo apt-get install libfreetype6-dev
-          cd Dependencies/cpython
+          cd thirdparty/cpython
+          chmod +x configure
           mkdir -p build/debug
           cd build/debug
           ../../configure --with-pydebug --enable-shared
@@ -70,7 +69,7 @@ jobs:
           cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=On
           cd ..
           pvs-studio-analyzer trace -- cmake --build cmake-build-debug --config Debug
-          pvs-studio-analyzer analyze -e ./Dependencies -e ./DearPyGui/vendor -e ./DearPyGui/src/core/AppItems/custom/mvTextEditor.cpp -l pvs-studio.lic -o pvs-studio.log
+          pvs-studio-analyzer analyze -e ./thirdparty -l pvs-studio.lic -o pvs-studio.log
           plog-converter -a 'GA:1,2;OP:1' -t fullhtml -o pvs-studio.html -w pvs-studio.log
 
       - name: Archive code coverage results

.gitmodules

@@ -1,18 +1,18 @@
-[submodule "Dependencies/imgui"]
-	path = Dependencies/imgui
+[submodule "thirdparty/imgui"]
+	path = thirdparty/imgui
 	url = https://github.com/ocornut/imgui
 	branch = master
-[submodule "Dependencies/cpython"]
-	path = Dependencies/cpython
+[submodule "thirdparty/cpython"]
+	path = thirdparty/cpython
 	url = https://github.com/python/cpython
 	branch = master
-[submodule "Dependencies/glfw"]
-	path = Dependencies/glfw
+[submodule "thirdparty/glfw"]
+	path = thirdparty/glfw
 	url = https://github.com/glfw/glfw
 	branch = master
-[submodule "Dependencies/freetype"]
-	path = Dependencies/freetype
+[submodule "thirdparty/freetype"]
+	path = thirdparty/freetype
 	url = https://gitlab.freedesktop.org/freetype/freetype
-[submodule "Dependencies/DearPyGui_Ext"]
-	path = Dependencies/DearPyGui_Ext
+[submodule "thirdparty/DearPyGui_Ext"]
+	path = thirdparty/DearPyGui_Ext
 	url = https://github.com/hoffstadt/DearPyGui_Ext

CMakeLists.txt

@@ -6,7 +6,7 @@ if(WIN32)
     add_definitions(-DIMGUI_USER_CONFIG="mvImGuiConfig.h")
     add_definitions(-DMV_PLATFORM="windows")
 elseif(APPLE)
-    add_definitions(-DIMGUI_USER_CONFIG="mvImGuiConfig.h")
+    add_definitions(-DIMGUI_USER_CONFIG="mvImGuiLinuxConfig.h")
     add_definitions(-DMV_PLATFORM="apple")
 else() # Linux
 	add_definitions(-DIMGUI_USER_CONFIG="mvImGuiLinuxConfig.h")
@@ -48,12 +48,12 @@ if(MV_TESTS_ONLY)
     add_definitions(-DMV_TESTS_ONLY)
 endif()
 
-add_subdirectory("Dependencies")
+add_subdirectory("thirdparty")
 
 # if this is not a distribution build
 # build development environment
 if(NOT MVDIST_ONLY)
-    add_subdirectory ("DearSandbox")
+    add_subdirectory ("sandbox")
 endif()
 
-add_subdirectory ("DearPyGui")
+add_subdirectory ("src")