You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2007/03/19 11:35:13 UTC
svn commit: r519897 - in /tcl/websh/trunk: CHANGES
doc/mod_websh/conf/websh.conf src/ChangeLog src/unix/Makefile.in websh.spec
Author: ronnie
Date: Mon Mar 19 03:35:12 2007
New Revision: 519897
URL: http://svn.apache.org/viewvc?view=rev&rev=519897
Log:
- more common installation paths (rpm style)
Modified:
tcl/websh/trunk/CHANGES
tcl/websh/trunk/doc/mod_websh/conf/websh.conf
tcl/websh/trunk/src/ChangeLog
tcl/websh/trunk/src/unix/Makefile.in
tcl/websh/trunk/websh.spec
Modified: tcl/websh/trunk/CHANGES
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/CHANGES?view=diff&rev=519897&r1=519896&r2=519897
==============================================================================
--- tcl/websh/trunk/CHANGES (original)
+++ tcl/websh/trunk/CHANGES Mon Mar 19 03:35:12 2007
@@ -9,6 +9,12 @@
Trunk
-----
+- Fixed websh.spec dependencies, paths, and improved installation
+ directories (more common rpm style) for Unix
+
+- Cleanup of unused local variables and some redundant initializations
+ of local variables throughout the code (compile with -Wall w/o warnings)
+
- Fix of html file handling in mod_websh under Windows
- Added documentation of [web::config reset] and [web::cmdurlcfg]
Modified: tcl/websh/trunk/doc/mod_websh/conf/websh.conf
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/doc/mod_websh/conf/websh.conf?view=diff&rev=519897&r1=519896&r2=519897
==============================================================================
--- tcl/websh/trunk/doc/mod_websh/conf/websh.conf (original)
+++ tcl/websh/trunk/doc/mod_websh/conf/websh.conf Mon Mar 19 03:35:12 2007
@@ -6,7 +6,7 @@
set webshroot "C:/Program Files/Apache Group/Websh"
} else {
# Unix (.so, .dylib ...)
- set webshroot /usr/local/websh
+ set webshroot /usr/share/websh3.6
}
# Setup interpreter classes for mod_websh
Modified: tcl/websh/trunk/src/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/ChangeLog?view=diff&rev=519897&r1=519896&r2=519897
==============================================================================
--- tcl/websh/trunk/src/ChangeLog (original)
+++ tcl/websh/trunk/src/ChangeLog Mon Mar 19 03:35:12 2007
@@ -1,3 +1,15 @@
+2007-03-19 Brunner Ronnie <ro...@netcetera.ch>
+
+ * src/unix/Makefile.in, doc/mod_websh/conf/websh.conf, websh.spec:
+ - more consistent installation directories (rpm style)
+
+2007-03-18 Brunner Ronnie <ro...@netcetera.ch>
+
+ * websh.spec:
+ - fixed dependencies, paths, and installation
+ (Thanks to Peter Kohler <pe...@netcetera.ch> for the
+ contribution)
+
2007-02-12 Brunner Ronnie <ro...@netcetera.ch>
* src/generic/dispatch.c, src/generic/crypt.c, src/generic/logutl.c,
Modified: tcl/websh/trunk/src/unix/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/unix/Makefile.in?view=diff&rev=519897&r1=519896&r2=519897
==============================================================================
--- tcl/websh/trunk/src/unix/Makefile.in (original)
+++ tcl/websh/trunk/src/unix/Makefile.in Mon Mar 19 03:35:12 2007
@@ -88,9 +88,10 @@
bindir = @bindir@
libdir = @libdir@
-moddir = $(exec_prefix)/modules
-docdir = $(prefix)/htdocs
-cfgdir = $(prefix)/conf
+moddir = $(libdir)/httpd/modules
+sharedir = $(prefix)/share/websh3.6
+docdir = $(sharedir)/htdocs
+cfgdir = $(sharedir)/conf
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -335,13 +336,14 @@
install-doc: install-dirs
cp -f $(TOP_DIR)/../doc/mod_websh/conf/*.* $(cfgdir)
cp -f $(TOP_DIR)/../doc/mod_websh/htdocs/*.* $(docdir)
- cp -f $(TOP_DIR)/../doc/mod_websh/README $(prefix)
+ cp -f $(TOP_DIR)/../doc/mod_websh/README $(sharedir)
# create destination directories
install-dirs:
mkdir -p $(bindir)
mkdir -p $(libdir)
mkdir -p $(moddir)
+ mkdir -p $(sharedir)
mkdir -p $(docdir)
mkdir -p $(cfgdir)
Modified: tcl/websh/trunk/websh.spec
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/websh.spec?view=diff&rev=519897&r1=519896&r2=519897
==============================================================================
--- tcl/websh/trunk/websh.spec (original)
+++ tcl/websh/trunk/websh.spec Mon Mar 19 03:35:12 2007
@@ -45,14 +45,14 @@
/usr/bin/websh3.6.0b4
/usr/lib/httpd/modules/mod_websh3.6.0b4.so
/usr/lib/libwebsh3.6.0b4.so
-/usr/share/websh3/conf/htmlhandler.ws3
-/usr/share/websh3/conf/httpd.conf
-/usr/share/websh3/conf/otherhandler.ws3
-/usr/share/websh3/conf/websh.conf
-/usr/share/websh3/htdocs/README
-/usr/share/websh3/htdocs/index.html
-/usr/share/websh3/htdocs/myApp.ws3
-/usr/share/websh3/htdocs/other.html
+/usr/share/websh3.6/conf/htmlhandler.ws3
+/usr/share/websh3.6/conf/httpd.conf
+/usr/share/websh3.6/conf/otherhandler.ws3
+/usr/share/websh3.6/conf/websh.conf
+/usr/share/websh3.6/htdocs/index.html
+/usr/share/websh3.6/htdocs/myApp.ws3
+/usr/share/websh3.6/htdocs/other.html
+/usr/share/websh3.6/README
%changelog
* Fri Dec 15 2006 Peter Kohler <pe...@netcetera.ch>
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org