mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iOS, fixes for release build

Browse Source 
removed coinmp (needed to update lo-all-static-libs)
convert CPUNAME to lowercase (needed by xcodebuild)

Change-Id: I13ccfbd6a6fd139db2745c1536192710afe094bb
This commit is contained in:
jan Iversen
2017-10-06 09:20:22 +02:00
parent 60e7480535
commit eed96773b4
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/lo-all-static-libs
View File

@@ -46,6 +46,15 @@ ANDROID)
# Only liblo-bootstrap.a ends up here: # Only liblo-bootstrap.a ends up here:
oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a" oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a"
# coinmp not used for iOS
oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a"
oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a"
oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a"
oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a"
oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a"
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="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
@@ -59,13 +68,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$foolibs \ $foolibs \
$WORKDIR/LinkTarget/StaticLibrary/lib*.a \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
$oslibs \ $oslibs \
$WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
$WORKDIR/UnpackedTarball/icu/source/lib/*.a \ $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
$WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \ $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \
$WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \ $WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \

2
ios/CustomTarget_iOS.mk
View File

@@ -116,7 +116,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj $(IOSKITXC) $(IOSAPPXC)
-project $(IOSKITPRJ) \ -project $(IOSKITPRJ) \
-target LibreOfficeKit \ -target LibreOfficeKit \
-sdk $(IOS_SDK) \ -sdk $(IOS_SDK) \
-arch $(CPU_NAME) \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'`\
-configuration $(if $(ENABLE_DEBUG),Debug,Release) \ -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
build \ build \
, $(WORKDIR)/ios/build.log \ , $(WORKDIR)/ios/build.log \

2
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
View File

@@ -25,7 +25,6 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
3908315E1F8395EB003F2A29 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = ../../../../../../../Users/jani/lo_ios/workdir/ios/loKit.xcconfig; sourceTree = "<group>"; };
39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; }; 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; };
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; }; 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; };
@@ -69,7 +68,6 @@
39B5D2171F78130F008FB162 /* LibreOfficeKit */ = { 39B5D2171F78130F008FB162 /* LibreOfficeKit */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
3908315E1F8395EB003F2A29 /* loKit.xcconfig */,
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */, 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */,
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */, 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */,
); );