Mwalker has submitted this change and it was merged.
Change subject: Updated Makefile and submodules to current masters
......................................................................
Updated Makefile and submodules to current masters
Change-Id: I554bdd3903ae4b40644d7c7cea991b15fc51c4a5
---
M .gitignore
M Makefile
M mw-ocg-bundler
M mw-ocg-latexer
M mw-ocg-service
5 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index fe26abb..0acda37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
node_modules/*
LocalSettings.js
+package.json
.idea
diff --git a/Makefile b/Makefile
index 56be9fd..5c92ee5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
all: debug
core:
- rm ./package.json
- npm cache clear
- npm install when
+ export LINK=g++
+ npm install semver when
./unify-package-json.js
npm install
npm update
@@ -17,4 +16,6 @@
npm prune
clean:
+ rm -f ./package.json
+ npm cache clear
rm -rf ./node_modules
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/mw-ocg-service b/mw-ocg-service
index 91eaf0c..ead65b1 160000
--- a/mw-ocg-service
+++ b/mw-ocg-service
-Subproject commit 91eaf0cbda583e299084cc5cf5ec372c452b98fb
+Subproject commit ead65b115c12637104dfe2bb566f78aa923b0c06
--
To view, visit https://gerrit.wikimedia.org/r/137234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I554bdd3903ae4b40644d7c7cea991b15fc51c4a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
