Andrew Grieve
6abb9da88a
Merge branch 'master' into 4.0.x
...
Conflicts:
bin/templates/project/custom_rules.xml
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/junit/MessageTest.java
2014-06-08 22:54:21 -04:00
Andrew Grieve
d5e8807756
Set version to 4.0.0-dev
2014-06-06 15:00:41 -04:00
Ian Clelland
7e9fdb3555
Remove Ant custom build directories
2014-06-05 13:11:14 -04:00
Marcel Kinard
32e07c22d0
CB-6876 Show the correct executable name
2014-06-04 19:23:43 -04:00
Marcel Kinard
d427c52aac
CB-6876 Fix the "print usage"
2014-06-04 19:12:55 -04:00
Michal Mocny
1641f09dc9
Revert "defaults.xml: Add AndroidLaunchMode preference"
...
This reverts commit 11fc6be328
2014-05-29 14:50:01 -04:00
Ian Clelland
22b1959333
Manually fix Android sdk location to support library projects without local.properties
2014-05-22 14:04:00 -04:00
Joe Bowser
00caa1c0a0
Set VERSION to 3.6.0-dev (via coho)
2014-05-06 15:51:14 -07:00
Ningxin Hu
e6adbb0e42
CB-6543 Fix cordova/run failure when no custom_rules.xml available
...
Github: Close #99
2014-04-28 22:50:22 -04:00
Fardjad Davari
11fc6be328
defaults.xml: Add AndroidLaunchMode preference
2014-04-25 00:27:33 +04:30
Joe Bowser
708c042b61
Set VERSION to 3.5.0-dev (via coho)
2014-01-22 16:30:02 -08:00
Andrew Grieve
600599f49e
Fix type "LANCH" -> "LAUNCH"
2014-01-22 14:53:40 -05:00
Andrew Grieve
f83d7a7cd1
CB-5793 Add work-around for library references not working with custom output directory (ugh).
2014-01-21 15:09:15 -05:00
Andrew Grieve
7094047b3d
CB-5793 Forgot to update ant path for clean.
2014-01-20 10:26:53 -05:00
Andrew Grieve
11d3607688
CB-5793 Don't clean before build and change output directory to ant-build to avoid conflicts with Eclipse.
2014-01-19 23:09:00 -05:00
Andrew Grieve
ef9ace9e65
CB-5803 Fix cordova/emulate on windows.
2014-01-16 13:19:39 -05:00
Andrew Grieve
22e4039133
CB-5801 Add spawn work-around on windows for it not being able to execute .cmd files
...
More info: https://github.com/joyent/node/issues/2318
2014-01-16 12:11:31 -05:00
Andrew Grieve
4971670e56
CB-5801 exec->spawn in build to make sure compile errors are shown.
2014-01-15 11:41:34 -05:00
Vyacheslav Shabelnik
8e260d5c40
CB-5714 Fix of android build when too big output stops build with error due to buffer overflow.
2013-12-30 11:06:37 -05:00
Justin Wark
be2f7d7a8a
Remove 2 X console.log from exec.js
...
With these console.log statements the output from commands such as 'list-devices' is very messy and hence difficult to parse the output programatically.
2013-12-23 08:54:46 -05:00
Michal Mocny
146e296826
CB-5047: Adding a defaults.xml template
...
This template will be consumed by the CLI, instead of the default
platform config.xml which is consumed by the bin/create workflow. We
remove the user app specific settings since those are to be edited in
the top level app config.xml by the user, and are injected by the CLI.
2013-12-05 14:33:21 -05:00
Josh Soref
74ea6bf00a
Spelling fixes
2013-12-05 12:20:58 -05:00
Joe Bowser
dbbe038939
Set VERSION to 3.4.0-dev (via coho)
2013-12-03 15:44:21 -08:00
Joe Bowser
6856b02aa7
Set VERSION to 3.3.0-dev (via coho)
2013-11-06 15:06:19 -08:00
Braden Shepherdson
8783cf03b2
[CB-4996] Fix paths with spaces while launching on emulator and device
2013-11-06 10:37:59 -05:00
Marcel Kinard
4e1156e083
CB-5284 Fixing the version from coho
...
Fixing the hardcoded versions, it got auto-incremented by accident.
2013-11-05 14:43:01 -05:00
Joe Bowser
937056fcaf
Set VERSION to 2.10.0-dev (via coho)
2013-11-01 11:11:09 -07:00
Carlos Santana
41ed18684d
CB-5209 Win: Cannot build Android app if project path contains spaces
2013-10-29 16:29:19 -04:00
Joe Bowser
96d4a22215
CB-5209: Dirty, Dirty Fix for Building. This works, but needs to be prettier.
2013-10-29 14:27:46 -04:00
Braden Shepherdson
b57317bdc2
Refactoring Android project-level and platform scripts to use Q.js
...
This eliminates the use of shelljs.exec's sync mode, which is the source
of the filehandle leaks that can cause EMFILE on OSX, and are
CPU-intensive everywhere.
Tested locally, needs poking before it gets released.
2013-10-16 13:10:53 -04:00
Andrew Grieve
2c6285d4b3
Set VERSION to 3.2.0-dev (via coho)
2013-09-17 11:03:51 -04:00
Andrew Grieve
437daa368a
[CB-4782] Convert ApplicationInfo.java -> appinfo.js
2013-09-10 16:32:42 -04:00
Andrew Grieve
1bfcc92677
Make version in version script easier to replace by coho
2013-09-09 15:37:00 -04:00
Benn Mapes
b1d8788506
Fix for cli with new node scripts
2013-08-27 11:41:54 -07:00
Benn Mapes
1bd4900981
[CB-3542] rewrote cli tooling scripts in node
2013-08-26 14:45:28 -07:00
Tomaz Muraus
121b74fa0c
[CB-4495] Modify start-emulator script to exit immediately on a fatal emulator error.
2013-08-15 11:46:50 -04:00
Ian Clelland
fa366eb7a8
[CB-4140] Fix master branch cordova version to 3.1.0-dev
2013-08-09 10:45:39 -04:00
Ian Clelland
fff956304f
[CB-4140] Fix master branch cordova version to DEV
2013-07-11 14:11:37 -04:00
bennmapes
bf6291020a
Added 'log' back to windows cli tooling
2013-07-03 10:52:13 -07:00
Fil Maj
6fe66ad79c
Accidentally commented "build" out when running ./run --emulator. Whoops D:
2013-06-21 14:23:40 -07:00
Benn Mapes
4ec3d6d064
[CB-3625] [CB-3338] updated windows cli scripts and added version option
2013-06-18 14:56:11 -07:00
Fil Maj
0efd9fcac0
[CB-3627] start-emulator now properly starts, waits for and unlocks an emulator, consumed by run as well.
2013-06-14 17:22:57 -07:00
Fil Maj
32d74f8623
correct refs to various lib scripts in run.
2013-06-14 14:48:23 -07:00
Fil Maj
add107583f
Proper modularization of bash scripts for [CB-3627], but not solved yet. wait_for_emulator does not work atm
2013-06-13 16:46:21 -07:00
Fil Maj
e86d811fc0
[CB-3626] fix to start-emulator: if no id is provided, should start the first emulator
2013-06-13 12:44:43 -07:00
Braden Shepherdson
e518eacbde
Replace naive relative path in version script with proper one
2013-06-06 12:00:33 -04:00
Andrew Grieve
420cee4ee6
[CB-3468] Add missing license headers found by RAT
2013-05-28 16:43:38 -04:00
Tim Kim
3917284f71
[CB-3340] - version script
2013-05-13 15:30:16 -07:00
Benn Mapes
4dee30ed84
[CB-2914] Cli script migration for unix bash
2013-04-18 16:34:52 -07:00
Benn Mapes
4599e9897d
[CB-2914] Cli script migration for windows jscript
2013-04-16 15:51:06 -07:00
Anis Kadri
226e72ac18
adding release command
2012-11-22 22:23:51 -05:00
Anis Kadri
65c78b8f3f
removing ApplicationInfo.class
2012-11-22 22:23:51 -05:00
Anis Kadri
6137c7ca06
removing appinfo.jar
2012-11-22 22:23:51 -05:00
Anis Kadri
68161d2714
refactoring windows scripts
2012-11-22 22:23:51 -05:00
Anis Kadri
a6473cb826
adding install function
2012-11-22 22:23:51 -05:00
Anis Kadri
0084c6f96a
refactoring android commands
2012-11-22 22:23:51 -05:00
Anis Kadri
81f283e56f
CB-1794 fixing cordova commands for paths with spaces in them
2012-11-07 13:22:14 -08:00
Josh Soref
2ecbde891a
Spelling: conjunction
2012-09-17 22:09:51 -04:00
Anis Kadri
d859bb8e67
adding windows createAppInfoJar
2012-09-17 17:14:25 -07:00
Fil Maj
b723beb545
[CB-1484] License headers audit
2012-09-17 14:19:02 -07:00
Anis Kadri
e069bbb800
CB-937 fixing debug for windows
2012-06-28 17:11:21 -07:00
Anis Kadri
17ff6be6a9
CB-937 fixing debug
2012-06-28 17:08:32 -07:00
Anis Kadri
98138a0a60
log was actually doing nothing...fixing it
2012-06-27 17:55:35 -07:00
Anis Kadri
4699ab5500
forgot to add +x on BOOM
2012-06-25 15:03:19 -07:00
Anis Kadri
69fc7f39b7
setting +x on script files
2012-06-25 14:59:35 -07:00
Anis Kadri
b9f9429542
windows build/debug/launch scripts
2012-06-21 21:15:53 -07:00
Anis Kadri
e9a9144098
adding windows scripts
2012-06-20 19:07:41 -07:00
Anis Kadri
e6d801a594
adding appinfo
2012-06-15 18:38:46 -07:00
Anis Kadri
c86b618aaa
adding bash helper scripts
2012-06-15 18:35:34 -07:00
