Skip to content

Commit 8d7b3f4

Browse files
committed
Merge branch 'GPII-1318'
* GPII-1318: GPII-1318: Updates Vagrant provisioning scripts to Node 4.4.3. GPII-1318: Fixed up broken tests for killProcess, registryResolver. Integrated material from GPII-12 and GPII-776 GPII-1318: Some fixes following review GPII-776 Minor changes from pull request review. GPII-1318: Added node_modules to .gitignore GPII-1318: Updated to node 4-ready branch of universal. Native build now seems reliable so node_modules can be deleted GPII-776 Fluid Function for checking if a registry key exists and unit tests for it.
2 parents f0d2b57 + fce6a0a commit 8d7b3f4

File tree

944 files changed

+286
-209374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

944 files changed

+286
-209374
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/node_modules/
2+
.vagrant

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To build the GPII for Windows using grunt, perform the following:
2323

2424
git clone https://github.com/GPII/windows.git
2525
cd windows
26-
npm install --ignore-scripts=true
26+
npm install
2727
grunt build
2828

2929
Note that whenever you run the `npm install` task for this project, you must use the option appearing above.

gpii/node_modules/WindowsUtilities/WindowsUtilities.js

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

gpii/node_modules/WindowsUtilities/test/testWindowsUtilities.js

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

gpii/node_modules/killProcess/killProcess.js

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

gpii/node_modules/WindowsUtilities/test/putty-0FEF1314.exe renamed to gpii/node_modules/killProcess/test/putty-0FEF1314.exe

File renamed without changes.

gpii/node_modules/killProcess/test/testKillProcess.js

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

gpii/node_modules/registryResolver/index.js

Lines changed: 9 additions & 11 deletions
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: 31 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gpii/node_modules/registryResolver/test/testRegistryResolver.js

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

0 commit comments

Comments
 (0)