Merge pull request #9 from yugang/wd-stub-optimization-task

Update for cgi file not found

Author: yugang

android/assets/system/service.sh

@@ -31,15 +31,15 @@ DOCPATH="${SYSPATH%/system}/docroot"
 chmod 0777 $LIBPATH/*
 
 for x in `$LIBPATH/busybox find $DOCPATH -name '*.cgi'`
-do
+do 
 {
-	$LIBPATH/busybox sed -i 's/#!\/bin\/sh/#!\/system\/bin\/sh/g' $x
+	$LIBPATH/busybox sed -ie 's/#!\/bin\/sh/#!\/system\/bin\/sh/g' $x
 	chmod 0777 $x
 }
 done
 
-for x in `$LIBPATH/busybox find $DOCPATH -name '*.cgi' | $LIBPATH/busybox grep '/cgi/'`;do echo `dirname $x`;done | $LIBPATH/busybox sort | $LIBPATH/busybox uniq > cgi
-for src in `cat cgi`;do dst=`echo $src|$LIBPATH/busybox sed -e "s/\/cgi//g"`;cp $src/*.cgi $dst;done
+#for x in `$LIBPATH/busybox find $DOCPATH -name '*.cgi' | $LIBPATH/busybox grep '/cgi/'`;do `$LIBPATH/busybox dirname $x`;done | $LIBPATH/busybox sort | $LIBPATH/busybox uniq > cgi
+#for src in `$LIBPATH/busybox cat cgi`;do dst=`$LIBPATH/busybox sed -e "s/\/cgi//g" $src`;cp $src/*.cgi $dst;done
 
 echo "Launch tinyweb daemon..."
 PATH=$PATH:$LIBPATH $LIBPATH/tinyweb -ssl_certificate $SYSPATH/server.pem -document_root $DOCPATH -listening_ports 8080,8081,8082,8083,8443s -pidfile $SYSPATH/tinyweb.pid

android/native/jni/Application.mk

@@ -1,3 +1,3 @@
 # Build both ARMv5TE and ARMv7-A machine code.
-APP_ABI := armeabi armeabi-v7a x86 x86_64
+APP_ABI := all
 APP_STL := gnustl_static

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

@@ -93,6 +93,25 @@ public void run() {
 						p = Runtime.getRuntime().exec(
 								target_path + "system/service.sh -p "
 										+ Build.CPU_ABI, null, null);
+			String line = "", res = "";
+
+			InputStream input = p.getInputStream();
+
+			BufferedReader osRes = new BufferedReader(new InputStreamReader(
+					input, "utf-8"));
+			while ((line = osRes.readLine()) != null)
+				res += line + "\n";
+			osRes.close();
+			input.close();
+
+			input = p.getErrorStream();
+			osRes = new BufferedReader(new InputStreamReader(input, "utf-8"));
+			while ((line = osRes.readLine()) != null)
+				res += line + "\n";
+                        
+			osRes.close();
+			input.close();
+			printLog(res);
 					} catch (IOException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
@@ -101,7 +120,7 @@ public void run() {
 			};
 			t.start();
 			t.wait(2000);
-			String line = "", res = "";
+		/*	String line = "", res = "";
 
 			InputStream input = p.getInputStream();
 
@@ -118,7 +137,7 @@ public void run() {
 				res += line + "\n";
 			osRes.close();
 			input.close();
-			printLog(res);
+			printLog(res); */
 
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -350,6 +369,8 @@ private int chmode(String filename, int mode) throws Exception {
 
 	private void unzipDocroot() {
 		try {
+	//		chmode(target_path + "system/libs/" + Build.CPU_ABI + "/unzip", 511);
+
 			String cmd = target_path
 					+ "system/libs/" + Build.CPU_ABI + "/busybox unzip /sdcard/docroot.zip -o -d "
 					+ target_path;