Merge pull request #923 from swiftwasm/maxd/group-build-flags

Move build flags to presets

Author: MaxDesiatov

utils/build-presets.ini

@@ -2427,3 +2427,82 @@ no-assertions
 mixin-preset=source_compat_suite_linux_base
 debug
 no-assertions
+
+#===----------------------------------------------------------------------===#
+# Preset for the WebAssembly toolchain and SDK
+#===----------------------------------------------------------------------===#
+
+[preset: webassembly]
+
+wasm
+release
+verbose
+cmake-c-launcher=%(C_CXX_LAUNCHER)s
+cmake-cxx-launcher=%(C_CXX_LAUNCHER)s
+skip-build-benchmarks
+build-stdlib-deployment-targets=wasi-wasm32
+build-swift-dynamic-sdk-overlay=false
+build-swift-dynamic-stdlib=false
+build-swift-static-sdk-overlay
+build-swift-static-stdlib
+llvm-targets-to-build=X86;WebAssembly
+stdlib-deployment-targets=wasi-wasm32
+wasi-icu-data=%(SOURCE_PATH)s/icu_out/lib/libicudata.a
+wasi-icu-i18n=%(SOURCE_PATH)s/icu_out/lib/libicui18n.a
+wasi-icu-i18n-include=%(SOURCE_PATH)s/icu_out/include
+wasi-icu-uc=%(SOURCE_PATH)s/icu_out/lib/libicuuc.a
+wasi-icu-uc-include=%(SOURCE_PATH)s/icu_out/include
+wasi-sdk=%(SOURCE_PATH)s/wasi-sdk
+
+[preset: webassembly-installable]
+
+install_destdir=%(SOURCE_PATH)s/install
+installable_package=%(INSTALLABLE_PACKAGE)s
+install-prefix=/%(TOOLCHAIN_NAME)s/usr
+swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-tools;license;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers;clang-resource-dir-symlink
+llvm-install-components=clang
+install-swift
+darwin-toolchain-bundle-identifier=%(BUNDLE_IDENTIFIER)s
+darwin-toolchain-display-name=%(DISPLAY_NAME)s
+darwin-toolchain-display-name-short=%(DISPLAY_NAME_SHORT)s
+darwin-toolchain-name=%(TOOLCHAIN_NAME)s
+darwin-toolchain-version=%(TOOLCHAIN_VERSION)s
+darwin-toolchain-alias=swift
+
+[preset: webassembly-linux]
+
+mixin-preset=webassembly
+extra-cmake-options=
+    -DSWIFT_PRIMARY_VARIANT_SDK:STRING=WASI
+    -DSWIFT_PRIMARY_VARIANT_ARCH:STRING=wasm32
+    -DSWIFT_SDKS='WASI;LINUX'
+    -DSWIFT_BUILD_SOURCEKIT=FALSE
+    -DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
+    -DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
+    -DCMAKE_AR="%(SOURCE_PATH)s/wasi-sdk/bin/llvm-ar"
+    -DCMAKE_RANLIB="%(SOURCE_PATH)s/wasi-sdk/bin/llvm-ranlib"
+
+[preset: webassembly-macos]
+
+mixin-preset=webassembly
+extra-cmake-options=
+    -DSWIFT_PRIMARY_VARIANT_SDK:STRING=WASI
+    -DSWIFT_PRIMARY_VARIANT_ARCH:STRING=wasm32
+    -DSWIFT_OSX_x86_64_ICU_STATICLIB=TRUE
+    -DSWIFT_BUILD_SOURCEKIT=FALSE
+    -DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
+    -DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
+    -DCMAKE_AR='/usr/local/opt/llvm/bin/llvm-ar'
+    -DCMAKE_RANLIB='/usr/local/opt/llvm/bin/llvm-ranlib'
+
+[preset: webassembly-linux-installable]
+
+mixin-preset=
+    webassembly-linux
+    webassembly-installable
+
+[preset: webassembly-macos-installable]
+
+mixin-preset=
+    webassembly-macos
+    webassembly-installable

