Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge branch 'release/1.5.0'
  • Loading branch information
pmuellr committed Jul 22, 2011
2 parents ab90fbc + a3e1798 commit d3c5964d5de4459596e7864f94f7d363b0f5bad5
Showing 22 changed files with 581 additions and 60 deletions.
@@ -8,7 +8,7 @@
#-----------------------------------------------------------
# weinre version
#-----------------------------------------------------------
WEINRE_VERSION: 1.4.0
WEINRE_VERSION: 1.5.0

#-----------------------------------------------------------
# some common locations used in the ant scripts
@@ -273,7 +273,7 @@
<target name="build-json-idl">
<uptodate property="JSON_IDL_UPTODATE" targetfile="${CACHED}/json-idl/all-json-idls.js">
<srcfiles dir="../${PROJECT_SERVER}/interfaces" includes="*.idl"/>
<srcfiles dir="${VENDOR}/WebKit/WebCore/inspector" includes="*.idl"/>
<srcfiles dir="${VENDOR}/webkit/WebCore/inspector" includes="*.idl"/>
</uptodate>

<antcall target="build-json-idl-fresh"/>
@@ -290,19 +290,21 @@
<delete dir="${CACHED}/json-idl"/>
<mkdir dir="${CACHED}/json-idl"/>

<simple-idl2json name="WeinreClientCommands" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreClientEvents" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreTargetCommands" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreTargetEvents" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreClientCommands" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreClientEvents" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreTargetCommands" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreTargetEvents" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreExtraClientCommands" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>
<simple-idl2json name="WeinreExtraTargetEvents" oDir="${CACHED}/json-idl" iDir="../${PROJECT_SERVER}/interfaces"/>

<simple-idl2json name="InjectedScriptHost" oDir="${CACHED}/json-idl" iDir="${VENDOR}/WebKit/WebCore/inspector"/>
<simple-idl2json name="InjectedScriptHost" oDir="${CACHED}/json-idl" iDir="${VENDOR}/webkit/WebCore/inspector"/>

<simple-idl2json name="Inspector" oDir="${CACHED}/json-idl" iDir="${VENDOR}/WebKit/WebCore/inspector">
<simple-idl2json name="Inspector" oDir="${CACHED}/json-idl" iDir="${VENDOR}/webkit/WebCore/inspector">
<arg value="--anyType"/>
<arg value="Value"/>
</simple-idl2json>

<simple-idl2json name="InspectorFrontendHost" oDir="${CACHED}/json-idl" iDir="${VENDOR}/WebKit/WebCore/inspector">
<simple-idl2json name="InspectorFrontendHost" oDir="${CACHED}/json-idl" iDir="${VENDOR}/webkit/WebCore/inspector">
<arg value="--anyType"/>
<arg value="MouseEvent"/>
</simple-idl2json>
@@ -346,11 +348,11 @@
<target name="build-client">

<copy todir="${WEB}/client/nls/English.lproj">
<fileset file="${VENDOR}/WebKit/WebCore/English.lproj/localizedStrings.js"/>
<fileset file="${VENDOR}/webkit/WebCore/English.lproj/localizedStrings.js"/>
</copy>

<copy todir="${WEB}/client">
<fileset dir="${VENDOR}/WebKit/WebCore/inspector/front-end"/>
<fileset dir="${VENDOR}/webkit/WebCore/inspector/front-end"/>
</copy>

<exec executable="python" failonerror="true" failifexecutionfails="true">
@@ -124,28 +124,28 @@
<delete dir="${VENDOR}/webkit"/>
<mkdir dir="${VENDOR}/webkit/WebCore"/>

<exec executable="svn" dir="${VENDOR}/WebKit/WebCore">
<exec executable="svn" dir="${VENDOR}/webkit/WebCore">
<arg value="export"/>
<arg value="-r"/>
<arg value="${WEBKIT_VERSION}"/>
<arg value="${WEBKIT_URL_PREFIX}/Source/WebCore/inspector"/>
</exec>

<exec executable="svn" dir="${VENDOR}/WebKit/WebCore">
<exec executable="svn" dir="${VENDOR}/webkit/WebCore">
<arg value="export"/>
<arg value="-r"/>
<arg value="${WEBKIT_VERSION}"/>
<arg value="${WEBKIT_URL_PREFIX}/Source/WebCore/English.lproj"/>
</exec>

