Skip to content

Commit de172e9

Browse files
committed
Base on deps v1.0.0-rc1
1 parent 4a07a79 commit de172e9

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

cmake/make_deps.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def build_url(user, release):
6868
"LuxCoreDeps",
6969
"releases",
7070
"download",
71-
release,
71+
f"v{release}",
7272
f"luxcore-deps-{suffix}.zip"
7373
)
7474

@@ -196,10 +196,9 @@ def main():
196196
)
197197

198198
# Initialize
199-
url = build_url(
200-
settings["Dependencies"]["user"],
201-
settings["Dependencies"]["release"],
202-
)
199+
user = settings["Dependencies"]["user"]
200+
release = settings["Dependencies"]["release"]
201+
url = build_url(user, release)
203202

204203
# Download and unzip
205204
if not args.local:
@@ -237,7 +236,7 @@ def main():
237236
# Installing profiles
238237
logger.info("Installing profiles")
239238
run_conan(
240-
["config", "install-pkg", "luxcoreconf/2.10.0@luxcore/luxcore"]
239+
["config", "install-pkg", f"luxcoreconf/{release}@luxcore/luxcore"]
241240
) # TODO version as a param
242241

243242
# Generate & deploy

conanfile.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,23 @@
55
from pathlib import Path
66
import io
77
import os
8+
import json
89

910
from conan import ConanFile
1011
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
1112
from conan.tools.env import VirtualBuildEnv
1213

14+
with open("luxcore.json") as config:
15+
config_json = json.load(config)
16+
LUXDEPS_VERSION = config_json["Dependencies"]["release"]
1317

1418
class LuxCore(ConanFile):
1519
name = "luxcore"
1620
version = "2.10.0"
1721
user = "luxcore"
1822
channel = "luxcore"
1923

20-
requires = "luxcoredeps/2.10.0@luxcore/luxcore"
24+
requires = f"luxcoredeps/{LUXDEPS_VERSION}@luxcore/luxcore"
2125
tool_requires = "ninja/[*]"
2226
settings = "os", "compiler", "build_type", "arch"
2327

luxcore.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"Dependencies": {
99
"user": "LuxCoreRender",
10-
"release": "v1.0.0-rc1"
10+
"release": "1.0.0-rc1"
1111
},
1212
"Build": {
1313
"gcc": "14",

0 commit comments

Comments
 (0)