Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 513D5115EE for ; Wed, 14 May 2014 00:09:47 +0000 (UTC) Received: (qmail 54370 invoked by uid 500); 14 May 2014 00:09:46 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 54212 invoked by uid 500); 14 May 2014 00:09:45 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 53904 invoked by uid 99); 14 May 2014 00:09:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 00:09:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E4C508B6C1A; Wed, 14 May 2014 00:09:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Wed, 14 May 2014 00:10:05 -0000 Message-Id: In-Reply-To: <052b2e60d3214179a7b9155a36518c15@git.apache.org> References: <052b2e60d3214179a7b9155a36518c15@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/24] git commit: Merge branch 'CB-5816' of https://github.com/Steckelfisch/cordova-firefoxos Merge branch 'CB-5816' of https://github.com/Steckelfisch/cordova-firefoxos Conflicts: package.json Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/9a15a5a5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/9a15a5a5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/9a15a5a5 Branch: refs/heads/master Commit: 9a15a5a562cc60c090534457d312cc2a4513ce09 Parents: 3ecb723 7800b1b Author: Steven Gill Authored: Tue May 13 16:52:33 2014 -0700 Committer: Steven Gill Committed: Tue May 13 16:52:33 2014 -0700 ---------------------------------------------------------------------- bin/lib/create.js | 24 +- bin/templates/project/cordova/build | 52 + bin/templates/project/cordova/clean | 37 + bin/templates/project/cordova/lib/build.js | 160 ++ bin/templates/project/cordova/lib/clean.js | 48 + .../adm-zip/.idea/scopes/scope_settings.xml | 5 + node_modules/adm-zip/MIT-LICENSE.txt | 21 + node_modules/adm-zip/README.md | 64 + node_modules/adm-zip/adm-zip.js | 404 +++++ node_modules/adm-zip/headers/entryHeader.js | 261 +++ node_modules/adm-zip/headers/index.js | 2 + node_modules/adm-zip/headers/mainHeader.js | 80 + node_modules/adm-zip/methods/deflater.js | 1578 ++++++++++++++++++ node_modules/adm-zip/methods/index.js | 2 + node_modules/adm-zip/methods/inflater.js | 448 +++++ node_modules/adm-zip/package.json | 39 + .../attributes_test/New folder/hidden.txt | 17 + .../New folder/hidden_readonly.txt | 17 + .../attributes_test/New folder/readonly.txt | 17 + .../attributes_test/New folder/somefile.txt | 17 + .../attributes_test/asd/New Text Document.txt | 0 .../test/assets/attributes_test/blank file.txt | 0 node_modules/adm-zip/test/index.js | 5 + node_modules/adm-zip/util/constants.js | 84 + node_modules/adm-zip/util/errors.js | 35 + node_modules/adm-zip/util/fattr.js | 84 + node_modules/adm-zip/util/index.js | 4 + node_modules/adm-zip/util/utils.js | 145 ++ node_modules/adm-zip/zipEntry.js | 224 +++ node_modules/adm-zip/zipFile.js | 311 ++++ package.json | 3 +- 31 files changed, 4182 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/9a15a5a5/package.json ---------------------------------------------------------------------- diff --cc package.json index 91ef532,c5f2201..6bd9b88 --- a/package.json +++ b/package.json @@@ -9,17 -12,18 +9,18 @@@ }, "keywords": [ "cordova", - "cli", - "tooling", - "firefoxos" + "firefoxos", + "apache" ], "dependencies": { - "shelljs": "^0.1.4" - "shelljs": "0.1.4", ++ "shelljs": "^0.1.4", + "adm-zip": "0.4.4" }, - "author": "Steve Gill", + "author": "Apache Software Foundation", "contributors": [ {"name": "James Long","email": "jlong@mozilla.com"}, - {"name": "Herm Wong", "email": "hermanw@adobe.com"} + {"name": "Herm Wong", "email": "hermanw@adobe.com"}, + {"name": "Steve Gill", "email": "steveng@adobe.com"}, ], - "license": "Apache V2" + "license": "Apache Version 2.0" }