diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-31 19:06:30 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-01 16:39:54 +0100 |
| commit | a626bdd56d7116efa57e65403ad51b56657148c3 (patch) | |
| tree | f48fac9d3e2fe327b59f10c1229eb43a2c3858da /bin | |
| parent | 4bd701a306c8068911203f976145adc717f015d2 (diff) | |
gbuild: rename value OS=IOS to OS=iOS
This gets rid of the horrible hack in gbuild.mk to accomodate the
case-incorrect iOS platform makefiles that cannot be renamed without
upsetting git on file systems that sadly lack the case sensitivity
feature.
Keep the macro defined to IOS though.
Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234
Reviewed-on: https://gerrit.libreoffice.org/62705
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lo-all-static-libs | 4 | ||||
| -rwxr-xr-x | bin/update_pch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 738bc58d81fe..560a041ed136 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -13,7 +13,7 @@ if test -z "$INSTDIR" ; then exit 1 fi -if test "$OS" != ANDROID -a "$OS" != IOS; then +if test "$OS" != ANDROID -a "$OS" != iOS; then echo This script makes sense only in Android or iOS builds. fi @@ -56,7 +56,7 @@ ANDROID) oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a" ;; -IOS) +iOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/cppunit/src/cppunit/.libs/*.a" ;; diff --git a/bin/update_pch b/bin/update_pch index 8d0c1599056a..435cc3fcdbb9 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -572,7 +572,7 @@ def process_makefile(root, module, makefile): if not os.path.isfile(filename): sys.stderr.write('Error: Module {} has no makefile at {}.'.format(module, filename)) - groups = {'':[], 'ANDROID':[], 'IOS':[], 'WNT':[], 'LINUX':[], 'MACOSX':[]} + groups = {'':[], 'ANDROID':[], 'iOS':[], 'WNT':[], 'LINUX':[], 'MACOSX':[]} with open(filename, 'r') as f: lines = f.readlines() @@ -1055,7 +1055,7 @@ class TestMakefileParser(unittest.TestCase): def test_parse_multiline_eval_with_if(self): source = """$(eval $(call gb_Library_add_defs,sal,\\ - $(if $(filter $(OS),IOS), \\ + $(if $(filter $(OS),iOS), \\ -DNO_CHILD_PROCESSES \\ ) \\ )) @@ -1156,7 +1156,7 @@ endif self.assertEqual(len(groups['']), 0) def test_parse_filter(self): - source = """ifneq ($(filter $(OS),MACOSX IOS),) + source = """ifneq ($(filter $(OS),MACOSX iOS),) $(eval $(call gb_Library_add_exception_objects,sal,\\ sal/osl/unx/osxlocale \\ )) |