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 2010/07/27 16:17:35 UTC
svn commit: r979716 - in /tcl/websh/trunk: CHANGES src/ChangeLog
src/generic/messages.c src/unix/Makefile.in
Author: ronnie
Date: Tue Jul 27 14:17:34 2010
New Revision: 979716
URL: http://svn.apache.org/viewvc?rev=979716&view=rev
Log:
- Also transfer CFLAGS_WARNING from tclConfig.sh
- Fixed redefinition warnings when including
TCL_DEFS for Apache > 2 and Tcl >= 8.6
- Fixed apachetests for Darwin (LIBRARY_PATH variable)
Modified:
tcl/websh/trunk/CHANGES
tcl/websh/trunk/src/ChangeLog
tcl/websh/trunk/src/generic/messages.c
tcl/websh/trunk/src/unix/Makefile.in
Modified: tcl/websh/trunk/CHANGES
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/CHANGES?rev=979716&r1=979715&r2=979716&view=diff
==============================================================================
--- tcl/websh/trunk/CHANGES (original)
+++ tcl/websh/trunk/CHANGES Tue Jul 27 14:17:34 2010
@@ -19,6 +19,12 @@ Known Issues
Trunk
-----
+- Improved configure.in and Makefile.in for Unix builds
+
+- Remove redundant log in web::decryptd
+
+- Made -Wall happy when compiling on Unix (removed unused vars etc.)
+
- Some reformatting, typo fixes and consistency improvements in quickref
Modified: tcl/websh/trunk/src/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/ChangeLog?rev=979716&r1=979715&r2=979716&view=diff
==============================================================================
--- tcl/websh/trunk/src/ChangeLog (original)
+++ tcl/websh/trunk/src/ChangeLog Tue Jul 27 14:17:34 2010
@@ -1,3 +1,17 @@
+2010-07-27 Brunner Ronnie <ro...@netcetera.ch>
+ * doap_websh.rdf:
+ - Fixed typo in description
+ * src/apachetests/conf/server.conf.tcl:
+ - Added LockFile config (to make sure directory exists)
+ * src/unix/Makefile.in, src/unix/configure.in:
+ - Also transfer CFLAGS_WARNING from tclConfig.sh
+ * src/unix/Makefile.in:
+ - Fixed redefinition warnings when including
+ TCL_DEFS for Apache > 2 and Tcl >= 8.6
+ - Fixed apachetests for Darwin (LIBRARY_PATH variable)
+ * src/generic/messages.c:
+ - Changed variable definition to avoid strange casting warnings
+
2010-05-03 Brunner Ronnie <ro...@netcetera.ch>
* src/generic/nca_d.c:
- removed redundant log in web::decryptd (handeled by caller)
Modified: tcl/websh/trunk/src/generic/messages.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/messages.c?rev=979716&r1=979715&r2=979716&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/messages.c (original)
+++ tcl/websh/trunk/src/generic/messages.c Tue Jul 27 14:17:34 2010
@@ -114,7 +114,7 @@ int Web_Recv(ClientData clientData,
{
int mode = 0;
- char *data = NULL;
+ void *data = NULL;
TCLCONST char *res = NULL;
int cmdcode = 0;
int flags = 0;
@@ -145,15 +145,15 @@ int Web_Recv(ClientData clientData,
return TCL_ERROR;
}
- if (receive_msg(tc, &cmdcode, &flags, &size, (void **) &data) == -1) {
+ if (receive_msg(tc, &cmdcode, &flags, &size, &data) == -1) {
if (data)
Tcl_Free((char *) data);
Tcl_PosixError(interp);
return TCL_ERROR;
}
- res = Tcl_SetVar(interp, Tcl_GetString(objv[3]), data, TCL_LEAVE_ERR_MSG);
- Tcl_Free(data);
+ res = Tcl_SetVar(interp, Tcl_GetString(objv[3]), (char *) data, TCL_LEAVE_ERR_MSG);
+ Tcl_Free((char *) data);
if (res == NULL)
return TCL_ERROR;
Modified: tcl/websh/trunk/src/unix/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/unix/Makefile.in?rev=979716&r1=979715&r2=979716&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/Makefile.in (original)
+++ tcl/websh/trunk/src/unix/Makefile.in Tue Jul 27 14:17:34 2010
@@ -94,6 +94,7 @@ CC = @CC@
CFLAGS_DEBUG = @CFLAGS_DEBUG@
CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
+CFLAGS_WARNING = @CFLAGS_WARNING@
CLEANFILES = @CLEANFILES@
EXEEXT = @EXEEXT@
LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
@@ -107,8 +108,10 @@ SHLIB_LD = @SHLIB_LD@
Platform=$(shell uname -s)
ifeq ($(Platform),Darwin)
SHLIB_LD_CURRENT = $(CC) -bundle -bundle_loader $(HTTPD_BIN) $(LDFLAGS)
+LDLIBPATHVAR = DYLD_LIBRARY_PATH
else
SHLIB_LD_CURRENT = $(SHLIB_LD) $(TCL_LD_FLAGS)
+LDLIBPATHVAR = LD_LIBRARY_PATH
endif
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
@@ -145,7 +148,10 @@ LDFLAGS = $(LDFLAGS_DEFAULT)
INCLUDES = @TCL_INCLUDES@ $(HTTPD_INCLUDES)
-EXTRA_CFLAGS = $(TCL_DEFS) $(PROTO_FLAGS) $(SECURITY_FLAGS) \
+# remove PACKAGE stuff: will cause warnings for Apache >2 and Tcl >=8.5
+FIXED_TCL_DEFS = $(filter-out -DPACKAGE_NAME=% -DPACKAGE_TARNAME=% -DPACKAGE_VERSION=% -DPACKAGE_STRING=% -DPACKAGE_BUGREPORT=% 8.% 9.%, $(TCL_DEFS))
+
+EXTRA_CFLAGS = $(FIXED_TCL_DEFS) $(PROTO_FLAGS) $(SECURITY_FLAGS) \
$(MEM_DEBUG_FLAGS) $(KEYSYM_FLAGS) $(NO_DEPRECATED_FLAGS) \
$(TCL_EXTRA_CFLAGS)
@@ -190,8 +196,8 @@ distdoc: ../../doc/quickref.xml ../../do
# =============================================================================
test: websh$(VERSION) $(web_LIB_FILE) $(web_OBJECTS)
- @LD_LIBRARY_PATH="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
- export LD_LIBRARY_PATH; \
+ @$(LDLIBPATHVAR)="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
+ export $(LDLIBPATHVAR); \
TCL_LIBRARY="$(TCL_SRC_DIR)/library"; export TCL_LIBRARY; \
WEB_LIBRARY=$(TOP_DIR)/unix/$(web_LIB_FILE); export WEB_LIBRARY; \
WEB_BIN=$(TOP_DIR)/unix/websh$(VERSION); export WEB_BIN; \
@@ -201,8 +207,8 @@ test: websh$(VERSION) $(web_LIB_FILE) $(
$(TOP_DIR)/unix/websh$(VERSION) webtest.ws3
test.pure: websh$(VERSION).pure $(web_LIB_FILE) $(web_OBJECTS)
- @LD_LIBRARY_PATH="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
- export LD_LIBRARY_PATH; \
+ @$(LDLIBPATHVAR)="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
+ export $(LDLIBPATHVAR); \
TCL_LIBRARY="$(TCL_SRC_DIR)/library"; export TCL_LIBRARY; \
WEB_LIBRARY=$(TOP_DIR)/unix/$(web_LIB_FILE); export WEB_LIBRARY; \
WEB_BIN=$(TOP_DIR)/unix/websh$(VERSION).pure; export WEB_BIN; \
@@ -212,8 +218,8 @@ test.pure: websh$(VERSION).pure $(web_LI
(echo source webtest.ws3) | ../unix/websh$(VERSION).pure
test.cov: websh$(VERSION).cov $(web_LIB_FILE) $(web_OBJECTS)
- @LD_LIBRARY_PATH="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
- export LD_LIBRARY_PATH; \
+ @$(LDLIBPATHVAR)="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
+ export $(LDLIBPATHVAR); \
TCL_LIBRARY="$(TCL_SRC_DIR)/library"; export TCL_LIBRARY; \
WEB_LIBRARY=$(TOP_DIR)/unix/$(web_LIB_FILE); export WEB_LIBRARY; \
WEB_BIN=$(TOP_DIR)/unix/websh$(VERSION).cov; export WEB_BIN; \
@@ -223,8 +229,8 @@ test.cov: websh$(VERSION).cov $(web_LIB_
(echo source webtest.ws3) | ../unix/websh$(VERSION).cov
apachetest: mod_websh.so websh
- @LD_LIBRARY_PATH="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
- export LD_LIBRARY_PATH; \
+ @$(LDLIBPATHVAR)="$(strip $(TCL_PACKAGE_PATH)):$(TOP_DIR)/unix:$(LD_LIBRARY_PATH)"; \
+ export $(LDLIBPATHVAR); \
TCL_LIBRARY="$(TCL_SRC_DIR)/library"; export TCL_LIBRARY; \
WEB_LIBRARY=$(TOP_DIR)/unix/$(web_LIB_FILE); export WEB_LIBRARY; \
WEB_BIN=$(TOP_DIR)/unix/websh$(VERSION); export WEB_BIN; \
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org