dumganhar · u0u0 · May 8, 2013 · May 8, 2013 · May 30, 2013 · May 30, 2013
diff --git a/README b/README
@@ -0,0 +1,11 @@
+TO build lib, need install cmake.
+
+iOS:
+$cd libwebsockets/ios
+$./build_framework.py buildname
+
+
+Android:
+$export ANDROID_NDK=/absolute/path/to/the/android-ndk
+$cd libwebsockets/android
+$./scripts/cmake_android_armeabi.sh
diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake
diff --git a/android/scripts/cmake_android_armeabi.sh b/android/scripts/cmake_android_armeabi.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+OUTPUT=$DIR/..
+cd $OUTPUT
+
+mkdir -p $OUTPUT/dist
+
+mkdir -p build_armeabi
+cd build_armeabi
+
+cmake -DANDROID_ABI=armeabi -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DLWS_WITH_SSL=OFF -DLWS_WITHOUT_SERVER=ON -DLWS_WITHOUT_TESTAPPS=ON -DCMAKE_INSTALL_PREFIX:PATH=$OUTPUT/dist/armv5 $@ ../..
+make
+make install
+
+
+cd ../
+mkdir -p build_armeabi-v7a
+cd build_armeabi-v7a
+
+cmake -DANDROID_ABI=armeabi-v7a -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DLWS_WITH_SSL=OFF -DLWS_WITHOUT_SERVER=ON -DLWS_WITHOUT_TESTAPPS=ON -DCMAKE_INSTALL_PREFIX:PATH=$OUTPUT/dist/armv7a $@ ../..
+make
+make install
+
+cd ../
+mkdir -p build_x86
+cd build_x86
+
+cmake -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DLWS_WITH_SSL=OFF -DLWS_WITHOUT_SERVER=ON -DLWS_WITHOUT_TESTAPPS=ON -DCMAKE_INSTALL_PREFIX:PATH=$OUTPUT/dist/x86 $@ ../..
+make
+make install
+
+# cmake -DANDROID_ABI=armeabi -DCMAKE_TOOLCHAIN_FILE=../scripts/toolchain-android-ndk-r8e.cmake $@ ../..
+
diff --git a/cmake/LibwebsocketsConfig.cmake.in b/cmake/LibwebsocketsConfig.cmake.in
diff --git a/cmake/LibwebsocketsConfigVersion.cmake.in b/cmake/LibwebsocketsConfigVersion.cmake.in
diff --git a/cross-ming.cmake b/cross-ming.cmake
diff --git a/cross-openwrt-makefile b/cross-openwrt-makefile
diff --git a/ios/build_framework.py b/ios/build_framework.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+"""
+The script builds OpenCV.framework for iOS.
+The built framework is universal, it can be used to build app and run it on either iOS simulator or real device.
+
+Usage:
+    ./build_framework.py <outputdir>
+
+By cmake conventions (and especially if you work with OpenCV repository),
+the output dir should not be a subdirectory of OpenCV source tree.
+
+Script will create <outputdir>, if it's missing, and a few its subdirectories:
+
+    <outputdir>
+        build/
+            iPhoneOS-*/
+               [cmake-generated build tree for an iOS device target]
+            iPhoneSimulator/
+               [cmake-generated build tree for iOS simulator]
+        opencv2.framework/
+            [the framework content]
+
+The script should handle minor OpenCV updates efficiently
+- it does not recompile the library from scratch each time.
+However, opencv2.framework directory is erased and recreated on each run.
+"""
+
+import glob, re, os, os.path, shutil, string, sys
+
+def build_opencv(srcroot, buildroot, target, arch):
+    "builds OpenCV for device or simulator"
+
+    builddir = os.path.join(buildroot, target + '-' + arch)
+    if not os.path.isdir(builddir):
+        os.makedirs(builddir)
+    currdir = os.getcwd()
+    os.chdir(builddir)
+    # for some reason, if you do not specify CMAKE_BUILD_TYPE, it puts libs to "RELEASE" rather than "Release"
+    cmakeargs = ("-GXcode " +
+                "-DCMAKE_TOOLCHAIN_FILE=%s/ios/cmake/Toolchains/Toolchain-%s_Xcode.cmake " +
+                "-DLWS_WITH_SSL=OFF " +
+                "-DLWS_WITHOUT_SERVER=ON " +
+                "-DLWS_WITHOUT_TESTAPPS=ON " +
+                "-DCMAKE_INSTALL_PREFIX:PATH=/Users/james/Project/libwebsockets/install") % (srcroot, target)
+    # if cmake cache exists, just rerun cmake to update OpenCV.xproj if necessary
+    if os.path.isfile(os.path.join(builddir, "CMakeCache.txt")):
+        os.system("cmake %s ." % (cmakeargs,))
+    else:
+        os.system("cmake %s %s" % (cmakeargs, srcroot))
+
+    # for wlib in [builddir + "/modules/world/UninstalledProducts/libopencv_world.a",
+    #              builddir + "/lib/Release/libopencv_world.a"]:
+    #     if os.path.isfile(wlib):
+    #         os.remove(wlib)
+
+    os.system("xcodebuild -parallelizeTargets ARCHS=%s -jobs 8 -sdk %s -configuration Release -target ALL_BUILD" % (arch, target.lower()))
+    os.system("xcodebuild ARCHS=%s -sdk %s -configuration Release -target install install" % (arch, target.lower()))
+    os.chdir(currdir)
+
+def put_framework_together(srcroot, dstroot):
+    "constructs the framework directory after all the targets are built"
+
+    # find the list of targets (basically, ["iPhoneOS", "iPhoneSimulator"])
+    targetlist = glob.glob(os.path.join(dstroot, "build", "*"))
+    targetlist = [os.path.basename(t) for t in targetlist]
+
+    # set the current dir to the dst root
+    currdir = os.getcwd()
+    framework_dir = dstroot + "/opencv2.framework"
+    if os.path.isdir(framework_dir):
+        shutil.rmtree(framework_dir)
+    os.makedirs(framework_dir)
+    os.chdir(framework_dir)
+
+    # determine OpenCV version (without subminor part)
+    tdir0 = "../build/" + targetlist[0]
+    cfg = open(tdir0 + "/cvconfig.h", "rt")
+    for l in cfg.readlines():
+        if l.startswith("#define  VERSION"):
+            opencv_version = l[l.find("\"")+1:l.rfind(".")]
+            break
+    cfg.close()
+
+    # form the directory tree
+    dstdir = "Versions/A"
+    os.makedirs(dstdir + "/Resources")
+
+    # copy headers
+    shutil.copytree(tdir0 + "/install/include/opencv2", dstdir + "/Headers")
+
+    # make universal static lib
+    wlist = " ".join(["../build/" + t + "/lib/Release/libopencv_world.a" for t in targetlist])
+    os.system("lipo -create " + wlist + " -o " + dstdir + "/opencv2")
+
+    # form Info.plist
+    srcfile = open(srcroot + "/ios/Info.plist.in", "rt")
+    dstfile = open(dstdir + "/Resources/Info.plist", "wt")
+    for l in srcfile.readlines():
+        dstfile.write(l.replace("${VERSION}", opencv_version))
+    srcfile.close()
+    dstfile.close()
+
+    # copy cascades
+    # TODO ...
+
+    # make symbolic links
+    os.symlink("A", "Versions/Current")
+    os.symlink("Versions/Current/Headers", "Headers")
+    os.symlink("Versions/Current/Resources", "Resources")
+    os.symlink("Versions/Current/opencv2", "opencv2")
+
+
+def build_framework(srcroot, dstroot):
+    "main function to do all the work"
+
+    targets = ["iPhoneOS", "iPhoneOS", "iPhoneOS", "iPhoneSimulator"]
+    archs = ["armv7", "armv7s", "arm64", "i386"]
+    for i in range(len(targets)):
+        build_opencv(srcroot, os.path.join(dstroot, "build"), targets[i], archs[i])
+
+    # put_framework_together(srcroot, dstroot)
+    print("srcroot:"+srcroot+",dstroot:"+dstroot)
+    build_root = dstroot+"/build"
+    lib_path = "/UninstalledProducts/libwebsockets.a "
+    lipo = "xcrun -sdk iphoneos lipo "
+    strip = "xcrun -sdk iphoneos strip "
+    os.system(lipo + "-create -output " + build_root+"/libwebsockets.a " 
+        + build_root+"/iPhoneSimulator-i386"+lib_path
+        + build_root+"/iPhoneOS-armv7"+lib_path
+        + build_root+"/iPhoneOS-armv7s"+lib_path
+        + build_root+"/iPhoneOS-arm64"+lib_path
+        )
+    os.system(strip + "-S " + build_root+"/libwebsockets.a")
+    os.system(lipo + "-info " + build_root+"/libwebsockets.a")
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print "Usage:\n\t./build_framework.py <outputdir>\n\n"
+        sys.exit(0)
+
+    build_framework(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..")), os.path.abspath(sys.argv[1]))
diff --git a/ios/cmake/Modules/Platform/iOS.cmake b/ios/cmake/Modules/Platform/iOS.cmake
@@ -0,0 +1,163 @@
+# This file is based off of the Platform/Darwin.cmake and Platform/UnixPaths.cmake
+# files which are included with CMake 2.8.4
+# It has been altered for iOS development
+set (UNIX 1)
+set (APPLE 1)
+set (IOS 1)
+
+# Darwin versions:
+#   6.x == Mac OSX 10.2
+#   7.x == Mac OSX 10.3
+#   8.x == Mac OSX 10.4
+#   9.x == Mac OSX 10.5
+#  10.x == Mac OSX 10.6 (Snow Leopard)
+string (REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_SYSTEM_VERSION}")
+string (REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\2" DARWIN_MINOR_VERSION "${CMAKE_SYSTEM_VERSION}")
+
+# Do not use the "-Wl,-search_paths_first" flag with the OSX 10.2 compiler.
+# Done this way because it is too early to do a TRY_COMPILE.
+if (NOT DEFINED HAVE_FLAG_SEARCH_PATHS_FIRST)
+    set (HAVE_FLAG_SEARCH_PATHS_FIRST 0)
+    if ("${DARWIN_MAJOR_VERSION}" GREATER 6)
+        set (HAVE_FLAG_SEARCH_PATHS_FIRST 1)
+    endif ("${DARWIN_MAJOR_VERSION}" GREATER 6)
+endif (NOT DEFINED HAVE_FLAG_SEARCH_PATHS_FIRST)
+# More desirable, but does not work:
+#INCLUDE(CheckCXXCompilerFlag)
+#CHECK_CXX_COMPILER_FLAG("-Wl,-search_paths_first" HAVE_FLAG_SEARCH_PATHS_FIRST)
+
+set (CMAKE_SHARED_LIBRARY_PREFIX "lib")
+set (CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+set (CMAKE_SHARED_MODULE_PREFIX "lib")
+set (CMAKE_SHARED_MODULE_SUFFIX ".so")
+set (CMAKE_MODULE_EXISTS 1)
+set (CMAKE_DL_LIBS "")
+
+set (CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set (CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
+set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
+set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
+
+# Hidden visibilty is required for cxx on iOS
+set (CMAKE_C_FLAGS "")
+set (CMAKE_CXX_FLAGS "-stdlib=libc++ -headerpad_max_install_names -fvisibility=hidden -fvisibility-inlines-hidden")
+
+set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -fomit-frame-pointer -ffast-math")
+
+if (HAVE_FLAG_SEARCH_PATHS_FIRST)
+    set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
+    set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
+endif (HAVE_FLAG_SEARCH_PATHS_FIRST)
+
+set (CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+set (CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
+set (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+set (CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+set (CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+set (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+
+# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
+# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
+# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
+if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+    find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
+endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+
+# Setup iOS developer location
+if (IPHONEOS)
+    set (_CMAKE_IOS_DEVELOPER_ROOT "/Developer/Platforms/iPhoneOS.platform/Developer")
+else ()
+    if (IPHONESIMULATOR)
+        set (_CMAKE_IOS_DEVELOPER_ROOT "/Developer/Platforms/iPhoneSimulator.platform/Developer")
+    endif ()
+endif ()
+# Find installed iOS SDKs
+file (GLOB _CMAKE_IOS_SDKS "${_CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
+
+# Find and use the most recent iOS sdk
+if (_CMAKE_IOS_SDKS)
+    list (SORT _CMAKE_IOS_SDKS)
+    list (REVERSE _CMAKE_IOS_SDKS)
+    list (GET _CMAKE_IOS_SDKS 0 _CMAKE_IOS_SDK_ROOT)
+
+    # Set the sysroot default to the most recent SDK
+    set (CMAKE_OSX_SYSROOT ${_CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support")
+
+    # set the architecture for iOS - this env var sets armv6,armv7 and appears to be XCode's standard. The other found is ARCHS_UNIVERSAL_IPHONE_OS but that is armv7 only
+    set (CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_BIT)" CACHE string  "Build architecture for iOS")
+
+    # Set the default based on this file and not the environment variable
+    set (CMAKE_FIND_ROOT_PATH ${_CMAKE_IOS_DEVELOPER_ROOT} ${_CMAKE_IOS_SDK_ROOT} CACHE string  "iOS library search path root")
+
+    # default to searching for frameworks first
+    set (CMAKE_FIND_FRAMEWORK FIRST)
+
+    # set up the default search directories for frameworks
+    set (CMAKE_SYSTEM_FRAMEWORK_PATH
+        ${_CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks
+        ${_CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks
+        ${_CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks
+    )
+endif (_CMAKE_IOS_SDKS)
+
+if ("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
+    set (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress")
+endif ("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
+
+if (NOT XCODE)
+      # Enable shared library versioning.  This flag is not actually referenced
+      # but the fact that the setting exists will cause the generators to support
+      # soname computation.
+      set (CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
+endif (NOT XCODE)
+
+# Xcode does not support -isystem yet.
+if (XCODE)
+    set (CMAKE_INCLUDE_SYSTEM_FLAG_C)
+    set (CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
+endif (XCODE)
+
+# Need to list dependent shared libraries on link line.  When building
+# with -isysroot (for universal binaries), the linker always looks for
+# dependent libraries under the sysroot.  Listing them on the link
+# line works around the problem.
+set (CMAKE_LINK_DEPENDENT_LIBRARY_FILES 1)
+
+set (CMAKE_C_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS -w)
+set (CMAKE_CXX_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS -w)
+
+set (CMAKE_C_CREATE_SHARED_LIBRARY
+    "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> -install_name <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+set (CMAKE_CXX_CREATE_SHARED_LIBRARY
+    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> -install_name <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+
+set (CMAKE_CXX_CREATE_SHARED_MODULE
+    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+set (CMAKE_C_CREATE_SHARED_MODULE
+    "<CMAKE_C_COMPILER>  <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_MODULE_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+set (CMAKE_C_CREATE_MACOSX_FRAMEWORK
+    "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> -install_name <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+set (CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
+    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> -install_name <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+
+
+# Add the install directory of the running cmake to the search directories
+# CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels up
+get_filename_component (_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
+get_filename_component (_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+
+# List common installation prefixes.  These will be used for all search types
+list (APPEND CMAKE_SYSTEM_PREFIX_PATH
+    # Standard
+    ${_CMAKE_IOS_DEVELOPER_ROOT}/usr
+    ${_CMAKE_IOS_SDK_ROOT}/usr
+
+    # CMake install location
+    "${_CMAKE_INSTALL_DIR}"
+
+    # Project install destination.
+    "${CMAKE_INSTALL_PREFIX}"
+)
diff --git a/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake b/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake
@@ -0,0 +1,31 @@
+message (STATUS "Setting up iPhoneOS toolchain")
+set (IPHONEOS TRUE)
+
+# Standard settings
+set (CMAKE_SYSTEM_NAME iOS)
+# Include extra modules for the iOS platform files
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/ios/cmake/Modules")
+
+# Force the compilers to gcc for iOS
+include (CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER (gcc gcc)
+CMAKE_FORCE_CXX_COMPILER (g++ g++)
+
+set (CMAKE_C_SIZEOF_DATA_PTR 4)
+set (CMAKE_C_HAS_ISYSROOT 1)
+set (CMAKE_C_COMPILER_ABI ELF)
+set (CMAKE_CXX_SIZEOF_DATA_PTR 4)
+set (CMAKE_CXX_HAS_ISYSROOT 1)
+set (CMAKE_CXX_COMPILER_ABI ELF)
+
+# Skip the platform compiler checks for cross compiling
+set (CMAKE_CXX_COMPILER_WORKS TRUE)
+set (CMAKE_C_COMPILER_WORKS TRUE)
+
+# Search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+#   for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+message (STATUS "iPhoneOS toolchain loaded")