diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-12-18 05:22:25 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-12-22 21:25:48 (GMT) |
| commit | f06ef1c01b1a93b9e3bfff5ea2e66992c35547ed (patch) | |
| tree | 853072d61955b24268c39828abe1eb545d047e57 | |
| parent | ad43c7004d3a618827baaedc546ce9b22b25ed9f (diff) | |
| download | mxe-f06ef1c01b1a93b9e3bfff5ea2e66992c35547ed.zip mxe-f06ef1c01b1a93b9e3bfff5ea2e66992c35547ed.tar.gz mxe-f06ef1c01b1a93b9e3bfff5ea2e66992c35547ed.tar.bz2 | |
mv docs/versions.json docs/packages.json
See https://github.com/mxe/mxe/issues/1422
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/packages.json (renamed from docs/versions.json) | 0 | ||||
| -rw-r--r-- | tools/mxe-activate | 2 | ||||
| -rwxr-xr-x | tools/travis-push.sh | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 937c323..aa8b215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: c sudo: false script: - - make docs/build-matrix.html docs/versions.json + - make docs/build-matrix.html docs/packages.json - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi - make download -j 6 -k MXE_PLUGIN_DIRS="$(./tools/plugins-with-additional-packages.sh)" @@ -864,8 +864,8 @@ docs/build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) @echo '</body>' >> $@ @echo '</html>' >> $@ -.PHONY: docs/versions.json -docs/versions.json: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) +.PHONY: docs/packages.json +docs/packages.json: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) @echo '{' > $@ @{$(foreach PKG,$(PKGS), \ echo ' "$(PKG)": \ diff --git a/docs/index.html b/docs/index.html index a2b5c59..67ba60e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2827,7 +2827,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre> } function loadVersionCache(doneCallback) { var request = new XMLHttpRequest(); - request.open('GET', 'versions.json', true); + request.open('GET', 'packages.json', true); request.onreadystatechange = function reqCallback() { if (request.readyState === 4) { if (request.status === 200) { diff --git a/docs/versions.json b/docs/packages.json index ccaabab..ccaabab 100644 --- a/docs/versions.json +++ b/docs/packages.json diff --git a/tools/mxe-activate b/tools/mxe-activate index 1abffb8..3d45e78 100644 --- a/tools/mxe-activate +++ b/tools/mxe-activate @@ -56,7 +56,7 @@ _mxe() ;; [!-]*) pkgs+=" docs/build-matrix.html \ - docs/versions.json \ + docs/packages.json \ check-requirements \ clean \ clean-junk \ diff --git a/tools/travis-push.sh b/tools/travis-push.sh index 6a7b3f7..c8d4b1b 100755 --- a/tools/travis-push.sh +++ b/tools/travis-push.sh @@ -8,5 +8,5 @@ git config --global push.default simple git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials git remote set-url origin 'https://github.com/mxe/mxe.git' -git commit -a -m 'Update versions.json & build-matrix.html' || true +git commit -a -m 'Update packages.json & build-matrix.html' || true git push origin HEAD:master |