Build the html manpage for the development versions of Tor from git
Sebastian Hahn commited on 2010-02-07 04:05:47
Zeige 3 geänderte Dateien mit 14 Einfügungen und 12 Löschungen.
This will mean that once 0.2.2.x is stable, we won't need to seperate checkouts anymore
- Makefile 093e5aa47..fc678e3cb
- Makefile.common 7e811df03..a63bba5d5
- en/tor-manual-dev.wml 856a870d0..846706db3
| ... | ... |
@@ -1,12 +1,15 @@ |
| 1 | 1 |
# Directions for building the website: |
| 2 |
-# 1. check out stable-tor and development-tor and website onto moria. |
|
| 3 |
-# 2. edit the two lines below to point to them. |
|
| 2 |
+# 1. check out stable-tor, make TORSVNSTABLE point to it. |
|
| 3 |
+# 2. Clone the Tor git repository, make TORGIT point to it. |
|
| 4 | 4 |
# 3. (edit include/versions.wmi or others if you like) |
| 5 |
-# 4. make |
|
| 6 |
-# 5. ./publish |
|
| 5 |
+# 4. Update STABLETAG and DEVTAG below if there is a new git tag |
|
| 6 |
+# 5. make |
|
| 7 |
+# 6. ./publish |
|
| 7 | 8 |
|
| 8 | 9 |
TORSVNSTABLE = ../tor-stable |
| 9 |
-TORSVNHEAD = ../tor |
|
| 10 |
+TORGIT = ../tor |
|
| 11 |
+STABLETAG = tor-0.2.1.22 |
|
| 12 |
+DEVTAG = tor-0.2.2.8-alpha |
|
| 10 | 13 |
#TORSVNSTABLE = /home/arma/work/onion/git/tor-021 |
| 11 | 14 |
#TORSVNHEAD = /home/arma/work/onion/git/tor |
| 12 | 15 |
|
| ... | ... |
@@ -14,7 +14,9 @@ WMLOPT = \ |
| 14 | 14 |
-D DOCROOT=$(WMLBASE) \ |
| 15 | 15 |
-D IMGROOT=$(WMLBASE)/images \ |
| 16 | 16 |
-D TORSVNSTABLE=$(TORSVNSTABLE) \ |
| 17 |
- -D TORSVNHEAD=$(TORSVNHEAD) |
|
| 17 |
+ -D TORGIT=$(TORGIT) \ |
|
| 18 |
+ -D DEVTAG=$(DEVTAG) \ |
|
| 19 |
+ -D STABLETAG=$(STABLETAG) |
|
| 18 | 20 |
|
| 19 | 21 |
LANGS=de en es it fi fr ja ko nl no pl pt ru se tr zh-cn fa ar |
| 20 | 22 |
|
| ... | ... |
@@ -9,12 +9,9 @@ |
| 9 | 9 |
<div class="main-column"> |
| 10 | 10 |
|
| 11 | 11 |
<: |
| 12 |
- die "Missing manpage" unless -f "$(TORSVNHEAD)/doc/tor.1.in"; |
|
| 13 |
- my $man = `man2html -M '' $(TORSVNHEAD)/doc/tor.1.in`; |
|
| 14 |
- die "No manpage" unless $man; |
|
| 15 |
- |
|
| 16 |
- $man =~ s,.*<body>,,is; |
|
| 17 |
- $man =~ s,</body>.*,,is; |
|
| 12 |
+ die "Missing git clone" unless -d "$(TORGIT)"; |
|
| 13 |
+ my $man = `GIT_DIR=$(TORGIT) git show $(DEVTAG):doc/tor.1.txt | asciidoc -d manpage -s -o - -`; |
|
| 14 |
+ die "No manpage because of asciidoc error or file not available from git" unless $man; |
|
| 18 | 15 |
|
| 19 | 16 |
print $man; |
| 20 | 17 |
:> |
| 21 | 18 |