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

See mxe#1500
nickrum · Aug 27, 2016 · f5567f2 · f5567f2
1 parent d0e4240
commit f5567f2
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 16 deletions.
diff --git 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
 

diff --git a/Makefile b/Makefile
@@ -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)":           \

diff --git a/assets/build-matrix.css → docs/assets/build-matrix.css b/assets/build-matrix.css → docs/assets/build-matrix.css
diff --git a/assets/common.css → docs/assets/common.css b/assets/common.css → docs/assets/common.css
diff --git a/assets/screenshot-4th-compile-small.png → docs/assets/screenshot-4th-compile-small.png b/assets/screenshot-4th-compile-small.png → docs/assets/screenshot-4th-compile-small.png
diff --git a/assets/screenshot-4th-compile.png → docs/assets/screenshot-4th-compile.png b/assets/screenshot-4th-compile.png → docs/assets/screenshot-4th-compile.png
diff --git a/assets/screenshot-4th-run-small.png → docs/assets/screenshot-4th-run-small.png b/assets/screenshot-4th-run-small.png → docs/assets/screenshot-4th-run-small.png
diff --git a/assets/screenshot-4th-run.png → docs/assets/screenshot-4th-run.png b/assets/screenshot-4th-run.png → docs/assets/screenshot-4th-run.png
diff --git a/build-matrix.html → docs/build-matrix.html b/build-matrix.html → docs/build-matrix.html
diff --git a/versions.json → docs/versions.json b/versions.json → docs/versions.json
diff --git 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 @@ <h3>Supported Toolchains</h3>
     </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 @@ <h2 id="screenshots">Screenshots</h2>
     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 @@ <h2 id="usage">Usage</h2>
         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 @@ <h2 id="packages">List of Packages</h2>
         }
         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) {

diff --git 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

diff --git 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 \