cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Marcel Kinard <cmarc...@gmail.com>
Subject git question
Date Thu, 21 Feb 2013 21:01:06 GMT
I was following the ContributorWorklow to fix these docs in both next and master. The commit
and push to next (see attached) looks good. However, when I did "git merge next" after "git
checkout master", I saw way more changes than I expected:
 289 files changed, 19759 insertions(+), 132 deletions(-)
All rhe 2.5.0rc1 files were added, and most if not all of the edge files had 2 or more line
changes each. That doesn't look right to me, so I did not do the "git push apache master".
I wanted to stop and ask for advice before I did any damage. Suggestions?

-- Marcel Kinard

Begin forwarded message:

> From: marcelk@apache.org
> Subject: docs commit: CB-2515: add lessons learned to the list of pre-reqs
> Date: February 21, 2013 3:46:08 PM EST
> To: commits@cordova.apache.org
> Reply-To: callback-dev@cordova.apache.org
> 
> Updated Branches:
>  refs/heads/next 10e89b559 -> 4c5e503e7
> 
> 
> CB-2515: add lessons learned to the list of pre-reqs
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/4c5e503e
> Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/4c5e503e
> Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/4c5e503e
> 
> Branch: refs/heads/next
> Commit: 4c5e503e7fdd9b407beb5ffc2a997ecc4e093151
> Parents: 10e89b5
> Author: Marcel Kinard <cmarcelk@gmail.com>
> Authored: Wed Feb 20 19:22:16 2013 -0500
> Committer: Marcel Kinard <cmarcelk@gmail.com>
> Committed: Thu Feb 21 15:39:56 2013 -0500
> 
> ----------------------------------------------------------------------
> .../guide/getting-started/windows-phone-8/index.md |   39 ++++++++-------
> 1 files changed, 20 insertions(+), 19 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/4c5e503e/docs/en/edge/guide/getting-started/windows-phone-8/index.md
> ----------------------------------------------------------------------
> diff --git a/docs/en/edge/guide/getting-started/windows-phone-8/index.md b/docs/en/edge/guide/getting-started/windows-phone-8/index.md
> index 9d09ce6..4f6aa5d 100644
> --- a/docs/en/edge/guide/getting-started/windows-phone-8/index.md
> +++ b/docs/en/edge/guide/getting-started/windows-phone-8/index.md
> @@ -28,42 +28,42 @@ Note: Applications built with Apache Cordova for Windows Phone 8
will only run o
> ---------------
> 
> - Operating System: 
> - - Windows 8, Windows 8 Pro
> +    - Windows 8 or Windows 8 Pro
> +        - The 64-bit version (x64) of Windows is required for the SDK.
> +        - The Pro version is recommended so you can run a device emulator.
> 
> - Hardware:
> - - 6.5 GB of free hard disk space
> - - 4 GB RAM
> - - 64-bit (x64) CPU
> +    - 6.5 GB of free hard disk space
> +    - 4 GB RAM
> +    - 64-bit (x64) CPU
> 
> -- Windows Phone 8 Emulator:
> - - Windows 8 Pro edition or greater
> - - Requires a processor that supports Second Level Address Translation (SLAT)
> +- Windows Phone 8 Emulator
> +    - The phone emulator uses Hyper-V, so this list includes those pre-reqs.
> +    - Windows 8 Pro 64-bit edition or greater
> +    - Requires a processor that supports virtualization and [Second Level Address Translation
(SLAT)](http://en.wikipedia.org/wiki/Second_Level_Address_Translation)
> +        - See the [list of Intel processors that support VT-x (virtualization) and EPT
(SLAT)](http://ark.intel.com/Products/VirtualizationTechnology)
> +    - Enable the virtualization capability (i.e., VT-x on Intel) in your BIOS settings,
as usually this is disabled by default.
> 
> - SDK + IDE ( Visual Studio )
> - - VS Express for Windows Phone ( included in the SDK )
> - - Visual Studio Professional, Premium, or Ultimate
> +    - Visual Studio 2012 Professional, Premium, or Ultimate. Note that Visual Studio
Express for Windows Phone (included in the SDK) is not recommended because you can not build
the template (see below) with VS Express, as it does not have the "Export Template" functionality,
which is only in VS Pro or higher.
> 
> -Note: Running in Virtual Machine might present some challenges. You can read this blog
post that gives insight on the solutions to develop for Windows Phone on a Mac: http://aka.ms/BuildaWP8apponaMac
> +- Register and pay for a [Windows Phone Dev Center](http://dev.windowsphone.com/en-us/publish)
account if you want to install your app on a real device and/or submit it to Market Place.
> 
> -Necessary for Installing on Device and Submitting to Market Place:
> -
> -- •	Register for the [Windows Phone Developer Center](http://dev.windowsphone.com/en-us/publish)
> +Note: Running the SDK in Virtual Machine might present some challenges. You can read
this blog post that gives insight on the solutions to develop for [Windows Phone on a Mac](http://aka.ms/BuildaWP8apponaMac).
> 
> 
> 2. Install SDK + Cordova
> ----------------------------
> 
> -- Download and install [Windows Phone  SDK](http://www.microsoft.com/en-us/download/details.aspx?id=35471)
> +- Download and install [Windows Phone SDK](http://www.microsoft.com/en-us/download/details.aspx?id=35471)
> - Download the latest copy of [Cordova](http://phonegap.com/download) and extract its
contents. We will be working with the subfolder: lib\windows-phone-8\
> - copy the file CordovaWP8AppFull-x.x.x.zip to the folder : \My Documents\Visual Studio
2012\Templates\ProjectTemplates\
> 
> 
> -
> -
> -
> 2.1. Building the template
> -----------------------------
> -Note: this step may not be required.  If the lib\windows-phone directory already contains
a file CordovaStarter-x.x.x.zip then you may skip this step )
> +Note: this step may not be required.  If the lib\windows-phone directory already contains
a file CordovaStarter-x.x.x.zip then you may skip this step.
> +
> In order to simplify the development process, Cordova comes with a Visual Studio template
that allows creating a Cordova application rapidly. This template can be modified if needed
and the below steps indicate how to proceed if you want to modify and re-generate the template.
> 
> - Open the file lib\windows-phone\templates\standalone\CordovaSolution.sln in Visual
Studio Express for Windows Phone
> @@ -74,15 +74,16 @@ In order to simplify the development process, Cordova comes with
a Visual Studio
> - Note: If you select ( 'Automatically import the template ... ') then you will not need
to copy the .zip file over as outlined in step 2.
> - Press 'Finish'
> 
> +
> 2.2 About the different templates
> --------------------
> Apache Cordova for Windows Phone 8 supports 2 different types of templates.  
> +
> The 'Full' template includes a pre-built dll containing all the framework code for Apache
Cordova.  This template will create a project that is easy to update, as you can simply replace
the JavaScript and .dll in your project and rebuild when a new version comes out. The downside
of this approach is that because the dll contains ALL of the Cordova API, it requires all
available permissions even if the APIs are not called.  When you submit an app to the App
store, Microsoft will run a static analyzer against your application, and detect that you
require all available permissions, and place a disclaimer on you app that is presented to
the user when they choose to install your app.  Users may be discouraged if they see a required
permission that does not make sense ( ie, why does this drawing program need access to my
media library and contacts ).
> 
> The 'Stand-Alone' template includes ALL the source code for Apache Cordova.  This project
is easier to fine-tune to use just the features you need, thereby working around the permissions
issues of the 'Full' template, however this type of project will be more difficult to update,
as you will need to update individual files within your project and manage any dependancies
yourself.  In order to exclude an API you are not using, you can simply right-click-select
the Command class file in Visual Studio and choose 'do not include in project'.
> 
> 
> -
> 3. Setup New Project
> --------------------
> 
> 


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message