[CB-315] generate valid Apache release artifacts names

- additional set of updates related to CB-315
- mainly doc hits
- now packaging for `npm install weinre` convenience

README.md

@@ -109,21 +109,24 @@ build the archives.
 * run: `ant clean`
 * perform the build as usual
 
+### other ant goodies: ###
+
+* run: `cd weinre.build`
+* run: `ant help`
+
 ### to run the output of the development build: ###
 
 * run: `cd weinre.server`
 * run: `./weinre [your flavorite options]`
 
 ### other fun development-time hacks ###
 
-If you have the [wr tool](https://github.com/pmuellr/wr) installed, there are
-two `.wr` files available to run the two builds.  If you run `wr` in the 
-top-level directory, a full build is performed when the source changes.  If you 
-run `wr` in the `weinre.build` directory, a development-time build is 
-performed.
+If you have the [wr tool](https://github.com/pmuellr/wr) installed, there is
+a `.wr` file available to run the development builds.
 
 The build is growl-enabled, so you can see a quick message when the build 
-completes.
+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
 [node-supervisor](https://github.com/isaacs/node-supervisor) to re-launch the
@@ -151,7 +154,7 @@ directories:
 * `weinre.build/vendor` - contains libraries used in the client and/or target,
 as well as libraries used by the build itself
 
-* `weinre.server/node_modules` - contains npm packages used by the weinre.server
+* `weinre.server/node_modules` - contains npm packages used by the weinre server
 
 To update the files in `weinre.build/vendor`:
 

weinre.build/build.xml

@@ -190,6 +190,7 @@ To update the weinre dependencies, use
         <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>
 

weinre.build/package.json.template

@@ -31,8 +31,8 @@
     {
       "weinre":        "./weinre"
     },
-  "homepage":          "http://incubator.apache.org/callback/",
-  "bugs":              "https://issues.apache.org/jira/browse/CB",
+  "homepage":          "http://people.apache.org/~pmuellr/weinre/",
+  "bugs":              "https://issues.apache.org/jira/secure/IssueNavigator.jspa?jqlQuery=project=CB+and+component=weinre",
   "repository":
     {
       "type":          "git",

weinre.build/vendor.properties

@@ -21,10 +21,5 @@
 # version / location of WebKit Web Inspector
 #-----------------------------------------------------------
 
-#WEBKIT_VERSION:         r67358
-#WEBKIT_VERSION:         r70098
-#WEBKIT_VERSION:         r76802
-#WEBKIT_VERSION:         r77127
-#WEBKIT_VERSION:         r77819
 WEBKIT_VERSION:          r78584
 WEBKIT_URL_PREFIX:       https://svn.webkit.org/repository/webkit/trunk

weinre.doc/ChangeLog.body.html

@@ -17,11 +17,6 @@
  * under the License.
 -->
 
-<!-- ======================================================================= -->
-<h2>Downloads</h2>
-
-<p><a href="https://github.com/callback/callback-weinre/downloads">https://github.com/callback/callback-weinre/downloads</a>
-
 <!-- ======================================================================= -->
 <h2>2012/??/?? - version 2.0.0</h2>
 
@@ -31,6 +26,25 @@ <h2>2012/??/?? - version 2.0.0</h2>
 
 </ul>
 
+<p>issues resolved:
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/CB-10" >CB-10</a>  - Apache source headers in callback-weinre
+<li><a href="https://issues.apache.org/jira/browse/CB-36" >CB-36</a>  - move/delete GitHub issues at phonegap/weinre and callback/callback-weinre into the Apache Callback JIRA
+<li><a href="https://issues.apache.org/jira/browse/CB-83" >CB-83</a>  - implement the server in node
+<li><a href="https://issues.apache.org/jira/browse/CB-100">CB-100</a> - fix issues regarding pre-req licenses for weinre distribution
+<li><a href="https://issues.apache.org/jira/browse/CB-175">CB-175</a> - error when XHR contentType is null
+<li><a href="https://issues.apache.org/jira/browse/CB-176">CB-176</a> - add vendor files to weinre instead of pulling in at build time
+<li><a href="https://issues.apache.org/jira/browse/CB-182">CB-182</a> - error when XHR contentType is null
+<li><a href="https://issues.apache.org/jira/browse/CB-232">CB-232</a> - rename assets from PhoneGap to Cordova
+<li><a href="https://issues.apache.org/jira/browse/CB-257">CB-257</a> - the README.md in the weinre-node distribution is bogus
+<li><a href="https://issues.apache.org/jira/browse/CB-259">CB-259</a> - create a weinre tarball as a build archive that is npm install-able
+<li><a href="https://issues.apache.org/jira/browse/CB-266">CB-266</a> - weinre runtime error if you don't have a ~/.weinre/server.settings file	Unassigned
+<li><a href="https://issues.apache.org/jira/browse/CB-284">CB-284</a> - invocation exception on WeinreClientEventsImpl.connectionCreated(): TypeError: Cannot read property 'url' of undefined
+<li><a href="https://issues.apache.org/jira/browse/CB-288">CB-288</a> - re-version as 2.0.0
+<li><a href="https://issues.apache.org/jira/browse/CB-293">CB-293</a> - bullet-proof modjewel
+<li><a href="https://issues.apache.org/jira/browse/CB-294">CB-294</a> - various exceptions thrown in the target in WeinreTargetEventsImpl.connectionCreated()
+<li><a href="https://issues.apache.org/jira/browse/CB-315">CB-315</a> - generate valid Apache release artifact names
+</ul>
 
 <!-- ======================================================================= -->
 <h2>2011/12/01 - version 1.6.1</h2>

weinre.doc/Home.body.html

@@ -31,12 +31,37 @@
 
 <p>Interesting places to visit:
 <table>
-<tr><td>- videos at YouTube:               <td><a href="http://www.youtube.com/results?search_query=weinre">http://www.youtube.com/results?search_query=weinre</a>
-<tr><td>- this documentation at Apache:    <td><a href="http://people.apache.org/~pmuellr/">http://people.apache.org/~pmuellr/</a> [temporary]</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>
-<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>
-<tr><td>- mailing lists at Apache:         <td><a href="http://incubator.apache.org/cordova/#mailing-list">http://incubator.apache.org/cordova/#mailing-list</a> (use callback-dev)
-<tr><td>- discussion at Google Group:      <td><a href="http://groups.google.com/group/weinre">http://groups.google.com/group/weinre</a>
+
+<tr><td>videos at YouTube:
+<td><a href="http://www.youtube.com/results?search_query=weinre">http://www.youtube.com/results?search_query=weinre</a>
+
+<tr><td>this documentation:
+<td><a href="http://people.apache.org/~pmuellr/weinre/">http://people.apache.org/~pmuellr/weinre/</a> [temporary]</a>
+
+<tr><td>unofficial binary packages:
+<td><a href="http://people.apache.org/~pmuellr/weinre/">http://people.apache.org/~pmuellr/weinre/</a> [temporary]</a>
+
+<tr><td>issues:
+<td><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?jqlQuery=project=CB+and+component=weinre">https://issues.apache.org/jira/gobble-de-gook/...</a>
+
+<tr><td>create a new issue:
+<td>
+<a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12312420&components=12316604&issuetype=1">bug</a>
+or
+<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>
+
+<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>
+
+<tr><td>mailing lists at Apache:
+<td><a href="http://incubator.apache.org/cordova/#mailing-list">http://incubator.apache.org/cordova/#mailing-list</a> (use callback-dev)
+
+<tr><td>discussion at Google Group:
+<td><a href="http://groups.google.com/group/weinre">http://groups.google.com/group/weinre</a>
+
 </table>
 
 <p>More information on <span class="weinre">weinre</span>'s big brothers, Web Inspector / Google Chrome
@@ -124,13 +149,6 @@ <h2>Supported Libraries and Platforms</h2>
 Later versions of those things are also hopefully supported,
 but let us know.
 
-<h3>Platforms not supported</h3>
-
-<ul>
-<li>iOS 3.1.3 or earlier
-<li>webOS 1.45 or earlier
-</ul>
-
 <h3>Libraries not supported</h3>
 
 <ul>
@@ -148,18 +166,25 @@ <h3>Platforms supported - debug client</h3>
 <p>The browser where the debugger user interface runs.
 
 <ul>
-<li>Google Chrome 8.x
-<li>Apple Safari 5.x
+<li>Google Chrome
+<li>Apple Safari
+<li>Other recent-ish WebKit-based browsers
 </ul>
 
 <h3>Platforms supported - debug target</h3>
 <p>The browser with the page you are debugging.
 
 <ul>
-<li>Android 2.2 Browser application
-<li>Android 2.2 w/PhoneGap 0.9.2
-<li>iOS 4.2.x Mobile Safari application
-<li>BlackBerry v6.x simulator
-<li>webOS 2.x (unspecified version)
+<li>Android Browser application
+<li>iOS Mobile Safari application
+<li>PhoneGap/Cordova
+<li>other
+</ul>
+
+<h3>Platforms not supported - debug target</h3>
+
+<ul>
+<li>iOS 3.1.3 or earlier
+<li>webOS 1.45 or earlier
 </ul>
 

weinre.doc/Installing.body.html

@@ -17,39 +17,62 @@
  * under the License.
 -->
 
-<p><span class="weinre">weinre</span> is shipped as archives
+<p><span class="weinre">weinre</span> is shipped as binary packages
 available at Apache.
 
-<p>To install weinre, download a <tt>bin</tt> release, unarchive
+<p>To install <span class="weinre">weinre</span>, download a <tt>bin</tt> package, unarchive
 to wherever you'd wish.  <span class="weinre">weinre</span> is not
 sensitive to the directory it's installed in, and does not 
 write to any files.
 
-<h2>Releases</h2>
+<!-- ======================================================================= -->
+<h2>npm installation</h2>
 
-<p>The distribution releases should be available at:
+<p><span class="weinre">weinre</span> can be installed as an 
+<a href="http://npmjs.org/doc/README.html">npm package</a>.  The
+<tt>*-bin.tar.gz</tt> urls/files can be used as a target of the 
+<a href="http://npmjs.org/doc/install.html"><tt>npm install</tt></a>
+command.  For example, use the following command to install 
+<span class="weinre">weinre</span> locally, from this example URL:
+
+<pre>
+npm install http://example.com/path/to/apache-cordova-weinre-X.Y.Z-bin.tar.gz
+</pre>
+
+<p>weinre is also deployed on
+<a href="http://search.npmjs.org/#/weinre">http://search.npmjs.org/#/weinre</a>
+so that you can install it via:
+
+<pre>
+npm install weinre
+</pre>
+
+<!-- ======================================================================= -->
+<h2>Binary Packages</h2>
+
+<p>The recent source and binary release archives should be available at:
 
 <ul>
 <li><a href="http://www.apache.org/dyn/closer.cgi/incubator/cordova">http://apache.org/dist/incubator/cordova/</a>
-(at the time of this writing, that link does not actually resolve because
-there are no official releases)
+<br><b><i>(at the time of this writing, that link does not actually resolve because
+there are no official releases)</i></b>
 </ul>
 
-<p>The archive releases should be available at:
+<p>All of the source and binary release archives should be available at:
 
 <ul>
 <li><a href="http://archive.apache.org/dist/incubator/cordova/">http://archive.apache.org/dist/incubator/cordova/</a>
-(at the time of this writing, that link does not actually resolve because
-there are no official releases)
+<br><b><i>(at the time of this writing, that link does not actually resolve because
+there are no official releases)</i></b>
 </ul>
 
-<p>Unofficial builds are available here:
+<p>Unofficial binary packages for your convenience:
 
 <ul>
-<li><a href="http://people.apache.org/~pmuellr/">http://people.apache.org/~pmuellr/</a>
+<li><a href="http://people.apache.org/~pmuellr/weinre/">http://people.apache.org/~pmuellr/weinre/</a>
 </ul>
 
-<p>The archives available are:
+<p>The binary packages available are:
 
 <ul>
 <li><tt>apache-cordova-weinre-{version}-bin.tar.gz</tt>
@@ -69,4 +92,5 @@ <h2>Releases</h2>
 <p>The <tt>bin</tt> archives contain the ready-to-run binaries
 
 <p>If the <tt>{version}</tt> contains a moniker like <tt>pre</tt>, this
-is indicative of a non-final release.
+is indicative of an unofficial, non-final binary package for your convenience,
+as opposed to an official release.

weinre.doc/License.body.html

@@ -17,10 +17,10 @@
  * under the License.
 -->
 
-<p>Source specific to weinre 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>weinre also makes use of third party code; the licensing details for
-those is available in the 
+<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>
 file in the top-most directory of the source distribution.