Skip to content

Commit 6c705b0

Browse files
touilleMantouilleMan
committed
Move pythonscript within addons folder in dist build
1 parent 0e1948e commit 6c705b0

File tree

11 files changed

+50
-50
lines changed

11 files changed

+50
-50
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ logs
2929
/build/
3030

3131
# Lazy generated symlinks on build
32-
/examples/*/pythonscript
33-
/tests/*/pythonscript
32+
/examples/*/addons
33+
/tests/*/addons
3434
/tests/*/lib

‎SConstruct‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ else:
156156

157157

158158
env["DIST_ROOT"] = Dir(f"build/dist")
159-
env["DIST_PLATFORM"] = Dir(f"{env['DIST_ROOT']}/pythonscript/{env['platform']}")
159+
env["DIST_PLATFORM"] = Dir(f"{env['DIST_ROOT']}/addons/pythonscript/{env['platform']}")
160160
VariantDir(f"build/{env['platform']}/platforms", f"platforms")
161161
VariantDir(f"build/{env['platform']}/pythonscript", "pythonscript")
162162

@@ -170,16 +170,16 @@ env.Command(
170170
action=Copy("$TARGET", "$SOURCE"),
171171
)
172172
env.Command(
173-
target=f"$DIST_ROOT/pythonscript/LICENSE.txt",
173+
target=f"$DIST_ROOT/addons/pythonscript/LICENSE.txt",
174174
source=f"#/misc/release_LICENSE.txt",
175175
action=Copy("$TARGET", "$SOURCE"),
176176
)
177+
env.Command(target="$DIST_ROOT/addons/pythonscript/.gdignore", source=None, action=Touch("$TARGET"))
177178
env.Command(
178-
target=f"$DIST_ROOT/pythonscript_repl",
179+
target=f"$DIST_ROOT/addons/pythonscript_repl",
179180
source=f"#/addons/repl",
180181
action=Copy("$TARGET", "$SOURCE"),
181182
)
182-
env.Command(target="$DIST_ROOT/pythonscript/.gdignore", source=None, action=Touch("$TARGET"))
183183

184184

185185
### Load sub scons scripts ###

‎examples/SConscript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Import("env")
22

33
for test in ["pong", "pong_multiplayer"]:
4-
dist_symlink = env.Symlink(f"{test}/pythonscript", "$DIST_ROOT/pythonscript")
4+
dist_symlink = env.Symlink(f"{test}/addons", "$DIST_ROOT/addons")
55
target = env.Command(
66
test, ["$godot_binary", dist_symlink], "${SOURCE.abspath} --path ${TARGET}"
77
)

‎examples/pong/pythonscript.gdnlib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ symbol_prefix="godot_"
66

77
[entry]
88

9-
X11.64="res://pythonscript/x11-64/libpythonscript.so"
10-
X11.32="res://pythonscript/x11-32/libpythonscript.so"
11-
Server.64="res://pythonscript/x11-64/libpythonscript.so"
12-
Windows.64="res://pythonscript/windows-64/pythonscript.dll"
13-
Windows.32="res://pythonscript/windows-32/pythonscript.dll"
14-
OSX.64="res://pythonscript/osx-64/libpythonscript.dylib"
9+
X11.64="res://addons/pythonscript/x11-64/libpythonscript.so"
10+
X11.32="res://addons/pythonscript/x11-32/libpythonscript.so"
11+
Server.64="res://addons/pythonscript/x11-64/libpythonscript.so"
12+
Windows.64="res://addons/pythonscript/windows-64/pythonscript.dll"
13+
Windows.32="res://addons/pythonscript/windows-32/pythonscript.dll"
14+
OSX.64="res://addons/pythonscript/osx-64/libpythonscript.dylib"
1515

1616
[dependencies]
1717

‎examples/pong_multiplayer/pythonscript.gdnlib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ symbol_prefix="godot_"
66

77
[entry]
88

9-
X11.64="res://pythonscript/x11-64/libpythonscript.so"
10-
X11.32="res://pythonscript/x11-32/libpythonscript.so"
11-
Server.64="res://pythonscript/x11-64/libpythonscript.so"
12-
Windows.64="res://pythonscript/windows-64/pythonscript.dll"
13-
Windows.32="res://pythonscript/windows-32/pythonscript.dll"
14-
OSX.64="res://pythonscript/osx-64/libpythonscript.dylib"
9+
X11.64="res://addons/pythonscript/x11-64/libpythonscript.so"
10+
X11.32="res://addons/pythonscript/x11-32/libpythonscript.so"
11+
Server.64="res://addons/pythonscript/x11-64/libpythonscript.so"
12+
Windows.64="res://addons/pythonscript/windows-64/pythonscript.dll"
13+
Windows.32="res://addons/pythonscript/windows-32/pythonscript.dll"
14+
OSX.64="res://addons/pythonscript/osx-64/libpythonscript.dylib"
1515

1616
[dependencies]
1717

‎misc/release_pythonscript.gdnlib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ symbol_prefix="godot_"
66

77
[entry]
88

9-
X11.64="res://pythonscript/x11-64/libpythonscript.so"
10-
X11.32="res://pythonscript/x11-32/libpythonscript.so"
11-
Server.64="res://pythonscript/x11-64/libpythonscript.so"
12-
Windows.64="res://pythonscript/windows-64/pythonscript.dll"
13-
Windows.32="res://pythonscript/windows-32/pythonscript.dll"
14-
OSX.64="res://pythonscript/osx-64/libpythonscript.dylib"
9+
X11.64="res://addons/pythonscript/x11-64/libpythonscript.so"
10+
X11.32="res://addons/pythonscript/x11-32/libpythonscript.so"
11+
Server.64="res://addons/pythonscript/x11-64/libpythonscript.so"
12+
Windows.64="res://addons/pythonscript/windows-64/pythonscript.dll"
13+
Windows.32="res://addons/pythonscript/windows-32/pythonscript.dll"
14+
OSX.64="res://addons/pythonscript/osx-64/libpythonscript.dylib"
1515

1616
[dependencies]
1717

‎tests/SConscript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if env["headless"]:
1919

2020
# TODO: fix&reenable work_with_gdscript test...
2121
for test in ["bindings", "helloworld", "threading"]:
22-
dist_symlink = env.Symlink(f"{test}/pythonscript", "$DIST_ROOT/pythonscript")
22+
dist_symlink = env.Symlink(f"{test}/addons", "$DIST_ROOT/addons")
2323
dist_symlink = env.Symlink(f"{test}/lib", "_lib_vendors")
2424
target = env.Command(
2525
test,

‎tests/bindings/pythonscript.gdnlib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ symbol_prefix="godot_"
66

77
[entry]
88

9-
X11.64="res://pythonscript/x11-64/libpythonscript.so"
10-
X11.32="res://pythonscript/x11-32/libpythonscript.so"
11-
Server.64="res://pythonscript/x11-64/libpythonscript.so"
12-
Windows.64="res://pythonscript/windows-64/pythonscript.dll"
13-
Windows.32="res://pythonscript/windows-32/pythonscript.dll"
14-
OSX.64="res://pythonscript/osx-64/libpythonscript.dylib"
9+
X11.64="res://addons/pythonscript/x11-64/libpythonscript.so"
10+
X11.32="res://addons/pythonscript/x11-32/libpythonscript.so"
11+
Server.64="res://addons/pythonscript/x11-64/libpythonscript.so"
12+
Windows.64="res://addons/pythonscript/windows-64/pythonscript.dll"
13+
Windows.32="res://addons/pythonscript/windows-32/pythonscript.dll"
14+
OSX.64="res://addons/pythonscript/osx-64/libpythonscript.dylib"
1515

1616
[dependencies]
1717

‎tests/helloworld/pythonscript.gdnlib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ symbol_prefix="godot_"
66

77
[entry]
88

9-
X11.64="res://pythonscript/x11-64/libpythonscript.so"
10-
X11.32="res://pythonscript/x11-32/libpythonscript.so"
11-
Server.64="res://pythonscript/x11-64/libpythonscript.so"
12-
Windows.64="res://pythonscript/windows-64/pythonscript.dll"
13-
Windows.32="res://pythonscript/windows-32/pythonscript.dll"
14-
OSX.64="res://pythonscript/osx-64/libpythonscript.dylib"
9+
X11.64="res://addons/pythonscript/x11-64/libpythonscript.so"
10+
X11.32="res://addons/pythonscript/x11-32/libpythonscript.so"
11+
Server.64="res://addons/pythonscript/x11-64/libpythonscript.so"
12+
Windows.64="res://addons/pythonscript/windows-64/pythonscript.dll"
13+
Windows.32="res://addons/pythonscript/windows-32/pythonscript.dll"
14+
OSX.64="res://addons/pythonscript/osx-64/libpythonscript.dylib"
1515

1616
[dependencies]
1717

‎tests/threading/pythonscript.gdnlib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ symbol_prefix="godot_"
66

77
[entry]
88

9-
X11.64="res://pythonscript/x11-64/libpythonscript.so"
10-
X11.32="res://pythonscript/x11-32/libpythonscript.so"
11-
Server.64="res://pythonscript/x11-64/libpythonscript.so"
12-
Windows.64="res://pythonscript/windows-64/pythonscript.dll"
13-
Windows.32="res://pythonscript/windows-32/pythonscript.dll"
14-
OSX.64="res://pythonscript/osx-64/libpythonscript.dylib"
9+
X11.64="res://addons/pythonscript/x11-64/libpythonscript.so"
10+
X11.32="res://addons/pythonscript/x11-32/libpythonscript.so"
11+
Server.64="res://addons/pythonscript/x11-64/libpythonscript.so"
12+
Windows.64="res://addons/pythonscript/windows-64/pythonscript.dll"
13+
Windows.32="res://addons/pythonscript/windows-32/pythonscript.dll"
14+
OSX.64="res://addons/pythonscript/osx-64/libpythonscript.dylib"
1515

1616
[dependencies]
1717

0 commit comments

Comments
 (0)