From 93c74432f479d3aabc3ba106ec111d9e07bcaa64 Mon Sep 17 00:00:00 2001 From: Paolo Marrone Date: Thu, 4 Jul 2024 11:21:41 +0200 Subject: [PATCH] proper spacing alignment --- templates/android-make/vars.mk | 54 +++++++++++++++---------------- templates/cmd-make/vars.mk | 22 ++++++------- templates/daisy-seed-make/vars.mk | 18 +++++------ templates/ios-make/vars.mk | 14 ++++---- templates/lv2-make/vars.mk | 16 ++++----- templates/vst3-make/vars.mk | 18 +++++------ templates/web-make/vars.mk | 18 +++++------ 7 files changed, 80 insertions(+), 80 deletions(-) diff --git a/templates/android-make/vars.mk b/templates/android-make/vars.mk index 7a4a7e6..0d9f33e 100644 --- a/templates/android-make/vars.mk +++ b/templates/android-make/vars.mk @@ -18,38 +18,38 @@ # File author: Stefano D'Angelo # -BUNDLE_NAME := {{=it.product.bundleName}} -JAVA_PACKAGE_NAME := {{=it.android.javaPackageName}} +BUNDLE_NAME := {{=it.product.bundleName}} +JAVA_PACKAGE_NAME := {{=it.android.javaPackageName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.android_make?.cflags ?? ""}} -CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.android_make?.cxxflags ?? ""}} -JFLAGS_EXTRA := {{=it.make?.jflags ?? ""}} {{=it.android_make?.jflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.android_make?.ldflags ?? ""}} +CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.android_make?.cflags ?? ""}} +CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.android_make?.cxxflags ?? ""}} +JFLAGS_EXTRA := {{=it.make?.jflags ?? ""}} {{=it.android_make?.jflags ?? ""}} +LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.android_make?.ldflags ?? ""}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.android_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.android_make?.cxxSrcs ?? ""}} +C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.android_make?.cSrcs ?? ""}} +CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.android_make?.cxxSrcs ?? ""}} -COMMON_DIR := {{=it.android_make?.commonDir ?? (it.make?.commonDir ?? "")}} -DATA_DIR := {{=it.android_make?.dataDir ?? (it.make?.dataDir ?? "")}} -PLUGIN_DIR := {{=it.android_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +COMMON_DIR := {{=it.android_make?.commonDir ?? (it.make?.commonDir ?? "")}} +DATA_DIR := {{=it.android_make?.dataDir ?? (it.make?.dataDir ?? "")}} +PLUGIN_DIR := {{=it.android_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} -KEY_STORE := {{=it.android_make.keyStore}} -KEY_ALIAS := {{=it.android_make.keyAlias}} -STORE_PASS := {{=it.android_make.storePass}} -KEY_PASS := {{=it.android_make.keyPass}} +KEY_STORE := {{=it.android_make.keyStore}} +KEY_ALIAS := {{=it.android_make.keyAlias}} +STORE_PASS := {{=it.android_make.storePass}} +KEY_PASS := {{=it.android_make.keyPass}} -ANDROID_SDK_DIR := {{=it.android_make.sdkDir}} -ANDROID_NDK_DIR := ${ANDROID_SDK_DIR}/ndk/{{=it.android_make.ndkVersion}} -BUILD_TOOLS_DIR := ${ANDROID_SDK_DIR}/build-tools/{{=it.android_make.buildToolsVersion}} -ANDROIDX_DIR := {{=it.android_make.androidxDir}} -KOTLIN_DIR := {{=it.android_make.kotlinDir}} +ANDROID_SDK_DIR := {{=it.android_make.sdkDir}} +ANDROID_NDK_DIR := ${ANDROID_SDK_DIR}/ndk/{{=it.android_make.ndkVersion}} +BUILD_TOOLS_DIR := ${ANDROID_SDK_DIR}/build-tools/{{=it.android_make.buildToolsVersion}} +ANDROIDX_DIR := {{=it.android_make.androidxDir}} +KOTLIN_DIR := {{=it.android_make.kotlinDir}} -ANDROID_JAR_FILE := ${ANDROID_SDK_DIR}/platforms/android-{{=it.android_make.androidVersion}}/android.jar -ANDROIDX_CORE_FILE := ${ANDROIDX_DIR}/core-{{=it.android_make.androidxCoreVersion}}.jar -ANDROIDX_LIFECYCLE_COMMON_FILE := ${ANDROIDX_DIR}/lifecycle-common-{{=it.android_make.androidxLifecycleCommonVersion}}.jar +ANDROID_JAR_FILE := ${ANDROID_SDK_DIR}/platforms/android-{{=it.android_make.androidVersion}}/android.jar +ANDROIDX_CORE_FILE := ${ANDROIDX_DIR}/core-{{=it.android_make.androidxCoreVersion}}.jar +ANDROIDX_LIFECYCLE_COMMON_FILE := ${ANDROIDX_DIR}/lifecycle-common-{{=it.android_make.androidxLifecycleCommonVersion}}.jar ANDROIDX_VERSIONEDPARCELABLE_FILE := ${ANDROIDX_DIR}/versionedparcelable-{{=it.android_make.androidxVersionedparcelableVersion}}.jar -KOTLIN_STDLIB_FILE := ${KOTLIN_DIR}/kotlin-stdlib-{{=it.android_make.kotlinStdlibVersion}}.jar -KOTLINX_COROUTINES_CORE_FILE := ${KOTLIN_DIR}/kotlinx-coroutines-core-{{=it.android_make.kotlinxCoroutinesCoreVersion}}.jar -KOTLINX_COROUTINES_CORE_JVM_FILE := ${KOTLIN_DIR}/kotlinx-coroutines-core-jvm-{{=it.android_make.kotlinxCoroutinesCoreJVMVersion}}.jar +KOTLIN_STDLIB_FILE := ${KOTLIN_DIR}/kotlin-stdlib-{{=it.android_make.kotlinStdlibVersion}}.jar +KOTLINX_COROUTINES_CORE_FILE := ${KOTLIN_DIR}/kotlinx-coroutines-core-{{=it.android_make.kotlinxCoroutinesCoreVersion}}.jar +KOTLINX_COROUTINES_CORE_JVM_FILE := ${KOTLIN_DIR}/kotlinx-coroutines-core-jvm-{{=it.android_make.kotlinxCoroutinesCoreJVMVersion}}.jar -HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}} +HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}} diff --git a/templates/cmd-make/vars.mk b/templates/cmd-make/vars.mk index 03dd33d..4596e22 100644 --- a/templates/cmd-make/vars.mk +++ b/templates/cmd-make/vars.mk @@ -18,20 +18,20 @@ # File author: Stefano D'Angelo # -BUNDLE_NAME := {{=it.product.bundleName}} +BUNDLE_NAME := {{=it.product.bundleName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.cmd_make?.cflags ?? ""}} -CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.cmd_make?.cxxflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.cmd_make?.ldflags ?? ""}} +CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.cmd_make?.cflags ?? ""}} +CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.cmd_make?.cxxflags ?? ""}} +LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.cmd_make?.ldflags ?? ""}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.cmd_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.cmd_make?.cxxSrcs ?? ""}} +C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.cmd_make?.cSrcs ?? ""}} +CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.cmd_make?.cxxSrcs ?? ""}} -COMMON_DIR := {{=it.cmd_make?.commonDir ?? (it.make?.commonDir ?? "")}} -DATA_DIR := {{=it.cmd_make?.dataDir ?? (it.make?.dataDir ?? "")}} -PLUGIN_DIR := {{=it.cmd_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +COMMON_DIR := {{=it.cmd_make?.commonDir ?? (it.make?.commonDir ?? "")}} +DATA_DIR := {{=it.cmd_make?.dataDir ?? (it.make?.dataDir ?? "")}} +PLUGIN_DIR := {{=it.cmd_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} -TINYWAV_DIR := {{=it.cmd_make.tinywavDir}} +TINYWAV_DIR := {{=it.cmd_make.tinywavDir}} MIDI_PARSER_DIR := {{=it.cmd_make.midiParserDir}} -HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}} +HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}} diff --git a/templates/daisy-seed-make/vars.mk b/templates/daisy-seed-make/vars.mk index 337404e..0685473 100644 --- a/templates/daisy-seed-make/vars.mk +++ b/templates/daisy-seed-make/vars.mk @@ -18,17 +18,17 @@ # File author: Stefano D'Angelo # -BUNDLE_NAME := {{=it.product.bundleName}} +BUNDLE_NAME := {{=it.product.bundleName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.daisy_seed_make?.cflags ?? ""}} +CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.daisy_seed_make?.cflags ?? ""}} CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.daisy_seed_make?.cxxflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.daisy_seed_make?.ldflags ?? ""}} +LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.daisy_seed_make?.ldflags ?? ""}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.daisy_seed_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.daisy_seed_make?.cxxSrcs ?? ""}} +C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.daisy_seed_make?.cSrcs ?? ""}} +CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.daisy_seed_make?.cxxSrcs ?? ""}} -COMMON_DIR := {{=it.daisy_seed_make?.commonDir ?? (it.make?.commonDir ?? "")}} -DATA_DIR := {{=it.daisy_seed_make?.dataDir ?? (it.make?.dataDir ?? "")}} -PLUGIN_DIR := {{=it.daisy_seed_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +COMMON_DIR := {{=it.daisy_seed_make?.commonDir ?? (it.make?.commonDir ?? "")}} +DATA_DIR := {{=it.daisy_seed_make?.dataDir ?? (it.make?.dataDir ?? "")}} +PLUGIN_DIR := {{=it.daisy_seed_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} -LIBDAISY_DIR := {{=it.daisy_seed_make.libdaisyDir}} +LIBDAISY_DIR := {{=it.daisy_seed_make.libdaisyDir}} diff --git a/templates/ios-make/vars.mk b/templates/ios-make/vars.mk index 78fd5d0..252d223 100644 --- a/templates/ios-make/vars.mk +++ b/templates/ios-make/vars.mk @@ -18,12 +18,12 @@ # File author: Stefano D'Angelo # -BUNDLE_NAME := {{=it.product.bundleName}} +BUNDLE_NAME := {{=it.product.bundleName}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.cmd_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.cmd_make?.cxxSrcs ?? ""}} -SRCS_EXTRA := {{=it.ios_make?.srcsExtra ?? ""}} +C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.cmd_make?.cSrcs ?? ""}} +CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.cmd_make?.cxxSrcs ?? ""}} +SRCS_EXTRA := {{=it.ios_make?.srcsExtra ?? ""}} -COMMON_DIR := {{=it.ios_make?.commonDir ?? (it.make?.commonDir ?? "")}} -DATA_DIR := {{=it.ios_make?.dataDir ?? (it.make?.dataDir ?? "")}} -PLUGIN_DIR := {{=it.ios_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +COMMON_DIR := {{=it.ios_make?.commonDir ?? (it.make?.commonDir ?? "")}} +DATA_DIR := {{=it.ios_make?.dataDir ?? (it.make?.dataDir ?? "")}} +PLUGIN_DIR := {{=it.ios_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} diff --git a/templates/lv2-make/vars.mk b/templates/lv2-make/vars.mk index ef0e151..330f797 100644 --- a/templates/lv2-make/vars.mk +++ b/templates/lv2-make/vars.mk @@ -18,15 +18,15 @@ # File author: Stefano D'Angelo # -BUNDLE_NAME := {{=it.product.bundleName}} +BUNDLE_NAME := {{=it.product.bundleName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.lv2_make?.cflags ?? ""}} +CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.lv2_make?.cflags ?? ""}} CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.lv2_make?.cxxflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.lv2_make?.ldflags ?? ""}} +LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.lv2_make?.ldflags ?? ""}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.lv2_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.lv2_make?.cxxSrcs ?? ""}} +C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.lv2_make?.cSrcs ?? ""}} +CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.lv2_make?.cxxSrcs ?? ""}} -COMMON_DIR := {{=it.lv2_make?.commonDir ?? (it.make?.commonDir ?? "")}} -DATA_DIR := {{=it.lv2_make?.dataDir ?? (it.make?.dataDir ?? "")}} -PLUGIN_DIR := {{=it.lv2_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +COMMON_DIR := {{=it.lv2_make?.commonDir ?? (it.make?.commonDir ?? "")}} +DATA_DIR := {{=it.lv2_make?.dataDir ?? (it.make?.dataDir ?? "")}} +PLUGIN_DIR := {{=it.lv2_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} diff --git a/templates/vst3-make/vars.mk b/templates/vst3-make/vars.mk index ccd6526..4e49bba 100644 --- a/templates/vst3-make/vars.mk +++ b/templates/vst3-make/vars.mk @@ -18,17 +18,17 @@ # File author: Stefano D'Angelo # -BUNDLE_NAME := {{=it.product.bundleName}} +BUNDLE_NAME := {{=it.product.bundleName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.vst3_make?.cflags ?? ""}} +CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.vst3_make?.cflags ?? ""}} CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.vst3_make?.cxxflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.vst3_make?.ldflags ?? ""}} +LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.vst3_make?.ldflags ?? ""}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.vst3_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.vst3_make?.cxxSrcs ?? ""}} +C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.vst3_make?.cSrcs ?? ""}} +CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.vst3_make?.cxxSrcs ?? ""}} -COMMON_DIR := {{=it.vst3_make?.commonDir ?? (it.make?.commonDir ?? "")}} -DATA_DIR := {{=it.vst3_make?.dataDir ?? (it.make?.dataDir ?? "")}} -PLUGIN_DIR := {{=it.vst3_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +COMMON_DIR := {{=it.vst3_make?.commonDir ?? (it.make?.commonDir ?? "")}} +DATA_DIR := {{=it.vst3_make?.dataDir ?? (it.make?.dataDir ?? "")}} +PLUGIN_DIR := {{=it.vst3_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} -HAS_UI := {{=it.product.ui ? "yes" : "no"}} +HAS_UI := {{=it.product.ui ? "yes" : "no"}} diff --git a/templates/web-make/vars.mk b/templates/web-make/vars.mk index a80d740..95d701d 100644 --- a/templates/web-make/vars.mk +++ b/templates/web-make/vars.mk @@ -18,17 +18,17 @@ # File author: Stefano D'Angelo # -BUNDLE_NAME := {{=it.product.bundleName}} +BUNDLE_NAME := {{=it.product.bundleName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.web_make?.cflags ?? ""}} +CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.web_make?.cflags ?? ""}} CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.web_make?.cxxflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.web_make?.ldflags ?? ""}} +LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.web_make?.ldflags ?? ""}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.web_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.web_make?.cxxSrcs ?? ""}} +C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.web_make?.cSrcs ?? ""}} +CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.web_make?.cxxSrcs ?? ""}} -COMMON_DIR := {{=it.web_make?.commonDir ?? (it.make?.commonDir ?? "")}} -DATA_DIR := {{=it.web_make?.dataDir ?? (it.make?.dataDir ?? "")}} -PLUGIN_DIR := {{=it.web_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +COMMON_DIR := {{=it.web_make?.commonDir ?? (it.make?.commonDir ?? "")}} +DATA_DIR := {{=it.web_make?.dataDir ?? (it.make?.dataDir ?? "")}} +PLUGIN_DIR := {{=it.web_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} -HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}} +HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}}