Skip to content

Commit

Permalink
Change WinPointingServer app
Browse files Browse the repository at this point in the history
  • Loading branch information
Izzatbek committed Apr 28, 2016
1 parent 121ecaa commit 426c721
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 25 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Makefile
*.vs
*.jar
*pointing.node
*target_wrapper.bat

*node_modules*
*build*
Expand All @@ -50,4 +51,5 @@ tests/interpolation/interpolation
tests/subpixel/subpixel
tests/hidreportparser/hidreportparser
tests/*/target_wrapper.sh
bindings/Node/cache
bindings/Node/cache
bindings/Node/nw
2 changes: 1 addition & 1 deletion bindings/Node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Follow these instructions to build the nw-app for Windows:

* npm install nw -g
* npm install nw-gyp -g
* npm install nw-builder
* npm install nw-builder ncp

1. In *libpointing*-folder run `npm install nan`

Expand Down
48 changes: 27 additions & 21 deletions bindings/Node/builder.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,42 @@
var NwBuilder = require('nw-builder');
var fs = require('fs');
var ncp = require('ncp');

fs.createReadStream('./libpointing/nw/Release/pointing.node').pipe(fs.createWriteStream('./nw/pointing.node'));
fs.readFile('./server/server.js', 'utf8', function (err, data) {
if (err) {
return console.log(err);
}
originalFile = data;
var result = originalFile.replace(/require\("libpointing"\)/g, 'require("./pointing.node")');
result = result.replace(/#!\/usr\/bin\/env node/g, '');
ncp("../../pointing-echomouse", "./nw/pointing-echomouse", function (err) {
if (err) {
return console.log(err);
}
originalFile = data;
var result = originalFile.replace(/require\("libpointing"\)/g, 'require("./pointing.node")');
result = result.replace(/#!\/usr\/bin\/env node/g, '');

fs.writeFile('./nw/server.js', result, 'utf8', function (err) {
if (err) return console.log(err);

var nw = new NwBuilder({
files: ['./nw/**'],// use the glob format
platforms: ['win64'],
version: '0.12.3'
});
fs.writeFile('./nw/server.js', result, 'utf8', function (err) {
if (err) return console.log(err);
var nw = new NwBuilder({
files: ['./nw/**'],// use the glob format
platforms: ['win64'],
version: '0.12.3'
});

nw.on('log', console.log);
nw.on('log', console.log);

// Build returns a promise
nw.build().then(function () {
// The executable needs to be named nw.exe (This is a bug in Node Webkit)
var dir = "./build/pointingserver/win64/";
process.chdir(dir);
fs.rename("pointingserver.exe", "nw.exe", function(err) {
if (err) console.log('ERROR: ' + err);
// Build returns a promise
nw.build().then(function () {
// The executable needs to be named nw.exe (This is a bug in Node Webkit)
var dir = "./build/pointingserver/win64/";
process.chdir(dir);
fs.rename("pointingserver.exe", "nw.exe", function(err) {
if (err) console.log('ERROR: ' + err);
});
}).catch(function (error) {
console.error(error);
});
}).catch(function (error) {
console.error(error);
});
});
});
Binary file modified bindings/Node/nw/iconwin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions bindings/Node/nw/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"main": "index.html",
"name": "pointingserver",
"description": "Pointing Server",
"version": "0.0.1",
"version": "0.9.5",
"keywords": [ "libpointing", "nwjs", "HID", "transfer function" ],
"window": {
"title": "Pointing server",
Expand All @@ -16,7 +16,7 @@
"min_height": 200,
"max_width": 800,
"max_height": 600,
"show": true
"show": false
},
"author": "Izzatbek Mukhanov",
"license": "GPL",
Expand Down

0 comments on commit 426c721

Please sign in to comment.