Skip to content

Commit

Permalink
Move addon to addons/numdot folder. Add licenses and gdextension to t…
Browse files Browse the repository at this point in the history
…he addons folder.
  • Loading branch information
Ivorforce committed Sep 17, 2024
1 parent dc5636f commit 0683a94
Show file tree
Hide file tree
Showing 17 changed files with 296 additions and 117 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
APPLE_CERT_BASE64: ${{ secrets.APPLE_CERT_BASE64 }}
uses: godotengine/godot-cpp-template/.github/actions/sign@main
with:
FRAMEWORK_PATH: bin/macos/macos.framework
FRAMEWORK_PATH: addons/numdot/macos/numdot-macos.framework
APPLE_CERT_BASE64: ${{ secrets.APPLE_CERT_BASE64 }}
APPLE_CERT_PASSWORD: ${{ secrets.APPLE_CERT_PASSWORD }}
APPLE_DEV_PASSWORD: ${{ secrets.APPLE_DEV_PASSWORD }}
Expand All @@ -74,7 +74,7 @@ jobs:
with:
name: GDExtension-${{ matrix.platform }}-${{ matrix.arch }}
path: |
${{ github.workspace }}/bin/**
${{ github.workspace }}/addons/numdot/**
merge:
runs-on: ubuntu-latest
needs: build
Expand Down
6 changes: 3 additions & 3 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ file = "{}{}{}".format(libname, env["suffix"], env["SHLIBSUFFIX"])
filepath = ""

if env["platform"] == "macos" or env["platform"] == "ios":
filepath = "{}.framework/".format(env["platform"])
filepath = "{}-{}.framework/".format(libname, env["platform"])
file = "{}.{}.{}".format(libname, env["platform"], env["target"])

libraryfile = "bin/{}/{}{}".format(env["platform"], filepath, file)
libraryfile = "addons/{}/{}/{}{}".format(libname, env["platform"], filepath, file)
library = env.SharedLibrary(
libraryfile,
source=sources,
)

copy = env.InstallAs("{}/bin/{}/{}lib{}".format(projectdir, env["platform"], filepath, file), library)
copy = env.Install("{}/addons/{}/{}/{}".format(projectdir, libname, env["platform"], filepath), library),

default_args = [library, copy]
if localEnv.get("compiledb", False):
Expand Down
4 changes: 3 additions & 1 deletion bin/.gitignore → addons/numdot/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@
# Add back .gitkeep files
!**/*.gitkeep

# Add back Info.plist files
# Add back root files, which contains useful things.
!/*
# Add back wanted files
!**/Info.plist
21 changes: 21 additions & 0 deletions addons/numdot/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2024 Lukas Tenbrink and NumDot contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
145 changes: 145 additions & 0 deletions addons/numdot/THIRDPARTY.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
NumDot incorporates third-party material from the projects listed below.

Godot Engine (https://github.com/godotengine/godot)

Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md).
Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.

