Skip to content

Commit 496d780

Browse files
committed
Merge branch 'master' of git://github.com/GPII/windows into patch-1
2 parents 315f0af + 5f3ce59 commit 496d780

File tree

19 files changed

+501
-428
lines changed

19 files changed

+501
-428
lines changed

.jshintrc

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"bitwise": false,
3+
"camelcase": false,
4+
"curly": true,
5+
"eqeqeq": true,
6+
"es3": true,
7+
"forin": false,
8+
"freeze": true,
9+
"immed": true,
10+
"indent": 4,
11+
"latedef": true,
12+
"newcap": true,
13+
"noarg": true,
14+
"noempty": false,
15+
"nonbsp": true,
16+
"nonew": true,
17+
"plusplus": false,
18+
"quotmark": "double",
19+
"undef": true,
20+
"unused": true,
21+
"strict": true,
22+
"trailing": true,
23+
24+
"maxerr": 1000,
25+
26+
"node": true,
27+
28+
"globals": {
29+
"fluid_1_5": true
30+
}
31+
}

Gruntfile.js

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*!
2+
GPII Windows Personalization Framework Gruntfile
3+
4+
Copyright 2014 RTF-US
5+
6+
Licensed under the New BSD license. You may not use this file except in
7+
compliance with this License.
8+
9+
You may obtain a copy of the License at
10+
https://github.com/gpii/universal/LICENSE.txt
11+
*/
12+
13+
"use strict";
14+
15+
module.exports = function (grunt) {
16+
grunt.loadNpmTasks("grunt-contrib-jshint");
17+
grunt.loadNpmTasks("grunt-jsonlint");
18+
grunt.loadNpmTasks("grunt-shell");
19+
grunt.loadNpmTasks("grunt-gpii");
20+
21+
var gpiiGrunt = grunt.config.getRaw("gpiiGruntGlobal");
22+
grunt.initConfig({
23+
jshint: {
24+
src: ["gpii/**/*.js", "tests/**/*.js"],
25+
buildScripts: ["Gruntfile.js"],
26+
options: {
27+
jshintrc: true
28+
}
29+
},
30+
jsonlint: {
31+
src: ["gpii/**/*.json", "tests/**/*.json"]
32+
}
33+
});
34+
35+
grunt.registerTask("build", "Build the entire GPII", function () {
36+
grunt.task.run("gpii-universal");
37+
});
38+
39+
grunt.registerTask("start", "Start the GPII", function () {
40+
gpiiGrunt.shellImmediate({
41+
name: "start",
42+
command: "node gpii.js"
43+
});
44+
});
45+
};

README

Lines changed: 0 additions & 15 deletions
This file was deleted.

README.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# GPII for Windows
2+
3+
Contains platform-specific components of the GPII architecture for Windows. See http://gpii.net/ for overall details of the GPII
4+
project. After checkout out using git, this project will require node.js and npm to be installed - please consult
5+
http://wiki.gpii.net/w/Setting_Up_Your_Development_Environment for installation instructions.
6+
7+
Note that tests and function involving the High Contrast setting will fail on all current versions of Windows (including
8+
Windows 7 SP1 and Windows 8 SP2) unless the following hotfix from Microsoft is applied: http://support.microsoft.com/kb/2516889
9+
10+
See http://issues.gpii.net/browse/GPII-49 for more details of this issue.
11+
12+
# Grunt Builds
13+
14+
We are in the process of adding support for building and running utility tasks
15+
with grunt.js. At some point these will replace the current build scripts.
16+
17+
To use these, you must be running a recent version of npm, necessarily greater
18+
than 1.4. If you need to upgrade npm you can issue the following command:
19+
20+
npm install -g npm
21+
22+
To build the GPII for Windows using grunt, perform the following:
23+
24+
git clone https://github.com/GPII/windows.git
25+
cd windows
26+
npm install --ignore-scripts=true
27+
grunt build
28+
29+
Note that whenever you run the `npm install` task for this project, you must use the option appearing above.
30+
31+
# Old Builds
32+
33+
This project is still bundled with command-line build scripts (with the same effect as the above grunt builds) - support for these
34+
will be withdrawn soon. You can operate these as follows:
35+
36+
37+
* `build.cmd` will check out GPII's universal project https://github.com/GPII/universal in a subdirectory.
38+
* `start.cmd` will run the GPII personalisation system
39+
40+

gpii.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ https://github.com/gpii/universal/LICENSE.txt
1313
var fluid = require("universal"),
1414
kettle = fluid.registerNamespace("kettle");
1515

16-
// TODO: it would be nice to not have to hardcode this path. A different module layout
17-
// for the platform packages, perhaps?
18-
fluid.require("./gpii/node_modules/registrySettingsHandler", require);
19-
fluid.require("./gpii/node_modules/registryResolver", require);
20-
fluid.require("./gpii/node_modules/spiSettingsHandler", require);
16+
require("./gpii/index.js");
2117

2218
kettle.config.makeConfigLoader({
2319
nodeEnv: kettle.config.getNodeEnv("fm.ps.sr.dr.mm.os.lms.development"),
20+
// TODO: it would be nice to not have to hardcode this path.
2421
configPath: kettle.config.getConfigPath() || "../node_modules/universal/gpii/configs"
2522
});

gpii/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var fluid = require("universal");
22

3+
fluid.require("WindowsUtilities/WindowsUtilities.js", require);
34
fluid.require("registrySettingsHandler", require);
45
fluid.require("registryResolver", require);
56
fluid.require("spiSettingsHandler", require);

gpii/node_modules/WindowsUtilities/WindowsUtilities.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gpii/node_modules/registryResolver/src/RegistryResolver.js

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gpii/node_modules/registrySettingsHandler/src/RegistrySettingsHandler.js

Lines changed: 24 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gpii/node_modules/registrySettingsHandler/test/testPayload.json

Lines changed: 7 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)