From: Martin Mares <mj@ucw.cz>
Date: Mon, 24 Sep 2012 13:49:16 +0000 (+0200)
Subject: Released version 2.0
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=386d10a6d820acc621054edafdd10f2a8f7c893d;p=moe.git

Released version 2.0
---

diff --git a/Makefile b/Makefile
index 6e52c47..86f91d8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 VERSION=2.0
 
 # The default target
-all: runtree programs datafiles configs
+all:: runtree programs datafiles configs
 
 # Include configuration
 s=.
@@ -12,6 +12,10 @@ s=.
 obj/config.mk:
 	@echo "You need to run configure first." && false
 
+ifdef CONFIG_DOC
+all:: docs
+endif
+
 # We will use the libucw build system
 BUILDSYS=$(s)/build
 include $(BUILDSYS)/Maketop
diff --git a/README b/README
index 59bb818..d0eb509 100644
--- a/README
+++ b/README
@@ -25,3 +25,6 @@ with others, please send them to mj@ucw.cz.
 First of all, edit default.cfg to choose which components should be built.
 
 Then run "./configure" and "make". This will place all compiled binaries in "run/".
+
+By default, documentation is built, which requires AsciiDoc to be present.
+You can skip documentation by "./configure -CONFIG_DOC".
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 831cf9f..0000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-install:
-	rsync -av --delete . jw:/var/www/moe/
diff --git a/isolate/Makefile b/isolate/Makefile
index 3ebe9ac..011a005 100644
--- a/isolate/Makefile
+++ b/isolate/Makefile
@@ -3,10 +3,18 @@
 
 DIRS+=isolate
 PROGS+=$(o)/isolate/isolate
-DOCS+=$(o)/isolate/isolate.1
+
+DOCS+=$(o)/isolate/isolate.1 $(o)/isolate/isolate.1.html
+MAN1DIR=share/man/man1
+EXTRA_RUNDIRS+=$(MAN1DIR)
 
 $(o)/isolate/isolate: $(o)/isolate/isolate.o
 
 $(o)/isolate/isolate.1: $(s)/isolate/isolate.1.txt
 	$(M)"MAN $<"
 	$(Q)a2x -f manpage -D $(o)/isolate $<
+	$(Q)$(call symlink,$@,run/$(MAN1DIR))
+
+$(o)/isolate/isolate.1.html: $(s)/isolate/isolate.1.txt
+	$(M)"HTML $<"
+	$(Q)a2x -f xhtml -D $(o)/isolate $<
diff --git a/maint/release b/maint/release
index a51ce42..4d189b1 100755
--- a/maint/release
+++ b/maint/release
@@ -15,6 +15,7 @@ push @{$r->{"uploads"}}, {
 	}, {
 		"url" => "scp://jabberwock.ucw.cz/~ftp/pub/moe/"
 	};
+$r->{'testmake'} = './configure mop/default.cfg && make -j4';
 $r->ParseOptions;
 $r->InitDist("maint/dist");
 $r->GenPackage;
diff --git a/maint/release.pm b/maint/release.pm
index 85a074e..9930c14 100644
--- a/maint/release.pm
+++ b/maint/release.pm
@@ -30,6 +30,8 @@ sub new($$) {
 		"archivedir" => "/home/mj/tmp/archives/$basename",
 		"uploads" => [
 			],
+		"testmake" => "make",
+		"testclean" => "make distclean",
 		# Options
 		"do_test" => 1,
 		"do_patch" => 1,
@@ -242,13 +244,15 @@ sub Test($) {
 	my $dd = $s->{"DISTDIR"};
 	my $pkg = $s->{"PKG"};
 	my $log = "$dd/$pkg.log";
+	my $make = $s->{'testmake'};
+	my $clean = $s->{'testclean'};
 	print "Doing a test compilation\n";
-	`( cd $dd/$pkg && make ) >$log 2>&1`;
+	`( cd $dd/$pkg && $make ) >$log 2>&1`;
 	die "There were errors. Please inspect $log" if $?;
 	`grep -q [Ww]arning $log`;
 	$? or print "There were warnings! Please inspect $log.\n";
 	print "Cleaning up\n";
-	`cd $dd/$pkg && make distclean`; die if $?;
+	`cd $dd/$pkg && $clean`; die if $?;
 }
 
 sub MakePatch($) {