Skip to content

Commit 75e6291

Browse files
somasissomasis
committed
Switch to using makedown, genericized version of the build system.
phew this took a lot of effort
1 parent e384deb commit 75e6291

13 files changed

+47
-303
lines changed

‎.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*.tmp
2-
*.html
3-
*.min.css
41
*.bak
2+
*.html
3+
*.tmp
54
*~
5+
66
work/

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "makedown"]
2+
path = makedown
3+
url = https://github.com/somasis/makedown

‎.mdlstyle.rb

-14
This file was deleted.

‎.travis.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,16 @@ notifications:
77
before_install:
88
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || openssl aes-256-cbc -K $encrypted_481248b6289f_key -iv $encrypted_481248b6289f_iv -in .travis.id_rsa.enc -out id_rsa -d'
99
- sudo apt-get -q update
10-
- sudo apt-get remove -y libtidy-0.99-0
11-
- wget https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-64bit.deb
12-
- sudo dpkg -i tidy-5.4.0-64bit.deb
1310
- sudo apt-get install -y discount linkchecker
1411
- gem install mdl
15-
- npm install -g postcss-cli cssnano autoprefixer
1612

1713
script:
18-
- make check
14+
- make lint
1915

2016
after_success:
2117
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || eval "$(ssh-agent -s)"'
2218
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || chmod 600 id_rsa'
2319
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ssh-add id_rsa'
2420
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || echo -e "Host somasis.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config'
25-
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || git remote add deploy [email protected]:/srv/www/wiki.musl-libc.org'
21+
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || git remote add deploy [email protected]:/srv/www/wiki.musl-libc.org.git'
2622
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || git push deploy -vf master'

‎Makefile

-70
This file was deleted.

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
makedown/Makefile

‎README.md

+24-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,29 @@ A community-maintained wiki detailing things such as implementation details,
77
frequently asked questions, open issues, users of musl, and other information to
88
the [musl libc](https://www.musl-libc.org/) project.
99

10+
## Cloning
11+
12+
Make sure to get the `makedown` submodule, you'll need it to make the HTML.
13+
14+
```sh
15+
git clone --recursive https://github.com/somasis/musl-wiki
16+
```
17+
18+
## Build requirements
19+
20+
- [Discount]'s `markdown`
21+
22+
### Testing/checking/linting
23+
24+
- [markdownlint]
25+
- [devd]
26+
- [linkchecker]
27+
28+
[Discount]: http://www.pell.portland.or.us/~orc/Code/discount/
29+
[markdownlint]: https://github.com/markdownlint/markdownlint
30+
[devd]: https://github.com/cortesi/devd
31+
[linkchecker]: https://wummel.github.io/linkchecker
32+
1033
## Contributing
1134

1235
[Pull requests](https://github.com/somasis/musl-wiki/pulls) are welcomed.
@@ -19,7 +42,7 @@ correct and reasonably good quality.
1942
When making edits for submission, you may want to run `make lint` in order to ensure
2043
that your newly-added documentation or edits are adherent to the markdown
2144
style. However, it's not really necessary to test locally; Travis CI tests all
22-
pull-requests and runs lint on them, and fails if the new commits introduce warnings.
45+
pull-requests and runs `lint` on them, and fails if the new commits introduce warnings.
2346

2447
In addition to editing locally, you can also edit online.
2548
For creating new pages, click GitHub's "Create New File" button, type the page

‎makedown

Submodule makedown added at 443a63a

‎makedown.conf

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SITE_NAME = musl libc
2+
IMAGE ?= /srv/www/wiki.musl-libc.org
3+
WIKI_LINKS = true

‎page.template

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<title><?makefile title?></title>
4+
<title><?makedown title?></title>
55
<meta charset="UTF-8" />
6-
<meta name="description" content="<?makefile description?>" />
6+
<meta name="description" content="<?makedown description?>" />
77
<meta name="viewport" content="width=device-width, initial-scale=1" />
8-
<meta name="author" content="<?makefile author?>" />
9-
<meta name="date" content="<?makefile date?>" />
10-
<meta name="generator" content="<?makefile version?>" />
8+
<meta name="author" content="<?makedown author?>" />
9+
<meta name="date" content="<?makedown date?>" />
10+
<meta name="generator" content="<?makedown version?>" />
1111
<link rel="icon" type="image/png" href="/favicon.png" sizes="96x96" />
12-
<link rel="stylesheet" type="text/css" href="/main.min.css" />
12+
<link rel="stylesheet" type="text/css" href="/main.css" />
1313
</head>
1414
<body>
1515
<header class='pageheader'>
@@ -25,21 +25,21 @@
2525
</form>
2626
</header>
2727
<nav class='toc'>
28-
<?makefile toc?>
28+
<?makedown toc?>
2929
</nav>
3030
<main>
3131
<header>
32-
<h1><?makefile title_unprefixed?></h1>
32+
<h1><?makedown title_unprefixed_escaped?></h1>
3333
</header>
34-
<?makefile body?>
34+
<?makedown body?>
3535
</main>
3636
<footer>
3737
You can contribute to this wiki! Submit pull-requests to <a href='https://github.com/somasis/musl-wiki'>somasis/musl-wiki</a>.<br />
3838
<a href='https://travis-ci.org/somasis/musl-wiki'><img alt='Build Status' src='https://img.shields.io/travis/somasis/musl-wiki.svg?style=flat-square' /></a>
3939
<a href='https://github.com/somasis/musl-wiki/issues'><img alt='GitHub Issues' src='https://img.shields.io/github/issues/somasis/musl-wiki.svg?style=flat-square' /></a><br />
4040
<small>
4141
This work is licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0'>Creative Commons Attribution-ShareAlike 3.0 Unported license</a>, unless otherwise noted.<br />
42-
<a title='Latest commit to this page' href='https://github.com/somasis/musl-wiki/commit/<?makefile file_commit?>'><?makefile file_commit?></a> / <a title='Latest commit to entire site' href='https://github.com/somasis/musl-wiki/commit/<?makefile tree_commit?>'><?makefile tree_commit?></a>
42+
<a title='Latest commit to this page' href='https://github.com/somasis/musl-wiki/commit/<?makedown file_commit?>'><?makedown file_commit?></a> / <a title='Latest commit to entire site' href='https://github.com/somasis/musl-wiki/commit/<?makedown tree_commit?>'><?makedown tree_commit?></a>
4343
</small>
4444
</footer>
4545
</body>

‎scripts/devd.sh

-6
This file was deleted.

‎scripts/genwikilinks.sh

-26
This file was deleted.

‎scripts/linkchecker.sh

-15
This file was deleted.

0 commit comments

Comments
 (0)