Permalink
Browse files

Merge pull request #2984 from dizzymonkey/timob-10355

Timob 10355  Fix issue with access properties on 2_0_X branch
  • Loading branch information...
2 parents f53cf04 + 553a95c commit f08035a601c1ae7ba69a23bede69f3749143b11c @billdawson billdawson committed Sep 20, 2012
@@ -392,7 +392,7 @@ module.exports = new function() {
make sure to only inject if the value doesn't already exist in the
config tiapp.xml so we avoid duplicates
*/
- newTiappXmlContents += "\t<property name=\"" + key + "\">" + self.customTiappXmlProperties[key] + "</property>\n";
+ newTiappXmlContents += "\t<property name=\"" + key + "\" type=\"" + self.customTiappXmlProperties[key].type + "\">" + self.customTiappXmlProperties[key].value + "</property>\n";
}
}
}
@@ -64,7 +64,7 @@ module.exports = new function() {
make sure the harness has access to what port number it should listen on for a connection
from the driver
*/
- common.customTiappXmlProperties["driver.socketPort"] = driverGlobal.config.androidSocketPort;
+ common.customTiappXmlProperties["driver.socketPort"] = {value: driverGlobal.config.androidSocketPort, type: "int"};
// due to python behavior on windows, we need to escape the slashes in the argument string
if (os.platform().substr(0 ,3) === "win") {
@@ -84,7 +84,7 @@ module.exports = new function() {
make sure the harness has access to what port number it should listen on for a connection
from the driver
*/
- common.customTiappXmlProperties["driver.socketPort"] = driverGlobal.config.iosSocketPort;
+ common.customTiappXmlProperties["driver.socketPort"] = {value: driverGlobal.config.iosSocketPort, type: "int"};
common.createHarness(
"ios",
@@ -135,7 +135,7 @@ module.exports = new function() {
};
// this is the same whether browser only mode is enabled or not
- common.customTiappXmlProperties["driver.httpPort"] = driverGlobal.config.httpPort;
+ common.customTiappXmlProperties["driver.httpPort"] = {value: driverGlobal.config.httpPort, type: "int"};
/*
check for browser only mode. When in browser only mode, we are gonna skip invoking the
@@ -151,7 +151,7 @@ module.exports = new function() {
since we are running in browser only mode, the harness should use the loopback address
when making requests to the driver
*/
- common.customTiappXmlProperties["driver.httpHost"] = "http://127.0.0.1";
+ common.customTiappXmlProperties["driver.httpHost"] = {value: "http://127.0.0.1", type: "string"};
// skip the normal logic of launching the browser on device
serverCallback = function() {
@@ -182,7 +182,7 @@ module.exports = new function() {
make sure that the harness has the correct wifi address to use when making requests to
the driver
*/
- common.customTiappXmlProperties["driver.httpHost"] = driverGlobal.httpHost;
+ common.customTiappXmlProperties["driver.httpHost"] = {value: driverGlobal.httpHost, type: "string"};
} else {
driverUtils.log("unable to get IP address", driverGlobal.logLevels.quiet);
@@ -18,7 +18,7 @@
<analytics>false</analytics>
<guid></guid>
<property name="ti.ui.defaultunit">system</property>
- <property name="ti.android.threadstacksize" type="int">32768</property>
+ <property name="ti.android.threadstacksize" type="int">49152</property>
<iphone>
<orientations device="iphone">
<orientation>Ti.UI.PORTRAIT</orientation>

0 comments on commit f08035a

Please sign in to comment.