ICU-13837 c build: make --disable-layoutex the default

- update GitHub workflow / Azure pipeline to no longer specify layoutex

Also:
- update configure.ac that was missed in #1265 cad3903cc25c0db7f392adbc024829aea6591a50 ICU-21051
- some FALSE/TRUE were missed in source/test/letest

diff --git a/.ci-builds/.azure-pipelines.yml b/.ci-builds/.azure-pipelines.yml
index 478f0a192a92e6762bec4eea90cddbd72d83cb05..e9411cb4f1cf253df05f3292994e939e8ad4eb30 100644 (file)
--- a/.ci-builds/.azure-pipelines.yml
+++ b/.ci-builds/.azure-pipelines.yml
@@ -90,7 +90,7 @@ jobs:
       lfs: true
       fetchDepth: 10
     - script: |
-        export CXXFLAGS="-std=c++14 -Winvalid-constexpr" && cd icu4c/source && ./runConfigureICU --enable-debug --disable-release Linux --disable-layout --disable-layoutex && make -j2 check
+        export CXXFLAGS="-std=c++14 -Winvalid-constexpr" && cd icu4c/source && ./runConfigureICU --enable-debug --disable-release Linux && make -j2 check
       displayName: 'Build and Test C++14'
       env:
         CC: clang

diff --git a/.ci-builds/.azure-valgrind.yml b/.ci-builds/.azure-valgrind.yml
index 6b00e5689d316041a3c0db191b48943851430da9..866fcbf7a9e8e20f970f95123b3b8fe6f4efd004 100644 (file)
--- a/.ci-builds/.azure-valgrind.yml
+++ b/.ci-builds/.azure-valgrind.yml
@@ -47,7 +47,7 @@ jobs:
       displayName: 'Install valgrind'
       timeoutInMinutes: 5
     - script: |
-        cd icu4c/source && ./runConfigureICU --enable-debug Linux --disable-renaming --disable-layout --disable-layoutex && make -j2 tests
+        cd icu4c/source && ./runConfigureICU --enable-debug Linux --disable-renaming && make -j2 tests
       displayName: 'Build'
       timeoutInMinutes: 10
       env:

diff --git a/.github/workflows/icu_ci.yml b/.github/workflows/icu_ci.yml
index 9e67b0915572ebf3095a016fd268d5e1d5d239fd..d905aa894470669e6eda742255a779f2afe10a99 100644 (file)
--- a/.github/workflows/icu_ci.yml
+++ b/.github/workflows/icu_ci.yml
@@ -47,7 +47,7 @@ jobs:
         run: |
           sudo apt-get -y install doxygen;
           cd icu4c/source;
-          ./runConfigureICU Linux --enable-layoutex=no;
+          ./runConfigureICU Linux;
           make -j 2;
           make -j 2 check;
           ( cd test/depstest && python3 depstest.py ../../../source/ );

diff --git a/icu4c/source/configure b/icu4c/source/configure
index d5d57ce88d7a3d7a3fd13974a884c2956d38ccc9..0dea6a58e843e4af039d832b0292c0b87ece8333 100755 (executable)
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -1455,7 +1455,7 @@ Optional Features:
   --enable-weak-threads   weakly reference the threading library default=no
   --enable-extras         build ICU extras default=yes
   --enable-icuio          build ICU's icuio library default=yes
-  --enable-layoutex         build ICU's Paragraph Layout library default=yes.
+  --enable-layoutex         build ICU's Paragraph Layout library default=no.
             icu-le-hb must be installed via pkg-config. See http://harfbuzz.org
 
   --enable-tools         build ICU's tools default=yes
@@ -7702,7 +7702,7 @@ if test "${enable_layoutex+set}" = set; then :
                *) as_fn_error $? "bad value ${enableval} for --enable-layoutex" "$LINENO" 5 ;;
                esac
 else
-  layoutex=$have_icu_le_hb
+  layoutex=false
 fi
 
 

diff --git a/icu4c/source/configure.ac b/icu4c/source/configure.ac
index 1796ca07555b5a7ccaf7c12a14ef23b7b253ac0a..425fdc7b8a546f557187536e00f05709d9c254e4 100644 (file)
--- a/icu4c/source/configure.ac
+++ b/icu4c/source/configure.ac
@@ -1101,14 +1101,14 @@ ICU_CONDITIONAL(ICUIO, test "$icuio" = true)
 
 # Enable/disable layoutex
 AC_ARG_ENABLE(layoutex,
-       [  --enable-layoutex         build ICU's Paragraph Layout library [default=yes].
+       [  --enable-layoutex         build ICU's Paragraph Layout library [default=no].
             icu-le-hb must be installed via pkg-config. See http://harfbuzz.org],
        [case "${enableval}" in
                yes) layoutex=$have_icu_le_hb ;;
                no)  layoutex=false ;;
                *) AC_MSG_ERROR(bad value ${enableval} for --enable-layoutex) ;;
                esac],