utils/webassembly/build-linux.sh

@@ -9,11 +9,11 @@ WASI_SDK_PATH=$SOURCE_PATH/wasi-sdk
 case $(uname -s) in
   Darwin)
     OS_SUFFIX=osx
-    BUILD_SCRIPT=$UTILS_PATH/build-mac.sh
+    PRESET_NAME=webassembly-macos-installable
   ;;
   Linux)
     OS_SUFFIX=linux
-    BUILD_SCRIPT=$UTILS_PATH/build-linux.sh
+    PRESET_NAME=webassembly-linux-installable
   ;;
   *)
     echo "Unrecognised platform $(uname -s)"
@@ -35,20 +35,15 @@ BUNDLE_IDENTIFIER="swiftwasm.${YEAR}${MONTH}${DAY}"
 DISPLAY_NAME_SHORT="Swift for WebAssembly Development Snapshot"
 DISPLAY_NAME="${DISPLAY_NAME_SHORT} ${YEAR}-${MONTH}-${DAY}"
 
-$BUILD_SCRIPT \
-  --install_destdir="$SOURCE_PATH/install" \
-  --installable_package="$INSTALLABLE_PACKAGE" \
-  --install-prefix=/$TOOLCHAIN_NAME/usr \
-  --swift-install-components "autolink-driver;compiler;clang-builtin-headers;stdlib;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-tools;license;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers;clang-resource-dir-symlink" \
-  --llvm-install-components "clang" \
-  --install-swift \
-  --darwin-toolchain-bundle-identifier="${BUNDLE_IDENTIFIER}" \
-  --darwin-toolchain-display-name="${DISPLAY_NAME}" \
-  --darwin-toolchain-display-name-short="${DISPLAY_NAME_SHORT}" \
-  --darwin-toolchain-name="${TOOLCHAIN_NAME}" \
-  --darwin-toolchain-version="${TOOLCHAIN_VERSION}" \
-  --darwin-toolchain-alias="swift" \
-  "$@"
+$SOURCE_PATH/swift/utils/build-script --preset=$PRESET_NAME \
+  SOURCE_PATH="$SOURCE_PATH" \
+  INSTALLABLE_PACKAGE="$INSTALLABLE_PACKAGE" \
+  BUNDLE_IDENTIFIER="${BUNDLE_IDENTIFIER}" \
+  DISPLAY_NAME="${DISPLAY_NAME}" \
+  DISPLAY_NAME_SHORT="${DISPLAY_NAME_SHORT}" \
+  TOOLCHAIN_NAME="${TOOLCHAIN_NAME}" \
+  TOOLCHAIN_VERSION="${TOOLCHAIN_VERSION}" \
+  C_CXX_LAUNCHER="$(which sccache)"
 
 
 NIGHTLY_TOOLCHAIN=$SOURCE_PATH/swift-nightly-toolchain

utils/webassembly/build-mac.sh

@@ -22,10 +22,7 @@ export PATH="$HOME/.wasmer/bin:$PATH"
 export SCCACHE_CACHE_SIZE="50G"
 export SCCACHE_DIR="$SOURCE_PATH/build-cache"
 
-CACHE_FLAGS="--cmake-c-launcher $(which sccache) --cmake-cxx-launcher $(which sccache)"
-FLAGS="--release $CACHE_FLAGS --verbose"
-
-$BUILD_SCRIPT $FLAGS
+$BUILD_SCRIPT
 
 if [[ "$(uname)" == "Darwin" ]]; then
   # workaround: host target test directory is necessary to use run-test
@@ -38,5 +35,5 @@ if [[ "$(uname)" == "Linux" ]]; then
   echo "Skip running test suites for Linux"
 else
   # Run test but ignore failure temporarily
-  $BUILD_SCRIPT $FLAGS -t || true
+  $BUILD_SCRIPT -t || true
 fi