From e41a4f85e952aafa75b6f82de23fa9604b97d360 Mon Sep 17 00:00:00 2001 From: Tom Rothamel Date: Sun, 15 Dec 2024 18:14:26 -0500 Subject: [PATCH] reorg: Eliminate use of the module directory. This directory contained a mix of both c/cython source code, scripts, and build information. Now, source is in src, scripts are in scripts, and setup.py is in the root. --- run.sh | 9 +--- .../generate_matrix_functions.py | 0 {module => scripts}/generate_styles.py | 9 ++-- {module => scripts}/setuplib.py | 47 +++++++------------ .../uguu/generate_required_functions.py | 0 {module => scripts}/uguu/gl.xml | 0 {module => scripts}/uguu/uguu_pyx_header.pyx | 0 .../uguu/uguugl_pxd_header.pxd | 0 .../uguu/uguugl_pyx_header.pyx | 0 {module => scripts}/uguu/xml_to_pyx.py | 0 {module => scripts/unicode}/LineBreak.txt | 0 .../emoji => scripts/unicode}/emoji-test.txt | 0 .../unicode}/generate_linebreak.py | 0 .../unicode}/make_emoji_trie.py | 0 module/setup.py => setup.py | 30 ++++-------- {module => src}/IMG_savepng.c | 0 {module => src}/IMG_savepng.h | 0 {module => src}/Setup | 0 {module => src}/Setup.tfd | 0 {module => src}/_renpy.pyx | 0 {module => src}/_renpybidi.pyx | 0 {module => src}/_renpytfd.pyx | 0 {module => src}/core.c | 0 {module => src}/ffmedia.c | 0 {module/include => src}/freetype.pxd | 0 {module => src}/ftsupport.c | 0 {module => src}/ftsupport.h | 0 {module => src}/libhydrogen/.gitignore | 0 {module => src}/libhydrogen/LICENSE | 0 {module => src}/libhydrogen/Makefile | 0 {module => src}/libhydrogen/hydrogen.c | 0 {module => src}/libhydrogen/hydrogen.h | 0 {module => src}/libhydrogen/impl/common.h | 0 {module => src}/libhydrogen/impl/core.h | 0 {module => src}/libhydrogen/impl/gimli-core.h | 0 .../libhydrogen/impl/gimli-core/portable.h | 0 .../libhydrogen/impl/gimli-core/sse2.h | 0 {module => src}/libhydrogen/impl/hash.h | 0 {module => src}/libhydrogen/impl/hydrogen_p.h | 0 {module => src}/libhydrogen/impl/kdf.h | 0 {module => src}/libhydrogen/impl/kx.h | 0 {module => src}/libhydrogen/impl/pwhash.h | 0 {module => src}/libhydrogen/impl/random.h | 0 {module => src}/libhydrogen/impl/random/avr.h | 0 .../libhydrogen/impl/random/esp32.h | 0 .../libhydrogen/impl/random/linux_kernel.h | 0 .../libhydrogen/impl/random/mbed.h | 0 .../libhydrogen/impl/random/nrf52832.h | 0 .../libhydrogen/impl/random/particle.h | 0 .../libhydrogen/impl/random/riot.h | 0 .../libhydrogen/impl/random/rtthread.h | 0 .../libhydrogen/impl/random/stm32.h | 0 .../libhydrogen/impl/random/unix.h | 0 .../libhydrogen/impl/random/wasi.h | 0 .../libhydrogen/impl/random/windows.h | 0 {module => src}/libhydrogen/impl/secretbox.h | 0 {module => src}/libhydrogen/impl/sign.h | 0 {module => src}/libhydrogen/impl/x25519.h | 0 {module => src}/pyfreetype.h | 0 {module/include => src}/pygame.pxd | 0 {module/include => src}/pygame_sdl2.pxd | 0 {module => src}/renpy.h | 0 {module => src}/renpybidicore.c | 0 {module => src}/renpybidicore.h | 0 {module => src}/renpygl.h | 0 {module => src}/renpysound_core.c | 0 {module => src}/renpysound_core.h | 0 {module/include => src}/sdl2.pxd | 0 {module/include => src}/style_common.pxi | 0 {module => src}/tinyfiledialogs/README.txt | 0 .../tinyfiledialogs/tinyfiledialogs.c | 0 .../tinyfiledialogs/tinyfiledialogs.h | 0 {module => src}/ttgsubtable.c | 0 {module => src}/ttgsubtable.h | 0 {module/include => src}/ttgsubtable.pxd | 0 75 files changed, 34 insertions(+), 61 deletions(-) rename module/symbolic_matrix.py => scripts/generate_matrix_functions.py (100%) rename {module => scripts}/generate_styles.py (98%) rename {module => scripts}/setuplib.py (93%) rename {module => scripts}/uguu/generate_required_functions.py (100%) rename {module => scripts}/uguu/gl.xml (100%) rename {module => scripts}/uguu/uguu_pyx_header.pyx (100%) rename {module => scripts}/uguu/uguugl_pxd_header.pxd (100%) rename {module => scripts}/uguu/uguugl_pyx_header.pyx (100%) rename {module => scripts}/uguu/xml_to_pyx.py (100%) rename {module => scripts/unicode}/LineBreak.txt (100%) rename {module/emoji => scripts/unicode}/emoji-test.txt (100%) rename {module => scripts/unicode}/generate_linebreak.py (100%) rename {module/emoji => scripts/unicode}/make_emoji_trie.py (100%) rename module/setup.py => setup.py (91%) rename {module => src}/IMG_savepng.c (100%) rename {module => src}/IMG_savepng.h (100%) rename {module => src}/Setup (100%) rename {module => src}/Setup.tfd (100%) rename {module => src}/_renpy.pyx (100%) rename {module => src}/_renpybidi.pyx (100%) rename {module => src}/_renpytfd.pyx (100%) rename {module => src}/core.c (100%) rename {module => src}/ffmedia.c (100%) rename {module/include => src}/freetype.pxd (100%) rename {module => src}/ftsupport.c (100%) rename {module => src}/ftsupport.h (100%) rename {module => src}/libhydrogen/.gitignore (100%) rename {module => src}/libhydrogen/LICENSE (100%) rename {module => src}/libhydrogen/Makefile (100%) rename {module => src}/libhydrogen/hydrogen.c (100%) rename {module => src}/libhydrogen/hydrogen.h (100%) rename {module => src}/libhydrogen/impl/common.h (100%) rename {module => src}/libhydrogen/impl/core.h (100%) rename {module => src}/libhydrogen/impl/gimli-core.h (100%) rename {module => src}/libhydrogen/impl/gimli-core/portable.h (100%) rename {module => src}/libhydrogen/impl/gimli-core/sse2.h (100%) rename {module => src}/libhydrogen/impl/hash.h (100%) rename {module => src}/libhydrogen/impl/hydrogen_p.h (100%) rename {module => src}/libhydrogen/impl/kdf.h (100%) rename {module => src}/libhydrogen/impl/kx.h (100%) rename {module => src}/libhydrogen/impl/pwhash.h (100%) rename {module => src}/libhydrogen/impl/random.h (100%) rename {module => src}/libhydrogen/impl/random/avr.h (100%) rename {module => src}/libhydrogen/impl/random/esp32.h (100%) rename {module => src}/libhydrogen/impl/random/linux_kernel.h (100%) rename {module => src}/libhydrogen/impl/random/mbed.h (100%) rename {module => src}/libhydrogen/impl/random/nrf52832.h (100%) rename {module => src}/libhydrogen/impl/random/particle.h (100%) rename {module => src}/libhydrogen/impl/random/riot.h (100%) rename {module => src}/libhydrogen/impl/random/rtthread.h (100%) rename {module => src}/libhydrogen/impl/random/stm32.h (100%) rename {module => src}/libhydrogen/impl/random/unix.h (100%) rename {module => src}/libhydrogen/impl/random/wasi.h (100%) rename {module => src}/libhydrogen/impl/random/windows.h (100%) rename {module => src}/libhydrogen/impl/secretbox.h (100%) rename {module => src}/libhydrogen/impl/sign.h (100%) rename {module => src}/libhydrogen/impl/x25519.h (100%) rename {module => src}/pyfreetype.h (100%) rename {module/include => src}/pygame.pxd (100%) rename {module/include => src}/pygame_sdl2.pxd (100%) rename {module => src}/renpy.h (100%) rename {module => src}/renpybidicore.c (100%) rename {module => src}/renpybidicore.h (100%) rename {module => src}/renpygl.h (100%) rename {module => src}/renpysound_core.c (100%) rename {module => src}/renpysound_core.h (100%) rename {module/include => src}/sdl2.pxd (100%) rename {module/include => src}/style_common.pxi (100%) rename {module => src}/tinyfiledialogs/README.txt (100%) rename {module => src}/tinyfiledialogs/tinyfiledialogs.c (100%) rename {module => src}/tinyfiledialogs/tinyfiledialogs.h (100%) rename {module => src}/ttgsubtable.c (100%) rename {module => src}/ttgsubtable.h (100%) rename {module/include => src}/ttgsubtable.pxd (100%) diff --git a/run.sh b/run.sh index ba666d362..239de730a 100755 --- a/run.sh +++ b/run.sh @@ -40,13 +40,9 @@ setup () { pushd $1 >/dev/null python setup.py $QUIET \ - build -b build/lib.$variant -t build/tmp.$variant $BUILD_J \ + build -b tmp/build/lib.$variant -t tmp/build/tmp.$variant $BUILD_J \ $RENPY_BUILD_ARGS install $ADAPT_TO_SETUPTOOLS - if [ -e install_headers.py ]; then - python install_headers.py $VIRTUAL_ENV - fi - popd >/dev/null } @@ -55,14 +51,13 @@ if [ -e "$ROOT/pygame_sdl2" ]; then fi - if [ -e "$ROOT/cubism" ]; then export CUBISM="$ROOT/cubism" export CUBISM_PLATFORM=${CUBISM_PLATFORM:-linux/x86_64} export LD_LIBRARY_PATH="$CUBISM/Core/dll/$CUBISM_PLATFORM" fi -setup "$ROOT/module/" +setup "$ROOT/" python "$ROOT/distribute.py" --link-directories diff --git a/module/symbolic_matrix.py b/scripts/generate_matrix_functions.py similarity index 100% rename from module/symbolic_matrix.py rename to scripts/generate_matrix_functions.py diff --git a/module/generate_styles.py b/scripts/generate_styles.py similarity index 98% rename from module/generate_styles.py rename to scripts/generate_styles.py index 74b3c2fa4..96fa59950 100644 --- a/module/generate_styles.py +++ b/scripts/generate_styles.py @@ -36,7 +36,6 @@ BASE = os.path.dirname(os.path.abspath(__file__)) ROOT = os.path.dirname(BASE) import setuplib -module_gen = "module/" + setuplib.gen def sorted_dict(**kwargs): @@ -507,7 +506,7 @@ def generate_constants(): This generates code that defines the property functions. """ - g = CodeGen(module_gen + "/styleconstants.pxi") + g = CodeGen(setuplib.gen + "/styleconstants.pxi") g.write("DEF PRIORITY_LEVELS = {}", PRIORITY_LEVELS) g.write("DEF PREFIX_COUNT = {}", PREFIX_COUNT) @@ -579,7 +578,7 @@ def generate_property_functions(): """ for prefix in sorted(prefixes.values(), key=lambda p : p.index): - g = CodeGen(module_gen + "/style_{}functions.pyx".format(prefix.name)) + g = CodeGen(setuplib.gen + "/style_{}functions.pyx".format(prefix.name)) g.write('include "style_common.pxi"') g.write('') @@ -622,7 +621,7 @@ def generate_property(g, propname): def generate_properties(): - g = CodeGen(module_gen + "/styleclass.pxi") + g = CodeGen(setuplib.gen + "/styleclass.pxi") g.write("cdef class Style(StyleCore):") g.write("") @@ -660,7 +659,7 @@ def generate_sets(): prefix_priority[p.name] = p.priority prefix_alts[p.name] = p.alt_names - g = CodeGen(module_gen + "/stylesets.pxi") + g = CodeGen(setuplib.gen + "/stylesets.pxi") g.write("# This file is generated by generate_styles.py.") g.write("") diff --git a/module/setuplib.py b/scripts/setuplib.py similarity index 93% rename from module/setuplib.py rename to scripts/setuplib.py index 77a415c9d..79ddb9d09 100644 --- a/module/setuplib.py +++ b/scripts/setuplib.py @@ -53,13 +53,8 @@ coverage = "RENPY_COVERAGE" in os.environ # Are we doing a static build? static = "RENPY_STATIC" in os.environ -gen = "gen" - -if sys.version_info.major > 2: - gen += "3" - PY2 = False -else: - PY2 = True +gen = "tmp/gen3" +PY2 = False if coverage: gen += "-coverage" @@ -93,7 +88,7 @@ else: install = [ ] # The include and library dirs that we compile against. -include_dirs = [ "." ] +include_dirs = [ "src" ] library_dirs = [ ] # Extra arguments that will be given to the compiler. @@ -229,13 +224,14 @@ def cython(name, source=[], libs=[], includes=[], compile_if=True, define_macros else: fn = "/".join(split_name) + ".pyx" - if os.path.exists(os.path.join("..", fn)): - fn = os.path.join("..", fn) - elif os.path.exists(fn): - pass + for d in [ ".", "src" ]: + prepended = os.path.join(d, fn) + if os.path.exists(prepended): + fn = prepended + break else: - print("Could not find {0}.".format(fn)) - sys.exit(-1) + raise SystemExit("Could not find {0}.".format(fn)) + module_dir = os.path.dirname(fn) @@ -282,16 +278,11 @@ def cython(name, source=[], libs=[], includes=[], compile_if=True, define_macros for dep_fn in deps: - if os.path.exists(os.path.join(module_dir, dep_fn)): - dep_fn = os.path.join(module_dir, dep_fn) - elif os.path.exists(os.path.join("..", dep_fn)): - dep_fn = os.path.join("..", dep_fn) - elif os.path.exists(os.path.join("include", dep_fn)): - dep_fn = os.path.join("include", dep_fn) - elif os.path.exists(os.path.join(gen, dep_fn)): - dep_fn = os.path.join(gen, dep_fn) - elif os.path.exists(dep_fn): - pass + for d in [ module_dir, ".", "src", gen ]: + prepended = os.path.join(d, dep_fn) + if os.path.exists(prepended): + dep_fn = prepended + break else: print("{0} depends on {1}, which can't be found.".format(fn, dep_fn)) sys.exit(-1) @@ -341,9 +332,9 @@ def generate_cython(name, language, mod_coverage, split_name, fn, c_fn): p = subprocess.Popen([ cython_command, - "-Iinclude", + "-Isrc", "-I" + gen, - "-I..", + "-I.", "--3str", ] + annotate + lang_args + coverage_args + [ "-X", "profile=False", @@ -480,6 +471,4 @@ def setup(name, version): ) -# Ensure the gen directory exists. -if not os.path.exists(gen): - os.mkdir(gen) +os.makedirs(gen, exist_ok=True) diff --git a/module/uguu/generate_required_functions.py b/scripts/uguu/generate_required_functions.py similarity index 100% rename from module/uguu/generate_required_functions.py rename to scripts/uguu/generate_required_functions.py diff --git a/module/uguu/gl.xml b/scripts/uguu/gl.xml similarity index 100% rename from module/uguu/gl.xml rename to scripts/uguu/gl.xml diff --git a/module/uguu/uguu_pyx_header.pyx b/scripts/uguu/uguu_pyx_header.pyx similarity index 100% rename from module/uguu/uguu_pyx_header.pyx rename to scripts/uguu/uguu_pyx_header.pyx diff --git a/module/uguu/uguugl_pxd_header.pxd b/scripts/uguu/uguugl_pxd_header.pxd similarity index 100% rename from module/uguu/uguugl_pxd_header.pxd rename to scripts/uguu/uguugl_pxd_header.pxd diff --git a/module/uguu/uguugl_pyx_header.pyx b/scripts/uguu/uguugl_pyx_header.pyx similarity index 100% rename from module/uguu/uguugl_pyx_header.pyx rename to scripts/uguu/uguugl_pyx_header.pyx diff --git a/module/uguu/xml_to_pyx.py b/scripts/uguu/xml_to_pyx.py similarity index 100% rename from module/uguu/xml_to_pyx.py rename to scripts/uguu/xml_to_pyx.py diff --git a/module/LineBreak.txt b/scripts/unicode/LineBreak.txt similarity index 100% rename from module/LineBreak.txt rename to scripts/unicode/LineBreak.txt diff --git a/module/emoji/emoji-test.txt b/scripts/unicode/emoji-test.txt similarity index 100% rename from module/emoji/emoji-test.txt rename to scripts/unicode/emoji-test.txt diff --git a/module/generate_linebreak.py b/scripts/unicode/generate_linebreak.py similarity index 100% rename from module/generate_linebreak.py rename to scripts/unicode/generate_linebreak.py diff --git a/module/emoji/make_emoji_trie.py b/scripts/unicode/make_emoji_trie.py similarity index 100% rename from module/emoji/make_emoji_trie.py rename to scripts/unicode/make_emoji_trie.py diff --git a/module/setup.py b/setup.py similarity index 91% rename from module/setup.py rename to setup.py index 561cf48e8..e0cce0261 100755 --- a/module/setup.py +++ b/setup.py @@ -34,15 +34,8 @@ import future BASE = os.path.abspath(os.path.dirname(sys.argv[0])) os.chdir(BASE) -# Create the gen directory if it doesn't exist. -try: - os.makedirs("gen") -except Exception: - pass +sys.path.insert(0, os.path.join(BASE, 'scripts')) -# Generate styles. -import generate_styles -generate_styles.generate() # If RENPY_CC or RENPY_LD are in the environment, and CC or LD are not, use them. def setup_env(name): @@ -58,6 +51,9 @@ setup_env("CXX") import setuplib from setuplib import android, ios, emscripten, raspi, include, library, cython, cmodule, copyfile, find_unnecessary_gen, generate_all_cython, PY2 +import generate_styles +generate_styles.generate() + # These control the level of optimization versus debugging. setuplib.extra_compile_args = [ "-Wno-unused-function" ] setuplib.extra_link_args = [ ] @@ -72,9 +68,6 @@ else: windows = False tfd_libs = [ ] -if raspi: - setuplib.extra_compile_args.append("-DRASPBERRY_PI") - include("zlib.h") include("png.h") include("SDL.h", directory="SDL2") @@ -115,13 +108,13 @@ if cubism: # Modules directory. cython( "_renpy", - [ "IMG_savepng.c", "core.c" ], + [ "src/IMG_savepng.c", "src/core.c" ], sdl + [ png, 'z', 'm' ]) -cython("_renpybidi", [ "renpybidicore.c" ], [ "fribidi" ]) +cython("_renpybidi", [ "src/renpybidicore.c" ], [ "fribidi" ]) if not (android or ios or emscripten): - cython("_renpytfd", [ "tinyfiledialogs/tinyfiledialogs.c" ], libs=tfd_libs) + cython("_renpytfd", [ "src/tinyfiledialogs/tinyfiledialogs.c" ], libs=tfd_libs) # Sound. @@ -140,7 +133,7 @@ if has_swscale: cython( "renpy.audio.renpysound", - [ "renpysound_core.c", "ffmedia.c" ], + [ "src/renpysound_core.c", "src/ffmedia.c" ], libs=sdl + sound, define_macros=macros, compile_args=[ "-Wno-deprecated-declarations" ] if ("RENPY_FFMPEG_NO_DEPRECATED_DECLARATIONS" in os.environ) else [ ]) @@ -189,20 +182,17 @@ cython("renpy.text.texwrap") cython( "renpy.text.ftfont", - [ "ftsupport.c", "ttgsubtable.c" ], + [ "src/ftsupport.c", "src/ttgsubtable.c" ], libs=sdl + [ 'freetype', 'z', 'm' ]) cython( "renpy.text.hbfont", - [ "ftsupport.c" ], + [ "src/ftsupport.c" ], libs=sdl + [ 'harfbuzz', 'freetype', 'z', 'm' ]) generate_all_cython() find_unnecessary_gen() -# Figure out the version, and call setup. -sys.path.insert(0, '..') import renpy - setuplib.setup("Ren'Py", renpy.version[7:].rstrip('un')) # @UndefinedVariable diff --git a/module/IMG_savepng.c b/src/IMG_savepng.c similarity index 100% rename from module/IMG_savepng.c rename to src/IMG_savepng.c diff --git a/module/IMG_savepng.h b/src/IMG_savepng.h similarity index 100% rename from module/IMG_savepng.h rename to src/IMG_savepng.h diff --git a/module/Setup b/src/Setup similarity index 100% rename from module/Setup rename to src/Setup diff --git a/module/Setup.tfd b/src/Setup.tfd similarity index 100% rename from module/Setup.tfd rename to src/Setup.tfd diff --git a/module/_renpy.pyx b/src/_renpy.pyx similarity index 100% rename from module/_renpy.pyx rename to src/_renpy.pyx diff --git a/module/_renpybidi.pyx b/src/_renpybidi.pyx similarity index 100% rename from module/_renpybidi.pyx rename to src/_renpybidi.pyx diff --git a/module/_renpytfd.pyx b/src/_renpytfd.pyx similarity index 100% rename from module/_renpytfd.pyx rename to src/_renpytfd.pyx diff --git a/module/core.c b/src/core.c similarity index 100% rename from module/core.c rename to src/core.c diff --git a/module/ffmedia.c b/src/ffmedia.c similarity index 100% rename from module/ffmedia.c rename to src/ffmedia.c diff --git a/module/include/freetype.pxd b/src/freetype.pxd similarity index 100% rename from module/include/freetype.pxd rename to src/freetype.pxd diff --git a/module/ftsupport.c b/src/ftsupport.c similarity index 100% rename from module/ftsupport.c rename to src/ftsupport.c diff --git a/module/ftsupport.h b/src/ftsupport.h similarity index 100% rename from module/ftsupport.h rename to src/ftsupport.h diff --git a/module/libhydrogen/.gitignore b/src/libhydrogen/.gitignore similarity index 100% rename from module/libhydrogen/.gitignore rename to src/libhydrogen/.gitignore diff --git a/module/libhydrogen/LICENSE b/src/libhydrogen/LICENSE similarity index 100% rename from module/libhydrogen/LICENSE rename to src/libhydrogen/LICENSE diff --git a/module/libhydrogen/Makefile b/src/libhydrogen/Makefile similarity index 100% rename from module/libhydrogen/Makefile rename to src/libhydrogen/Makefile diff --git a/module/libhydrogen/hydrogen.c b/src/libhydrogen/hydrogen.c similarity index 100% rename from module/libhydrogen/hydrogen.c rename to src/libhydrogen/hydrogen.c diff --git a/module/libhydrogen/hydrogen.h b/src/libhydrogen/hydrogen.h similarity index 100% rename from module/libhydrogen/hydrogen.h rename to src/libhydrogen/hydrogen.h diff --git a/module/libhydrogen/impl/common.h b/src/libhydrogen/impl/common.h similarity index 100% rename from module/libhydrogen/impl/common.h rename to src/libhydrogen/impl/common.h diff --git a/module/libhydrogen/impl/core.h b/src/libhydrogen/impl/core.h similarity index 100% rename from module/libhydrogen/impl/core.h rename to src/libhydrogen/impl/core.h diff --git a/module/libhydrogen/impl/gimli-core.h b/src/libhydrogen/impl/gimli-core.h similarity index 100% rename from module/libhydrogen/impl/gimli-core.h rename to src/libhydrogen/impl/gimli-core.h diff --git a/module/libhydrogen/impl/gimli-core/portable.h b/src/libhydrogen/impl/gimli-core/portable.h similarity index 100% rename from module/libhydrogen/impl/gimli-core/portable.h rename to src/libhydrogen/impl/gimli-core/portable.h diff --git a/module/libhydrogen/impl/gimli-core/sse2.h b/src/libhydrogen/impl/gimli-core/sse2.h similarity index 100% rename from module/libhydrogen/impl/gimli-core/sse2.h rename to src/libhydrogen/impl/gimli-core/sse2.h diff --git a/module/libhydrogen/impl/hash.h b/src/libhydrogen/impl/hash.h similarity index 100% rename from module/libhydrogen/impl/hash.h rename to src/libhydrogen/impl/hash.h diff --git a/module/libhydrogen/impl/hydrogen_p.h b/src/libhydrogen/impl/hydrogen_p.h similarity index 100% rename from module/libhydrogen/impl/hydrogen_p.h rename to src/libhydrogen/impl/hydrogen_p.h diff --git a/module/libhydrogen/impl/kdf.h b/src/libhydrogen/impl/kdf.h similarity index 100% rename from module/libhydrogen/impl/kdf.h rename to src/libhydrogen/impl/kdf.h diff --git a/module/libhydrogen/impl/kx.h b/src/libhydrogen/impl/kx.h similarity index 100% rename from module/libhydrogen/impl/kx.h rename to src/libhydrogen/impl/kx.h diff --git a/module/libhydrogen/impl/pwhash.h b/src/libhydrogen/impl/pwhash.h similarity index 100% rename from module/libhydrogen/impl/pwhash.h rename to src/libhydrogen/impl/pwhash.h diff --git a/module/libhydrogen/impl/random.h b/src/libhydrogen/impl/random.h similarity index 100% rename from module/libhydrogen/impl/random.h rename to src/libhydrogen/impl/random.h diff --git a/module/libhydrogen/impl/random/avr.h b/src/libhydrogen/impl/random/avr.h similarity index 100% rename from module/libhydrogen/impl/random/avr.h rename to src/libhydrogen/impl/random/avr.h diff --git a/module/libhydrogen/impl/random/esp32.h b/src/libhydrogen/impl/random/esp32.h similarity index 100% rename from module/libhydrogen/impl/random/esp32.h rename to src/libhydrogen/impl/random/esp32.h diff --git a/module/libhydrogen/impl/random/linux_kernel.h b/src/libhydrogen/impl/random/linux_kernel.h similarity index 100% rename from module/libhydrogen/impl/random/linux_kernel.h rename to src/libhydrogen/impl/random/linux_kernel.h diff --git a/module/libhydrogen/impl/random/mbed.h b/src/libhydrogen/impl/random/mbed.h similarity index 100% rename from module/libhydrogen/impl/random/mbed.h rename to src/libhydrogen/impl/random/mbed.h diff --git a/module/libhydrogen/impl/random/nrf52832.h b/src/libhydrogen/impl/random/nrf52832.h similarity index 100% rename from module/libhydrogen/impl/random/nrf52832.h rename to src/libhydrogen/impl/random/nrf52832.h diff --git a/module/libhydrogen/impl/random/particle.h b/src/libhydrogen/impl/random/particle.h similarity index 100% rename from module/libhydrogen/impl/random/particle.h rename to src/libhydrogen/impl/random/particle.h diff --git a/module/libhydrogen/impl/random/riot.h b/src/libhydrogen/impl/random/riot.h similarity index 100% rename from module/libhydrogen/impl/random/riot.h rename to src/libhydrogen/impl/random/riot.h diff --git a/module/libhydrogen/impl/random/rtthread.h b/src/libhydrogen/impl/random/rtthread.h similarity index 100% rename from module/libhydrogen/impl/random/rtthread.h rename to src/libhydrogen/impl/random/rtthread.h diff --git a/module/libhydrogen/impl/random/stm32.h b/src/libhydrogen/impl/random/stm32.h similarity index 100% rename from module/libhydrogen/impl/random/stm32.h rename to src/libhydrogen/impl/random/stm32.h diff --git a/module/libhydrogen/impl/random/unix.h b/src/libhydrogen/impl/random/unix.h similarity index 100% rename from module/libhydrogen/impl/random/unix.h rename to src/libhydrogen/impl/random/unix.h diff --git a/module/libhydrogen/impl/random/wasi.h b/src/libhydrogen/impl/random/wasi.h similarity index 100% rename from module/libhydrogen/impl/random/wasi.h rename to src/libhydrogen/impl/random/wasi.h diff --git a/module/libhydrogen/impl/random/windows.h b/src/libhydrogen/impl/random/windows.h similarity index 100% rename from module/libhydrogen/impl/random/windows.h rename to src/libhydrogen/impl/random/windows.h diff --git a/module/libhydrogen/impl/secretbox.h b/src/libhydrogen/impl/secretbox.h similarity index 100% rename from module/libhydrogen/impl/secretbox.h rename to src/libhydrogen/impl/secretbox.h diff --git a/module/libhydrogen/impl/sign.h b/src/libhydrogen/impl/sign.h similarity index 100% rename from module/libhydrogen/impl/sign.h rename to src/libhydrogen/impl/sign.h diff --git a/module/libhydrogen/impl/x25519.h b/src/libhydrogen/impl/x25519.h similarity index 100% rename from module/libhydrogen/impl/x25519.h rename to src/libhydrogen/impl/x25519.h diff --git a/module/pyfreetype.h b/src/pyfreetype.h similarity index 100% rename from module/pyfreetype.h rename to src/pyfreetype.h diff --git a/module/include/pygame.pxd b/src/pygame.pxd similarity index 100% rename from module/include/pygame.pxd rename to src/pygame.pxd diff --git a/module/include/pygame_sdl2.pxd b/src/pygame_sdl2.pxd similarity index 100% rename from module/include/pygame_sdl2.pxd rename to src/pygame_sdl2.pxd diff --git a/module/renpy.h b/src/renpy.h similarity index 100% rename from module/renpy.h rename to src/renpy.h diff --git a/module/renpybidicore.c b/src/renpybidicore.c similarity index 100% rename from module/renpybidicore.c rename to src/renpybidicore.c diff --git a/module/renpybidicore.h b/src/renpybidicore.h similarity index 100% rename from module/renpybidicore.h rename to src/renpybidicore.h diff --git a/module/renpygl.h b/src/renpygl.h similarity index 100% rename from module/renpygl.h rename to src/renpygl.h diff --git a/module/renpysound_core.c b/src/renpysound_core.c similarity index 100% rename from module/renpysound_core.c rename to src/renpysound_core.c diff --git a/module/renpysound_core.h b/src/renpysound_core.h similarity index 100% rename from module/renpysound_core.h rename to src/renpysound_core.h diff --git a/module/include/sdl2.pxd b/src/sdl2.pxd similarity index 100% rename from module/include/sdl2.pxd rename to src/sdl2.pxd diff --git a/module/include/style_common.pxi b/src/style_common.pxi similarity index 100% rename from module/include/style_common.pxi rename to src/style_common.pxi diff --git a/module/tinyfiledialogs/README.txt b/src/tinyfiledialogs/README.txt similarity index 100% rename from module/tinyfiledialogs/README.txt rename to src/tinyfiledialogs/README.txt diff --git a/module/tinyfiledialogs/tinyfiledialogs.c b/src/tinyfiledialogs/tinyfiledialogs.c similarity index 100% rename from module/tinyfiledialogs/tinyfiledialogs.c rename to src/tinyfiledialogs/tinyfiledialogs.c diff --git a/module/tinyfiledialogs/tinyfiledialogs.h b/src/tinyfiledialogs/tinyfiledialogs.h similarity index 100% rename from module/tinyfiledialogs/tinyfiledialogs.h rename to src/tinyfiledialogs/tinyfiledialogs.h diff --git a/module/ttgsubtable.c b/src/ttgsubtable.c similarity index 100% rename from module/ttgsubtable.c rename to src/ttgsubtable.c diff --git a/module/ttgsubtable.h b/src/ttgsubtable.h similarity index 100% rename from module/ttgsubtable.h rename to src/ttgsubtable.h diff --git a/module/include/ttgsubtable.pxd b/src/ttgsubtable.pxd similarity index 100% rename from module/include/ttgsubtable.pxd rename to src/ttgsubtable.pxd