Changeset 20

Timestamp:

12/12/06 20:15:06 (2 years ago)

Author:

ingy

Message:

 r2320@skinny-2:  ingy | 2006-12-12 20:13:06 -0800
 Implemented 'kwiki -configure'. Now the README is correct.
 

Files:

• trunk/Configure.pl (deleted)
• trunk/Makefile (modified) (1 diff)
• trunk/bin/kwiki (modified) (2 diffs)
• trunk/core/Kwiki/lib/Kwiki/Command.pm (modified) (1 diff)
• trunk/core/Kwiki/lib/Kwiki/Configure.pm (added)
• trunk/core/modules.mk (modified) (1 diff)
• trunk/lib/Kwiki/Configure.pm (added)

trunk/Makefile

@@ -3 +3 @@
-
-links:
-
+ all
-
-clean:
-        $(MAKE) -C lib $@
-        rm -f config.*
-
-distclean: PURGE clean
-
-PURGE:
-        $(MAKE) -C kwiki/sample $@

trunk/bin/kwiki

@@ -1 +1 @@
-#!/usr/bin/env perl
+use 5.008003;
-use strict;
-use warnings;
-37
+40
-use Cwd 'abs_path';
-use FindBin;
+use Config;
-
-sub valid_base {
@@ -39 +41 @@
-    eval "use lib '$base/lib'; 1"
-      or die $@;
+    if (1 || XXX("XXX - Only for test")) {
+        @INC = (
+            "$base/lib",
+            $Config::Config{privlib},
+            $Config::Config{archlib},
+        ); 
+    }
-    $ENV{KWIKI_BASE} = $base;
-}

trunk/core/Kwiki/lib/Kwiki/Command.pm

@@ -1 +1 @@
-package Kwiki::Command;
-use Spoon::Command -Base;
+
+sub process {
+    if (defined $ENV{KWIKI_BASE}) {
+        $self->hub->config->add_plugin('Kwiki::Configure');
+    }
+    $self->SUPER::process(@_);
+}
-
-sub handle_new {

trunk/core/modules.mk

@@ -18 +18 @@
-        IO/All.pm \
-        Kwiki/Archive.pm Kwiki/Base.pm Kwiki/BrowserDetect.pm Kwiki/CGI.pm \
-
+
+
-        Kwiki/Cookie.pm Kwiki/CSS.pm Kwiki/Display.pm Kwiki/Edit.pm \
-        Kwiki/Files.pm Kwiki/Formatter.pm Kwiki/Hub.pm Kwiki/Icons.pm \