Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changes to create a third_party folder and README.txt file in the fin…

…al build for OSS compliance.

Reviewed By: Jeffrey Heifetz <jheifetz@rim.com>
Tested By: Igor Shneur <ishneur@rim.com>
  • Loading branch information...
commit 7428686fda238eb0af317009824924cadbfdc4d6 1 parent ecd3f1b
@nukulb nukulb authored
2  Framework
@@ -1 +1 @@
-Subproject commit 3fad4aa509d731ec524fd48815d8acce48f8fd29
+Subproject commit adf336bf33020c318e4ed215077760e468e202ba
View
4 README.txt
@@ -1,11 +1,11 @@
To get started with the BB10 WebWorks SDK please visit
-https://developer.blackberry.com/html5/
+https://developer.blackberry.com/html5/documentation/
Third party software used-
***
JNEXT 1.0.8.3 is used to build extensions.
Original source of JNEXT was downloaded from here - http://jnext.googlecode.com/files/jnext-src-1.0.8.3.zip
-Modifications are available in patch format located at third_party/jnext-patch.txt
+Modifications are available in patch format located at third_party/jnext/jnext-patch.txt
***
View
5 build/build/conf.js
@@ -20,9 +20,10 @@ module.exports = {
DEPLOY: path.normalize(__dirname + "/../../target/zip/"),
TARGET: path.normalize(__dirname + "/../../target/"),
BUILD: path.normalize(__dirname + "/.."),
- LIB: path.normalize(__dirname + "/../../lib"),
+ LIB: path.normalize(__dirname + "/../../lib"),
DEPENDENCIES: path.normalize(__dirname + "/../../dependencies"),
NODE_MOD: path.normalize(__dirname + "/../../node_modules"),
FRAMEWORK: path.normalize(__dirname + "/../../Framework"),
- FRAMEWORK_DEPLOY: path.normalize(__dirname + "/../../Framework/target/zip/")
+ FRAMEWORK_DEPLOY: path.normalize(__dirname + "/../../Framework/target/zip/"),
+ THIRD_PARTY: path.normalize(__dirname + "/../../third_party")
};
View
11 build/build/pack.js
@@ -31,21 +31,24 @@ module.exports = function (src, baton) {
var frameworkDest = path.join(_c.DEPLOY, 'Framework/'),
libDest = path.join(_c.DEPLOY, 'lib'),
nodeModulesDest = path.join(_c.DEPLOY, 'node_modules'),
-
+ thirdPartyDest = path.join(_c.DEPLOY, 'third_party'),
+
//files
bbwpFile = path.join(_c.ROOT, 'bbwp'),
bbwpBatFile = path.join(_c.ROOT, 'bbwp.bat'),
licenseFile = path.join(_c.ROOT, 'licenses.txt'),
- defaultIcon = path.join(_c.ROOT, 'default-icon.png');
+ defaultIcon = path.join(_c.ROOT, 'default-icon.png'),
+ readMeFile = path.join(_c.ROOT, 'README.txt');
//Copy folders to target directory
copyFolder(_c.FRAMEWORK_DEPLOY, frameworkDest);
copyFolder(_c.LIB, libDest);
copyFolder(_c.NODE_MOD, nodeModulesDest);
-
+ copyFolder(_c.THIRD_PARTY, thirdPartyDest);
+
//Copy files to target directory
utils.copyFile(bbwpFile, _c.DEPLOY);
utils.copyFile(bbwpBatFile, _c.DEPLOY);
utils.copyFile(licenseFile, _c.DEPLOY);
- utils.copyFile(defaultIcon, _c.DEPLOY);
+ utils.copyFile(readMeFile, _c.DEPLOY);
};
View
10 third_party/jnext-patch.txt → third_party/jnext/jnext-patch.txt
@@ -5,13 +5,13 @@ index 0349893..c7ce3cf
--- a/dependencies/jnext_1_0_8_3/jncore/jnext-extensions/common/plugin.cpp
+++ b/dependencies/jnext_1_0_8_3/jncore/jnext-extensions/common/plugin.cpp
@@ -81,7 +81,7 @@ string& g_trim( string& str )
-
+
void g_tokenize( const string& str, const string& delimiters, vector<string>& tokens )
{
- tokenize( str, tokens, delimiters );
+ tokenize( str, tokens, delimiters );
}
-
+
char* SetEventFunc( SendPluginEv funcPtr )
diff --git a/dependencies/jnext_1_0_8_3/jncore/jnext-extensions/common/plugin.h b/dependencies/jnext_1_0_8_3/jncore/jnext-extensions/common/plugin.h
old mode 100755
@@ -25,7 +25,7 @@ index f073ae4..4ef7116
#include <vector>
+#include <unistd.h>
//#include "tokenizer.h"
-
+
using namespace std;
@@ -29,12 +30,12 @@ extern SendPluginEv SendPluginEvent;
/////////////////////////////////////////////////////////////////////////
@@ -35,14 +35,14 @@ index f073ae4..4ef7116
-#define szOK "Ok "
+#define szERROR "Error "
+#define szOK "Ok "
-
+
-#define szDISPOSE "Dispose"
-#define szINVOKE "InvokeMethod"
-#define szCREATE "CreateObj"
+#define szDISPOSE "Dispose"
+#define szINVOKE "InvokeMethod"
+#define szCREATE "CreateObj"
-
+
/////////////////////////////////////////////////////////////////////////
// Utility functions
@@ -52,6 +53,7 @@ bool g_unregisterObject( const string& strObjId, void* pContext );
Please sign in to comment.
Something went wrong with that request. Please try again.