[CB-1800] weinre: remove "incubator" from project
https://issues.apache.org/jira/browse/CB-1800
Mostly doc changes. Also changing name of built archive
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 @@
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 @@
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 @@
* 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 @@
* 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 @@
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 @@
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,
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 @@
<format property="BUILD_DATE" pattern="yyyy-MM-dd__HH-mm-ss" timezone="GMT"/>
</tstamp>
-->
-
+
<exec executable="node" outputproperty="BUILD_DATE">
<arg value="-e"/>
<arg value="console.log((new Date()).valueOf().toString(36).toUpperCase())"/>
</exec>
- <condition property="BUILD_VERSION" value="${WEINRE_VERSION}-${BUILD_DATE}-incubating">
+ <condition property="BUILD_VERSION" value="${WEINRE_VERSION}-${BUILD_DATE}">
<matches pattern=".*pre$" string="${WEINRE_VERSION}"/>
</condition>
-
- <condition property="BUILD_VERSION" value="${WEINRE_VERSION}-incubating">
+
+ <condition property="BUILD_VERSION" value="${WEINRE_VERSION}">
<not>
<matches pattern=".*pre$" string="${WEINRE_VERSION}"/>
</not>
</condition>
-
+
<property name="ARCH-SRC" value="apache-cordova-weinre-${BUILD_VERSION}-src"/>
<property name="ARCH-BIN" value="apache-cordova-weinre-${BUILD_VERSION}-bin"/>
<property name="ARCH-DOC" value="apache-cordova-weinre-${BUILD_VERSION}-doc"/>
@@ -79,8 +79,8 @@
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 @@
</echo>
</target>
-
+
<!-- ============================================================
do a build, but print message about help
============================================================ -->
@@ -99,7 +99,7 @@
<antcall target="build"/>
</target>
-
+
<!-- ============================================================
do a clean build
============================================================ -->
@@ -139,11 +139,11 @@
<mkdir dir="${OUT}"/>
<delete includeemptydirs="true">
<fileset dir="${OUT}" includes="**/*" excludes="build-done.txt"/>
- </delete>
-
- <exec
- executable = "git"
- outputproperty = "git-log"
+ </delete>
+
+ <exec
+ executable = "git"
+ outputproperty = "git-log"
failifexecutionfails = "false"
>
<arg line="log -1 --pretty=oneline"/>
@@ -154,21 +154,21 @@
<isset property="git-log"/>
</not>
</condition>
-
+
<property
name = "build-info-text"
value = "weinre build ${BUILD_VERSION} by ${BUILDER}"
/>
-
- <concat
- append = "no"
+
+ <concat
+ append = "no"
destfile = "${OUT}/build-info.txt"
>${build-info-text}
</concat> <!-- keep this outdented, since Ant is so wonderful -->
-
- <concat
- append = "yes"
- fixlastline = "yes"
+
+ <concat
+ append = "yes"
+ fixlastline = "yes"
eol = "lf"
destfile = "${OUT}/build-info.txt"
>git: ${git-log}
@@ -188,10 +188,10 @@
<antcall target="finished"/>
<antcall target="finished-growl"/>
-
+
<echo file="${OUT}/build-done.txt" message="${build-info-text} is finished!"/>
<echo file="${OUT}/version.txt" message="${BUILD_VERSION}"/>
-
+
</target>
<!-- ============================================================
@@ -506,7 +506,7 @@
<delete dir="${OUT}/files/${ARCH-SRC}"/>
<mkdir dir="${OUT}/files/${ARCH-SRC}"/>
<copy todir="${OUT}/files/${ARCH-SRC}" file="${OUT}/build-info.txt" />
-
+
<copy todir="${OUT}/files/${ARCH-SRC}" preservelastmodified="yes">
<fileset dir="..">
<exclude name="weinre.build/bin/**"/>
@@ -541,7 +541,7 @@
============================================================ -->
<target name="build-archives-ck" depends="build-archives">
-
+
<checksum file="${OUT}/archives/${ARCH-BIN}.zip" algorithm="MD5"/>
<checksum file="${OUT}/archives/${ARCH-DOC}.zip" algorithm="MD5"/>
<checksum file="${OUT}/archives/${ARCH-SRC}.zip" algorithm="MD5"/>
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"
}
}
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 @@
following repos:
<ul>
-<li>Apache repo: <td><a href="https://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre.git">https://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre.git</a>
-<li>GitHub repo: <td><a href="https://github.com/apache/incubator-cordova-weinre">https://github.com/apache/incubator-cordova-weinre</a>
+<li>Apache repo: <td><a href="https://git-wip-us.apache.org/repos/asf/cordova-weinre.git">https://git-wip-us.apache.org/repos/asf/cordova-weinre.git</a>
+<li>GitHub repo: <td><a href="https://github.com/apache/cordova-weinre">https://github.com/apache/cordova-weinre</a>
</ul>
<p>The Apache repo is the canonical repo. The url can be used in a web
browser, or as the argument of a <tt>git clone</tt> command.
<p>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 <tt>git clone</tt>.
-<p>See the file
-<tt><a href="https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-weinre.git;a=blob;f=README.md;hb=HEAD">README.md<a/></tt>
+<p>See the file
+<tt><a href="https://git-wip-us.apache.org/repos/asf?p=cordova-weinre.git;a=blob;f=README.md;hb=HEAD">README.md<a/></tt>
in the top-most directory of the source distribution for more instructions on
-how to perform a build. A <a href="https://github.com/apache/incubator-cordova-weinre/blob/master/README.md">markdown-processed version of the README file
+how to perform a build. A <a href="https://github.com/apache/cordova-weinre/blob/master/README.md">markdown-processed version of the README file
is available on GitHub</a>.
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 @@
<li><a href="https://issues.apache.org/jira/browse/CB-1666">CB-1666</a> - "INVALID_STATE_ERR: DOM Exception 11" with chbrody/Cordova-SQLitePlugin
<li><a href="https://issues.apache.org/jira/browse/CB-1759">CB-1759</a> - doc indicates that you should launch weinre with a command prefix of `node`
<li><a href="https://issues.apache.org/jira/browse/CB-1193">CB-1193</a> - add Windows Phone support
+<li><a href="https://issues.apache.org/jira/browse/CB-1800">CB-1800</a> - remove references to "incubator"
</ul>
<!-- ======================================================================= -->
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 @@
<a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12312420&components=12316604&issuetype=2">new feature</a>
<tr><td>cloneable source at Apache:
-<td><a href="https://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre.git">https://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre.git</a>
+<td><a href="https://git-wip-us.apache.org/repos/asf/cordova-weinre.git">https://git-wip-us.apache.org/repos/asf/cordova-weinre.git</a>
<tr><td>Apache repo cloned at GitHub:
-<td><a href="https://github.com/apache/incubator-cordova-weinre">https://github.com/apache/incubator-cordova-weinre</a>
+<td><a href="https://github.com/apache/cordova-weinre">https://github.com/apache/cordova-weinre</a>
<tr><td>mailing lists at Apache:
-<td><a href="http://incubator.apache.org/cordova/#mailing-list">http://incubator.apache.org/cordova/#mailing-list</a> (for weinre development)
+<td><a href="http://mail-archives.apache.org/mod_mbox/cordova-dev/">http://mail-archives.apache.org/mod_mbox/cordova-dev/</a> (for weinre development)
<tr><td>discussion at Google Group:
<td><a href="http://groups.google.com/group/weinre">http://groups.google.com/group/weinre</a> (for weinre usage)
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.
-->
-<p>Source specific to <span class="weinre">weinre</span> is all licensed under the
+<p>Source specific to <span class="weinre">weinre</span> is all licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-<p><span class="weinre">weinre</span> also makes use of third party code;
-the licensing details for those is available in the
-<a href="https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-weinre.git;a=blob;f=LICENSE;hb=HEAD">LICENSE</a>
+<p><span class="weinre">weinre</span> also makes use of third party code;
+the licensing details for those is available in the
+<a href="https://git-wip-us.apache.org/repos/asf?p=cordova-weinre.git;a=blob;f=LICENSE;hb=HEAD">LICENSE</a>
file in the top-most directory of the source distribution.
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 @@
<body>
<div class="ribbon">clone weinre at
-<a href="https://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre.git">apache</a>
+<a href="https://git-wip-us.apache.org/repos/asf?p=cordova-weinre.git">apache</a>
</div>
<!-- ======================================================================= -->
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 @@
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,
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 @@
utils = require './utils'
weinre = require './weinre'
-optionDefaults =
+optionDefaults =
httpPort: 8080
boundHost: 'localhost'
verbose: false
@@ -36,7 +36,7 @@
#-------------------------------------------------------------------------------
exports.run = ->
- knownOpts =
+ knownOpts =
httpPort: Number
boundHost: String
verbose: Boolean
@@ -44,14 +44,14 @@
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 @@
printHelp() if args.length != 0
#----
-
+
delete parsedOpts.argv
opts = _.extend {}, optionDefaults, getDotWeinreServerProperties(), parsedOpts
@@ -69,7 +69,7 @@
opts.deathTimeout = 3 * opts.readTimeout
utils.setOptions opts
-
+
weinre.run opts
#-------------------------------------------------------------------------------
@@ -79,7 +79,7 @@
#-------------------------------------------------------------------------------
printHelp = () ->
version = weinre.getVersion()
-
+
console.error """
usage: #{utils.Program} [options]
version: #{version}
@@ -91,21 +91,21 @@
--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 @@
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
