95815a558c
Merge branch 'master' into 4.0.x (fix ant run command)
2014-09-22 15:38:59 -04:00
879da03438
CB-7579 Fix run script's ability to use non-arch-specific APKs
2014-09-22 14:23:30 -04:00
6bdc01290d
Merge branch 'master' into 4.0.x (gradle fix)
2014-09-16 15:15:11 -04:00
ac34bf1e54
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
2014-09-16 15:14:40 -04:00
6fb164d200
Merge branch 'master' into 4.0.x (unaligned apk fix)
2014-09-16 15:00:54 -04:00
a5d300c6ff
CB-7512 Use aligned apk rather than unaligned apk when sorting
2014-09-16 14:59:43 -04:00
6eb4409a72
Merge branch 'master' into 4.0.x (gradle debug v release)
2014-09-16 14:14:46 -04:00
533677df8b
CB-7512 Speed up gradle builds by building debug or release (not both)
2014-09-16 14:13:49 -04:00
8f27b2ab56
Merge branch 'master' into 4.0.x (gradle fixes)
2014-09-16 13:02:55 -04:00
00f6d30e08
CB-7512 Change gradle android plugins from 0.10 -> 0.12
2014-09-16 13:00:27 -04:00
a10106c61a
Merge branch 'master' into 4.0.x (x86 deploy)
2014-09-15 14:24:45 -04:00
5cb01f2ae9
CB-7554 Use x86 apk when deploying to an intel device / emulator
2014-09-15 14:23:26 -04:00
f9b89e98c2
Fix invalid syntax (missing + in multiline string)
2014-09-15 10:34:43 -04:00
be01ce03d0
Fix invalid syntax (missing + in multiline string)
2014-09-12 17:00:29 -04:00
30e8b818f5
Merge branch 'master' into 4.0.x (error messages)
2014-09-12 14:21:47 -04:00
525ce0e0ad
CB-7536 Tweak error messages for missing JDK / SDK / AVDs
2014-09-12 14:19:13 -04:00
91cf78f183
Set VERSION to 3.7.0-dev (via coho)
2014-08-29 16:34:12 -07:00
0b6b068097
CB-3445: Allow build and run scripts to select APK by architecture
2014-08-29 16:00:54 -04:00
4bc2051f44
CB-3445: Allow build and run scripts to select APK by architecture
2014-08-29 16:00:13 -04:00
623b2306ca
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
2014-08-28 16:18:51 -04:00
34dde53506
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
2014-08-28 16:18:02 -04:00
7caa96abcd
Fix previous merges
...
Build scripts (create and build) were mangled somewhat by the previous
merge commits. This resets them to (almost) exactly the same state as
the 3.6.x (master) branch.
Conflicts:
bin/lib/create.js
2014-08-20 11:45:35 -04:00
4c1942e3fe
Merge branch 'master' into 4.0.x (build & create script updates)
...
Conflicts:
bin/lib/check_reqs.js
bin/lib/create.js
bin/node_modules/which/package.json
bin/templates/cordova/lib/build.js
2014-08-19 12:02:36 -04:00
58cdfd86d0
CB-7330 Fix dangling function call in last commit (broke gradle builds)
2014-08-19 11:53:53 -04:00
dfa66b9dd4
CB-7330 Don't run "android update" during creation
...
Instead, have the build script copy do the equivalent logic on each
build.
Advantages:
- Scripts run much faster
- No more duplicate CordovaLib entries in project.properties
- Building is more independent from create/update script (more robust)
2014-08-18 23:24:29 -04:00
d56ea25816
CB-3445 Add gradle support clean command (plus some code cleanup)
...
* Don't run ant clean for gradle ever
* Don't set sdk.dir since ANDROID_HOME is not always set
* Don't export builders
2014-08-18 16:19:40 -04:00
ca8bb75b40
CB-3445 Copy gradle wrapper in build instead of create
...
This should play nicer with updates to the android SDK.
2014-08-18 14:51:40 -04:00
effffcba1d
CB-3445 Speed up gradle building (incremental builds go from 10s -> 1.5s for me)
...
Biggest win is disabling the linter.
2014-08-18 14:17:34 -04:00
7d6ac87033
CB-3445: Add option to build and install with gradle
...
This gives build/cordova two new command-line arguments: --ant and
--gradle, and will select the build type from those. As a fallback
for the Cordova CLI, the environment variable ANDROID_BUILD can also be
used, set to either "ant" or "gradle".
The default is currently "ant", but it is intended for this to change in
the future.
2014-08-18 09:48:31 -04:00
95aa5c9f1c
CB-7321 Don't require ant for create script
2014-08-15 13:58:53 -04:00
4319447cb5
CB-7044, CB-7299 Fix up PATH problems when possible.
...
Uses heuristics:
- Adds javac to PATH based on default install paths on Windows
- Adds javac to PATH based on JAVA_HOME
- Adds android and adb to PATH based on ANDROID_HOME
- Sets ANDROID_HOME based on location of "android"
2014-08-15 13:46:20 -04:00
9c5e340fb8
Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)
...
Conflicts:
bin/templates/cordova/defaults.xml
framework/res/xml/config.xml
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-08 11:52:44 -04:00
e86c2e5970
Move registration of App plugin from config.xml -> code
...
Less fragile this way.
2014-07-08 11:47:26 -04:00
693ec14df5
Rename App->CoreAndroid in defaults.xml (related to 635a6279a9)
2014-06-17 20:55:55 -04:00
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
d5e8807756
Set version to 4.0.0-dev
2014-06-06 15:00:41 -04:00
7e9fdb3555
Remove Ant custom build directories
2014-06-05 13:11:14 -04:00
32e07c22d0
CB-6876 Show the correct executable name
2014-06-04 19:23:43 -04:00
d427c52aac
CB-6876 Fix the "print usage"
2014-06-04 19:12:55 -04:00
1641f09dc9
Revert "defaults.xml: Add AndroidLaunchMode preference"
...
This reverts commit 11fc6be328
2014-05-29 14:50:01 -04:00
22b1959333
Manually fix Android sdk location to support library projects without local.properties
2014-05-22 14:04:00 -04:00
00caa1c0a0
Set VERSION to 3.6.0-dev (via coho)
2014-05-06 15:51:14 -07:00
e6adbb0e42
CB-6543 Fix cordova/run failure when no custom_rules.xml available
...
Github: Close #99
2014-04-28 22:50:22 -04:00
11fc6be328
defaults.xml: Add AndroidLaunchMode preference
2014-04-25 00:27:33 +04:30
708c042b61
Set VERSION to 3.5.0-dev (via coho)
2014-01-22 16:30:02 -08:00
600599f49e
Fix type "LANCH" -> "LAUNCH"
2014-01-22 14:53:40 -05:00
f83d7a7cd1
CB-5793 Add work-around for library references not working with custom output directory (ugh).
2014-01-21 15:09:15 -05:00
7094047b3d
CB-5793 Forgot to update ant path for clean.
2014-01-20 10:26:53 -05:00
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
ef9ace9e65
CB-5803 Fix cordova/emulate on windows.
2014-01-16 13:19:39 -05:00
Andrew Grieve