godot-cpp (https://github.com/godot-jolt/godot-cpp)

Copyright (c) 2017-present Godot Engine contributors.
Copyright (c) 2022-present Mikael Hermansson.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.

xtensor (https://github.com/xtensor-stack/xtensor)

Copyright (c) 2016, Johan Mabille, Sylvain Corlay and Wolf Vollprecht
Copyright (c) 2016, QuantStack
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

xtl (https://github.com/xtensor-stack/xtl)

BSD 3-Clause License

Copyright (c) 2017, Sylvain Corlay, Johan Mabille and Wolf Vollprecht
Copyright (c) 2017, QuantStack
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

xsimd (https://github.com/xtensor-stack/xtl)

Copyright (c) 2016, Johan Mabille, Sylvain Corlay, Wolf Vollprecht and Martin Renou
Copyright (c) 2016, QuantStack
Copyright (c) 2018, Serge Guelton
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions addons/numdot/numdot.gdextension
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[configuration]

entry_symbol = "numdot_library_init"
compatibility_minimum = "4.1"
reloadable = true

[libraries]

macos.debug = "macos/numdot-macos.framework/libnumdot.macos.template_release"
macos.release = "macos/numdot-macos.framework/libnumdot.macos.template_release"

ios.debug = "ios/numdot-ios.framework/libnumdot.ios.template_release"
ios.release = "ios/numdot-ios.framework/libnumdot.ios.template_release"

windows.debug.x86_32 = "windows/libnumdot.windows.template_release.x86_32.dll"
windows.release.x86_32 = "windows/libnumdot.windows.template_release.x86_32.dll"

windows.debug.x86_64 = "windows/libnumdot.windows.template_release.x86_64.dll"
windows.release.x86_64 = "windows/libnumdot.windows.template_release.x86_64.dll"

linux.debug.x86_64 = "linux/libnumdot.linux.template_release.x86_64.so"
linux.release.x86_64 = "linux/libnumdot.linux.template_release.x86_64.so"

linux.debug.arm64 = "linux/libnumdot.linux.template_release.arm64.so"
linux.release.arm64 = "linux/libnumdot.linux.template_release.arm64.so"

linux.debug.rv64 = "linux/libnumdot.linux.template_release.rv64.so"
linux.release.rv64 = "linux/libnumdot.linux.template_release.rv64.so"

android.debug.x86_64 = "android/libnumdot.android.template_release.x86_64.so"
android.release.x86_64 = "android/libnumdot.android.template_release.x86_64.so"

android.debug.arm64 = "android/libnumdot.android.template_release.arm64.so"
android.release.arm64 = "android/libnumdot.android.template_release.arm64.so"
File renamed without changes.
32 changes: 0 additions & 32 deletions bin/macos/macos.framework/Resources/Info.plist

This file was deleted.

4 changes: 4 additions & 0 deletions demo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ export_presets.cfg
.mono/
data_*/
mono_crash.*.json

# Locally built addon
addons/numdot/*
!addons/numdot/numdot.gdextension
34 changes: 34 additions & 0 deletions demo/addons/numdot/numdot.gdextension
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[configuration]

entry_symbol = "numdot_library_init"
compatibility_minimum = "4.1"
reloadable = true

[libraries]

macos.debug = "macos/numdot-macos.framework/libnumdot.macos.template_debug"
macos.release = "macos/numdot-macos.framework/libnumdot.macos.template_release"

ios.debug = "ios/numdot-ios.framework/libnumdot.ios.template_debug"
ios.release = "ios/numdot-ios.framework/libnumdot.ios.template_release"

windows.debug.x86_32 = "windows/libnumdot.windows.template_debug.x86_32.dll"
windows.release.x86_32 = "windows/libnumdot.windows.template_release.x86_32.dll"

windows.debug.x86_64 = "windows/libnumdot.windows.template_debug.x86_64.dll"
windows.release.x86_64 = "windows/libnumdot.windows.template_release.x86_64.dll"

linux.debug.x86_64 = "linux/libnumdot.linux.template_debug.x86_64.so"
linux.release.x86_64 = "linux/libnumdot.linux.template_release.x86_64.so"

linux.debug.arm64 = "linux/libnumdot.linux.template_debug.arm64.so"
linux.release.arm64 = "linux/libnumdot.linux.template_release.arm64.so"

linux.debug.rv64 = "linux/libnumdot.linux.template_debug.rv64.so"
linux.release.rv64 = "linux/libnumdot.linux.template_release.rv64.so"

android.debug.x86_64 = "android/libnumdot.android.template_debug.x86_64.so"
android.release.x86_64 = "android/libnumdot.android.template_release.x86_64.so"

android.debug.arm64 = "android/libnumdot.android.template_debug.arm64.so"
android.release.arm64 = "android/libnumdot.android.template_release.arm64.so"
3 changes: 0 additions & 3 deletions demo/bin/.gitignore

This file was deleted.

26 changes: 0 additions & 26 deletions demo/bin/numdot.gdextension

This file was deleted.

Loading

0 comments on commit 0683a94

Please sign in to comment.