Changes for remote execution

Justin McPherson · Justin McPherson · commit 730b8848e56b · 2016-05-09T14:11:59.000+10:00
diff --git a/ReactUbuntu/runtime/src/reactnetexecutor.cpp b/ReactUbuntu/runtime/src/reactnetexecutor.cpp
@@ -14,7 +14,10 @@ ReactNetExecutor::ReactNetExecutor(QObject* parent)
   : ReactExecutor(parent)
   , m_socket(new QTcpSocket(this))
 {
-  m_socket->connectToHost("localhost", 5000);
+  QString serverHost = qgetenv("REACT_SERVER_HOST");
+  if (serverHost.isEmpty())
+    serverHost = "localhost";
+  m_socket->connectToHost(serverHost, 5000);
   //  connect(m_socket, SIGNAL(connected()), SLOT(connected()));
   //  connect(m_socket, SIGNAL(disconnected()), SLOT(disconnected()));
   connect(m_socket, SIGNAL(readyRead()), SLOT(readReply()));
diff --git a/local-cli/generator-ubuntu/templates/run-app.sh.in b/local-cli/generator-ubuntu/templates/run-app.sh.in
@@ -1,5 +1,27 @@
 #!/bin/bash
 
+args=""
+ondevice=0
+
+for arg in "$@"
+do
+  if [ $arg == "--on-device" ]
+  then
+    ondevice=1
+  else
+    args=$args" $arg"
+  fi 
+done
+
 (node ${CMAKE_SOURCE_DIR}/../node_modules/react-native/ubuntu-server.js 2>&1 > /dev/null) &
-${CMAKE_BINARY_DIR}/bin/${APP_NAME} $*
+
+if [[ $ondevice = 1 ]]
+then
+  react_host=`hostname -I`
+  adb push ${CMAKE_BINARY_DIR}/bin/${APP_NAME} /home/phablet 
+#  adb reverse --no-rebind tcp:8081 tcp:8081
+  adb shell REACT_SERVER_HOST=$react_host /home/phablet/${APP_NAME} --host $react_host $args -- --desktop_file_hint=/usr/share/applications/webbrowser-app.desktop
+else
+  ${CMAKE_BINARY_DIR}/bin/${APP_NAME} $args
+fi
 
