cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject mac commit: @trivial remove patches and update docu
Date Fri, 28 Aug 2015 01:50:40 GMT
Repository: cordova-osx
Updated Branches:
  refs/heads/master 8110bbd0b -> 610107ecb


@trivial remove patches and update docu


Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/610107ec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/610107ec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/610107ec

Branch: refs/heads/master
Commit: 610107ecbc7dfec5796468172eb7a2e91d5ae060
Parents: 8110bbd
Author: Tobias Bocanegra <tripod@adobe.com>
Authored: Thu Aug 27 17:53:03 2015 -0700
Committer: Tobias Bocanegra <tripod@adobe.com>
Committed: Thu Aug 27 17:53:03 2015 -0700

----------------------------------------------------------------------
 README.md                 | 97 +++++++++++++++++++++++++-----------------
 patches/cordova-lib.patch | 31 --------------
 2 files changed, 58 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/610107ec/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e4606a2..c85db4f 100644
--- a/README.md
+++ b/README.md
@@ -29,47 +29,57 @@ Make sure you have installed the latest released OS X SDK which comes
with Xcode
 Download it at [http://developer.apple.com/downloads](http://developer.apple.com/downloads)

 or the [Mac App Store](http://itunes.apple.com/us/app/xcode/id497799835?mt=12).
 
-Add the Cordova OSX Platform the a CLI project
--------------------------------------------------------------
-1. get a patched version of cordova-lib
-    1. checkout the cordova-lib master. 
-    2. patch cordova-lib with the patch file provided in the `patches` directory to
-       enable the osx platform:
-       
-       ````
-       $ cordova-lib
-       $ cat ../cordova-osx/patches/cordova-lib.patch | patch -p1
-       patching file cordova-lib/src/platforms/platformsConfig.json
-       $ cd ..
-       ````
-    3. link the patched version to cordova-cli and cordova-plugman (see https://github.com/apache/cordova-lib#setup)
-    
-        ````
-        $ cd cordova-lib/cordova-lib
-        $ npm install && npm link
-        $ cd ../../cordova-cli
-        $ npm link cordova-lib && npm install 
-        $ cd ../cordova-plugman
-        $ npm link cordova-lib && npm install
-        ````
-    
+Add the Cordova OSX Platform to a CLI project
+---------------------------------------------
+Since OSX is not officially released yet, we need to use the development versions of the
respective modules where OSX was already added. currently those are:
+
+* _cordova-lib_
+* _cordova-plugman_
+* _cordova-plugin-file_
+
+### Use Development versions for your build
 
-2. Follow the instructions in the [**Command-Line Usage** section](http://cordova.apache.org/docs/en/edge/guide_cli_index.md.html#The%20Command-line%20Interface)
of the [Cordova Docs](http://cordova.apache.org/docs/en/edge). For example
+1. checkout the master branch of _cordova-lib_, _cordova-plugman_, _cordova-cli_ and all
the plugins you require
+2. link the development version if _cordova-lib_ to _cordova-cli_ and _cordova-plugman_ (see
https://github.com/apache/cordova-lib#setup)
+    
+   ````
+   $ cd cordova-lib/cordova-lib
+   $ npm install && npm link
+   $ cd ../../cordova-cli
+   $ npm link cordova-lib && npm install 
+   $ cd ../cordova-plugman
+   $ npm link cordova-lib && npm install
+   ````
+
+### Create your project
+   
+1. (Optionally) Follow the instructions in the [**Command-Line Usage** section](http://cordova.apache.org/docs/en/edge/guide_cli_index.md.html#The%20Command-line%20Interface)
of the [Cordova Docs](http://cordova.apache.org/docs/en/edge) to create a new project. For
example
     ````
     $ cordova create hello com.example.hello HelloWorld
     ````
 
-3. add the osx platform:
+2. add the osx platform:
 
-    ````
-    $ cordova platform add ../cordova-osx
-    $ cordova run osx
-    ````
+   ````
+   $ cordova platform add ../cordova-osx
+   $ cordova run osx
+   ````
+
+3. You can also open the project in XCode:
+
+   ````
+   $ open platforms/osx/<yourproject>.xcodeproj
+   ````
 
 
-You can also open the project in XCode:
+### Add plugins
 
-    $ open platforms/osx/<yourproject>.xcodeproj
+1. if you need the file-plugin add the master branch version, eg:
+
+   ````
+   $ cordova plugin add https://github.com/apache/cordova-plugin-file.git
+   ````
+    
 
 Create a Cordova OSX Standalone project
 -------------------------------------------------------------
@@ -77,15 +87,24 @@ Create a Cordova OSX Standalone project
 1. Download the source
 2. execute the `create` command to setup an empty project:
 
-    ````
-    $ bin/create <path_to_new_project> <package_name> <project_name>
-    ````
+   ````
+   $ bin/create <path_to_new_project> <package_name> <project_name>
+   ````
     
-    for example
+   for example
     
-    ````
-    $ bin/create ../Foo org.apache.foo FooBar
-    ````
+   ````
+   $ bin/create ../Foo org.apache.foo FooBar
+   ````
+
+### Add plugins
+
+1. if you need the file-plugin add the master branch version, eg:
+
+   ````
+   $ cordova plugin add https://github.com/apache/cordova-plugin-file.git
+   ````
+
 
 Updating a CordovaLib subproject reference in your project
 -------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/610107ec/patches/cordova-lib.patch
----------------------------------------------------------------------
diff --git a/patches/cordova-lib.patch b/patches/cordova-lib.patch
deleted file mode 100644
index 06760b4..0000000
--- a/patches/cordova-lib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/cordova-lib/src/platforms/platformsConfig.json b/cordova-lib/src/platforms/platformsConfig.json
-index a1eaf3f..e20fc83 100644
---- a/cordova-lib/src/platforms/platformsConfig.json
-+++ b/cordova-lib/src/platforms/platformsConfig.json
-@@ -6,6 +6,13 @@
-         "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git",
-         "version": "~3.9.0"
-     },
-+    "osx": {
-+        "hostos": ["darwin"],
-+        "parser_file": "../cordova/metadata/ios_parser",
-+        "handler_file": "../plugman/platforms/ios",
-+        "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-osx.git",
-+        "version": "~4.0.0"
-+    },
-     "android": {
-         "parser_file": "../cordova/metadata/android_parser",
-         "handler_file": "../plugman/platforms/android",
-diff --git a/cordova-lib/src/plugman/util/default-engines.js b/cordova-lib/src/plugman/util/default-engines.js
-index 16b5b33..0382b6e 100644
---- a/cordova-lib/src/plugman/util/default-engines.js
-+++ b/cordova-lib/src/plugman/util/default-engines.js
-@@ -29,6 +29,8 @@ module.exports = function(project_dir){
-             { 'platform':'android', 'scriptSrc': path.join(project_dir,'cordova','version')
},
-         'cordova-ios':
-             { 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','version')
},
-+        'cordova-osx':
-+            { 'platform':'osx', 'scriptSrc': path.join(project_dir,'cordova','version')
},
-         'cordova-blackberry10':
-             { 'platform':'blackberry10', 'scriptSrc': path.join(project_dir,'cordova','version')
},
-         'cordova-wp8':


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message