Skip to content

GitLab

I
iotivity-classic
Commit df031b02 authored by Yogisha Poojary's avatar Yogisha Poojary Committed by Mats Wichmann
Browse files
Options

iOS: Fix to build iOS Iotivity 1.3-Rel branch 

Bug: https://jira.iotivity.org/browse/IOT-1897 https://jira.iotivity.org/browse/IOT-2570

Change-Id: If8eb4fd34191da7144f39b9e6d1870209d17c9ca
Signed-off-by: default avatarYogisha Poojary <yogisha.poojary@lnttechservices.com>
parent cd141746
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 40 deletions
resource/SConscript
View file @ df031b02
......@@ -39,7 +39,7 @@ SConscript('#extlibs/libcoap/SConscript')
# Build csdk
SConscript('csdk/SConscript')
if target_os not in ['arduino', 'darwin', 'ios']:
if target_os not in ['arduino', 'darwin']:
# Build liboc_logger
SConscript('oc_logger/SConscript')
......
service/resource-encapsulation/src/common/SConscript
View file @ df031b02
......@@ -23,9 +23,13 @@
##
import os
Import('env')
# SConscript file for Local PKI google tests
gtest_env = SConscript('#extlibs/gtest/SConscript')
lib_env = gtest_env.Clone()
rcs_common_env = env.Clone()
# Add third party libraries
SConscript('#service/third_party_libs.scons', exports = 'lib_env')
rcs_common_env = lib_env.Clone()
target_os = rcs_common_env.get('TARGET_OS')
release = rcs_common_env.get('RELEASE')
src_dir = rcs_common_env.get('SRC_DIR')
......
tools/darwin/mkfwk_ios.sh
View file @ df031b02
......@@ -2,7 +2,18 @@
#===============================================================================
# Author: Pete Goodliffe
# Copyright: (c) Copyright 2009 Pete Goodliffe
# Licence: Please feel free to use this, with attribution
# Licence: Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#===============================================================================
#VERSION_IOS="${MAJOR_VERSION}.${MINOR_VERSION}.${RELEASE_NUMBER}.${BUILD_NUMBER}"
......@@ -10,14 +21,41 @@ VERSION_IOS="0.9.0.1"
OUTDIR=$PWD/out/ios
BUILD=debug
BUILD=release
LIBCOAP=libcoap
SDKLIB=liboctbstack
LIBC_COMMON=libc_common
LIBCJSON=libcjson
LIBCONNECTIVITY_ABSTRACTION_INTERNAL=libconnectivity_abstraction_internal
LIBCONNECTIVITY_ABSTRACTION=libconnectivity_abstraction
LIBESMEDIATORRICH=libESMediatorRich
LIBLOGGER=liblogger
LIBMBEDCRYPTO=libmbedcrypto
LIBMBEDTLS=libmbedtls
LIBMBEDX509=libmbedx509
LIBNOTIFICATION_CONSUMER_WRAPPER=libnotification_consumer_wrapper
LIBNOTIFICATION_CONSUMER=libnotification_consumer
LIBNOTIFICATION_PROVIDER_WRAPPER=libnotification_provider_wrapper
LIBNOTIFICATION_PROVIDER=libnotification_provider
LIBOC_LOGGER_INTERNAL=liboc_logger_internal
LIBOC_LOGGER=liboc_logger
LIBOCLIB=liboc
LIBOCPROVISION=libocprovision
LIBOCSRM=libocsrm
LIBOCTBSTACK_INTERNAL=liboctbstack_internal
LIBRCS_CLIENT=librcs_client
LIBRCS_COMMON=librcs_common
LIBRCS_CONTAINER=librcs_container
LIBRCS_SERVER=librcs_server
LIBRESOURCE_DIRECTORY=libresource_directory
LIBROUTINGMANAGER=libroutingmanager
LIBSCENE_MANAGER=libscene_manager
LIPO="xcrun -sdk iphoneos lipo"
VERSION_TYPE=Alpha
FRAMEWORK_NAME=iotivity-csdk
FRAMEWORK_NAME=iotivity
FRAMEWORK_VERSION=A
FRAMEWORK_CURRENT_VERSION=${VERSION_IOS}
FRAMEWORK_COMPATIBILITY_VERSION=${VERSION_IOS}
......@@ -44,10 +82,10 @@ FRAMEWORK_INSTALL_NAME=$FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/$FRAMEWORK_
lipolite()
{
PREV="$PWD"
cd "$1"
ar -x "$2"
cd "$PREV"
PREV="$PWD"
cd "$1"
ar -x "$2"
cd "$PREV"
}
......@@ -59,33 +97,72 @@ FATFILE=""
for ARCH in $ARCHS
do
echo "extracting $ARCH"
mkdir $OUTDIR/objs/$ARCH
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBCOAP.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$SDKLIB.a"
ar -r $OUTDIR/objs/$ARCH.a $OUTDIR/objs/$ARCH/*.o
echo "extracting $ARCH"
mkdir $OUTDIR/objs/$ARCH
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBCOAP.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBC_COMMON.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBCJSON.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBCONNECTIVITY_ABSTRACTION_INTERNAL.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBCONNECTIVITY_ABSTRACTION.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBESMEDIATORRICH.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBLOGGER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOCLIB.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBMBEDCRYPTO.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBMBEDTLS.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBMBEDX509.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBNOTIFICATION_CONSUMER_WRAPPER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBNOTIFICATION_CONSUMER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBNOTIFICATION_PROVIDER_WRAPPER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBNOTIFICATION_PROVIDER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOC_LOGGER_INTERNAL.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOC_LOGGER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOCPROVISION.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOCSRM.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOCTBSTACK_INTERNAL.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$SDKLIB.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBRCS_CLIENT.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBRCS_COMMON.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBRCS_CONTAINER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBRCS_SERVER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBRESOURCE_DIRECTORY.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBROUTINGMANAGER.a"
lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBSCENE_MANAGER.a"
ar -r $OUTDIR/objs/$ARCH.a $OUTDIR/objs/$ARCH/*.o
done
echo "Lipoing library into $FRAMEWORK_INSTALL_NAME..."
$LIPO \
-create \
-arch armv7 "$OUTDIR/objs/armv7.a" \
-arch armv7s "$OUTDIR/objs/armv7s.a" \
-arch arm64 "$OUTDIR/objs/arm64.a" \
-arch i386 "$OUTDIR/objs/i386.a" \
-arch x86_64 "$OUTDIR/objs/x86_64.a" \
-output "$FRAMEWORK_INSTALL_NAME" \
|| abort "Lipo $1 failed"
-create \
-arch armv7 "$OUTDIR/objs/armv7.a" \
-arch armv7s "$OUTDIR/objs/armv7s.a" \
-arch arm64 "$OUTDIR/objs/arm64.a" \
-arch i386 "$OUTDIR/objs/i386.a" \
-arch x86_64 "$OUTDIR/objs/x86_64.a" \
-output "$FRAMEWORK_INSTALL_NAME" \
|| abort "Lipo $1 failed"
echo rm -rf objs
find $OUTDIR/objs -name "*.o" | xargs rm
echo "Framework: Copying includes..."
cp -r resource/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/include/*.hpp $FRAMEWORK_BUNDLE/Headers
cp -r resource/oc_logger/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/oc_logger/include/*.hpp $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/stack/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/ocsocket/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/c_common/ocrandom/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/c_common/oic_malloc/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/connectivity/api/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/security/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/security/include/experimental/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/security/include/internal/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/security/provisioning/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/security/provisioning/include/internal/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/c_common/experimental/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/c_common/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/csdk/resource-directory/include/*.h $FRAMEWORK_BUNDLE/Headers
cp -r resource/oc_logger/include/targets/oc_ostream_logger.h $FRAMEWORK_BUNDLE/Headers
cp -r $OUTDIR/arm64/$BUILD/resource/c_common/iotivity_config.h $FRAMEWORK_BUNDLE/Headers
echo "Framework: Creating plist..."
cat > $FRAMEWORK_BUNDLE/Resources/Info.plist <<EOF
......@@ -93,20 +170,20 @@ cat > $FRAMEWORK_BUNDLE/Resources/Info.plist <<EOF
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${FRAMEWORK_NAME}</string>
<key>CFBundleIdentifier</key>
<string>org.iotivity</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${FRAMEWORK_CURRENT_VERSION}</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${FRAMEWORK_NAME}</string>
<key>CFBundleIdentifier</key>
<string>org.iotivity</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${FRAMEWORK_CURRENT_VERSION}</string>
</dict>
</plist>
EOF
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment