Andrew Grieve
30e8b818f5
Merge branch 'master' into 4.0.x (error messages)
2014-09-12 14:21:47 -04:00
Andrew Grieve
525ce0e0ad
CB-7536 Tweak error messages for missing JDK / SDK / AVDs
2014-09-12 14:19:13 -04:00
Ian Clelland
dd5a337a49
Merge branch 'master' into 4.0.x
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
Ian Clelland
0e78dc35d8
CB-7512: Read android target from project.properties if possible
2014-09-10 11:39:29 -04:00
Ian Clelland
c8bbdb23de
CB-7512: Determine SDK and build tools version dynamcally at build time
2014-09-10 10:57:43 -04:00
Ian Clelland
7ee8117186
CB-7463: Adding licence to project template gradle file
2014-09-10 10:54:21 -04:00
Steven Gill
91cf78f183
Set VERSION to 3.7.0-dev (via coho)
2014-08-29 16:34:12 -07:00
Ian Clelland
0b6b068097
CB-3445: Allow build and run scripts to select APK by architecture
2014-08-29 16:00:54 -04:00
Ian Clelland
4bc2051f44
CB-3445: Allow build and run scripts to select APK by architecture
2014-08-29 16:00:13 -04:00
Ian Clelland
623b2306ca
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
2014-08-28 16:18:51 -04:00
Ian Clelland
34dde53506
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
2014-08-28 16:18:02 -04:00
Ian Clelland
7a09182446
CB-3445: Ensure that JAR files in libs directory are included
2014-08-28 13:17:26 -04:00
Ian Clelland
233e513860
CB-3445: Ensure that JAR files in libs directory are included
2014-08-28 11:26:58 -04:00
Ian Clelland
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
Ian Clelland
b2776269cf
Merge branch 'master' into 4.0.x (Gradle library dependencies)
2014-08-20 11:43:58 -04:00
Ian Clelland
b6c5a5fc9a
CB-3445: Read project.properties to configure gradle libraries
2014-08-20 11:42:04 -04:00
Andrew Grieve
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
Andrew Grieve
71e72f215d
CB-7335 Add a .gitignore to android project template
2014-08-19 11:59:18 -04:00
Andrew Grieve
58cdfd86d0
CB-7330 Fix dangling function call in last commit (broke gradle builds)
2014-08-19 11:53:53 -04:00
Andrew Grieve
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
Andrew Grieve
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
Andrew Grieve
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
Andrew Grieve
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
Ian Clelland
a91bd095b0
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-08-18 09:48:31 -04:00
Ian Clelland
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
Ian Clelland
8aa813b862
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-08-18 09:48:31 -04:00
Andrew Grieve
95aa5c9f1c
CB-7321 Don't require ant for create script
2014-08-15 13:58:53 -04:00
Andrew Grieve
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
Andrew Grieve
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
Andrew Grieve
e86c2e5970
Move registration of App plugin from config.xml -> code
...
Less fragile this way.
2014-07-08 11:47:26 -04:00
Andrew Grieve
1571b26a65
Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
framework/src/org/apache/cordova/CordovaWebViewClient.java
framework/src/org/apache/cordova/PluginManager.java
2014-07-07 16:23:51 -04:00
Andrew Grieve
0f15608175
CB-4404 Revert setting android:windowSoftInputMode to "adjustPan"
...
"adjustResize" is what the value has been set to for the longest time (due to it
being in the wrong place in the manifest). "adjustResize" is a better default value anyways.
2014-07-07 13:07:51 -04:00
Andrew Grieve
705991e5b0
Refactor: Use ConfigXmlParser in activity. Adds CordovaWebView.init()
...
This does subtly change the API surface due to CordovaWebView.init(),
but only minimally, and is backwards compatibly with the default
generated projects from prior versions.
2014-07-04 16:32:09 -04:00
Andrew Grieve
96a1192474
Merge branch 'master' into 4.0.x (back button default behaviour fix)
...
Conflicts:
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-06-23 14:50:01 -04:00
Ian Clelland
0ffb5d253a
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-06-19 16:12:40 -04:00
Andrew Grieve
693ec14df5
Rename App->CoreAndroid in defaults.xml (related to 635a6279a9
)
2014-06-17 20:55:55 -04:00
Ian Clelland
fa189b3234
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-06-17 17:36:26 -04:00
Joe Bowser
663a919ed1
CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works
2014-06-12 11:47:41 -07:00
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
Andrew Grieve
743541218f
CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
2014-06-03 16:08:35 -04:00
Andrew Grieve
94de0a7ce2
Add a comment to custom_rules.xml saying why we move AndroidManifest.xml
2014-06-03 15:29:06 -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
Ian Clelland
97008305ff
Merge branch 'master' into pluggable_webview
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-05-15 15:59:11 -04:00
Joe Bowser
00caa1c0a0
Set VERSION to 3.6.0-dev (via coho)
2014-05-06 15:51:14 -07:00
Ningxin Hu
4a67dd2e28
Crosswalk runtime needs the two permissions to auto detect connection status.
...
See more details at: https://crosswalk-project.org/jira/browse/XWALK-1324
2014-04-29 22:50:11 -04: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
Michal Mocny
298cd9e065
Fix CB-6048: Set launchMode=singleTop so tapping app icon does not always restart app
2014-04-01 11:33:40 -04:00
Marcel Kinard
87285d94f7
CB-5908: add splascreen images to template
...
This will enable the default splashscreens to reside in the correct place
after creating a new project. Before only the default icons were present.
I copied these from cordova-app-hello-world.
2014-02-10 16:56:45 -05:00
Andrew Grieve
5b2a73e3eb
CB-5715 For CLI, hide assets/www and res/xml/config.xml by default
...
Add a helper file under assets to say how to re-show the hidden files.
Move the config.xml, www, merges entries to the root to be more discoverable.
2014-01-28 00:28:42 -05:00
Andrew Grieve
6f163a6ba5
CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ as a project when importing
2014-01-25 21:58:28 -05:00
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
1fe7bbbbc4
CB-5793 Make ant work-around work on windows.
2014-01-21 21:14:32 -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
fcae58d355
CB-4910 Fix CLI's eclipse project template not working on windows due to "*" in the virtual folder name.
2014-01-17 12:00:29 -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
Andrew Grieve
51abf5b0a6
CB-4910 Update CLI project template to point to config.xml at the root now that it's not in www/ by default.
2014-01-14 12:29:53 -05:00
Andrew Grieve
5e0479e414
CB-5715 Add Eclipse .project file to create template.
...
Adds resource filter to hide CordovaLib/, platform_www/, and cordova/.
Adds linked resources to root www/, merges/, config.xml
2014-01-02 16:40:48 -05:00
Andrew Grieve
942c77816d
CB-5447 Removed android:debuggable=“true” from project template.
2013-12-30 11:27:17 -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
charles bourasseau
e646a0840d
Add missing semicolon
2013-12-05 12:41:28 -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
34bdef9c45
[CB-4817] Remove unused assets in project template.
2013-09-13 23:07:41 -04:00
Andrew Grieve
cad673f8cd
[CB-4817] Avoid generating unused files in create script
...
by using "android update project" instead of "android create project"
2013-09-13 22:49:15 -04:00
Joe Bowser
39d32bcb5b
CB-4620: Throwing this over the fence, since there is a problem actually in the wild here
2013-09-11 15:02:00 -07: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
Andrew Grieve
a97487bcec
[CB-4048] Merge branch '3.0.0' into master
2013-06-28 11:59:54 -04: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
5ee178789f
Axed all permissions from template manifest except for INTERNET. Bumped minSDkVersion to 10.
2013-06-17 11:23:17 -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
Andrew Grieve
8a95ed8ee6
[CB-3307] Rename cordova-VERSION.js -> cordova.js
2013-05-08 09:52:56 -04: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
Joe Bowser
b42c918973
Prep for 2.6.0 final
2013-04-01 14:54:51 -07:00
Joe Bowser
31bc015cdd
Pre-2.6 prep
2013-03-21 10:35:09 -07:00
Joe Bowser
fb1455a17b
Preparing to tag 2.5.0
2013-02-26 13:49:47 -08:00
Joe Bowser
5cd17730b1
Tagging 2.5.0rc1. Updating files
2013-02-19 11:53:36 -08:00
Joe Bowser
db099e7722
Preparing for 2.4.0
2013-02-04 11:12:52 -08:00
Andrew Grieve
d29eb84010
Tagging 2.4.0rc2
2013-01-30 09:51:40 -05:00
Fil Maj
09035eb4c4
Setting template AndroidManifest values for version to 1.0 and code to 1.
2013-01-23 12:13:07 -08:00
Joe Bowser
dbfe12a993
Partial fix for CB-2269, we probably shoudln't call Config.init twice
2013-01-18 16:41:10 -08:00
Joe Bowser
679de40780
2.4.0rc1 updating
2013-01-18 15:33:38 -08:00
Braden Shepherdson
55074b925f
Added a comment to explain where the start page is getting set.
2013-01-11 10:24:03 -08:00
Braden Shepherdson
958424ce59
Add configurable start location to config.xml and template
...
Still possible to hardcode, there's a comment in the template showing
how that can be done.
2013-01-11 10:24:02 -08:00
Braden Shepherdson
d04fc289ac
Move config.xml parsing into its own Config class
...
Now the parsing happens very early in the bootstrap process, before
loadUrl() is called. This enables a future change to put the start page
in config.xml instead of hardcoding it.
2013-01-11 10:24:02 -08:00
Joe Bowser
7c069f14f8
Incrementing version to 2.3.0 final
2013-01-02 17:07:21 -08:00
Joe Bowser
6efeb1471c
Incremeting version to 2.3.0rc2
2012-12-10 14:26:38 -08:00
Simon MacDonald
7b3724972b
Tagging to 2.3.0rc1
2012-11-26 16:09:52 -05: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
Joe Bowser
e55327b064
Tagging the 2.2.0 release after this commit
2012-10-31 10:57:57 -07:00
Joe Bowser
bef0d47924
Starting incrementing the tag to RC2
2012-10-24 12:06:00 -07:00
Joe Bowser
d3ee322d7c
Updating Hello World
2012-10-15 14:19:46 -07:00
Joe Bowser
08dfb13dbf
Updating Android to 2.2.0rc1
2012-10-15 13:52:19 -07:00
Simon MacDonald
451688a12e
CB-1126: Splashscreen
2012-09-18 11:49:11 -04:00
Simon MacDonald
37b3e980dc
CB-1362: We should add android:hardwareAccelerated=true to the template manifest.xml
2012-09-17 22:09:51 -04:00
Josh Soref
1bc49fe450
Spelling: explicitly
2012-09-17 22:09:51 -04: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
Joe Bowser
5c60b09bf4
Updating the manifest so that it is correct
2012-09-13 11:46:31 -07:00
Simon MacDonald
59a3cf93e6
Tagging 2.1.0
2012-09-12 11:44:53 -04:00
Simon MacDonald
dc40d8afac
CB-1335: Update www/ Application
2012-09-03 13:42:15 -04:00
Simon MacDonald
774d21747a
Tagging 2.1.0rc2
2012-08-31 16:44:53 -04:00
macdonst
f111c245c1
Tagging 2.1.0rc1
2012-08-24 16:44:18 -04:00
macdonst
a219feaa60
Downgrade min sdk version of sample app
2012-08-13 13:30:27 -04:00
Joe Bowser
f2afa4dd50
Tweaking the Android Manfest to cope with new target changes: CB-1147
2012-07-27 13:31:25 -07:00
Joe Bowser
b9b2c6a013
Updating sample project
2012-07-23 10:43:23 -07:00
Joe Bowser
93ec092eaf
Forgot to add the example app. Works with the script
2012-07-20 09:57:26 -07:00
Joe Bowser
29ae492983
Upping the version to 2.0.0
2012-07-18 16:58:03 -07:00