separate static and dynamic libraries completely

Author: electronstudio

.github/workflows/build.yml

@@ -187,3 +187,34 @@ jobs:
         with:
           name: wheel
           path: dist/*
+
+  dynamic-distro:
+    runs-on: ubuntu-18.04
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Setup Python
+        uses: actions/[email protected]
+        with:
+          # Version range or exact version of a Python version to use, using SemVer's version range syntax.
+          python-version: '3.9'
+          # The target architecture (x86, x64) of the Python interpreter.
+          architecture: x64
+
+      - name: Build raylib-python-cffi-dynamic
+        run: |
+          python -m pip install --upgrade pip
+          pip3 install cffi
+          pip3 install wheel
+          cd dynamic
+          python setup.py sdist
+
+      - name: Upload build Artifact wheel
+        uses: actions/[email protected]
+        with:
+          name: wheel
+          path: dynamic/dist/*

MANIFEST.in

@@ -1,11 +1,8 @@
-include raylib/static/*.so
-include raylib/static/*.pyi
-include raylib/static/*.pyd
-exclude raylib/static/*.a
+include raylib/*.so
+include raylib/*.pyi
+include raylib/*.pyd
+exclude raylib/*.a
 include raylib/*.h
 include raylib/*.pyi
-exclude raylib/static/*.c
-exclude raylib/static/*.o
-include raylib/dynamic/*.dylib
-include raylib/dynamic/*.dll
-include raylib/dynamic/*.so
+exclude raylib/*.c
+exclude raylib/*.o

create_stub_pyray.py

@@ -12,7 +12,7 @@
 #
 #  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
-from raylib.static import rl, ffi
+from raylib import rl, ffi
 
 from inspect import ismethod, getmembers, isbuiltin
 import inflection, sys, json

create_stub_static.py

@@ -12,7 +12,7 @@
 #
 #  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
-from raylib.static import rl, ffi
+from raylib import rl, ffi
 
 from inspect import ismethod, getmembers, isbuiltin
 import inflection, sys, json

docs-src/dynamic.rst

@@ -1,28 +1,42 @@
 raylib.dynamic
 ==============
 
-CFFI ABI dynamic bindings exist in order to avoid the need to compile a C extension module.
+CFFI ABI dynamic bindings avoid the need to compile a C extension module.  They now been moved to a separate module::
 
-See https://github.com/electronstudio/raylib-python-cffi/blob/master/test_static.py for how to use.
+   python3 -m pip install raylib_dll
 
-Currently the github version may include bundled DLLs in ``raylib/dynamic`` but the pypi version requires a system installed Raylib.
-You can put your own DLLs in ``raylib/dynamic`` if you prefer.
+.. warning::
 
-If your system already has the Raylib library installed, you can set the environment variable ``USE_EXTERNAL_RAYLIB`` and it will
-always be used instead of the bundled DLLs.
+   There have been some weird failures with dynamic bindings and ctypes bindings before and often the
+   failures are silent
+   so you dont even know.  Also the static bindings are faster.  Therefore I personally recommend the static ones.
+   But the dynamic bindings have the advantage that you don't need to compile anything to install.  You just need a Raylib DLL.
 
-If you want to build your own wheel with just raylib.dynamic and not even attempt to compile the static libraries,
-the command is::
+API is exactly the same as the static one documented here.  (Therefore you can't have both modules installed at once.)  The only difference is you can't do::
 
-    python3 setup_dynamic.py bdist_wheel
+    from raylib import *
 
+Instead you have to do::
 
+    from raylib import raylib as rl
 
-.. warning::
+Then you access the functions with ``rl.`` prefix.  See
 
-   There have been some weird failures with dynamic bindings and ctypes bindings before and often the
-   failures are silent
-   so you dont even know.  Also the static bindings should be faster.  Therefore I personally recommend the static ones.
-   But the dynamic bindings have the big advantage that you don't need to compile anything to install.  You just need a Raylib DLL.
+See https://github.com/electronstudio/raylib-python-cffi/blob/master/dynamic/test_dynamic.py for an example.
+
+
+
+.. important::
+
+   If your system already has the Raylib library installed, you can set the environment variable ``USE_EXTERNAL_RAYLIB`` and it will
+   always be used instead of the bundled DLLs.
+
+
+
+.. note::
+
+   If you write a program using the ``rl.`` prefix on all the functions and then you decide you want to use
+   that same program with the static binding instead of the dynamic, you don't have to remove the ``rl``,
+   you can just do::
 
-API is the same as raylib.static.
+       import raylib as rl

dynamic/MANIFEST.in

@@ -0,0 +1,13 @@
+include raylib/*.pyi
+include raylib/*.pyd
+exclude raylib/*.a
+include raylib/*.h
+include raylib/*.pyi
+exclude raylib/*.c
+exclude raylib/*.o
+include raylib/*.dylib
+include raylib/*.dll
+include raylib/*.so
+include raylib/32bit/*.dylib
+include raylib/32bit/*.dll
+include raylib/32bit/*.so

dynamic/README.md

@@ -0,0 +1 @@
+Dynamically linked version of Raylib Python CFFI

raylib/dynamic/32bit/raylib.dll renamed to dynamic/raylib/32bit/raylib.dll

@@ -23,15 +23,15 @@
 import pathlib
 import platform
 
-MODULE = pathlib.Path(__file__).parent.parent
+MODULE = pathlib.Path(__file__).parent
 
 def raylib_library_path():
     '''Return the full path of the raylib shared library
     If the environment variable "USE_EXTERNAL_RAYLIB" is set (no value required)
     then the library will be loaded from the system library paths.
     '''
     def so_path():
-        return str(MODULE / 'dynamic') if not 'USE_EXTERNAL_RAYLIB' in os.environ else ''
+        return str(MODULE) if not 'USE_EXTERNAL_RAYLIB' in os.environ else ''
     def so_name():
         '''Returns the appropriate for the library on the current platform.'''
         lib_filenames = {

raylib/dynamic/__init__.py renamed to dynamic/raylib/__init__.py

@@ -0,0 +1,40 @@
+#  Copyright (c) 2021 Richard Smith and others
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Eclipse Public License 2.0 which is available at
+#  http://www.eclipse.org/legal/epl-2.0.
+#
+#  This Source Code may also be made available under the following Secondary
+#  licenses when the conditions for such availability set forth in the Eclipse
+#  Public License, v. 2.0 are satisfied: GNU General Public License, version 2
+#  with the GNU Classpath Exception which is
+#  available at https://www.gnu.org/software/classpath/license.html.
+#
+#  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+LIGHTGRAY  =( 200, 200, 200, 255 )
+GRAY       =( 130, 130, 130, 255 )
+DARKGRAY   =( 80, 80, 80, 255 )
+YELLOW     =( 253, 249, 0, 255 )
+GOLD       =( 255, 203, 0, 255 )
+ORANGE     =( 255, 161, 0, 255 )
+PINK       =( 255, 109, 194, 255 )
+RED        =( 230, 41, 55, 255 )
+MAROON     =( 190, 33, 55, 255 )
+GREEN      =( 0, 228, 48, 255 )
+LIME       =( 0, 158, 47, 255 )
+DARKGREEN  =( 0, 117, 44, 255 )
+SKYBLUE    =( 102, 191, 255, 255 )
+BLUE       =( 0, 121, 241, 255 )
+DARKBLUE   =( 0, 82, 172, 255 )
+PURPLE     =( 200, 122, 255, 255 )
+VIOLET     =( 135, 60, 190, 255 )
+DARKPURPLE =( 112, 31, 126, 255 )
+BEIGE      =( 211, 176, 131, 255 )
+BROWN      =( 127, 106, 79, 255 )
+DARKBROWN  =( 76, 63, 47, 255 )
+WHITE      =( 255, 255, 255, 255 )
+BLACK      =( 0, 0, 0, 255 )
+BLANK      =( 0, 0, 0, 0 )
+MAGENTA    =( 255, 0, 255, 255 )
+RAYWHITE   =( 245, 245, 245, 255 )