From 6e5246e31265970c996f1beb913d449730cede7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 9 Feb 2017 00:07:44 +0100 Subject: [PATCH] Reorder the folders in tools to prepare moving tools/editor - `certs` and `editor_fonts` go to `thirdparty` - `dist` and `scripts` go to a new `misc` folder - `collada` and `doc` go to `tools/editor` The next step will be to rename `tools/editor` to `editor` directly, but this will be done at the right time to avoid breaking too many PRs. (cherry picked from commit b87a232668d9f9f3b32c2fceb60bc5f6ef46df22) --- SConstruct | 4 +- main/main.cpp | 5 +- {tools => misc}/dist/docker/Dockerfile | 0 {tools => misc}/dist/docker/README.md | 0 .../dist/docker/scripts/install-android-tools | 0 {tools => misc}/dist/html_fs/godot.html | 0 {tools => misc}/dist/html_fs/godotfs.js | 0 .../dist/ios_xcode/godot_xcode/data.pck | 0 .../ios_xcode/godot_xcode/godot_debug.iphone | 0 .../godot_ios.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../godot_ios/Default-568h@2x~iphone.png | Bin .../godot_xcode/godot_ios/Default-667h.png | Bin .../godot_xcode/godot_ios/Default-667h@2x.png | Bin .../godot_xcode/godot_ios/Default-736h.png | Bin .../godot_xcode/godot_ios/Default-736h@3x.png | Bin .../godot_ios/Default-Landscape-736h.png | Bin .../godot_ios/Default-Landscape@2x~ipad.png | Bin .../godot_ios/Default-Landscape~ipad.png | Bin .../godot_ios/Default-Portrait@2x~ipad.png | Bin .../godot_ios/Default-Portrait~ipad.png | Bin .../godot_ios/Default@2x~iphone.png | Bin .../godot_xcode/godot_ios/Default~iphone.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/Icon-100.png | Bin .../AppIcon.appiconset/Icon-114.png | Bin .../AppIcon.appiconset/Icon-120.png | Bin .../AppIcon.appiconset/Icon-144.png | Bin .../AppIcon.appiconset/Icon-152.png | Bin .../AppIcon.appiconset/Icon-180.png | Bin .../AppIcon.appiconset/Icon-29.png | Bin .../AppIcon.appiconset/Icon-40.png | Bin .../AppIcon.appiconset/Icon-50.png | Bin .../AppIcon.appiconset/Icon-57.png | Bin .../AppIcon.appiconset/Icon-58.png | Bin .../AppIcon.appiconset/Icon-60.png | Bin .../AppIcon.appiconset/Icon-72.png | Bin .../AppIcon.appiconset/Icon-76.png | Bin .../AppIcon.appiconset/Icon-80.png | Bin .../AppIcon.appiconset/icon-167.png | Bin .../AppIcon.appiconset/icon-87.png | Bin .../Images.xcassets/AppIcon.appiconset/sizes | 0 .../godot_ios/en.lproj/InfoPlist.strings | 0 .../godot_ios/godot_ios-Info.plist | 0 .../ios_xcode/godot_xcode/godot_ios/main.m | 0 .../ios_xcode/godot_xcode/godot_opt.iphone | 0 .../dist/osx_template.app/Contents/Info.plist | 0 .../dist/osx_template.app/Contents/PkgInfo | 0 .../Contents/Resources/icon.icns | Bin .../dist/osx_tools.app/Contents/Info.plist | 0 .../dist/osx_tools.app/Contents/PkgInfo | 0 .../Contents/Resources/Godot.icns | Bin {tools => misc}/scripts/addheader.py | 0 {tools => misc}/scripts/file-hex-array.py | 0 {tools => misc}/scripts/make_bmfhdr.py | 0 {tools => misc}/scripts/make_glwrapper.py | 0 {tools => misc}/scripts/make_icons.sh | 0 {tools => misc}/scripts/makeargs.py | 0 {tools => misc}/scripts/memsort.py | 0 {tools => misc}/scripts/sort-demos.sh | 0 {tools => misc}/scripts/svgs_2_pngs.py | 0 thirdparty/README.md | 14 ++ .../certs/ca-certificates.crt | 0 .../fonts}/DroidSans.ttf | Bin .../fonts}/DroidSansArabic.ttf | Bin .../fonts}/DroidSansFallback.ttf | Bin .../fonts}/DroidSansHebrew.ttf | Bin .../fonts}/DroidSansJapanese.ttf | Bin .../fonts}/DroidSansThai.ttf | Bin .../fonts}/LICENSE.DroidSans.txt | 0 .../fonts}/LICENSE.SourceCodePro.txt | 0 .../fonts}/source_code_pro.otf | Bin tools/SCsub | 121 ------------- tools/editor/SCsub | 169 ++++++++++++++---- tools/{ => editor}/collada/SCsub | 2 +- tools/{ => editor}/collada/collada.cpp | 0 tools/{ => editor}/collada/collada.h | 0 tools/{ => editor}/doc/SCsub | 2 +- tools/{ => editor}/doc/doc_data.cpp | 0 tools/{ => editor}/doc/doc_data.h | 0 tools/{ => editor}/doc/doc_dump.cpp | 0 tools/{ => editor}/doc/doc_dump.h | 0 tools/editor/editor_help.h | 2 +- tools/editor/fileserver/SCsub | 2 +- tools/editor/icons/SCsub | 2 +- tools/editor/io_plugins/SCsub | 2 +- .../io_plugins/editor_import_collada.cpp | 3 +- tools/editor/plugins/SCsub | 2 +- tools/{ => editor}/translations/Makefile | 0 tools/{ => editor}/translations/README.md | 0 tools/{ => editor}/translations/bn.po | 0 tools/{ => editor}/translations/ca.po | 0 tools/{ => editor}/translations/de.po | 0 tools/{ => editor}/translations/es.po | 0 tools/{ => editor}/translations/es_AR.po | 0 tools/{ => editor}/translations/extract.py | 0 tools/{ => editor}/translations/fa.po | 0 tools/{ => editor}/translations/fr.po | 0 tools/{ => editor}/translations/id.po | 0 tools/{ => editor}/translations/it.po | 0 tools/{ => editor}/translations/ko.po | 0 tools/{ => editor}/translations/pl.po | 0 tools/{ => editor}/translations/pt_BR.po | 0 tools/{ => editor}/translations/ru.po | 0 tools/{ => editor}/translations/tools.pot | 0 tools/{ => editor}/translations/tr.po | 0 tools/{ => editor}/translations/zh_CN.po | 0 107 files changed, 163 insertions(+), 167 deletions(-) rename {tools => misc}/dist/docker/Dockerfile (100%) rename {tools => misc}/dist/docker/README.md (100%) rename {tools => misc}/dist/docker/scripts/install-android-tools (100%) rename {tools => misc}/dist/html_fs/godot.html (100%) rename {tools => misc}/dist/html_fs/godotfs.js (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/data.pck (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_debug.iphone (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-667h.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-667h@2x.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-736h.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-736h@3x.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape-736h.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default@2x~iphone.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Default~iphone.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/godot_ios-Info.plist (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_ios/main.m (100%) rename {tools => misc}/dist/ios_xcode/godot_xcode/godot_opt.iphone (100%) rename {tools => misc}/dist/osx_template.app/Contents/Info.plist (100%) rename {tools => misc}/dist/osx_template.app/Contents/PkgInfo (100%) rename {tools => misc}/dist/osx_template.app/Contents/Resources/icon.icns (100%) rename {tools => misc}/dist/osx_tools.app/Contents/Info.plist (100%) rename {tools => misc}/dist/osx_tools.app/Contents/PkgInfo (100%) rename {tools => misc}/dist/osx_tools.app/Contents/Resources/Godot.icns (100%) rename {tools => misc}/scripts/addheader.py (100%) rename {tools => misc}/scripts/file-hex-array.py (100%) rename {tools => misc}/scripts/make_bmfhdr.py (100%) rename {tools => misc}/scripts/make_glwrapper.py (100%) rename {tools => misc}/scripts/make_icons.sh (100%) rename {tools => misc}/scripts/makeargs.py (100%) rename {tools => misc}/scripts/memsort.py (100%) rename {tools => misc}/scripts/sort-demos.sh (100%) rename {tools => misc}/scripts/svgs_2_pngs.py (100%) rename {tools => thirdparty}/certs/ca-certificates.crt (100%) rename {tools/editor_fonts => thirdparty/fonts}/DroidSans.ttf (100%) rename {tools/editor_fonts => thirdparty/fonts}/DroidSansArabic.ttf (100%) rename {tools/editor_fonts => thirdparty/fonts}/DroidSansFallback.ttf (100%) rename {tools/editor_fonts => thirdparty/fonts}/DroidSansHebrew.ttf (100%) rename {tools/editor_fonts => thirdparty/fonts}/DroidSansJapanese.ttf (100%) rename {tools/editor_fonts => thirdparty/fonts}/DroidSansThai.ttf (100%) rename {tools/editor_fonts => thirdparty/fonts}/LICENSE.DroidSans.txt (100%) rename {tools/editor_fonts => thirdparty/fonts}/LICENSE.SourceCodePro.txt (100%) rename {tools/editor_fonts => thirdparty/fonts}/source_code_pro.otf (100%) delete mode 100644 tools/SCsub rename tools/{ => editor}/collada/SCsub (51%) rename tools/{ => editor}/collada/collada.cpp (100%) rename tools/{ => editor}/collada/collada.h (100%) rename tools/{ => editor}/doc/SCsub (51%) rename tools/{ => editor}/doc/doc_data.cpp (100%) rename tools/{ => editor}/doc/doc_data.h (100%) rename tools/{ => editor}/doc/doc_dump.cpp (100%) rename tools/{ => editor}/doc/doc_dump.h (100%) rename tools/{ => editor}/translations/Makefile (100%) rename tools/{ => editor}/translations/README.md (100%) rename tools/{ => editor}/translations/bn.po (100%) rename tools/{ => editor}/translations/ca.po (100%) rename tools/{ => editor}/translations/de.po (100%) rename tools/{ => editor}/translations/es.po (100%) rename tools/{ => editor}/translations/es_AR.po (100%) rename tools/{ => editor}/translations/extract.py (100%) rename tools/{ => editor}/translations/fa.po (100%) rename tools/{ => editor}/translations/fr.po (100%) rename tools/{ => editor}/translations/id.po (100%) rename tools/{ => editor}/translations/it.po (100%) rename tools/{ => editor}/translations/ko.po (100%) rename tools/{ => editor}/translations/pl.po (100%) rename tools/{ => editor}/translations/pt_BR.po (100%) rename tools/{ => editor}/translations/ru.po (100%) rename tools/{ => editor}/translations/tools.pot (100%) rename tools/{ => editor}/translations/tr.po (100%) rename tools/{ => editor}/translations/zh_CN.po (100%) diff --git a/SConstruct b/SConstruct index c529021d557..84f3032f6e8 100644 --- a/SConstruct +++ b/SConstruct @@ -359,7 +359,7 @@ if selected_platform in platform_list: SConscript("core/SCsub") SConscript("servers/SCsub") SConscript("scene/SCsub") - SConscript("tools/SCsub") + SConscript("tools/editor/SCsub") SConscript("drivers/SCsub") SConscript("modules/SCsub") @@ -375,7 +375,7 @@ if selected_platform in platform_list: AddToVSProject(env.modules_sources) AddToVSProject(env.scene_sources) AddToVSProject(env.servers_sources) - AddToVSProject(env.tool_sources) + AddToVSProject(env.editor_sources) # this env flag won't work, it needs to be set in env_base=Environment(MSVC_VERSION='9.0') # Even then, SCons still seems to ignore it and builds with the latest MSVC... diff --git a/main/main.cpp b/main/main.cpp index a483cca25f1..6b35d2d4d7a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -54,20 +54,17 @@ #include "scene/main/viewport.h" #ifdef TOOLS_ENABLED +#include "tools/editor/doc/doc_data.h" #include "tools/editor/editor_node.h" #include "tools/editor/project_manager.h" - #endif #include "io/file_access_network.h" -#include "tools/doc/doc_data.h" - #include "servers/spatial_sound_server.h" #include "servers/spatial_sound_2d_server.h" #include "servers/physics_2d_server.h" - #include "core/io/stream_peer_tcp.h" #include "core/os/thread.h" #include "core/io/file_access_pack.h" diff --git a/tools/dist/docker/Dockerfile b/misc/dist/docker/Dockerfile similarity index 100% rename from tools/dist/docker/Dockerfile rename to misc/dist/docker/Dockerfile diff --git a/tools/dist/docker/README.md b/misc/dist/docker/README.md similarity index 100% rename from tools/dist/docker/README.md rename to misc/dist/docker/README.md diff --git a/tools/dist/docker/scripts/install-android-tools b/misc/dist/docker/scripts/install-android-tools similarity index 100% rename from tools/dist/docker/scripts/install-android-tools rename to misc/dist/docker/scripts/install-android-tools diff --git a/tools/dist/html_fs/godot.html b/misc/dist/html_fs/godot.html similarity index 100% rename from tools/dist/html_fs/godot.html rename to misc/dist/html_fs/godot.html diff --git a/tools/dist/html_fs/godotfs.js b/misc/dist/html_fs/godotfs.js similarity index 100% rename from tools/dist/html_fs/godotfs.js rename to misc/dist/html_fs/godotfs.js diff --git a/tools/dist/ios_xcode/godot_xcode/data.pck b/misc/dist/ios_xcode/godot_xcode/data.pck similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/data.pck rename to misc/dist/ios_xcode/godot_xcode/data.pck diff --git a/tools/dist/ios_xcode/godot_xcode/godot_debug.iphone b/misc/dist/ios_xcode/godot_xcode/godot_debug.iphone similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_debug.iphone rename to misc/dist/ios_xcode/godot_xcode/godot_debug.iphone diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj b/misc/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj rename to misc/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/misc/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to misc/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-667h.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-667h.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h@2x.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-667h@2x.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h@2x.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-667h@2x.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-736h.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-736h.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h@3x.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-736h@3x.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h@3x.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-736h@3x.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape-736h.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape-736h.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape-736h.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape-736h.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default@2x~iphone.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default@2x~iphone.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default@2x~iphone.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default@2x~iphone.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Default~iphone.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Default~iphone.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Default~iphone.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Default~iphone.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes b/misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes rename to misc/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings b/misc/dist/ios_xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings rename to misc/dist/ios_xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/godot_ios-Info.plist b/misc/dist/ios_xcode/godot_xcode/godot_ios/godot_ios-Info.plist similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/godot_ios-Info.plist rename to misc/dist/ios_xcode/godot_xcode/godot_ios/godot_ios-Info.plist diff --git a/tools/dist/ios_xcode/godot_xcode/godot_ios/main.m b/misc/dist/ios_xcode/godot_xcode/godot_ios/main.m similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_ios/main.m rename to misc/dist/ios_xcode/godot_xcode/godot_ios/main.m diff --git a/tools/dist/ios_xcode/godot_xcode/godot_opt.iphone b/misc/dist/ios_xcode/godot_xcode/godot_opt.iphone similarity index 100% rename from tools/dist/ios_xcode/godot_xcode/godot_opt.iphone rename to misc/dist/ios_xcode/godot_xcode/godot_opt.iphone diff --git a/tools/dist/osx_template.app/Contents/Info.plist b/misc/dist/osx_template.app/Contents/Info.plist similarity index 100% rename from tools/dist/osx_template.app/Contents/Info.plist rename to misc/dist/osx_template.app/Contents/Info.plist diff --git a/tools/dist/osx_template.app/Contents/PkgInfo b/misc/dist/osx_template.app/Contents/PkgInfo similarity index 100% rename from tools/dist/osx_template.app/Contents/PkgInfo rename to misc/dist/osx_template.app/Contents/PkgInfo diff --git a/tools/dist/osx_template.app/Contents/Resources/icon.icns b/misc/dist/osx_template.app/Contents/Resources/icon.icns similarity index 100% rename from tools/dist/osx_template.app/Contents/Resources/icon.icns rename to misc/dist/osx_template.app/Contents/Resources/icon.icns diff --git a/tools/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist similarity index 100% rename from tools/dist/osx_tools.app/Contents/Info.plist rename to misc/dist/osx_tools.app/Contents/Info.plist diff --git a/tools/dist/osx_tools.app/Contents/PkgInfo b/misc/dist/osx_tools.app/Contents/PkgInfo similarity index 100% rename from tools/dist/osx_tools.app/Contents/PkgInfo rename to misc/dist/osx_tools.app/Contents/PkgInfo diff --git a/tools/dist/osx_tools.app/Contents/Resources/Godot.icns b/misc/dist/osx_tools.app/Contents/Resources/Godot.icns similarity index 100% rename from tools/dist/osx_tools.app/Contents/Resources/Godot.icns rename to misc/dist/osx_tools.app/Contents/Resources/Godot.icns diff --git a/tools/scripts/addheader.py b/misc/scripts/addheader.py similarity index 100% rename from tools/scripts/addheader.py rename to misc/scripts/addheader.py diff --git a/tools/scripts/file-hex-array.py b/misc/scripts/file-hex-array.py similarity index 100% rename from tools/scripts/file-hex-array.py rename to misc/scripts/file-hex-array.py diff --git a/tools/scripts/make_bmfhdr.py b/misc/scripts/make_bmfhdr.py similarity index 100% rename from tools/scripts/make_bmfhdr.py rename to misc/scripts/make_bmfhdr.py diff --git a/tools/scripts/make_glwrapper.py b/misc/scripts/make_glwrapper.py similarity index 100% rename from tools/scripts/make_glwrapper.py rename to misc/scripts/make_glwrapper.py diff --git a/tools/scripts/make_icons.sh b/misc/scripts/make_icons.sh similarity index 100% rename from tools/scripts/make_icons.sh rename to misc/scripts/make_icons.sh diff --git a/tools/scripts/makeargs.py b/misc/scripts/makeargs.py similarity index 100% rename from tools/scripts/makeargs.py rename to misc/scripts/makeargs.py diff --git a/tools/scripts/memsort.py b/misc/scripts/memsort.py similarity index 100% rename from tools/scripts/memsort.py rename to misc/scripts/memsort.py diff --git a/tools/scripts/sort-demos.sh b/misc/scripts/sort-demos.sh similarity index 100% rename from tools/scripts/sort-demos.sh rename to misc/scripts/sort-demos.sh diff --git a/tools/scripts/svgs_2_pngs.py b/misc/scripts/svgs_2_pngs.py similarity index 100% rename from tools/scripts/svgs_2_pngs.py rename to misc/scripts/svgs_2_pngs.py diff --git a/thirdparty/README.md b/thirdparty/README.md index 95ce7f8dee4..e1c92605faf 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -1,6 +1,20 @@ # Third party libraries +## certs + +- Upstream: ? + +TODO. + + +## fonts + +- Upstream: ? + +TODO. + + ## freetype - Upstream: https://www.freetype.org diff --git a/tools/certs/ca-certificates.crt b/thirdparty/certs/ca-certificates.crt similarity index 100% rename from tools/certs/ca-certificates.crt rename to thirdparty/certs/ca-certificates.crt diff --git a/tools/editor_fonts/DroidSans.ttf b/thirdparty/fonts/DroidSans.ttf similarity index 100% rename from tools/editor_fonts/DroidSans.ttf rename to thirdparty/fonts/DroidSans.ttf diff --git a/tools/editor_fonts/DroidSansArabic.ttf b/thirdparty/fonts/DroidSansArabic.ttf similarity index 100% rename from tools/editor_fonts/DroidSansArabic.ttf rename to thirdparty/fonts/DroidSansArabic.ttf diff --git a/tools/editor_fonts/DroidSansFallback.ttf b/thirdparty/fonts/DroidSansFallback.ttf similarity index 100% rename from tools/editor_fonts/DroidSansFallback.ttf rename to thirdparty/fonts/DroidSansFallback.ttf diff --git a/tools/editor_fonts/DroidSansHebrew.ttf b/thirdparty/fonts/DroidSansHebrew.ttf similarity index 100% rename from tools/editor_fonts/DroidSansHebrew.ttf rename to thirdparty/fonts/DroidSansHebrew.ttf diff --git a/tools/editor_fonts/DroidSansJapanese.ttf b/thirdparty/fonts/DroidSansJapanese.ttf similarity index 100% rename from tools/editor_fonts/DroidSansJapanese.ttf rename to thirdparty/fonts/DroidSansJapanese.ttf diff --git a/tools/editor_fonts/DroidSansThai.ttf b/thirdparty/fonts/DroidSansThai.ttf similarity index 100% rename from tools/editor_fonts/DroidSansThai.ttf rename to thirdparty/fonts/DroidSansThai.ttf diff --git a/tools/editor_fonts/LICENSE.DroidSans.txt b/thirdparty/fonts/LICENSE.DroidSans.txt similarity index 100% rename from tools/editor_fonts/LICENSE.DroidSans.txt rename to thirdparty/fonts/LICENSE.DroidSans.txt diff --git a/tools/editor_fonts/LICENSE.SourceCodePro.txt b/thirdparty/fonts/LICENSE.SourceCodePro.txt similarity index 100% rename from tools/editor_fonts/LICENSE.SourceCodePro.txt rename to thirdparty/fonts/LICENSE.SourceCodePro.txt diff --git a/tools/editor_fonts/source_code_pro.otf b/thirdparty/fonts/source_code_pro.otf similarity index 100% rename from tools/editor_fonts/source_code_pro.otf rename to thirdparty/fonts/source_code_pro.otf diff --git a/tools/SCsub b/tools/SCsub deleted file mode 100644 index 43cad794d43..00000000000 --- a/tools/SCsub +++ /dev/null @@ -1,121 +0,0 @@ -#!/usr/bin/env python - -Import('env') - -env.tool_sources = [] -env.add_source_files(env.tool_sources, "*.cpp") - -Export('env') - - -def make_translations_header(target, source, env): - - dst = target[0].srcnode().abspath - - g = open(dst, "wb") - - """" - """ - - g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - g.write("#ifndef _EDITOR_TRANSLATIONS_H\n") - g.write("#define _EDITOR_TRANSLATIONS_H\n") - - import zlib - import os.path - - paths = [node.srcnode().abspath for node in source] - sorted_paths = sorted(paths, key=lambda path: os.path.splitext(os.path.basename(path))[0]) - - xl_names = [] - for i in range(len(sorted_paths)): - print("Appending translation: " + sorted_paths[i]) - f = open(sorted_paths[i], "rb") - buf = f.read() - decomp_size = len(buf) - buf = zlib.compress(buf) - name = os.path.splitext(os.path.basename(sorted_paths[i]))[0] - - #g.write("static const int _translation_"+name+"_compressed_size="+str(len(buf))+";\n") - #g.write("static const int _translation_"+name+"_uncompressed_size="+str(decomp_size)+";\n") - g.write("static const unsigned char _translation_" + name + "_compressed[]={\n") - for i in range(len(buf)): - g.write(str(ord(buf[i])) + ",\n") - - g.write("};\n") - - xl_names.append([name, len(buf), str(decomp_size)]) - - g.write("struct EditorTranslationList {\n") - g.write("\tconst char* lang;\n") - g.write("\tint comp_size;\n") - g.write("\tint uncomp_size;\n") - g.write("\tconst unsigned char* data;\n") - g.write("};\n\n") - g.write("static EditorTranslationList _editor_translations[]={\n") - for x in xl_names: - g.write("\t{ \"" + x[0] + "\", " + str(x[1]) + ", " + str(x[2]) + ",_translation_" + x[0] + "_compressed},\n") - g.write("\t{NULL,0,0,NULL}\n") - g.write("};\n") - - g.write("#endif") - - -def make_fonts_header(target, source, env): - - dst = target[0].srcnode().abspath - - g = open(dst, "wb") - - """" - """ - - g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - g.write("#ifndef _EDITOR_FONTS_H\n") - g.write("#define _EDITOR_FONTS_H\n") - - # saving uncompressed, since freetype will reference from memory pointer - xl_names = [] - for i in range(len(source)): - print("Appending font: " + source[i].srcnode().abspath) - f = open(source[i].srcnode().abspath, "rb") - buf = f.read() - import os.path - - name = os.path.splitext(os.path.basename(source[i].srcnode().abspath))[0] - - g.write("static const int _font_" + name + "_size=" + str(len(buf)) + ";\n") - g.write("static const unsigned char _font_" + name + "[]={\n") - for i in range(len(buf)): - g.write(str(ord(buf[i])) + ",\n") - - g.write("};\n") - - g.write("#endif") - - -if (env["tools"] != "no"): - - import glob - - dir = env.Dir('.').abspath - tlist = glob.glob(dir + "/translations/*.po") - - print("translations: ", tlist) - env.Depends('#tools/editor/translations.h', tlist) - env.Command('#tools/editor/translations.h', tlist, make_translations_header) - - flist = glob.glob(dir + "/editor_fonts/*.ttf") - flist.append(glob.glob(dir + "/editor_fonts/*.otf")) - - print("fonts: ", flist) - env.Depends('#tools/editor/builtin_fonts.h', flist) - env.Command('#tools/editor/builtin_fonts.h', flist, make_fonts_header) - - SConscript('editor/SCsub') - SConscript('collada/SCsub') - SConscript('doc/SCsub') - - lib = env.Library("tool", env.tool_sources) - - env.Prepend(LIBS=[lib]) diff --git a/tools/editor/SCsub b/tools/editor/SCsub index caf45d25be5..ee0223a2319 100644 --- a/tools/editor/SCsub +++ b/tools/editor/SCsub @@ -1,29 +1,7 @@ #!/usr/bin/env python Import('env') - - -def make_doc_header(target, source, env): - - src = source[0].srcnode().abspath - dst = target[0].srcnode().abspath - f = open(src, "rb") - g = open(dst, "wb") - buf = f.read() - decomp_size = len(buf) - import zlib - buf = zlib.compress(buf) - - g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - g.write("#ifndef _DOC_DATA_RAW_H\n") - g.write("#define _DOC_DATA_RAW_H\n") - g.write("static const int _doc_data_compressed_size=" + str(len(buf)) + ";\n") - g.write("static const int _doc_data_uncompressed_size=" + str(decomp_size) + ";\n") - g.write("static const unsigned char _doc_data_compressed[]={\n") - for i in range(len(buf)): - g.write(str(ord(buf[i])) + ",\n") - g.write("};\n") - g.write("#endif") +env.editor_sources = [] def make_certs_header(target, source, env): @@ -49,12 +27,116 @@ def make_certs_header(target, source, env): g.write("#endif") +def make_doc_header(target, source, env): + + src = source[0].srcnode().abspath + dst = target[0].srcnode().abspath + f = open(src, "rb") + g = open(dst, "wb") + buf = f.read() + decomp_size = len(buf) + import zlib + buf = zlib.compress(buf) + + g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") + g.write("#ifndef _DOC_DATA_RAW_H\n") + g.write("#define _DOC_DATA_RAW_H\n") + g.write("static const int _doc_data_compressed_size=" + str(len(buf)) + ";\n") + g.write("static const int _doc_data_uncompressed_size=" + str(decomp_size) + ";\n") + g.write("static const unsigned char _doc_data_compressed[]={\n") + for i in range(len(buf)): + g.write(str(ord(buf[i])) + ",\n") + g.write("};\n") + g.write("#endif") + + +def make_fonts_header(target, source, env): + + dst = target[0].srcnode().abspath + + g = open(dst, "wb") + + g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") + g.write("#ifndef _EDITOR_FONTS_H\n") + g.write("#define _EDITOR_FONTS_H\n") + + # saving uncompressed, since freetype will reference from memory pointer + xl_names = [] + for i in range(len(source)): + print("Appending font: " + source[i].srcnode().abspath) + f = open(source[i].srcnode().abspath, "rb") + buf = f.read() + import os.path + + name = os.path.splitext(os.path.basename(source[i].srcnode().abspath))[0] + + g.write("static const int _font_" + name + "_size=" + str(len(buf)) + ";\n") + g.write("static const unsigned char _font_" + name + "[]={\n") + for i in range(len(buf)): + g.write(str(ord(buf[i])) + ",\n") + + g.write("};\n") + + g.write("#endif") + + +def make_translations_header(target, source, env): + + dst = target[0].srcnode().abspath + + g = open(dst, "wb") + + g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") + g.write("#ifndef _EDITOR_TRANSLATIONS_H\n") + g.write("#define _EDITOR_TRANSLATIONS_H\n") + + import zlib + import os.path + + paths = [node.srcnode().abspath for node in source] + sorted_paths = sorted(paths, key=lambda path: os.path.splitext(os.path.basename(path))[0]) + + xl_names = [] + for i in range(len(sorted_paths)): + print("Appending translation: " + sorted_paths[i]) + f = open(sorted_paths[i], "rb") + buf = f.read() + decomp_size = len(buf) + buf = zlib.compress(buf) + name = os.path.splitext(os.path.basename(sorted_paths[i]))[0] + + #g.write("static const int _translation_"+name+"_compressed_size="+str(len(buf))+";\n") + #g.write("static const int _translation_"+name+"_uncompressed_size="+str(decomp_size)+";\n") + g.write("static const unsigned char _translation_" + name + "_compressed[]={\n") + for i in range(len(buf)): + g.write(str(ord(buf[i])) + ",\n") + + g.write("};\n") + + xl_names.append([name, len(buf), str(decomp_size)]) + + g.write("struct EditorTranslationList {\n") + g.write("\tconst char* lang;\n") + g.write("\tint comp_size;\n") + g.write("\tint uncomp_size;\n") + g.write("\tconst unsigned char* data;\n") + g.write("};\n\n") + g.write("static EditorTranslationList _editor_translations[]={\n") + for x in xl_names: + g.write("\t{ \"" + x[0] + "\", " + str(x[1]) + ", " + str(x[2]) + ",_translation_" + x[0] + "_compressed},\n") + g.write("\t{NULL,0,0,NULL}\n") + g.write("};\n") + + g.write("#endif") + + if (env["tools"] == "yes"): + # Register exporters reg_exporters_inc = '#include "register_exporters.h"\n' reg_exporters = 'void register_exporters() {\n' for e in env.platform_exporters: - env.tool_sources.append("#platform/" + e + "/export/export.cpp") + env.editor_sources.append("#platform/" + e + "/export/export.cpp") reg_exporters += '\tregister_' + e + '_exporter();\n' reg_exporters_inc += '#include "platform/' + e + '/export/export.h"\n' reg_exporters += '}\n' @@ -63,18 +145,41 @@ if (env["tools"] == "yes"): f.write(reg_exporters) f.close() + # API documentation env.Depends("#tools/editor/doc_data_compressed.h", "#doc/base/classes.xml") env.Command("#tools/editor/doc_data_compressed.h", "#doc/base/classes.xml", make_doc_header) - env.Depends("#tools/editor/certs_compressed.h", "#tools/certs/ca-certificates.crt") - env.Command("#tools/editor/certs_compressed.h", "#tools/certs/ca-certificates.crt", make_certs_header) + # Certificates + env.Depends("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt") + env.Command("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header) - # make_doc_header(env.File("#tools/editor/doc_data_raw.h").srcnode().abspath,env.File("#doc/base/classes.xml").srcnode().abspath,env) + import glob + path = env.Dir('.').abspath - env.add_source_files(env.tool_sources, "*.cpp") + # Translations + tlist = glob.glob(path + "/translations/*.po") + print("translations: ", tlist) + env.Depends('#tools/editor/translations.h', tlist) + env.Command('#tools/editor/translations.h', tlist, make_translations_header) + + # Fonts + flist = glob.glob(path + "/../../thirdparty/fonts/*.ttf") + flist.append(glob.glob(path + "/../../thirdparty/fonts/*.otf")) + print("fonts: ", flist) + env.Depends('#tools/editor/builtin_fonts.h', flist) + env.Command('#tools/editor/builtin_fonts.h', flist, make_fonts_header) + + + env.add_source_files(env.editor_sources, "*.cpp") + + SConscript('collada/SCsub') + SConscript('doc/SCsub') + SConscript('fileserver/SCsub') + SConscript('icons/SCsub') + SConscript('io_plugins/SCsub') + SConscript('plugins/SCsub') + + lib = env.Library("editor", env.editor_sources) + env.Prepend(LIBS=[lib]) Export('env') - SConscript('icons/SCsub') - SConscript('plugins/SCsub') - SConscript('fileserver/SCsub') - SConscript('io_plugins/SCsub') diff --git a/tools/collada/SCsub b/tools/editor/collada/SCsub similarity index 51% rename from tools/collada/SCsub rename to tools/editor/collada/SCsub index 4bc64ffdc2d..04c9a827efe 100644 --- a/tools/collada/SCsub +++ b/tools/editor/collada/SCsub @@ -2,6 +2,6 @@ Import('env') -env.add_source_files(env.tool_sources, "*.cpp") +env.add_source_files(env.editor_sources, "*.cpp") Export('env') diff --git a/tools/collada/collada.cpp b/tools/editor/collada/collada.cpp similarity index 100% rename from tools/collada/collada.cpp rename to tools/editor/collada/collada.cpp diff --git a/tools/collada/collada.h b/tools/editor/collada/collada.h similarity index 100% rename from tools/collada/collada.h rename to tools/editor/collada/collada.h diff --git a/tools/doc/SCsub b/tools/editor/doc/SCsub similarity index 51% rename from tools/doc/SCsub rename to tools/editor/doc/SCsub index 4bc64ffdc2d..04c9a827efe 100644 --- a/tools/doc/SCsub +++ b/tools/editor/doc/SCsub @@ -2,6 +2,6 @@ Import('env') -env.add_source_files(env.tool_sources, "*.cpp") +env.add_source_files(env.editor_sources, "*.cpp") Export('env') diff --git a/tools/doc/doc_data.cpp b/tools/editor/doc/doc_data.cpp similarity index 100% rename from tools/doc/doc_data.cpp rename to tools/editor/doc/doc_data.cpp diff --git a/tools/doc/doc_data.h b/tools/editor/doc/doc_data.h similarity index 100% rename from tools/doc/doc_data.h rename to tools/editor/doc/doc_data.h diff --git a/tools/doc/doc_dump.cpp b/tools/editor/doc/doc_dump.cpp similarity index 100% rename from tools/doc/doc_dump.cpp rename to tools/editor/doc/doc_dump.cpp diff --git a/tools/doc/doc_dump.h b/tools/editor/doc/doc_dump.h similarity index 100% rename from tools/doc/doc_dump.h rename to tools/editor/doc/doc_dump.h diff --git a/tools/editor/editor_help.h b/tools/editor/editor_help.h index 6a6cd7439e1..ff1322c91f2 100644 --- a/tools/editor/editor_help.h +++ b/tools/editor/editor_help.h @@ -40,7 +40,7 @@ #include "scene/main/timer.h" #include "tools/editor/code_editor.h" -#include "tools/doc/doc_data.h" +#include "tools/editor/doc/doc_data.h" class EditorNode; diff --git a/tools/editor/fileserver/SCsub b/tools/editor/fileserver/SCsub index 4bf55189ccb..f1fa50148f7 100644 --- a/tools/editor/fileserver/SCsub +++ b/tools/editor/fileserver/SCsub @@ -2,4 +2,4 @@ Import('env') Export('env') -env.add_source_files(env.tool_sources, "*.cpp") +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/tools/editor/icons/SCsub b/tools/editor/icons/SCsub index 4e604e02acb..77c8808b0ea 100644 --- a/tools/editor/icons/SCsub +++ b/tools/editor/icons/SCsub @@ -90,5 +90,5 @@ make_editor_icons_builder = Builder(action=make_editor_icons_action, env['BUILDERS']['MakeEditorIconsBuilder'] = make_editor_icons_builder env.Alias('editor_icons', [env.MakeEditorIconsBuilder('#tools/editor/editor_icons.cpp', Glob("*.png"))]) -env.tool_sources.append("#tools/editor/editor_icons.cpp") +env.editor_sources.append("#tools/editor/editor_icons.cpp") Export('env') diff --git a/tools/editor/io_plugins/SCsub b/tools/editor/io_plugins/SCsub index 4bf55189ccb..f1fa50148f7 100644 --- a/tools/editor/io_plugins/SCsub +++ b/tools/editor/io_plugins/SCsub @@ -2,4 +2,4 @@ Import('env') Export('env') -env.add_source_files(env.tool_sources, "*.cpp") +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp index 299b74cedc7..bb48885696b 100644 --- a/tools/editor/io_plugins/editor_import_collada.cpp +++ b/tools/editor/io_plugins/editor_import_collada.cpp @@ -27,7 +27,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "editor_import_collada.h" -#include "collada/collada.h" + #include "scene/3d/spatial.h" #include "scene/3d/skeleton.h" #include "scene/3d/path.h" @@ -38,6 +38,7 @@ #include "scene/resources/animation.h" #include "scene/resources/packed_scene.h" #include "os/os.h" +#include "tools/editor/collada/collada.h" #include "tools/editor/editor_node.h" #include diff --git a/tools/editor/plugins/SCsub b/tools/editor/plugins/SCsub index 4bf55189ccb..f1fa50148f7 100644 --- a/tools/editor/plugins/SCsub +++ b/tools/editor/plugins/SCsub @@ -2,4 +2,4 @@ Import('env') Export('env') -env.add_source_files(env.tool_sources, "*.cpp") +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/tools/translations/Makefile b/tools/editor/translations/Makefile similarity index 100% rename from tools/translations/Makefile rename to tools/editor/translations/Makefile diff --git a/tools/translations/README.md b/tools/editor/translations/README.md similarity index 100% rename from tools/translations/README.md rename to tools/editor/translations/README.md diff --git a/tools/translations/bn.po b/tools/editor/translations/bn.po similarity index 100% rename from tools/translations/bn.po rename to tools/editor/translations/bn.po diff --git a/tools/translations/ca.po b/tools/editor/translations/ca.po similarity index 100% rename from tools/translations/ca.po rename to tools/editor/translations/ca.po diff --git a/tools/translations/de.po b/tools/editor/translations/de.po similarity index 100% rename from tools/translations/de.po rename to tools/editor/translations/de.po diff --git a/tools/translations/es.po b/tools/editor/translations/es.po similarity index 100% rename from tools/translations/es.po rename to tools/editor/translations/es.po diff --git a/tools/translations/es_AR.po b/tools/editor/translations/es_AR.po similarity index 100% rename from tools/translations/es_AR.po rename to tools/editor/translations/es_AR.po diff --git a/tools/translations/extract.py b/tools/editor/translations/extract.py similarity index 100% rename from tools/translations/extract.py rename to tools/editor/translations/extract.py diff --git a/tools/translations/fa.po b/tools/editor/translations/fa.po similarity index 100% rename from tools/translations/fa.po rename to tools/editor/translations/fa.po diff --git a/tools/translations/fr.po b/tools/editor/translations/fr.po similarity index 100% rename from tools/translations/fr.po rename to tools/editor/translations/fr.po diff --git a/tools/translations/id.po b/tools/editor/translations/id.po similarity index 100% rename from tools/translations/id.po rename to tools/editor/translations/id.po diff --git a/tools/translations/it.po b/tools/editor/translations/it.po similarity index 100% rename from tools/translations/it.po rename to tools/editor/translations/it.po diff --git a/tools/translations/ko.po b/tools/editor/translations/ko.po similarity index 100% rename from tools/translations/ko.po rename to tools/editor/translations/ko.po diff --git a/tools/translations/pl.po b/tools/editor/translations/pl.po similarity index 100% rename from tools/translations/pl.po rename to tools/editor/translations/pl.po diff --git a/tools/translations/pt_BR.po b/tools/editor/translations/pt_BR.po similarity index 100% rename from tools/translations/pt_BR.po rename to tools/editor/translations/pt_BR.po diff --git a/tools/translations/ru.po b/tools/editor/translations/ru.po similarity index 100% rename from tools/translations/ru.po rename to tools/editor/translations/ru.po diff --git a/tools/translations/tools.pot b/tools/editor/translations/tools.pot similarity index 100% rename from tools/translations/tools.pot rename to tools/editor/translations/tools.pot diff --git a/tools/translations/tr.po b/tools/editor/translations/tr.po similarity index 100% rename from tools/translations/tr.po rename to tools/editor/translations/tr.po diff --git a/tools/translations/zh_CN.po b/tools/editor/translations/zh_CN.po similarity index 100% rename from tools/translations/zh_CN.po rename to tools/editor/translations/zh_CN.po