Mwalker has submitted this change and it was merged.
Change subject: Updated to latest masters
......................................................................
Updated to latest masters
Change-Id: I8735984d093047127358bfb57eee99daf04fc8cb
---
M Makefile
M mw-ocg-bundler
M mw-ocg-latexer
M node_modules/domino/package.json
A node_modules/gammalatex/node_modules/.bin/rimraf
M node_modules/rimraf/package.json
6 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
diff --git a/Makefile b/Makefile
index 56be9fd..6eb4a80 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
all: debug
core:
- rm ./package.json
+ export LINK=g++
+ rm -f ./package.json
npm cache clear
- npm install when
+ npm install when semver
./unify-package-json.js
npm install
npm update
diff --git a/mw-ocg-bundler b/mw-ocg-bundler
index 085d024..3fb0354 160000
--- a/mw-ocg-bundler
+++ b/mw-ocg-bundler
-Subproject commit 085d024cdc33d82fb2cc4b9d7a1560a24dd6910c
+Subproject commit 3fb0354af5a443f7b31284950193cc9171ff99b5
diff --git a/mw-ocg-latexer b/mw-ocg-latexer
index 9bff3d6..8803c27 160000
--- a/mw-ocg-latexer
+++ b/mw-ocg-latexer
-Subproject commit 9bff3d6da3ad1255f5c9d5f8d8a190756545acfe
+Subproject commit 8803c27b6a34a8437531105fb1b1d6ef623ba616
diff --git a/node_modules/domino/package.json b/node_modules/domino/package.json
index 772e890..72b12af 100644
--- a/node_modules/domino/package.json
+++ b/node_modules/domino/package.json
@@ -29,6 +29,6 @@
"dist": {
"shasum": "59bea71fa864ff5c02e3baf1f65fc13fbeb31848"
},
- "_from": "domino@~1.0.15",
+ "_from": "[email protected]",
"_resolved": "https://registry.npmjs.org/domino/-/domino-1.0.17.tgz";
}
diff --git a/node_modules/gammalatex/node_modules/.bin/rimraf
b/node_modules/gammalatex/node_modules/.bin/rimraf
new file mode 120000
index 0000000..4cd49a4
--- /dev/null
+++ b/node_modules/gammalatex/node_modules/.bin/rimraf
@@ -0,0 +1 @@
+../rimraf/bin.js
\ No newline at end of file
diff --git a/node_modules/rimraf/package.json b/node_modules/rimraf/package.json
index 2a76f99..adb3a65 100644
--- a/node_modules/rimraf/package.json
+++ b/node_modules/rimraf/package.json
@@ -54,6 +54,6 @@
"dist": {
"shasum": "43e67e90396f05b9425d2d3c0ea58a691df523fa"
},
- "_from": "rimraf@~2.2.2",
+ "_from": "[email protected]",
"_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
}
--
To view, visit https://gerrit.wikimedia.org/r/136162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8735984d093047127358bfb57eee99daf04fc8cb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: Mwalker <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