<exec executable="svn" dir="${VENDOR}/WebKit/WebCore">
<exec executable="svn" dir="${VENDOR}/webkit/WebCore">
<arg value="export"/>
<arg value="-r"/>
<arg value="${WEBKIT_VERSION}"/>
<arg value="${WEBKIT_URL_PREFIX}/Source/WebCore/css/CSSPropertyNames.in"/>
</exec>

<exec executable="grep" outputproperty="gpl-grep-results" dir="${VENDOR}/WebKit/WebCore">
<exec executable="grep" outputproperty="gpl-grep-results" dir="${VENDOR}/webkit/WebCore">
<arg value="-r"/>
<arg value="GPL"/>
<arg value="."/>
@@ -8,7 +8,7 @@
# ---

git log "--pretty=format:- %s" $1.. | \
sed 's/#\([0-9]*\)/\<a href="https:\/\/github.com\/pmuellr\/weinre\/issues\/1"\>issue \1\<\/a\>./' |
sed 's/#\([0-9]*\)/\<a href="https:\/\/github.com\/phonegap\/weinre\/issues\/1"\>issue \1\<\/a\>./' |
sed 's/^-/\<li\>/'

# sed 's/#\([0-9]*\)/[issue \1](https:\/\/github.com\/pmuellr\/weinre\/issues\/1)./'
@@ -5,6 +5,52 @@
* Copyright (c) 2011 IBM Corporation
-->

<!-- ======================================================================= -->
<h2>Downloads</h2>

<p><a href="https://github.com/phonegap/weinre/downloads">https://github.com/phonegap/weinre/downloads</a>

<!-- ======================================================================= -->
<h2>2011/07/22 - version 1.5.0</h2>

<ul>

<li><p>The Resources panel now includes an active Databases section. For any WebSQL
database that you open, you should see an entry in the expanded section. For each database,
you'll see the list of tables owned by the database when the database section
is expanded. Note that you need to open
the database to see it listed here. Databases which you have previously created
in other browsing sessions will not be displayed until they are first opened.

<p>Clicking on a database table will dump the database contents to the panel.
Clicking on the database itself will provide a prompter for you to run SQL
commands against that database. For example, entering
<tt>"select * from YourTableNameHere"</tt>
will dump the table contents to the panel.

<li><p>Some of the console functions, like <tt>console.log()</tt>, were not handling
object arguments correctly. You should now see a an object display. For example,
typing <tt>"window"</tt> or <tt>"console.log(window)"</tt> into the console
will show you the same object display for the window.

<li><p>The ant build script did not have the correctly-cased file names for some
of the files, and the build failed. This has been fixed. You should be able
to do a build on Linux, and other case-sensitive file systems.

<li><p>While weinre already removes some of the Web Inspector panels wholesale,
there were still a number of meaningless gee-gaws on the panels that we do show.
Those have been surgically removed with CSS.

</ul>

<p>issues closed:
<ul>
<li> <a href="https://github.com/phonegap/weinre/issues/7">issue 7</a> - support for WebSQL
<li> <a href="https://github.com/phonegap/weinre/issues/8">issue 8</a> - console.log() etal don't handle object parameters
<li> <a href="https://github.com/phonegap/weinre/issues/12">issue 12</a> - wrong-cased file names in ant scripts for Linux
<li> <a href="https://github.com/phonegap/weinre/issues/16">issue 16</a> - hide stuff in the Web Inspector UI that's not used
</ul>

<!-- ======================================================================= -->
<h2>2011/05/09 - version 1.4.0</h2>
<ul>
@@ -10,6 +10,14 @@
Pronounced like the word "winery". Or maybe like the word "weiner". Who knows,
really.

<p>Interesting places:
<ul>
<li>GitHub: <a href="https://github.com/phonegap/weinre">https://github.com/phonegap/weinre</a>
<li>Google Group: <a href="http://groups.google.com/group/weinre">http://groups.google.com/group/weinre</a>
<li>weinre documentation: <a href="http://phonegap.github.com/weinre">http://phonegap.github.com/weinre</a>
<li>Google Chrome Developer Tools: <a href="http://code.google.com/chrome/devtools/docs/overview.html">http://code.google.com/chrome/devtools/docs/overview.html</a>
</ul>

