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

[[ Build ]] Make use of thirdparty prebuilts optional #7297

Open
livecodeian wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[[ Build ]] Make use of thirdparty prebuilts optional #7297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26b9e57
[[ BUILD ]] Switch dependencies to gyp files in thirdparty submodule
Mar 18, 2020
4f62f2a
[[ Build ]] Detect BUILD_THIRDPARTY env var in config.py script
Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ def process_env_options(opts):
'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY', 'OBJDUMP',
'STRIP', 'JAVA_SDK', 'NODE_JS', 'BUILD_EDITION', 'CC_PREFIX', 'CROSS',
'SYSROOT', 'AUX_SYSROOT', 'TRIPLE', 'MS_SPEECH_SDK5', 'QUICKTIME_SDK',
'BUILD_THIRDPARTY',
)
for v in vars:
opts[v] = os.getenv(v)
Expand Down Expand Up @@ -720,6 +721,9 @@ def core_gyp_args(opts):

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

if opts['BUILD_THIRDPARTY'] is not None:
args.append('-Duse_prebuilt_thirdparty=0')

return args

def export_opts(opts, names):
Expand Down
2 changes: 2 additions & 0 deletions config/thirdparty.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
'use_system_libxslt%': 0,
'use_system_libz%': 0,
'use_system_libzip%': 0,

'use_prebuilt_thirdparty%': 1,
},
}
2 changes: 1 addition & 1 deletion engine/kernel-development.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
'kernel.gyp:kernel',

'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libz/libz.gyp:libz',
],

'sources':
Expand Down
2 changes: 1 addition & 1 deletion engine/kernel-installer.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
'dependencies':
[
'kernel.gyp:kernel',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libz/libz.gyp:libz',
],

'includes':
Expand Down
12 changes: 6 additions & 6 deletions engine/kernel-server.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@
'../prebuilt/libcurl.gyp:libcurl',
'../prebuilt/libopenssl.gyp:libopenssl',

'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pcre',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
'../thirdparty/libpcre/libpcre.gyp:libpcre',
'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
'../thirdparty/libgif/libgif.gyp:libgif',
'../thirdparty/libpng/libpng.gyp:libpng',

'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libz/libz.gyp:libz',

'engine-common.gyp:quicktime_stubs',

Expand Down Expand Up @@ -94,7 +94,7 @@
{
'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_cairo',
'../thirdparty/libcairo/libcairo.gyp:libcairo',
],

'defines':
Expand Down
18 changes: 9 additions & 9 deletions engine/kernel.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@

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

'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pcre',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
'../thirdparty/libpcre/libpcre.gyp:libpcre',
'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
'../thirdparty/libgif/libgif.gyp:libgif',
'../thirdparty/libpng/libpng.gyp:libpng',

'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libz/libz.gyp:libz',

'engine-common.gyp:encode_version',
'engine-common.gyp:quicktime_stubs',
Expand Down Expand Up @@ -79,9 +79,9 @@

'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_harfbuzz',
'../thirdparty/libskia/libskia.gyp:libskia',
'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
'../thirdparty/libharfbuzz/libharfbuzz.gyp:libharfbuzz',
],

'link_settings':
Expand Down Expand Up @@ -109,7 +109,7 @@

'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
'../thirdparty/libskia/libskia.gyp:libskia',
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion libfoundation/libfoundation.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
[
'../prebuilt/libicu.gyp:libicu',
'../prebuilt/libicu.gyp:encode_minimal_icu_data',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libz/libz.gyp:libz',
'../thirdparty/libffi/libffi.gyp:libffi',
],

Expand Down
12 changes: 6 additions & 6 deletions libgraphics/libgraphics.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
'../thirdparty/libgif/libgif.gyp:libgif',
'../thirdparty/libpng/libpng.gyp:libpng',
'../thirdparty/libjpeg/libjpeg.gyp:libjpeg',
'../thirdparty/libskia/libskia.gyp:libskia',
'../libfoundation/libfoundation.gyp:libFoundation',
],

Expand All @@ -28,8 +28,8 @@
{
'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_harfbuzz',
'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
'../thirdparty/libharfbuzz/libharfbuzz.gyp:libharfbuzz',
'../prebuilt/libicu.gyp:libicu',
],
},
Expand Down
2 changes: 1 addition & 1 deletion libscript/libscript.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
'dependencies':
[
'../libfoundation/libfoundation.gyp:libFoundation',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
'../thirdparty/libffi/libffi.gyp:libffi',
],

'include_dirs':
Expand Down
3 changes: 3 additions & 0 deletions prebuilt/scripts/build-thirdparty.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
ECHO Configuring Thirdparty for %BUILDTRIPLE%
ECHO ========== CONFIGURING ========== >%THIRDPARTY_BUILD_LOG%

REM Configure project files to build thirdparty libraries
SET BUILD_THIRDPARTY=1

REM Generate project files
cd %_TOOLS_DIR%..
python config.py --platform %BUILD_PLATFORM% >>%THIRDPARTY_BUILD_LOG% 2>>&1
Expand Down
3 changes: 3 additions & 0 deletions prebuilt/scripts/build-thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ elif [ "$PLATFORM" == "win32" ]; then
LIBPATH=""
fi

# Configure project files to build thirdparty libraries
export BUILD_THIRDPARTY=1

make -C .. config-$MAKE_TARGET

