Preparing for release 2.0

diff --git a/Makefile b/Makefile
index bd1c58c6f45159b503aebd3f3b4f1447637d2bd3..6e52c470bfd9568e0e62197162539970d23bc931 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for Moe
 # (c) 2008--2012 Martin Mares <mj@ucw.cz>
 
-VERSION=1.0.99-20080220
+VERSION=2.0
 
 # The default target
 all: runtree programs datafiles configs

diff --git a/README b/README
index 17ae449b6393cc2f62066aaaafec6660728bdd7e..59bb8188a48961c348c113c3d2a63e781884afb7 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,8 @@
 
                          Moe Contest Environment @VERSION@
 
-                   (c) 2001--2008 Martin Mares <mj@ucw.cz>
+                   (c) 2001--2012 Martin Mares <mj@ucw.cz>
+                            and other contributors
 
 ================================================================================
 
@@ -19,11 +20,8 @@ Public License version 2.
 If you have any suggestions, bug reports or improvements you would like to share
 with others, please send them to mj@ucw.cz.
 
+** How to build Moe **
 
-** How to compile the submission system **
+First of all, edit default.cfg to choose which components should be built.
 
-First, unpack holmes-libs-3.12, configure it and run make. You can build a thinner
-version with `./configure default.cfg -CONFIG_IMAGES -CONFIG_UCW_THREADS -CONFIG_SHARED'.
-
-Then uncomment the "SUBMIT" line in the top-level Makefile and let LIBUCW
-point to the compiled Holmes libraries.
+Then run "./configure" and "make". This will place all compiled binaries in "run/".

diff --git a/default.cfg b/default.cfg
index a1fba31dfae4a062c12361a73e62cdab58758285..259b391b210dbde29adfe63d6652ebc590fd6fd3 100644 (file)
--- a/default.cfg
+++ b/default.cfg
@@ -1,10 +1,12 @@
 # Default configuration file for Moe
+# By default, only the core parts are built, including box and isolate.
+# If you wish to build more, enable it below.
 
 # Compile the submit server
-Set("CONFIG_SUBMIT" => 1);
+#Set("CONFIG_SUBMIT" => 1);
 
 # Build MO-P contest environment
-Set("CONFIG_MOP" => 1);
+#Set("CONFIG_MOP" => 1);
 
 # If you are running a 64-bit Linux kernel, you need to build a 64-bit
 # sandbox and decide whether your userspace is 32- or 64-bit.

diff --git a/maint/release b/maint/release
index c1c8cc9e84f1e2e93157626afdee494a90da6f2f..a51ce4202953f2a82207c6740d6ca8af8ef55fba 100755 (executable)
--- a/maint/release
+++ b/maint/release
@@ -1,20 +1,19 @@
 #!/usr/bin/perl
-# A simple script for making releases of mo-eval
-# (c) 2005--2008 Martin Mares <mj@ucw.cz>
+# A simple script for making releases of Moe
+# (c) 2005--2012 Martin Mares <mj@ucw.cz>
 
 use strict;
 use warnings;
 require "maint/release.pm";
 
-my $r = new UCW::Release("mo-eval");
+my $r = new UCW::Release("moe");
 my $ver = $r->GetVersionFromFile("Makefile", "VERSION=(.*)");
-#$r->GetVersionsFromChangelog("ChangeLog", "Released as (.*)\.");
 unshift @{$r->{"rules"}}, '^(problems|testing|solutions|maint|certs)/.*' => '-';
 push @{$r->{"directories"}}, "problems", "testing", "solutions";
 push @{$r->{"uploads"}}, {
-               "url" => "scp://atrey.karlin.mff.cuni.cz/~ftp/pub/local/mj/eval/"
+               "url" => "scp://atrey.karlin.mff.cuni.cz/~ftp/pub/moe/"
        }, {
-               "url" => "scp://jabberwock.ucw.cz/~ftp/pub/mj/eval/"
+               "url" => "scp://jabberwock.ucw.cz/~ftp/pub/moe/"
        };
 $r->ParseOptions;
 $r->InitDist("maint/dist");
@@ -24,5 +23,5 @@ $r->Dispatch;
 
 if ($r->{"do_upload"}) {
        print "Updating documentation at Jabberwock\n";
-       `rsync -a doc/. jabberwock.ucw.cz:www/mo-eval/`; die if $?;
+       `rsync -av --delete doc/. jabberwock.ucw.cz:/var/www/moe/`; die if $?;
 }