Skip to content

Commit 9b19f6c

Browse files
committed
Rename BuildConfig to ScriptConfig
1 parent 9638d03 commit 9b19f6c

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

src/scripts/build_bulk_libldks.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
import sys
44

55
import build_individual_libldk
6-
from script_config import BuildConfig, LibldkBuildConfiguration
6+
from script_config import ScriptConfig, BuildConfig
77

88
CALL_INDIVIDUAL_BUILD_METHOD_VIA_SHELL = False
99

1010

11-
def parse_config() -> BuildConfig:
12-
config = BuildConfig.parse(allow_ldk_argument=True, parse_configuration=(not CALL_INDIVIDUAL_BUILD_METHOD_VIA_SHELL))
11+
def parse_config() -> ScriptConfig:
12+
config = ScriptConfig.parse(allow_ldk_argument=True, parse_configuration=(not CALL_INDIVIDUAL_BUILD_METHOD_VIA_SHELL))
1313

14-
individual_configurations: [LibldkBuildConfiguration] = [LibldkBuildConfiguration('iphoneos', '', ['arm64']),
15-
LibldkBuildConfiguration('iphonesimulator', '-simulator', ['arm64', 'x86_64']),
16-
LibldkBuildConfiguration('macosx', '', ['arm64', 'x86_64']),
17-
LibldkBuildConfiguration('macosx', '-macabi', ['arm64', 'x86_64']), ]
14+
individual_configurations: [BuildConfig] = [BuildConfig('iphoneos', '', ['arm64']),
15+
BuildConfig('iphonesimulator', '-simulator', ['arm64', 'x86_64']),
16+
BuildConfig('macosx', '', ['arm64', 'x86_64']),
17+
BuildConfig('macosx', '-macabi', ['arm64', 'x86_64']), ]
1818

1919
config.LIBLDK_BUILD_CONFIGURATIONS = individual_configurations
2020

2121
return config
2222

2323

24-
def run(config: BuildConfig):
24+
def run(config: ScriptConfig):
2525
child_environment = dict(os.environ)
2626
child_environment['LDK_C_BINDINGS_BASE'] = config.LDK_C_BINDINGS_BASE
2727
child_environment['LDK_C_BINDINGS_DIRECTORY'] = config.LDK_C_BINDINGS_DIRECTORY

src/scripts/build_individual_libldk.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
import subprocess
33
import sys
44

5-
from script_config import BuildConfig, LibldkBuildConfiguration
5+
from script_config import ScriptConfig, BuildConfig
66

77

8-
def parse_config() -> BuildConfig:
9-
config = BuildConfig.parse(allow_ldk_argument=False, parse_configuration=True)
8+
def parse_config() -> ScriptConfig:
9+
config = ScriptConfig.parse(allow_ldk_argument=False, parse_configuration=True)
1010
return config
1111

1212

13-
def run(config: BuildConfig):
13+
def run(config: ScriptConfig):
1414
if len(config.LIBLDK_BUILD_CONFIGURATIONS) != 1:
1515
print('Individual libldk build must have exactly 1 build configuration.')
1616
sys.exit(1)
@@ -87,13 +87,13 @@ def run(config: BuildConfig):
8787

8888

8989
if __name__ == '__main__':
90-
config = parse_config()
90+
script_config = parse_config()
9191

9292
platform = os.getenv('PLATFORM')
9393
llvm_target_triple_suffix = os.getenv('LLVM_TARGET_TRIPLE_SUFFIX')
9494
architectures = os.getenv('ARCHS').split(' ')
9595

96-
ldkBuildConfig = LibldkBuildConfiguration(platform, llvm_target_triple_suffix, architectures)
97-
config.LIBLDK_BUILD_CONFIGURATIONS = [ldkBuildConfig]
96+
ldkBuildConfig = BuildConfig(platform, llvm_target_triple_suffix, architectures)
97+
script_config.LIBLDK_BUILD_CONFIGURATIONS = [ldkBuildConfig]
9898

99-
run(config=config)
99+
run(script_config)

src/scripts/prepare_headers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import os.path
22
import subprocess
33

4-
from script_config import BuildConfig
4+
from script_config import ScriptConfig
55

66

7-
def run(config: BuildConfig):
7+
def run(config: ScriptConfig):
88
header_directories = [
99
os.path.join(config.LDK_C_BINDINGS_DIRECTORY, 'include'),
1010
os.path.join(config.LDK_C_BINDINGS_BASE, 'ldk-net'),
@@ -28,5 +28,5 @@ def run(config: BuildConfig):
2828

2929

3030
if __name__ == '__main__':
31-
config = BuildConfig.parse(allow_ldk_argument=True)
32-
run(config)
31+
script_config = ScriptConfig.parse(allow_ldk_argument=True)
32+
run(script_config)

src/scripts/script_config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
import sys
33

44

5-
class LibldkBuildConfiguration:
5+
class BuildConfig:
66
def __init__(self, platform: str, llvm_target_triple_suffix: str, architectures: [str]):
77
self.platform = platform
88
self.llvm_target_triple_suffix = llvm_target_triple_suffix
99
self.architectures = architectures
1010

1111

12-
class BuildConfig:
12+
class ScriptConfig:
1313
def __init__(self):
1414
self.LDK_C_BINDINGS_BASE: str = ''
1515
self.LDK_C_BINDINGS_DIRECTORY: str = ''
16-
self.LIBLDK_BUILD_CONFIGURATIONS: [LibldkBuildConfiguration] = []
16+
self.LIBLDK_BUILD_CONFIGURATIONS: [BuildConfig] = []
1717
self.CONFIGURATION: str = ''
1818
self.RUST_CONFIGURATION: str = ''
1919
self.RUST_CONFIGURATION_FLAG: str = ''
@@ -39,7 +39,7 @@ def parse(cls, allow_ldk_argument=True, parse_configuration=False):
3939
print('lightning-c-bindings is not a directory')
4040
sys.exit(1)
4141

42-
config = BuildConfig()
42+
config = ScriptConfig()
4343
config.LDK_C_BINDINGS_BASE = ldk_directory
4444
config.LDK_C_BINDINGS_DIRECTORY = c_bindings_directory
4545

0 commit comments

Comments
 (0)