mv versions.json build-matrix.html assets docs/

See https://github.com/mxe/mxe/issues/1500
8 years ago · f5567f2c37
parent d0e424038e
commit f5567f2c37
13 changed files with 14 additions and 16 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,7 +2,7 @@ language: c
 sudo: false

 script:
-  - make build-matrix.html versions.json
+  - make docs/build-matrix.html docs/versions.json
  - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi
  - make download -j 6 -k

--- a/6
+++ b/6
@ -757,7 +757,7 @@ cleanup-deps-style:
 	     || echo '*** Multi-line deps are mangled ***' && comm -3 tmp-$@-pre tmp-$@-post
 	@rm -f $(TOP_DIR)/tmp-$@-*

-build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES))
+docs/build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES))
 	@echo '<!DOCTYPE html>'                  > $@
 	@echo '<html>'                          >> $@
 	@echo '<head>'                          >> $@
@ -849,8 +849,8 @@ build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES))
 	@echo '</body>'                         >> $@
 	@echo '</html>'                         >> $@

-.PHONY: versions.json
-versions.json: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
+.PHONY: docs/versions.json
+docs/versions.json: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
 	@echo '{'                         > $@
 	@{$(foreach PKG,$(PKGS),          \
 	    echo '    "$(PKG)":           \
--- a/docs/assets/build-matrix.css
+++ b/docs/assets/build-matrix.css
--- a/docs/assets/common.css
+++ b/docs/assets/common.css
--- a/docs/assets/screenshot-4th-compile-small.png
+++ b/docs/assets/screenshot-4th-compile-small.png
--- a/docs/assets/screenshot-4th-compile.png
+++ b/docs/assets/screenshot-4th-compile.png
--- a/docs/assets/screenshot-4th-run-small.png
+++ b/docs/assets/screenshot-4th-run-small.png
--- a/docs/assets/screenshot-4th-run.png
+++ b/docs/assets/screenshot-4th-run.png
--- a/docs/build-matrix.html
+++ b/docs/build-matrix.html
--- a/docs/versions.json
+++ b/docs/versions.json
--- a/index.html
+++ b/index.html
@ -6,7 +6,7 @@

    <title>MXE (M cross environment)</title>

-    <link rel="stylesheet" href="assets/common.css">
+    <link rel="stylesheet" href="docs/assets/common.css">

 </head>
 <body>
@ -125,7 +125,7 @@
    </table>
    <p>
        These numbers were last updated on December 16, 2015.
-        See the <a href="build-matrix.html">current status</a>
+        See the <a href="docs/build-matrix.html">current status</a>
        for individual packages.
    </p>
    <p>
@ -147,15 +147,15 @@
    Cross compiling
    <a href="http://thebeez.home.xs4all.nl/4tH/">4tH</a>:
    </p>
-    <a href="assets/screenshot-4th-compile.png">
-        <img src="assets/screenshot-4th-compile-small.png" alt="4th-compile">
+    <a href="docs/assets/screenshot-4th-compile.png">
+        <img src="docs/assets/screenshot-4th-compile-small.png" alt="4th-compile">
    </a>

    <p>
    and running it:
    </p>
-    <a href="assets/screenshot-4th-run.png">
-        <img src="assets/screenshot-4th-run-small.png" alt="4th-run">
+    <a href="docs/assets/screenshot-4th-run.png">
+        <img src="docs/assets/screenshot-4th-run-small.png" alt="4th-run">
    </a>
 </div>

@ -1050,11 +1050,11 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
        suitable for usage in shell scripts
        </dd>

-    <dt>make build-matrix.html</dt>
+    <dt>make docs/build-matrix.html</dt>

        <dd>
        generate a report of what packages are
-        supported on what targets to build-matrix.html
+        supported on what targets to docs/build-matrix.html
        </dd>

    <dt>make update</dt>
@ -2831,7 +2831,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
        }
        function loadVersionCache(doneCallback, errCallback) {
            var request = new XMLHttpRequest();
-            request.open('GET', 'versions.json', true);
+            request.open('GET', 'docs/versions.json', true);
            request.onreadystatechange = function reqCallback() {
                if (request.readyState === 4) {
                    if (request.status === 200) {
--- a/tools/build-pkg.lua
+++ b/tools/build-pkg.lua
@ -1030,14 +1030,12 @@ local function makeMxeSourcePackage()
        'Makefile',
        'patch.mk',
        'README.md',
-        'assets',
        'docs',
        'ext',
        'index.html',
        'src',
        'plugins',
        'tools',
-        'versions.json',
    }
    local d1 = "MXE source"
    local d2 = MXE_SOURCE_DESCRIPTION2
--- a/tools/mxe-activate
+++ b/tools/mxe-activate
@ -55,7 +55,7 @@ _mxe()
        return 0
        ;;
    [!-]*)
-        pkgs+=" build-matrix.html \
+        pkgs+=" docs/build-matrix.html \
                check-requirements \
                clean \
                clean-junk \