<p>It's a debugger for web pages, like
FireBug (for FireFox)
and
@@ -22,7 +30,9 @@
<span class="weinre">weinre</span> reuses the user interface code from the
<a href="http://trac.webkit.org/wiki/WebInspector">Web Inspector project at WebKit</a>,
so if you've used Safari's Web Inspector or Chrome's Developer Tools,
<span class="weinre">weinre</span> will be very familiar.
<span class="weinre">weinre</span> will be very familiar. If you're not
familiar with Web Inspector, the link above to Google Chrome Developer Tools
provides some documentation Real Web Inspector, which <span class="weinre">weinre</span> is based on.

<!--
<div class="note">
@@ -96,15 +106,6 @@
- to see a walkthrough of
how to use it, visit the <a href="TestDrive.html">Test Drive</a>.

<!-- ======================================================== -->
<h2>Places</h2>

<ul>
<li>GitHub: <a href="https://github.com/phonegap/weinre">https://github.com/phonegap/weinre</a>
<li>Documentation: <a href="http://phonegap.github.com/weinre">http://phonegap.github.com/weinre</a>
<li>Google Group: <a href="http://groups.google.com/group/weinre">http://groups.google.com/group/weinre</a>
</ul>

<!-- ======================================================== -->
<h2>Supported Libraries and Platforms</h2>

@@ -14,7 +14,7 @@ module weinre {

void getTargets(out Object[] targets);
void getClients(out Object[] clients);

void connectTarget(in string clientId, in string targetId);
void disconnectTarget(in string clientId);

@@ -0,0 +1,17 @@
/*
* weinre is available under *either* the terms of the modified BSD license *or* the
* MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
*
* Copyright (c) 2011 IBM Corporation
*/

// extra messages from the client to the target

module weinre {
interface WeinreExtraClientCommands {

void getDatabases(out Object[] databaseRecords);

};
}

@@ -0,0 +1,17 @@
/*
* weinre is available under *either* the terms of the modified BSD license *or* the
* MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
*
* Copyright (c) 2011 IBM Corporation
*/

// extra messages from the target to the client

module weinre {
interface WeinreExtraTargetEvents {

void databaseOpened(in Object databaseRecord);

};
}

@@ -14,7 +14,7 @@ module weinre {
void connectionDestroyed(string clientId, string targetId);

void sendCallback(string callbackId, Object result);

};
}

@@ -19,6 +19,34 @@
font-family: Monaco, Consolas, Lucida Console, dejavu sans mono, monospace;
}

.panel.resources .cookie-storage-tree-item {
display: none;
}

.panel.resources .frame-storage-tree-item {
display: none;
}

.panel.resources .application-cache-storage-tree-item {
display: none;
}

.panel.timeline .resources-size-graph-sidebar-item {
display: none;
}

#main-status-bar .timeline-category-rendering {
display: none;
}

#search {
display: none;
}

#search-toolbar-label {
display: none;
}

.weinre-connector-item {
font-size: 140%;
}
@@ -9,10 +9,8 @@
<head>
<meta name="viewport" content="user-scalable=no, width=device-width, height=device-height">
<title>weinre demo</title>
<link rel="stylesheet" href="weinre-demo.css">
<script src="weinre-demo.js"></script>

<script src="/modjewel-require.js"></script>
<script src="/json2.js"></script>
<script type="text/javascript">require("modjewel").warnOnRecursiveRequire(true)</script>
<script src="/scooj.transportd.js"></script>
<script src="/weinre/common/Ex.transportd.js"></script>
@@ -44,12 +42,17 @@
<script src="/weinre/target/ElementHighlighter.transportd.js"></script>
<script src="/weinre/target/InjectedScript.js"></script>
<script src="/weinre/target/Timeline.transportd.js"></script>
<script src="/weinre/target/SqlStepper.transportd.js"></script>
<script src="/weinre/target/WeinreExtraClientCommandsImpl.transportd.js"></script>
<script src="/interfaces/all-json-idls-min.js"></script>

<script type="text/javascript">
require("weinre/common/Weinre").getClass().showNotImplemented()
require('weinre/target/Target').getClass().main()
</script>

<link rel="stylesheet" href="weinre-demo.css">
<script src="weinre-demo.js"></script>
</head>

<body onload="onLoad()">

0 comments on commit d3c5964

Please sign in to comment.