Merge pull request #13 from Shao-Feng/travis

Enable Travis and CMake for arm ia32 and ia64

Author: Shao-Feng

.travis.yml

@@ -0,0 +1,31 @@
+language: cpp
+
+compiler:
+  - gcc
+before_script:
+  - sudo apt-get update 
+  - sudo apt-get install tree cmake gcc-4.6-arm-linux-gnueabi g++-4.6-arm-linux-gnueabi libc6-dev-i386 lib32stdc++6 g++-multilib g++-4.6-multilib
+  - mkdir build
+  - cd build
+  # build for x86_64
+  - cmake -Dx86_64=ON .. 
+  - make
+  - cp ./tinyweb ../dest/x86_64/
+  - cp ./cgi-getcookie ../dest/x86_64/
+  - cp ./cgi-getfield ../dest/x86_64/
+  - rm -rf *
+  # build for i386
+  - cmake -Di386=ON .. 
+  - make
+  - cp ./tinyweb ../dest/i386/
+  - cp ./cgi-getcookie ../dest/i386/  
+  - cp ./cgi-getfield ../dest/i386/
+  - rm -rf *
+  # build for arm
+  - cmake -D CMAKE_TOOLCHAIN_FILE=../arm_toolchain.cmake ..
+  - make
+  - cp ./tinyweb ../dest/arm/
+  - cp ./cgi-getcookie ../dest/arm/  
+  - cp ./cgi-getfield ../dest/arm/
+  - rm -rf *
+script: tree ../dest/ 

CMakeLists.txt

@@ -0,0 +1,33 @@
+cmake_minimum_required (VERSION 2.8)
+project (tinyweb)
+
+#version number
+set (tinyweb_VERSION_MAJOR 1)
+set (tinyweb_VERSION_MINOR 0)
+
+#build arch option
+option(i386 "i386" OFF)
+option(x86_64 "x86_64" OFF)
+
+find_package(Threads REQUIRED)
+
+add_executable(tinyweb websocket.c tinyweb.c mongoose.c)
+
+target_link_libraries(tinyweb "${CMAKE_THREAD_LIBS_INIT}")
+target_link_libraries(tinyweb ${CMAKE_DL_LIBS})
+
+add_executable(cgi-getfield cgi-getfield.c)
+
+add_executable(cgi-getcookie cgi-getcookie.c)  
+
+
+IF(i386)
+    set_target_properties(tinyweb PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+    set_target_properties(cgi-getfield PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+    set_target_properties(cgi-getcookie PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+ENDIF()
+IF(x86_64)
+    set_target_properties(tinyweb PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
+    set_target_properties(cgi-getfield PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
+    set_target_properties(cgi-getcookie PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
+ENDIF()

android/src/com/intel/tinywebtestservice/FullscreenActivity.java

@@ -156,7 +156,10 @@ public void run() {
                 }
             };
             t.start();
-            t.wait(2000);
+            synchronized(t){
+                t.wait(2000);
+            }
+
         /*	String line = "", res = "";
 
 			InputStream input = p.getInputStream();

arm_toolchain.cmake

@@ -0,0 +1,20 @@
+# CMake toolchain file for building ARM software on OI environment
+
+# this one is important
+SET(CMAKE_SYSTEM_NAME Linux)
+#this one not so much
+SET(CMAKE_SYSTEM_VERSION 1)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER   /usr/bin/arm-linux-gnueabi-gcc-4.6)
+SET(CMAKE_CXX_COMPILER /usr/bin/arm-linux-gnueabi-g++-4.6)
+SET(CMAKE_STRIP /usr/bin/arm-linux-gnueabi-strip) 
+
+# where is the target environment 
+SET(CMAKE_FIND_ROOT_PATH  /usr/arm-linux-gnueabi)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)