changeset
fixes wrong indentation
8 weeks ago
- author
- Mike Becker <universe@uap-core.de>
- date
- Mon, 24 Feb 2025 21:12:27 +0100 (8 weeks ago)
- changeset 136
- 6d4d165fc8f5
- parent 135
- 9afe68b15c66
- child 137
- 19953f64e1be
fixes wrong indentation
fixes #602
--- a/src/main/resources/make/configure.vm Sun Jan 12 16:28:08 2025 +0100 +++ b/src/main/resources/make/configure.vm Mon Feb 24 21:12:27 2025 +0100 @@ -108,8 +108,8 @@ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] Build Types: ---debug add extra compile flags for debug builds ---release add extra compile flags for release builds + --debug add extra compile flags for debug builds + --release add extra compile flags for release builds #if( $options.size() > 0 ) Options:
--- a/test/configure Sun Jan 12 16:28:08 2025 +0100 +++ b/test/configure Mon Feb 24 21:12:27 2025 +0100 @@ -107,8 +107,8 @@ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] Build Types: ---debug add extra compile flags for debug builds ---release add extra compile flags for release builds + --debug add extra compile flags for debug builds + --release add extra compile flags for release builds Optional Features: --disable-pg @@ -527,11 +527,11 @@ # build type if [ "$BUILD_TYPE" = "debug" ]; then TEMP_CFLAGS="\${DEBUG_CFLAGS}$TEMP_CFLAGS" - TEMP_CXXFLAGS="\${DEBUG_CXXFLAGS}$TEMP_CXXFLAGS" + TEMP_CXXFLAGS="\${DEBUG_CXXFLAGS}$TEMP_CXXFLAGS" fi if [ "$BUILD_TYPE" = "release" ]; then - TEMP_CFLAGS="\${RELEASE_CFLAGS}$TEMP_CFLAGS" - TEMP_CXXFLAGS="\${RELEASE_CXXFLAGS}$TEMP_CXXFLAGS" + TEMP_CFLAGS="\${RELEASE_CFLAGS}$TEMP_CFLAGS" + TEMP_CXXFLAGS="\${RELEASE_CXXFLAGS}$TEMP_CXXFLAGS" fi # add general dependency flags to flags.mk
--- a/test/configure2 Sun Jan 12 16:28:08 2025 +0100 +++ b/test/configure2 Mon Feb 24 21:12:27 2025 +0100 @@ -107,8 +107,8 @@ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] Build Types: ---debug add extra compile flags for debug builds ---release add extra compile flags for release builds + --debug add extra compile flags for debug builds + --release add extra compile flags for release builds Options: --toolkit=(gtk3|cli|gtk2|wpf) @@ -545,6 +545,16 @@ break done +# build type +if [ "$BUILD_TYPE" = "debug" ]; then + TEMP_CFLAGS="\${DEBUG_CFLAGS}$TEMP_CFLAGS" + TEMP_CXXFLAGS="\${DEBUG_CXXFLAGS}$TEMP_CXXFLAGS" +fi +if [ "$BUILD_TYPE" = "release" ]; then + TEMP_CFLAGS="\${RELEASE_CFLAGS}$TEMP_CFLAGS" + TEMP_CXXFLAGS="\${RELEASE_CXXFLAGS}$TEMP_CXXFLAGS" +fi + # add general dependency flags to flags.mk echo "# general flags" >> "$TEMP_DIR/flags.mk" if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then @@ -768,22 +778,6 @@ if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then echo "DAV_CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" fi -if [ "$BUILD_TYPE" = "debug" ]; then - if [ -n "$lang_c" ]; then - echo 'DAV_CFLAGS += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk" - fi - if [ -n "$lang_cpp" ]; then - echo 'DAV_CXXFLAGS += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk" - fi -fi -if [ "$BUILD_TYPE" = "release" ]; then - if [ -n "$lang_c" ]; then - echo 'DAV_CFLAGS += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk" - fi - if [ -n "$lang_cpp" ]; then - echo 'DAV_CXXFLAGS += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk" - fi -fi if [ -n "${TEMP_LDFLAGS}" ]; then echo "DAV_LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" fi @@ -809,22 +803,6 @@ if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" fi -if [ "$BUILD_TYPE" = "debug" ]; then - if [ -n "$lang_c" ]; then - echo 'CFLAGS += ${DEBUG_CFLAGS}' >> "$TEMP_DIR/flags.mk" - fi - if [ -n "$lang_cpp" ]; then - echo 'CXXFLAGS += ${DEBUG_CXXFLAGS}' >> "$TEMP_DIR/flags.mk" - fi -fi -if [ "$BUILD_TYPE" = "release" ]; then - if [ -n "$lang_c" ]; then - echo 'CFLAGS += ${RELEASE_CFLAGS}' >> "$TEMP_DIR/flags.mk" - fi - if [ -n "$lang_cpp" ]; then - echo 'CXXFLAGS += ${RELEASE_CXXFLAGS}' >> "$TEMP_DIR/flags.mk" - fi -fi if [ -n "${TEMP_LDFLAGS}" ]; then echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" fi
--- a/test/make/configure.vm Sun Jan 12 16:28:08 2025 +0100 +++ b/test/make/configure.vm Mon Feb 24 21:12:27 2025 +0100 @@ -108,8 +108,8 @@ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] Build Types: ---debug add extra compile flags for debug builds ---release add extra compile flags for release builds + --debug add extra compile flags for debug builds + --release add extra compile flags for release builds #if( $options.size() > 0 ) Options:
