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 98F21DE70 for ; Fri, 30 Nov 2012 14:21:32 +0000 (UTC) Received: (qmail 86334 invoked by uid 500); 30 Nov 2012 14:21:32 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 86248 invoked by uid 500); 30 Nov 2012 14:21:31 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 86222 invoked by uid 99); 30 Nov 2012 14:21:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 14:21:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7A1A88162B5; Fri, 30 Nov 2012 14:21:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pmuellr@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: weinre commit: [CB-1800] weinre: remove "incubator" from project Message-Id: <20121130142130.7A1A88162B5@tyr.zones.apache.org> Date: Fri, 30 Nov 2012 14:21:30 +0000 (UTC) Updated Branches: refs/heads/master a9583e774 -> de980f8b0 [CB-1800] weinre: remove "incubator" from project https://issues.apache.org/jira/browse/CB-1800 Mostly doc changes. Also changing name of built archive Project: http://git-wip-us.apache.org/repos/asf/cordova-weinre/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-weinre/commit/de980f8b Tree: http://git-wip-us.apache.org/repos/asf/cordova-weinre/tree/de980f8b Diff: http://git-wip-us.apache.org/repos/asf/cordova-weinre/diff/de980f8b Branch: refs/heads/master Commit: de980f8b0de7c6472576aef1e4ab0b07d54534f7 Parents: a9583e7 Author: Patrick Mueller Authored: Fri Nov 30 09:19:21 2012 -0500 Committer: Patrick Mueller Committed: Fri Nov 30 09:19:21 2012 -0500 ---------------------------------------------------------------------- README.md | 60 +++++++++++++------------- weinre.build/build.xml | 52 ++++++++++++------------ weinre.build/package.json.template | 4 +- weinre.doc/Building.body.html | 12 +++--- weinre.doc/ChangeLog.body.html | 1 + weinre.doc/Home.body.html | 6 +- weinre.doc/License.body.html | 8 ++-- weinre.doc/boilerplate-header.html.txt | 2 +- weinre.server/README.md | 22 +++++----- weinre.server/lib/cli.coffee | 30 +++++++------- 10 files changed, 99 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 625c63c..27d006b 100644 --- a/README.md +++ b/README.md @@ -19,16 +19,16 @@ weinre is WEb INspector REmote. -Pronounced like the word "winery". Or maybe like the word "weiner". +Pronounced like the word "winery". Or maybe like the word "weiner". Who knows, really. -weinre is a debugger for web pages, -like FireBug (for FireFox) and Web Inspector (for WebKit-based browsers), -except it's designed to work remotely, and in particular, +weinre is a debugger for web pages, +like FireBug (for FireFox) and Web Inspector (for WebKit-based browsers), +except it's designed to work remotely, and in particular, to allow you debug web pages on a mobile device such as a phone. -weinre is part of the -[Apache Cordova project](http://incubator.apache.org/cordova/). +weinre is part of the +[Apache Cordova project](http://cordova.io/). For descriptive information, and links to downloads, installable things, etc see: [http://people.apache.org/~pmuellr/weinre/](http://people.apache.org/~pmuellr/weinre/) @@ -51,10 +51,10 @@ that weinre uses, and holds the output of the build building weinre --------------- -The weinre build is currently run on a Mac OS X 10.7 laptop. It also runs on -Apache continuous integration servers running Linux. The build is not -typically run on Windows, so if you have problems with that, please log an -issue. +The weinre build is currently run on a Mac OS X 10.7 laptop. It also runs on +Apache continuous integration servers running Linux. The build is not +typically run on Windows, so if you have problems with that, please log an +issue. The weinre build pre-req's the following tools: @@ -63,16 +63,16 @@ The weinre build pre-req's the following tools: To update the npm-based pre-reqs, you will also need: -* npm - should be shipped with node.js, on Linux may need to be installed as a -separate package +* npm - should be shipped with node.js, on Linux may need to be installed as a +separate package Before doing a weinre build, you will need to create the file -`weinre.build/personal.properties`. Use the `sample.personal.properties` as a +`weinre.build/personal.properties`. Use the `sample.personal.properties` as a template. The build should fail if this file is not available. -To update the version label of weinre, edit the file -`weinre.build/build.properties`. If the version has a `-pre` suffix, this -triggers the build to artifacts with timestamped names. For an 'official' +To update the version label of weinre, edit the file +`weinre.build/build.properties`. If the version has a `-pre` suffix, this +triggers the build to artifacts with timestamped names. For an 'official' build, do not use the `-pre` suffix. There are two ways to build weinre: @@ -94,7 +94,7 @@ These will be stored in the `weinre.build/cached` directory. * run: `cd weinre.build` * run: `ant build-archives` -This will run the development build (see below), and then create zip archives +This will run the development build (see below), and then create zip archives of the build in the `weinre.build/out/archives` directory. ### to perform the development build: ### @@ -102,8 +102,8 @@ of the build in the `weinre.build/out/archives` directory. * run: `cd weinre.build` * run: `ant` -This will populate a number of resources in the `weinre.server` directory, so -that you can run weinre directly from that directory for testing. It does not +This will populate a number of resources in the `weinre.server` directory, so +that you can run weinre directly from that directory for testing. It does not build the archives. ### performing a clean build: ### @@ -128,8 +128,8 @@ If you have the [grunt tool](https://github.com/cowboy/grunt) installed, there i a `grunt.js` file available to run the development builds when a source file changes. -The build is growl-enabled, so you can see a quick message when the build -completes, as long as the `USE_GROWL` property is set in the +The build is growl-enabled, so you can see a quick message when the build +completes, as long as the `USE_GROWL` property is set in the `weinre.build/personal.properties` file. The command `weinre.server/weinre-hot` makes use of @@ -137,22 +137,22 @@ The command `weinre.server/weinre-hot` makes use of weinre server generated by the development build, whenever a weinre build completes. -Putting this altogether, you can open two terminal windows, run `grunt` in the -main directory to have a development build run whenever you change -the source, and then run `weinre-hot` in the `weinre.server` directory to have -the weinre server restart whenever a build completes, getting a growl +Putting this altogether, you can open two terminal windows, run `grunt` in the +main directory to have a development build run whenever you change +the source, and then run `weinre-hot` in the `weinre.server` directory to have +the weinre server restart whenever a build completes, getting a growl notification at that time. updating 3rd party libraries ----------------------------- -> **IMPORTANT** - All 3rd party libraries are stored in the SCM, so that the -build does not require 3rd party packages to be downloaded. As such, these -files need to be ok to use and store in the SCM, given their licenses. If -you're adding or updating a 3rd party library, make sure the license is +> **IMPORTANT** - All 3rd party libraries are stored in the SCM, so that the +build does not require 3rd party packages to be downloaded. As such, these +files need to be ok to use and store in the SCM, given their licenses. If +you're adding or updating a 3rd party library, make sure the license is acceptable, and add/update the license in the top-level `LICENSE` file. -All of the 3rd party dependencies used with weinre are stored in one of two +All of the 3rd party dependencies used with weinre are stored in one of two directories: * `weinre.build/vendor` - contains libraries used in the client and/or target, http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.build/build.xml ---------------------------------------------------------------------- diff --git a/weinre.build/build.xml b/weinre.build/build.xml index cdd3060..6917c0b 100644 --- a/weinre.build/build.xml +++ b/weinre.build/build.xml @@ -43,22 +43,22 @@ --> - + - + - - + + - + @@ -79,8 +79,8 @@ ant targets available: runs `build` build-clean - runs `clean` then `build` clean - removes transient build files - -the file `personal.properties` must be available in the same + +the file `personal.properties` must be available in the same directory as this ant file. Use the file `sample.personal.properties` as a template. @@ -89,7 +89,7 @@ To update the weinre dependencies, use - + @@ -99,7 +99,7 @@ To update the weinre dependencies, use - + @@ -139,11 +139,11 @@ To update the weinre dependencies, use - - - + + @@ -154,21 +154,21 @@ To update the weinre dependencies, use - + - - ${build-info-text} - - git: ${git-log} @@ -188,10 +188,10 @@ To update the weinre dependencies, use - + - + - + http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.build/package.json.template ---------------------------------------------------------------------- diff --git a/weinre.build/package.json.template b/weinre.build/package.json.template index 15d21e0..71f3762 100644 --- a/weinre.build/package.json.template +++ b/weinre.build/package.json.template @@ -32,11 +32,11 @@ "weinre": "./weinre" }, "homepage": "http://people.apache.org/~pmuellr/weinre/", - "bugs": "https://issues.apache.org/jira/secure/IssueNavigator.jspa?jqlQuery=project=CB+and+component=weinre", + "bugs": "https://issues.apache.org/jira/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project%3DCB+and+component%3Dweinre&runQuery=true&clear=true", "repository": { "type": "git", - "url": "https://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre.git" + "url": "https://git-wip-us.apache.org/repos/asf/cordova-weinre.git" } } http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.doc/Building.body.html ---------------------------------------------------------------------- diff --git a/weinre.doc/Building.body.html b/weinre.doc/Building.body.html index 40e79a2..edbee12 100644 --- a/weinre.doc/Building.body.html +++ b/weinre.doc/Building.body.html @@ -25,19 +25,19 @@ page for more information on downloading a source archive. following repos:

The Apache repo is the canonical repo. The url can be used in a web browser, or as the argument of a git clone command.

The GitHub repo is a clone of the Apache repo, and automatically shadowed -at some regular interval. The url is the web view of the repo, from +at some regular interval. The url is the web view of the repo, from which you can obtain a url to use with git clone. -

See the file -README.md +

See the file +README.md in the top-most directory of the source distribution for more instructions on -how to perform a build. A markdown-processed version of the README file +how to perform a build. A markdown-processed version of the README file is available on GitHub. http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.doc/ChangeLog.body.html ---------------------------------------------------------------------- diff --git a/weinre.doc/ChangeLog.body.html b/weinre.doc/ChangeLog.body.html index 3a33546..2c0a98c 100644 --- a/weinre.doc/ChangeLog.body.html +++ b/weinre.doc/ChangeLog.body.html @@ -51,6 +51,7 @@

  • CB-1666 - "INVALID_STATE_ERR: DOM Exception 11" with chbrody/Cordova-SQLitePlugin
  • CB-1759 - doc indicates that you should launch weinre with a command prefix of `node`
  • CB-1193 - add Windows Phone support +
  • CB-1800 - remove references to "incubator" http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.doc/Home.body.html ---------------------------------------------------------------------- diff --git a/weinre.doc/Home.body.html b/weinre.doc/Home.body.html index cb3cf6a..8ae39c3 100644 --- a/weinre.doc/Home.body.html +++ b/weinre.doc/Home.body.html @@ -51,13 +51,13 @@ or new feature cloneable source at Apache: -https://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre.git +https://git-wip-us.apache.org/repos/asf/cordova-weinre.git Apache repo cloned at GitHub: -https://github.com/apache/incubator-cordova-weinre +https://github.com/apache/cordova-weinre mailing lists at Apache: -http://incubator.apache.org/cordova/#mailing-list (for weinre development) +http://mail-archives.apache.org/mod_mbox/cordova-dev/ (for weinre development) discussion at Google Group: http://groups.google.com/group/weinre (for weinre usage) http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.doc/License.body.html ---------------------------------------------------------------------- diff --git a/weinre.doc/License.body.html b/weinre.doc/License.body.html index ef7ab64..c0e9ca0 100644 --- a/weinre.doc/License.body.html +++ b/weinre.doc/License.body.html @@ -17,10 +17,10 @@ * under the License. --> -

    Source specific to weinre is all licensed under the +

    Source specific to weinre is all licensed under the Apache License, Version 2.0. -

    weinre also makes use of third party code; -the licensing details for those is available in the -LICENSE +

    weinre also makes use of third party code; +the licensing details for those is available in the +LICENSE file in the top-most directory of the source distribution. http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.doc/boilerplate-header.html.txt ---------------------------------------------------------------------- diff --git a/weinre.doc/boilerplate-header.html.txt b/weinre.doc/boilerplate-header.html.txt index b33bec7..2a279d1 100644 --- a/weinre.doc/boilerplate-header.html.txt +++ b/weinre.doc/boilerplate-header.html.txt @@ -29,7 +29,7 @@

    clone weinre at -apache +apache
    http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.server/README.md ---------------------------------------------------------------------- diff --git a/weinre.server/README.md b/weinre.server/README.md index 935a407..ec562e5 100644 --- a/weinre.server/README.md +++ b/weinre.server/README.md @@ -17,18 +17,18 @@ * under the License. --> -weinre is WEb INspector REmote. -Pronounced like the word "winery". -Or maybe like the word "weiner". +weinre is WEb INspector REmote. +Pronounced like the word "winery". +Or maybe like the word "weiner". Who knows, really. -weinre is a debugger for web pages, -like FireBug (for FireFox) and Web Inspector (for WebKit-based browsers), -except it's designed to work remotely, and in particular, +weinre is a debugger for web pages, +like FireBug (for FireFox) and Web Inspector (for WebKit-based browsers), +except it's designed to work remotely, and in particular, to allow you debug web pages on a mobile device such as a phone. For more information on weinre: -[http://http://incubator.apache.org/callback/](http://incubator.apache.org/callback/) +[http://people.apache.org/~pmuellr/weinre/](http://people.apache.org/~pmuellr/weinre/) running ------- @@ -39,17 +39,17 @@ and browse the documentation online. Start the server with the following command node weinre - + This will start the server, and display a message with the URL to the -server. Browse to that URL in your web browser, and then click on +server. Browse to that URL in your web browser, and then click on 'documentation' link, which will display weinre's online documentation. -From there click on the 'Running' page to get more information about +From there click on the 'Running' page to get more information about running weinre. source ------ -Follow the link for more information at the top of this file +Follow the link for more information at the top of this file for instructions on obtaining source. If you're reading this file as part of the source distribution of weinre, http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/de980f8b/weinre.server/lib/cli.coffee ---------------------------------------------------------------------- diff --git a/weinre.server/lib/cli.coffee b/weinre.server/lib/cli.coffee index 390d280..197e39c 100644 --- a/weinre.server/lib/cli.coffee +++ b/weinre.server/lib/cli.coffee @@ -26,7 +26,7 @@ nopt = require 'nopt' utils = require './utils' weinre = require './weinre' -optionDefaults = +optionDefaults = httpPort: 8080 boundHost: 'localhost' verbose: false @@ -36,7 +36,7 @@ optionDefaults = #------------------------------------------------------------------------------- exports.run = -> - knownOpts = + knownOpts = httpPort: Number boundHost: String verbose: Boolean @@ -44,14 +44,14 @@ exports.run = -> readTimeout: Number deathTimeout: Number help: Boolean - - shortHands = + + shortHands = '?': ['--help'] 'h': ['--help'] - + nopt.invalidHandler = printNoptError parsedOpts = nopt(knownOpts, shortHands, process.argv, 2) - + #---- printHelp() if parsedOpts.help @@ -61,7 +61,7 @@ exports.run = -> printHelp() if args.length != 0 #---- - + delete parsedOpts.argv opts = _.extend {}, optionDefaults, getDotWeinreServerProperties(), parsedOpts @@ -69,7 +69,7 @@ exports.run = -> opts.deathTimeout = 3 * opts.readTimeout utils.setOptions opts - + weinre.run opts #------------------------------------------------------------------------------- @@ -79,7 +79,7 @@ printNoptError = (key, val, types) -> #------------------------------------------------------------------------------- printHelp = () -> version = weinre.getVersion() - + console.error """ usage: #{utils.Program} [options] version: #{version} @@ -91,21 +91,21 @@ options: --debug print even more diagnostics default: #{optionDefaults.debug} --readTimeout seconds to wait for a client message default: #{optionDefaults.readTimeout} --deathTimeout seconds to wait to kill client default: 3*readTimeout - + --boundHost can be an ip address, hostname, or -all-, where -all- means binding to all ip address on the current machine' -for more info see: http://incubator.apache.org/callback/ +for more info see: http://people.apache.org/~pmuellr/weinre/ """ process.exit() #------------------------------------------------------------------------------- getDotWeinreServerProperties = () -> properties = {} - + fileName = replaceTilde '~/.weinre/server.properties' return properties if !utils.fileExistsSync(fileName) - + contents = fs.readFileSync(fileName, 'utf8') lines = contents.split('\n') @@ -113,10 +113,10 @@ getDotWeinreServerProperties = () -> line = line.replace(/#.*/,'') match = line.match /\s*(\w+)\s*:\s*(.+)\s*/ continue if !match - + key = utils.trim match[1] val = utils.trim match[2] - + properties[key] = val properties