Permalink
Browse files

Updating WP to use on device version, removing the copying of build

scripts. Removes WP as a submodule from Framework and adds
a dependency on ui.html instead.

Reviewed By: Nukul Bhasin <nbhasin@rim.com>
tested By: Nukul Bhasin <nbhasin@rim.com>
  • Loading branch information...
1 parent e1826b4 commit 158388415383c25461e67087f2534ce9e929a15d @ejzn ejzn committed with nukulb Oct 27, 2012
Showing with 71 additions and 48 deletions.
  1. +0 −3 .gitmodules
  2. +2 −8 README.md
  3. +1 −5 build/build/conf.js
  4. +2 −15 build/build/pack.js
  5. +0 −15 configure
  6. +65 −0 dependencies/bootstrap/ui.html
  7. +0 −1 dependencies/webplatform
  8. +1 −1 lib/framework.js
View
@@ -1,6 +1,3 @@
-[submodule "dependencies/webplatform"]
- path = dependencies/webplatform
- url = http://github.rim.net/webworks/webplatform.git
[submodule "dependencies/jasmine"]
path = dependencies/jasmine
url = https://github.com/pivotal/jasmine.git
View
@@ -5,8 +5,7 @@ This repo contains the code for the BlackBerry 10 WebWorks Framework.
##Prerequisites
1. Install [node[v0.6.10] and npm](http://nodejs.org/dist/v0.6.10/) and add to path.
2. Install [BlackBerry Native SDK](https://bdsc.webapps.blackberry.com/native/).
-3. Install [BlackBerry 10 WebWorks SDK](https://developer.blackberry.com/html5/download/sdk).
-4. [*Windows*] Add Git bin to PATH. i.e. `*Installation Directory*\bin`
+3. [*Windows*] Add Git bin to PATH. i.e. `*Installation Directory*\bin`
##Setup and Build
1. `git clone https://github.com/blackberry-webworks/BB10-WebWorks-Framework.git`
@@ -18,12 +17,7 @@ This repo contains the code for the BlackBerry 10 WebWorks Framework.
5. **Setup bbndk environment variables:** (must be done within each session, prior to jake)
- [*Mac/Linux*] `source *BBNDK installation directory*/bbndk-env.sh`
- [*Windows*] `*BBNDK installation directory*\bbndk-env.bat`
-6. **Webplatform setup:**<br />
- Copy the following webplatform files from the latest [BlackBerry 10 WebWorks SDK](https://developer.blackberry.com/html5/download/sdk) into `./dependencies/webplatform/framework/clientFiles/`. For more details on how to install go [here](https://developer.blackberry.com/html5/documentation/install_and_configure_ww_bb10_2007535_11.html).
- - `Framework/webplatform.js`
- - `Framework/ui-resources/`
- - `Framework/i18n.js`
-7. Run `jake` or `jake build` and check that the output folder is created under the "target/zip" subfolder. If on windows, run jake from command prompt.
+6. Run `jake` or `jake build` and check that the output folder is created under the "target/zip" subfolder. If on windows, run jake from command prompt.
8. Run `jake test` and check that jake runs and completes
##Running Tests
View
@@ -36,11 +36,7 @@ module.exports = {
DEPENDENCIES_PREPROCESSOR: path.normalize(__dirname + "/../../dependencies/Node-JavaScript-Preprocessor/server.js"),
DEPENDENCIES_BOOTSTRAP: path.normalize(__dirname + "/../../dependencies/bootstrap"),
DEPENDENCIES_JNEXT: path.normalize(__dirname + "/../../dependencies/jnext"),
- DEPENDENCIES_WEBPLATFORM_FRAMEWORK_LIB: path.normalize(__dirname + "/../../dependencies/webplatform/framework/clientFiles/webplatform.js"),
- DEPENDENCIES_WEBPLATFORM_FRAMEWORK_REQUIRE: path.normalize(__dirname + "/../../dependencies/require/require.js"),
- DEPENDENCIES_WEBPLATFORM_UI: path.normalize(__dirname + "/../../dependencies/webplatform/framework/clientFiles/ui-resources"),
- DEPENDENCIES_WEBPLATFORM_I18N: path.normalize(__dirname + "/../../dependencies/webplatform/framework/clientFiles/i18n.js"),
- DEPENDENCIES_WEBPLATFORM: path.normalize(__dirname + "/../../dependencies/webplatform"),
+ DEPENDENCIES_REQUIRE: path.normalize(__dirname + "/../../dependencies/require/require.js"),
DEPENDENCIES_CONFIGURE_QSK: path.normalize(__dirname + "/../../dependencies/configure-qsk/configure-qsk"),
NODE_MOD: path.normalize(__dirname + "/../../node_modules"),
COMPILER_THREADS: "4",
View
@@ -86,8 +86,6 @@ module.exports = function (src, baton) {
clientFilesDest = path.join(_c.DEPLOY, 'clientFiles'),
bootstrapDest = path.join(_c.DEPLOY, 'dependencies/bootstrap'),
jnextDest = path.join(_c.DEPLOY, 'dependencies/jnext'),
- browserRequireDest = path.join(_c.DEPLOY, 'dependencies/bootstrap/'),
- webplatformDest = _c.DEPLOY,
//files
readmeFile = path.join(_c.ROOT, 'README.md'),
@@ -101,22 +99,11 @@ module.exports = function (src, baton) {
copyFolder(_c.CLIENTFILES, clientFilesDest);
copyFolder(_c.DEPENDENCIES_BOOTSTRAP, bootstrapDest);
copyFolder(_c.DEPENDENCIES_JNEXT, jnextDest);
-
-
- //Copy webplatform files/folders if they exist
- if (path.existsSync(_c.DEPENDENCIES_WEBPLATFORM)) {
- copyFolder(_c.DEPENDENCIES_WEBPLATFORM_UI, _c.DEPLOY_UI);
- utils.copyFile(_c.DEPENDENCIES_WEBPLATFORM_FRAMEWORK_REQUIRE, browserRequireDest);
- utils.copyFile(_c.DEPENDENCIES_WEBPLATFORM_FRAMEWORK_LIB, webplatformDest);
- utils.copyFile(_c.DEPENDENCIES_WEBPLATFORM_I18N, webplatformDest);
- } else {
- console.log("\n****ERROR: Webplatform could not be found.****");
- console.log("Please refer to the README for instructions on how to copy the Webplatform from a BB10 Webworks SDK installation.\n");
- }
-
+
//Copy files to target directory (DO NOT copy webplatform-framework lib/* files over)
utils.copyFile(readmeFile, _c.DEPLOY);
utils.copyFile(licenseFile, _c.DEPLOY);
+ utils.copyFile(_c.DEPENDENCIES_REQUIRE, bootstrapDest);
//Remove public folder
wrench.rmdirSyncRecursive(_c.DEPLOY + 'lib/public', true);
View
@@ -14,19 +14,4 @@ if [ "$1" != "-scm" ]; then
git submodule update --init;
fi
-#If webplatform exists, configure and build it.
-if [ -f "./dependencies/webplatform/framework/configure" ]; then
- cd ./dependencies/webplatform/framework;
- if [[ "$OS" == *Windows* ]]; then
- source configure;
- else
- ./configure
- fi
- jake;
-else if [ ! -f "./dependencies/webplatform/framework/clientFiles/webplatform.js" ]; then
- mkdir -p ./dependencies/webplatform/framework/clientFiles;
- echo -e "\n**** WARNING: Webplatform could not be found. ****"
- echo -e "Please refer to the README for instructions on how to copy the Webplatform from a BB10 Webworks SDK installation before running jake."
- fi
-fi
echo -e "\nConfiguring complete. Please proceed with running \"jake\"."
@@ -0,0 +1,65 @@
+<!-- Copyright 2012 Research In Motion Limited.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+<!DOCTYPE HTML>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
+ <title>Overlay WebView</title>
+ <link rel="stylesheet" href="platform:///ui-resources/styles/styles.css" type="text/css" media="screen" charset="utf-8">
+
+ <script src="../chrome/require.js" type="text/javascript"></script>
+ <script src="platform:///webplatform.js" type="text/javascript"></script>
+ <script src="platform:///i18n.js" type="text/javascript"></script>
+ <script src="platform:///ui-resources/index.js" type="text/javascript"></script>
+ </head>
+ <body>
+
+ <div id="contextMenuModal" style="display:none;"></div>
+<div id="contextMenu" class="hideMenu">
+ <div id="contextMenuHeader">
+ <div id="contextMenuHeadText"></div>
+ <div id="contextMenuSubheadText"></div>
+ </div>
+ <div id="contextMenuContent"></div>
+ <div id="contextMenuHandle"></div>
+ <div id="contextMenuDelete"></div>
+</div>
+
+ <div id="dialog" class="hidden">
+ <div class="dialog-top-third">
+ <div id="dialog-panel">
+ </div>
+ </div>
+ <div class="dialog-bottom-two-thirds">
+ </div>
+</div>
+
+ <div id="invocationlist" class="screenInner screenSlide removed">
+ <div id="cancelTitlebar"></div>
+ <div id="invocationListContent" class="targetList"></div>
+ <div id="targetLoader">
+ <div id="targetLoaderActivity" class="activityIndicator"></div>
+ </div>
+</div>
+
+ <div id="toaster" class="toaster"></div>
+
+
+ <div id="childwebviewcontrols"></div>
+
+ </body>
+</html>
Submodule webplatform deleted from 85b79a
View
@@ -79,7 +79,7 @@ var _self = {
}
overlayWebView.create(function () {
- overlayWebView.setURL("local:///ui-resources/ui.html");
+ overlayWebView.setURL("local:///chrome/ui.html");
overlayWebView.renderContextMenuFor(webview);
overlayWebView.handleDialogFor(webview);
controllerWebView.dispatchEvent('ui.init', null);

0 comments on commit 1583884

Please sign in to comment.