iOS:Fix to build IoTivity 1.3.1 provisioning 71/24071/9
authorYogisha Poojary <yogisha.poojary@lnttechservices.com>
Fri, 2 Feb 2018 13:38:00 +0000 (08:38 -0500)
committerMats Wichmann <mats@linux.com>
Sat, 21 Apr 2018 14:24:00 +0000 (14:24 +0000)
Bug:https://jira.iotivity.org/browse/IOT-2968

Dependency::If8eb4fd34191da7144f39b9e6d1870209d17c9ca Ia97785ff88ef0b7e83538f09a394eefe824ba54f

Change-Id: I04014707bfdd22caab570cd7d2b0de23caa9e2ba
Signed-off-by: Yogisha Poojary <yogisha.poojary@lnttechservices.com>
resource/csdk/security/SConscript
tools/darwin/mkfwk_ios.sh

index 8204141..e83811a 100644 (file)
@@ -62,7 +62,7 @@ if target_os in ['windows', 'msys_nt']:
     libocsrm_env.AppendUnique(CCFLAGS=['/W4'])
 
 if libocsrm_env.get('SECURED') == '1':
-    if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows']:
+    if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows', 'ios']:
         SConscript('provisioning/SConscript', 'libocsrm_env')
 
     if target_os in ['linux', 'tizen', 'windows', 'darwin']:
index 22dadb7..37d69bb 100755 (executable)
@@ -49,6 +49,8 @@ LIBRCS_SERVER=librcs_server
 LIBRESOURCE_DIRECTORY=libresource_directory
 LIBROUTINGMANAGER=libroutingmanager
 LIBSCENE_MANAGER=libscene_manager
+LIBOCPMAPI_INTERNAL=libocpmapi_internal
+LIBOCPMAPI=libocpmapi
 
 LIPO="xcrun -sdk iphoneos lipo"
 
@@ -126,20 +128,22 @@ 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"
+lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOCPMAPI_INTERNAL.a"
+lipolite $OUTDIR/objs/$ARCH "$OUTDIR/$ARCH/$BUILD/$LIBOCPMAPI.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
@@ -169,20 +173,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