[CONPRO-1442] Fix crash in cpp wrapper.

[platform/upstream/iotivity.git] / tools / darwin / mkfwk_ios.sh

diff --git a/tools/darwin/mkfwk_ios.sh b/tools/darwin/mkfwk_ios.sh
index 0eb86b7..0d91809 100755 (executable)
--- a/tools/darwin/mkfwk_ios.sh
+++ b/tools/darwin/mkfwk_ios.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
-
+#===============================================================================
+# Author:    Pete Goodliffe
+# Copyright: (c) Copyright 2009 Pete Goodliffe
+# Licence:   Please feel free to use this, with attribution
+#===============================================================================
 
 #VERSION_IOS="${MAJOR_VERSION}.${MINOR_VERSION}.${RELEASE_NUMBER}.${BUILD_NUMBER}"
 VERSION_IOS="0.9.0.1"
@@ -40,7 +44,7 @@ FRAMEWORK_INSTALL_NAME=$FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/$FRAMEWORK_
 
 lipolite()
 {
-   PREV="$PWD" 
+   PREV="$PWD"
    cd "$1"
    ar -x "$2"
    cd "$PREV"
@@ -57,8 +61,8 @@ 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" 
+       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
 done
 
@@ -75,13 +79,13 @@ $LIPO \
     || abort "Lipo $1 failed"
 
 echo rm -rf objs
-find $OUTDIR/objs -name "*.o" | xargs rm 
+find $OUTDIR/objs -name "*.o" | xargs rm
 
 echo "Framework: Copying includes..."
 cp -r  resource/csdk/stack/include/*.h  $FRAMEWORK_BUNDLE/Headers
 cp -r  resource/csdk/ocsocket/include/*.h  $FRAMEWORK_BUNDLE/Headers
-cp -r  resource/csdk/ocrandom/include/*.h  $FRAMEWORK_BUNDLE/Headers
-cp -r  resource/csdk/ocmalloc/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
 
 echo "Framework: Creating plist..."
 cat > $FRAMEWORK_BUNDLE/Resources/Info.plist <<EOF