You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by da...@apache.org on 2004/06/02 10:20:48 UTC
cvs commit: tcl-rivet/win makefile.vc
davidw 2004/06/02 01:20:48
Modified: . ChangeLog
debian changelog
src rivetParser.h
src/buildscripts aardvark.tcl
tests binary.rvt
win makefile.vc
Log:
* src/buildscripts/aardvark.tcl: Use 'Output' instead of puts. It
might be useful were we ever to do something like make an aardvark
GUI.
* Following changes by Pat Thoyts <pa...@users.sourceforge.net>:
* win/makefile.vc: Updated to deal with the START_TAG END_TAG macros.
* src/rivetParser.h: Declare missing prototype.
* tests/binary.rvt: The stdout channel under Windows needs to be told
to use translation binary for binary data.
Revision Changes Path
1.185 +15 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ChangeLog 18 May 2004 20:23:01 -0000 1.184
+++ ChangeLog 2 Jun 2004 08:20:48 -0000 1.185
@@ -1,3 +1,18 @@
+2004-06-02 David N. Welton <da...@dedasys.com>
+
+ * src/buildscripts/aardvark.tcl: Use 'Output' instead of puts. It
+ might be useful were we ever to do something like make an aardvark
+ GUI.
+
+2004-06-01 David N. Welton <da...@dedasys.com>
+
+ * Following changes by Pat Thoyts <pa...@users.sourceforge.net>:
+ * win/makefile.vc: Updated to deal with the START_TAG END_TAG
+ macros.
+ * src/rivetParser.h: Declare missing prototype.
+ * tests/binary.rvt: The stdout channel under Windows needs to be
+ told to use translation binary for binary data.
+
2004-05-18 David N. Welton <da...@dedasys.com>
* src/make.tcl: Quote Tcl argument.
1.6 +6 -0 tcl-rivet/debian/changelog
Index: changelog
===================================================================
RCS file: /home/cvs/tcl-rivet/debian/changelog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changelog 6 Feb 2004 21:52:02 -0000 1.5
+++ changelog 2 Jun 2004 08:20:48 -0000 1.6
@@ -1,3 +1,9 @@
+rivet (0.4.0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- David N. Welton <da...@debian.org> Fri, 28 May 2004 22:44:16 +0200
+
rivet (0.3.0-1) unstable; urgency=low
* New upstream version.
1.5 +3 -0 tcl-rivet/src/rivetParser.h
Index: rivetParser.h
===================================================================
RCS file: /home/cvs/tcl-rivet/src/rivetParser.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rivetParser.h 25 Feb 2004 12:56:49 -0000 1.4
+++ rivetParser.h 2 Jun 2004 08:20:48 -0000 1.5
@@ -27,4 +27,7 @@
EXTERN int Rivet_GetTclFile(char *filename, Tcl_Obj *outbuf, Tcl_Interp *interp);
+EXTERN int Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf);
+
+
#endif /* RIVETPARSER_H */
1.19 +4 -4 tcl-rivet/src/buildscripts/aardvark.tcl
Index: aardvark.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/src/buildscripts/aardvark.tcl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aardvark.tcl 24 Apr 2004 20:13:24 -0000 1.18
+++ aardvark.tcl 2 Jun 2004 08:20:48 -0000 1.19
@@ -284,7 +284,7 @@
uplevel #0 $body
} err
if { $err != "" } {
- puts "Error: $err"
+ Output error $err
}
createnode $name
$grph node set $name -key buildinfo [array get buildinfo]
@@ -335,7 +335,7 @@
puts [$grph walk all -order post -command runbuildcommand]
}
} err] } {
- puts "Compilation failed on command \"$err\""
+ Output error "Compilation failed on command \"$err\""
}
$grph destroy
unset grph
@@ -360,7 +360,7 @@
proc aardvark::getconfigs { {filename configs.tcl} } {
catch {namespace delete ::configs}
if { [catch {source $filename}] } {
- puts stderr "You must run ./configure.tcl before running ./make.tcl"
+ Output error "You must run ./configure.tcl before running ./make.tcl"
exit 1
}
1.2 +3 -0 tcl-rivet/tests/binary.rvt
Index: binary.rvt
===================================================================
RCS file: /home/cvs/tcl-rivet/tests/binary.rvt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binary.rvt 27 Jan 2002 02:40:31 -0000 1.1
+++ binary.rvt 2 Jun 2004 08:20:48 -0000 1.2
@@ -5,6 +5,9 @@
fconfigure $fl -encoding binary
fconfigure $fl -translation binary
fconfigure stdout -encoding binary
+ if {$::tcl_platform(platform) eq "windows"} {
+ fconfigure stdout -translation binary
+ }
puts -nonewline [read $fl]
close $fl
} else {
1.4 +11 -3 tcl-rivet/win/makefile.vc
Index: makefile.vc
===================================================================
RCS file: /home/cvs/tcl-rivet/win/makefile.vc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makefile.vc 24 Feb 2004 10:24:35 -0000 1.3
+++ makefile.vc 2 Jun 2004 08:20:48 -0000 1.4
@@ -183,8 +183,11 @@
RIVET_LIB = $(OUT_DIR)\rivet.dll
RIVETPARSER_LIB= $(OUT_DIR)\rivetparser.dll
-
+# Set path to Apache 1.3
+!ifndef APACHE_ROOT
APACHE_ROOT = c:\opt\apache
+!endif
+
APACHE_LIB_DIR = $(APACHE_ROOT)\libexec
APACHE_INCLUDE_DIR = $(APACHE_ROOT)\include
APACHE_MODULES_DIR = $(APACHE_ROOT)\modules
@@ -268,7 +271,8 @@
!endif
!endif
-INCLUDES = $(TCL_INCLUDES) -I"$(WINDIR)" -I"$(GENERICDIR)"
+INCLUDES = $(TCL_INCLUDES) -I"$(WINDIR)" -I"$(GENERICDIR)" \
+ -FI$(TMP_DIR)\config-win.h
BASE_CLFAGS = $(cflags) $(cdebug) $(crt) $(INCLUDES) -I"$(APACHE_INCLUDE_DIR)" \
-DWIN32 -D_WIN32 -D_WINDOWS -DNAMEOFEXECUTABLE="\"$(TCLSH:\=/)\""
CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE
@@ -338,6 +342,10 @@
setup:
@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
+ @type << >$(TMP_DIR)\config-win.h
+#define START_TAG "<?"
+#define END_TAG "?>"
+<<
$(MOD_RIVET): $(MOD_RIVET_OBJS)
$(link32) $(dlllflags) -out:$@ $(baselibs) $(APACHE_LIB) @<<
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org