-       layoutex=$have_icu_le_hb)
+       layoutex=false)
 ICU_CONDITIONAL(LAYOUTEX, test "$layoutex" = true)
 
 # Enable/disable layout
@@ -1399,6 +1399,7 @@ AC_CONFIG_FILES([icudefs.mk \
                test/perf/ubrkperf/Makefile \
                test/perf/charperf/Makefile \
                test/perf/convperf/Makefile \
+               test/perf/localecanperf/Makefile \
                test/perf/normperf/Makefile \
                test/perf/DateFmtPerf/Makefile \
                test/perf/howExpensiveIs/Makefile \

diff --git a/icu4c/source/test/letest/PortableFontInstance.cpp b/icu4c/source/test/letest/PortableFontInstance.cpp
index 26c7fbd80e16643a7bea8d9a56ce2668460ceff5..7743fd68c6ca32c989658608903b2c4379995346 100644 (file)
--- a/icu4c/source/test/letest/PortableFontInstance.cpp
+++ b/icu4c/source/test/letest/PortableFontInstance.cpp
@@ -394,7 +394,7 @@ void PortableFontInstance::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) co
 
 le_bool PortableFontInstance::getGlyphPoint(LEGlyphID /*glyph*/, le_int32 /*pointNumber*/, LEPoint &/*point*/) const
 {
-    return FALSE;
+    return false;
 }
 
 le_int32 PortableFontInstance::getUnitsPerEM() const

diff --git a/icu4c/source/test/letest/SimpleFontInstance.cpp b/icu4c/source/test/letest/SimpleFontInstance.cpp
index 5c46103a629fcf807a88599a84389263406c7ed5..e387b083dc435192ec8134bc25d5279551f6d190 100644 (file)
--- a/icu4c/source/test/letest/SimpleFontInstance.cpp
+++ b/icu4c/source/test/letest/SimpleFontInstance.cpp
@@ -135,6 +135,6 @@ float SimpleFontInstance::getScaleFactorY() const
 
 le_bool SimpleFontInstance::getGlyphPoint(LEGlyphID /*glyph*/, le_int32 /*pointNumber*/, LEPoint &/*point*/) const
 {
-    return FALSE;
+    return false;
 }
 

diff --git a/icu4c/source/test/letest/cmaps.cpp b/icu4c/source/test/letest/cmaps.cpp
index 382799ab0bdf698fdffda976914cc3ae22d204a8..cb385042f8fb85567232720613b54b6b60baa19d 100644 (file)
--- a/icu4c/source/test/letest/cmaps.cpp
+++ b/icu4c/source/test/letest/cmaps.cpp
@@ -58,7 +58,7 @@ CMAPMapper *CMAPMapper::createUnicodeMapper(const CMAPTable *cmap)
     le_uint16 i;
     le_uint16 nSubtables = SWAPW(cmap->numberSubtables);
     const CMAPEncodingSubtable *subtable = NULL;
-    le_bool found = FALSE;
+    le_bool found = false;
     le_uint16 foundPlatformID = 0xFFFF;
     le_uint16 foundPlatformSpecificID = 0xFFFF;
     le_uint32 foundOffset = 0;
@@ -76,7 +76,7 @@ CMAPMapper *CMAPMapper::createUnicodeMapper(const CMAPTable *cmap)
                 foundOffset = SWAPL(esh->encodingOffset);
                 foundPlatformID = platformID;
                 foundPlatformSpecificID = platformSpecificID;
-                found = TRUE;
+                found = true;
                 foundTable = i;
                 break;
 
@@ -106,7 +106,7 @@ CMAPMapper *CMAPMapper::createUnicodeMapper(const CMAPTable *cmap)
             foundPlatformID = platformID;
             foundPlatformSpecificID = platformSpecificID;
             foundTable = i;
-            found = TRUE;
+            found = true;
             break;
 
           default: printf("Error: table %d (psid %d) is unknown. Skipping.\n", i, platformSpecificID); break;