[sdks] Change the DISABLE_ conditionals to ENABLE_ to avoid building extra stuff. (#16719)

4 files changed, 32 insertions, 38 deletions

diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
index e65076cbb82..cf05c815010 100755
--- a/scripts/ci/run-jenkins.sh
+++ b/scripts/ci/run-jenkins.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -e
+# -*- mode: shell-script; indent-tabs-mode: nil; -*-
 
 export MONO_REPO_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )"
 export TESTCMD=${MONO_REPO_ROOT}/scripts/ci/run-step.sh
@@ -195,9 +196,8 @@ if [[ ${CI_TAGS} == *'sdks-ios'* ]];
         # make sure we embed the correct path into the PDBs
         export MONOTOUCH_MCS_FLAGS=-pathmap:${MONO_REPO_ROOT}/=/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/src/Xamarin.iOS/
 
-        echo "DISABLE_ANDROID=1" > sdks/Make.config
-        echo "DISABLE_WASM=1" >> sdks/Make.config
-        echo "DISABLE_DESKTOP=1" >> sdks/Make.config
+        echo "ENABLE_IOS=1" > sdks/Make.config
+        echo "ENABLE_MAC=1" >> sdks/Make.config
         if [[ ${CI_TAGS} == *'cxx'* ]]; then
             echo "ENABLE_CXX=1" >> sdks/Make.config
         fi
@@ -249,10 +249,7 @@ then
     # make sure we embed the correct path into the PDBs
     export XAMMAC_MCS_FLAGS=-pathmap:${MONO_REPO_ROOT}/=/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/src/Xamarin.Mac/
 
-    echo "DISABLE_IOS=1" > sdks/Make.config
-    echo "DISABLE_ANDROID=1" >> sdks/Make.config
-    echo "DISABLE_WASM=1" >> sdks/Make.config
-    echo "DISABLE_DESKTOP=1" >> sdks/Make.config
+    echo "ENABLE_MAC=1" > sdks/Make.config
     if [[ ${CI_TAGS} == *'cxx'* ]]; then
         echo "ENABLE_CXX=1" >> sdks/Make.config
     fi
@@ -269,10 +266,7 @@ fi
 
 if [[ ${CI_TAGS} == *'sdks-android'* ]];
    then
-        echo "DISABLE_IOS=1" > sdks/Make.config
-        echo "DISABLE_MAC=1" >> sdks/Make.config
-        echo "DISABLE_WASM=1" >> sdks/Make.config
-        echo "DISABLE_DESKTOP=1" >> sdks/Make.config
+        echo "ENABLE_ANDROID=1" > sdks/Make.config
         echo "DISABLE_CCACHE=1" >> sdks/Make.config
         if [[ ${CI_TAGS} == *'cxx'* ]]; then
             echo "ENABLE_CXX=1" >> sdks/Make.config
@@ -320,10 +314,8 @@ fi
 
 if [[ ${CI_TAGS} == *'webassembly'* ]] || [[ ${CI_TAGS} == *'wasm'* ]];
    then
-        echo "DISABLE_ANDROID=1" > sdks/Make.config
-        echo "DISABLE_IOS=1" >> sdks/Make.config
-        echo "DISABLE_MAC=1" >> sdks/Make.config
-        echo "DISABLE_DESKTOP=1" >> sdks/Make.config
+        echo "ENABLE_WASM=1" > sdks/Make.config
+        echo "ENABLE_WINDOWS=1" >> sdks/Make.config
         if [[ ${CI_TAGS} == *'cxx'* ]]; then
             echo "ENABLE_CXX=1" >> sdks/Make.config
         fi
diff --git a/sdks/builds/Makefile b/sdks/builds/Makefile
index ddd8c96a298..ad7aa7cc7b8 100644
--- a/sdks/builds/Makefile
+++ b/sdks/builds/Makefile
@@ -37,17 +37,17 @@ endif
 
 ifneq ($(UNAME),Darwin)
 # iOS and Mac requires Xcode to be available, and Xcode is only available on macOS
-DISABLE_IOS=1
-DISABLE_MAC=1
+ENABLE_IOS=
+ENABLE_MAC=
 endif
 
 # On Windows, we will just trigger LLVM and Android builds using this Makefile.
 ifeq ($(UNAME),Windows)
-DISABLE_IOS=1
-DISABLE_MAC=1
-DISABLE_WASM=1
-DISABLE_WASM_CROSS=1
-DISABLE_DESKTOP=1
+ENABLE_IOS=
+ENABLE_MAC=
+ENABLE_WASM=
+ENABLE_WASM_CROSS=
+ENABLE_DESKTOP=
 DISABLE_CCACHE=1
 DISABLE_LIBTOOLIZE=1
 IGNORE_PROVISION_MXE=1
@@ -93,19 +93,19 @@ $(TOP)/configure: $(TOP)/configure.ac $(TOP)/autogen.sh .stamp-ulimit-check
 
 ## Archive targets
 
-ifndef DISABLE_ANDROID
+ifdef ENABLE_ANDROID
 android_ARCHIVE=
 endif
 
-ifndef DISABLE_IOS
+ifdef ENABLE_IOS
 ios_ARCHIVE=
 endif
 
-ifndef DISABLE_MAC
+ifdef ENABLE_MAC
 mac_ARCHIVE=
 endif
 
-ifndef DISABLE_WASM
+ifdef ENABLE_WASM
 wasm_ARCHIVE=
 endif
 
@@ -126,19 +126,19 @@ archive-$(1):
 	cd $$(TOP)/sdks/out && 7z a $$(_$(1)_COMPRESSION_ARGS) $$(TOP)/$$(_$(1)_PACKAGE) $$(sort $$($(1)_ARCHIVE))
 endef
 
-ifndef DISABLE_ANDROID
+ifdef ENABLE_ANDROID
 $(eval $(call ArchiveTemplate,android,7z))
 endif
 
-ifndef DISABLE_IOS
+ifdef ENABLE_IOS
 $(eval $(call ArchiveTemplate,ios,7z))
 endif
 
-ifndef DISABLE_MAC
+ifdef ENABLE_MAC
 $(eval $(call ArchiveTemplate,mac,7z))
 endif
 
-ifndef DISABLE_WASM
+ifdef ENABLE_WASM
 $(eval $(call ArchiveTemplate,wasm,zip))
 endif
 
@@ -209,27 +209,27 @@ endif
 include llvm.mk
 
 ## Android targets
-ifndef DISABLE_ANDROID
+ifdef ENABLE_ANDROID
 include android.mk
 endif
 
 ## iOS targets
-ifndef DISABLE_IOS
+ifdef ENABLE_IOS
 include ios.mk
 endif
 
 ## Mac targets
-ifndef DISABLE_MAC
+ifdef ENABLE_MAC
 include mac.mk
 endif
 
 ## Desktop targets
 ## To run host-side tests
-ifndef DISABLE_DESKTOP
+ifdef ENABLE_DESKTOP
 include desktop.mk
 endif
 
 ## WASM targets
-ifndef DISABLE_WASM
+ifdef ENABLE_WASM
 include wasm.mk
 endif
diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk
index ab7ef306a0b..518638b6437 100644
--- a/sdks/builds/wasm.mk
+++ b/sdks/builds/wasm.mk
@@ -241,6 +241,8 @@ $$(eval $$(call CrossRuntimeTemplate,wasm,$(1),$(2)-w64-mingw32$$(if $$(filter $
 
 endef
 
+ifdef ENABLE_WINDOWS
 $(eval $(call WasmCrossMXETemplate,cross-win,x86_64,wasm32,runtime,llvm-llvmwin64,wasm32-unknown-unknown))
+endif
 
 $(eval $(call BclTemplate,wasm,wasm wasm_tools,wasm))
diff --git a/sdks/paths.mk b/sdks/paths.mk
index 4f77b1ba390..48f10deeb7b 100644
--- a/sdks/paths.mk
+++ b/sdks/paths.mk
@@ -1,5 +1,5 @@
 
-ifeq ($(and $(DISABLE_IOS),$(DISABLE_MAC)),)
+ifneq ($(or $(ENABLE_IOS),$(ENABLE_MAC)),)
 
 CheckXcodeDir=$(or $(and $(wildcard $(1))),$(warning Could not find Xcode in "$(1)"))
 
@@ -9,9 +9,9 @@ endif
 
 endif
 
-ifndef DISABLE_ANDROID
+ifdef ENABLE_ANDROID
 
 ANDROID_TOOLCHAIN_DIR?=$(HOME)/android-toolchain
 ANDROID_TOOLCHAIN_CACHE_DIR?=$(HOME)/android-archives
 
-endif
\ No newline at end of file
+endif