Permalink
Browse files

Merge branch 'master' of github.com:zeromq/ztools

  • Loading branch information...
2 parents 258aa72 + b1db208 commit 041d57e400b085cbe5baea0fadc31ec166ed4e9e Mikko Koppanen committed Apr 20, 2011
Showing with 24 additions and 38 deletions.
  1. +8 −9 apisite/README.md
  2. +6 −7 apisite/README.txt
  3. +5 −17 apisite/apiall
  4. +3 −3 apisite/apione
  5. +2 −2 apisite/xml2wd.pl
View
@@ -8,7 +8,7 @@ ztools/apisite - Rebuild api.zero.mq site
**<a href="#toc2-14">How?</a>**
-**<a href="#toc2-43">Site Admin and CSS</a>**
+**<a href="#toc2-42">Site Admin and CSS</a>**
<A name="toc2-9" title="What?" />
## What?
@@ -25,12 +25,11 @@ To install:
export APISITE_USER=_login_
export APISITE_KEY=_key_
git clone git://github.com/zeromq/ztools.git
- git clone git://github.com/zeromq/zeromq2.git
+ git clone git://github.com/zeromq/libzmq.git
git clone git://github.com/zeromq/zeromq2-1.git
+ git clone git://github.com/zeromq/zeromq2-2.git
-Make sure the main and 2.1 gits are in parallel directories to ztools.
-
-To run on all versions from 2.0.6 to master:
+To run on current versions:
cd ztools/apisite
./apiall
@@ -39,12 +38,12 @@ To run on one specific version:
cd ztools/apisite
./apione <zmq_dir> <branch> <category>
-
+
Where branch is the git branch or tag, and category is the destination on the wiki site. E.g.
- ./apione ../../zeromq2 v2.0.10 2-0-10
-
-<A name="toc2-43" title="Site Admin and CSS" />
+ ./apione ../../libzmq master 3-0
+
+<A name="toc2-42" title="Site Admin and CSS" />
## Site Admin and CSS
To change the look and feel of the site you need edit access, and then you can edit http://api.zero.mq/admin:css. The site manager is at http://api.zero.mq/admin:manage.
View
@@ -19,12 +19,11 @@ To install:
export APISITE_USER=_login_
export APISITE_KEY=_key_
git clone git://github.com/zeromq/ztools.git
- git clone git://github.com/zeromq/zeromq2.git
+ git clone git://github.com/zeromq/libzmq.git
git clone git://github.com/zeromq/zeromq2-1.git
+ git clone git://github.com/zeromq/zeromq2-2.git
-Make sure the main and 2.1 gits are in parallel directories to ztools.
-
-To run on all versions from 2.0.6 to master:
+To run on current versions:
cd ztools/apisite
./apiall
@@ -33,11 +32,11 @@ To run on one specific version:
cd ztools/apisite
./apione <zmq_dir> <branch> <category>
-
+
Where branch is the git branch or tag, and category is the destination on the wiki site. E.g.
- ./apione ../../zeromq2 v2.0.10 2-0-10
-
+ ./apione ../../libzmq master 3-0
+
## Site Admin and CSS
To change the look and feel of the site you need edit access, and then you can edit http://api.zero.mq/admin:css. The site manager is at http://api.zero.mq/admin:manage.
View
@@ -10,25 +10,13 @@
#
# Requires these gits be checked out parallel to the ztools git:
#
-# zeromq2 - current master
+# libzmq - current 3.0 master
# zeromq2-1 - 2.1 release
# zeromq2-0 - 2.0 release
#
TOOLDIR=`dirname $0`
-# 2.2 is in the source git
-$TOOLDIR/apione ../../zeromq2 master master
-
-# 2.1 is in its own release git
-$TOOLDIR/apione ../../zeromq2-1 v2.1.3 2-1-3
-#$TOOLDIR/apione ../../zeromq2-1 v2.1.2 2-1-2
-#$TOOLDIR/apione ../../zeromq2-1 v2.1.1 2-1-1
-#$TOOLDIR/apione ../../zeromq2-1 v2.1.0 2-1-0
-
-# 2.0 is in its own release git
-$TOOLDIR/apione ../../zeromq2-0 v2.0.11 2-0-11
-#$TOOLDIR/apione ../../zeromq2-0 v2.0.10 2-0-10
-#$TOOLDIR/apione ../../zeromq2-0 v2.0.9 2-0-9
-#$TOOLDIR/apione ../../zeromq2-0 v2.0.8 2-0-8
-#$TOOLDIR/apione ../../zeromq2-0 v2.0.7 2-0-7
-#$TOOLDIR/apione ../../zeromq2-0 v2.0.6 2-0-6
+# Directory Branch Category
+$TOOLDIR/apione ../../libzmq master 3-0
+$TOOLDIR/apione ../../zeromq2-1 v2.1.5 2-1
+$TOOLDIR/apione ../../zeromq2-0 v2.0.11 2-0
View
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# apione - Upload all 0MQ manuals to api.zero.mq
+# apione - Upload all 0MQ manuals to api.zeromq.org
# Part of the ztools/apione toolkit.
#
# Author: Pieter Hintjens <ph@imatix.com>
@@ -27,7 +27,7 @@ UPLOAD=1
#
function do_upload {
- wdput 0mq-api $1 $2 $3
+ wdput 0mq-api $1 $2 "$3"
if [ $? != 0 ]; then
echo "Error uploading file to wikidot"
exit 1
@@ -66,7 +66,7 @@ function do_branch {
done
if [ $UPLOAD -eq 1 ]; then
- echo "Uploading to api.zero.mq/$CATEGORY..."
+ echo "Uploading to api.zeromq.org/$CATEGORY..."
# Send table of contents as category:_start
do_upload $CATEGORY "_start" "ØMQ API"
View
@@ -45,9 +45,9 @@
END
if ($title eq "zmq") {
open (TOC, ">_start.wd");
- print TOC "[[image http://api.zeromq.org/local--files/admin:css/logo.gif link=\"/master:_start\"]]\n\n";
+ print TOC "[[image http://api.zeromq.org/local--files/admin:css/logo.gif link=\"/2-1:_start\"]]\n\n";
print TOC "++ ØMQ/$version API Reference\n\n";
- print TOC "[/master:_start Master] | [/2-1-3:_start v2.1.3] | [/2-0-11:_start v2.0.11]\n\n";
+ print TOC "[/3-0:_start v3.0 raw] | [/2-1:_start v2.1 stable] | [/2-0:_start v2.0 legacy]\n\n";
close (TOC);
}
}

0 comments on commit 041d57e

Please sign in to comment.