[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r21567: {website} Build the html manpage for the development versions of Tor f (in website/trunk: . en)
Author: sebastian
Date: 2010-02-07 03:05:47 +0000 (Sun, 07 Feb 2010)
New Revision: 21567
Modified:
website/trunk/Makefile
website/trunk/Makefile.common
website/trunk/en/tor-manual-dev.wml
Log:
Build the html manpage for the development versions of Tor from git
This will mean that once 0.2.2.x is stable, we won't need to
seperate checkouts anymore
Modified: website/trunk/Makefile
===================================================================
--- website/trunk/Makefile 2010-02-05 21:41:39 UTC (rev 21566)
+++ website/trunk/Makefile 2010-02-07 03:05:47 UTC (rev 21567)
@@ -1,12 +1,15 @@
# Directions for building the website:
-# 1. check out stable-tor and development-tor and website onto moria.
-# 2. edit the two lines below to point to them.
+# 1. check out stable-tor, make TORSVNSTABLE point to it.
+# 2. Clone the Tor git repository, make TORGIT point to it.
# 3. (edit include/versions.wmi or others if you like)
-# 4. make
-# 5. ./publish
+# 4. Update STABLETAG and DEVTAG below if there is a new git tag
+# 5. make
+# 6. ./publish
TORSVNSTABLE = ../tor-stable
-TORSVNHEAD = ../tor
+TORGIT = ../tor
+STABLETAG = tor-0.2.1.22
+DEVTAG = tor-0.2.2.8-alpha
#TORSVNSTABLE = /home/arma/work/onion/git/tor-021
#TORSVNHEAD = /home/arma/work/onion/git/tor
Modified: website/trunk/Makefile.common
===================================================================
--- website/trunk/Makefile.common 2010-02-05 21:41:39 UTC (rev 21566)
+++ website/trunk/Makefile.common 2010-02-07 03:05:47 UTC (rev 21567)
@@ -14,7 +14,9 @@
-D DOCROOT=$(WMLBASE) \
-D IMGROOT=$(WMLBASE)/images \
-D TORSVNSTABLE=$(TORSVNSTABLE) \
- -D TORSVNHEAD=$(TORSVNHEAD)
+ -D TORGIT=$(TORGIT) \
+ -D DEVTAG=$(DEVTAG) \
+ -D STABLETAG=$(STABLETAG)
LANGS=de en es it fi fr ja ko nl no pl pt ru se tr zh-cn fa ar
Modified: website/trunk/en/tor-manual-dev.wml
===================================================================
--- website/trunk/en/tor-manual-dev.wml 2010-02-05 21:41:39 UTC (rev 21566)
+++ website/trunk/en/tor-manual-dev.wml 2010-02-07 03:05:47 UTC (rev 21567)
@@ -9,13 +9,10 @@
<div class="main-column">
<:
- die "Missing manpage" unless -f "$(TORSVNHEAD)/doc/tor.1.in";
- my $man = `man2html -M '' $(TORSVNHEAD)/doc/tor.1.in`;
- die "No manpage" unless $man;
+ die "Missing git clone" unless -d "$(TORGIT)";
+ my $man = `GIT_DIR=$(TORGIT) git show $(DEVTAG):doc/tor.1.txt | asciidoc -d manpage -s -o - -`;
+ die "No manpage because of asciidoc error or file not available from git" unless $man;
- $man =~ s,.*<body>,,is;
- $man =~ s,</body>.*,,is;
-
print $man;
:>