Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 1e8a1bd

Browse files
livecode-vulcanlivecode-vulcan
authored
Auto-merge pull request #7297 from livecodeian/feature-optional-use-thirdparty-prebuilts
[[ Build ]] Make use of thirdparty prebuilts optional This PR allows the use of prebuilt thirdparty libraries to be determined by the 'BUILD_THIRDPARTY' environment variable. If this variable is set when configuring the build project files (i.e. with `make config-<platform>`) then rather than use the prebuilt thirdparty libraries these libraries will be compiled from source. *Note* - depends on livecode/livecode-thirdparty#142
2 parents 9e2bcc9 + 4f62f2a commit 1e8a1bd

File tree

20 files changed

+62
-50
lines changed

20 files changed

+62
-50
lines changed

‎config.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ def process_env_options(opts):
152152
'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY', 'OBJDUMP',
153153
'STRIP', 'JAVA_SDK', 'NODE_JS', 'BUILD_EDITION', 'CC_PREFIX', 'CROSS',
154154
'SYSROOT', 'AUX_SYSROOT', 'TRIPLE', 'MS_SPEECH_SDK5', 'QUICKTIME_SDK',
155+
'BUILD_THIRDPARTY',
155156
)
156157
for v in vars:
157158
opts[v] = os.getenv(v)
@@ -720,6 +721,9 @@ def core_gyp_args(opts):
720721

721722
args.append('-Duniform_arch=' + opts['UNIFORM_ARCH'])
722723

724+
if opts['BUILD_THIRDPARTY'] is not None:
725+
args.append('-Duse_prebuilt_thirdparty=0')
726+
723727
return args
724728

725729
def export_opts(opts, names):

‎config/thirdparty.gypi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@
2121
'use_system_libxslt%': 0,
2222
'use_system_libz%': 0,
2323
'use_system_libzip%': 0,
24+
25+
'use_prebuilt_thirdparty%': 1,
2426
},
2527
}

‎engine/kernel-development.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
'kernel.gyp:kernel',
5151

5252
'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
53-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
53+
'../thirdparty/libz/libz.gyp:libz',
5454
],
5555

5656
'sources':

‎engine/kernel-installer.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
'dependencies':
3838
[
3939
'kernel.gyp:kernel',
40-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
40+
'../thirdparty/libz/libz.gyp:libz',
4141
],
4242

4343
'includes':

‎engine/kernel-server.gyp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@
5757
'../prebuilt/libcurl.gyp:libcurl',
5858
'../prebuilt/libopenssl.gyp:libopenssl',
5959

60-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pcre',
61-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
62-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
63-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
60+
'../thirdparty/libpcre/libpcre.gyp:libpcre',
61+
'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
62+
'../thirdparty/libgif/libgif.gyp:libgif',
63+
'../thirdparty/libpng/libpng.gyp:libpng',
6464

65-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
65+
'../thirdparty/libz/libz.gyp:libz',
6666

6767
'engine-common.gyp:quicktime_stubs',
6868

@@ -94,7 +94,7 @@
9494
{
9595
'dependencies':
9696
[
97-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_cairo',
97+
'../thirdparty/libcairo/libcairo.gyp:libcairo',
9898
],
9999

100100
'defines':

‎engine/kernel.gyp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
'../prebuilt/libopenssl.gyp:libopenssl_headers',
2626

27-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pcre',
28-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
29-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
30-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
27+
'../thirdparty/libpcre/libpcre.gyp:libpcre',
28+
'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
29+
'../thirdparty/libgif/libgif.gyp:libgif',
30+
'../thirdparty/libpng/libpng.gyp:libpng',
3131

32-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
32+
'../thirdparty/libz/libz.gyp:libz',
3333

3434
'engine-common.gyp:encode_version',
3535
'engine-common.gyp:quicktime_stubs',
@@ -79,9 +79,9 @@
7979

8080
'dependencies':
8181
[
82-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
83-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
84-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_harfbuzz',
82+
'../thirdparty/libskia/libskia.gyp:libskia',
83+
'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
84+
'../thirdparty/libharfbuzz/libharfbuzz.gyp:libharfbuzz',
8585
],
8686

8787
'link_settings':
@@ -109,7 +109,7 @@
109109

110110
'dependencies':
111111
[
112-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
112+
'../thirdparty/libskia/libskia.gyp:libskia',
113113
],
114114
},
115115
],

‎libfoundation/libfoundation.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
[
4848
'../prebuilt/libicu.gyp:libicu',
4949
'../prebuilt/libicu.gyp:encode_minimal_icu_data',
50-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
50+
'../thirdparty/libz/libz.gyp:libz',
5151
'../thirdparty/libffi/libffi.gyp:libffi',
5252
],
5353

‎libgraphics/libgraphics.gyp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
'dependencies':
1616
[
17-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
18-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
19-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
20-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
17+
'../thirdparty/libgif/libgif.gyp:libgif',
18+
'../thirdparty/libpng/libpng.gyp:libpng',
19+
'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
20+
'../thirdparty/libskia/libskia.gyp:libskia',
2121
'../libfoundation/libfoundation.gyp:libFoundation',
2222
],
2323

@@ -28,8 +28,8 @@
2828
{
2929
'dependencies':
3030
[
31-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
32-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_harfbuzz',
31+
'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
32+
'../thirdparty/libharfbuzz/libharfbuzz.gyp:libharfbuzz',
3333
'../prebuilt/libicu.gyp:libicu',
3434
],
3535
},

‎libscript/libscript.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
'dependencies':
4949
[
5050
'../libfoundation/libfoundation.gyp:libFoundation',
51-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
51+
'../thirdparty/libffi/libffi.gyp:libffi',
5252
],
5353

5454
'include_dirs':

‎prebuilt/scripts/build-thirdparty.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
4545
ECHO Configuring Thirdparty for %BUILDTRIPLE%
4646
ECHO ========== CONFIGURING ========== >%THIRDPARTY_BUILD_LOG%
4747

48+
REM Configure project files to build thirdparty libraries
49+
SET BUILD_THIRDPARTY=1
50+
4851
REM Generate project files
4952
cd %_TOOLS_DIR%..
5053
python config.py --platform %BUILD_PLATFORM% >>%THIRDPARTY_BUILD_LOG% 2>>&1

0 commit comments

Comments
 (0)