if [ "$PLATFORM" == "mac" ] || [ "$PLATFORM" == "ios" ] ; then
Expand Down
16 changes: 8 additions & 8 deletions revdb/revdb.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
'dependencies':
[
'../libexternal/libexternal.gyp:libExternal',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_mysql',
'../thirdparty/libmysql/libmysql.gyp:libmysql',
'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
],

Expand Down Expand Up @@ -156,7 +156,7 @@
'dependencies':
[
'../libexternal/libexternal.gyp:libExternal',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_mysql',
'../thirdparty/libmysql/libmysql.gyp:libmysql',
'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
],

Expand Down Expand Up @@ -223,7 +223,7 @@
{
'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_iodbc',
'../thirdparty/libiodbc/libiodbc.gyp:libiodbc',
],
},
{
Expand Down Expand Up @@ -287,7 +287,7 @@
{
'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_iodbc',
'../thirdparty/libiodbc/libiodbc.gyp:libiodbc',
],
},
{
Expand Down Expand Up @@ -360,7 +360,7 @@
[
'../libexternal/libexternal.gyp:libExternal',
'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pq',
'../thirdparty/libpq/libpq.gyp:libpq',
],

'include_dirs':
Expand Down Expand Up @@ -405,7 +405,7 @@
'dependencies':
[
'../libexternal/libexternal.gyp:libExternal',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pq',
'../thirdparty/libpq/libpq.gyp:libpq',
'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
],

Expand Down Expand Up @@ -467,7 +467,7 @@
'dependencies':
[
'../libexternal/libexternal.gyp:libExternal',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_sqlite',
'../thirdparty/libsqlite/libsqlite.gyp:libsqlite',
],

'include_dirs':
Expand Down Expand Up @@ -574,7 +574,7 @@
'dependencies':
[
'../libexternal/libexternal.gyp:libExternal',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_sqlite',
'../thirdparty/libsqlite/libsqlite.gyp:libsqlite',
],

'include_dirs':
Expand Down
4 changes: 2 additions & 2 deletions revpdfprinter/revpdfprinter.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[
'../libcore/libcore.gyp:libCore',
'../libexternal/libexternal.gyp:libExternal',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_cairo',
'../thirdparty/libcairo/libcairo.gyp:libcairo',
],

'include_dirs':
Expand Down Expand Up @@ -76,7 +76,7 @@

'dependencies':
[
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
],
},
],
Expand Down
12 changes: 6 additions & 6 deletions revxml/revxml.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
[
'../libexternal/libexternal.gyp:libExternal',
'../libexternal/libexternal.gyp:libExternal-symbol-exports',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_xml',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_xslt',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libxml/libxml.gyp:libxml',
'../thirdparty/libxslt/libxslt.gyp:libxslt',
'../thirdparty/libz/libz.gyp:libz',
],

'include_dirs':
Expand Down Expand Up @@ -80,9 +80,9 @@
[
'../libexternal/libexternal.gyp:libExternal',
'../libexternal/libexternal.gyp:libExternal-symbol-exports',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_xml',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_xslt',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libxml/libxml.gyp:libxml',
'../thirdparty/libxslt/libxslt.gyp:libxslt',
'../thirdparty/libz/libz.gyp:libz',
],

'include_dirs':
Expand Down
8 changes: 4 additions & 4 deletions revzip/revzip.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
[
'../libexternal/libexternal.gyp:libExternal',
'../libexternal/libexternal.gyp:libExternal-symbol-exports',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_zip',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libzip/libzip.gyp:libzip',
'../thirdparty/libz/libz.gyp:libz',
],

'sources':
Expand Down Expand Up @@ -77,8 +77,8 @@
[
'../libexternal/libexternal.gyp:libExternal',
'../libexternal/libexternal.gyp:libExternal-symbol-exports',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_zip',
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
'../thirdparty/libzip/libzip.gyp:libzip',
'../thirdparty/libz/libz.gyp:libz',
],

'sources':
Expand Down
2 changes: 1 addition & 1 deletion toolchain/lc-compile-ffi-java/lc-compile-ffi-java.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

'dependencies':
[
'../../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
'../../thirdparty/libffi/libffi.gyp:libffi',
],

'conditions':
Expand Down
2 changes: 1 addition & 1 deletion toolchain/lc-compile/lc-compile.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

'dependencies':
[
'../../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
'../../thirdparty/libffi/libffi.gyp:libffi',
],

'conditions':
Expand Down
2 changes: 1 addition & 1 deletion toolchain/lc-compile/lc-run.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'../../libfoundation/libfoundation.gyp:libFoundation',
'../../libscript/libscript.gyp:libScript',
'../../libscript/libscript.gyp:stdscript',
'../../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
'../../thirdparty/libffi/libffi.gyp:libffi',
],

'sources':
Expand Down
2 changes: 1 addition & 1 deletion toolchain/lc-compile/src/lc-compile-lib.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'../../../libfoundation/libfoundation.gyp:libFoundation',
'../../../libscript/libscript.gyp:libScript',
'../../libcompile/libcompile.gyp:libcompile',
'../../../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
'../../../thirdparty/libffi/libffi.gyp:libffi',
],

'sources':
Expand Down
2 changes: 1 addition & 1 deletion toolchain/libcompile/libcompile.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[
'../../libfoundation/libfoundation.gyp:libFoundation',
'../../libscript/libscript.gyp:libScript',
'../../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
'../../thirdparty/libffi/libffi.gyp:libffi',
],

'sources':
Expand Down