I've sent this a couple of hours ago, but it didn't appear in the
web archive, so I'm resending it. If the original does get through,
apologies for the duplicate.
On 2 Feb 2003, Robert Collins wrote:
> On Sun, 2003-02-02 at 07:37, Igor Pechtchanski wrote:
>
> [snip]
>
> > Incidentally, there are two backslash() functions defined: one in
> > filemanip.h, and another in concat.h. This is the only function defined
> > in concat.h, and it doesn't seem to be used anywhere anymore. Is concat.h
> > dead? Should it be removed? Ditto for concat.cc?
>
> Not sure, lets leave this for now.
>
> Rob
FYI, I've built setup without concat.h and concat.cc, and it seems to be
working fine. I'm attaching a patch that removes all references to
concat.* files (most of the size is due to the generated Makefile.in
changes). After applying the patch, you'll have to "cvs rm" concat.*,
sorry (I don't know how to do this with patch).
Igor
========================================================================
ChangeLog:
2003-02-01 Igor Pechtchanski <[EMAIL PROTECTED]>
* String++.cc: Don't include concat.h.
* Makefile.am: Remove concat.cc and concat.h references.
* Makefile.in: Regenerate.
* concat.h: Remove.
* concat.cc: Remove.
--
http://cs.nyu.edu/~pechtcha/
|\ _,,,---,,_ [EMAIL PROTECTED]
ZZZzz /,`.-'`' -. ;-;;,_ [EMAIL PROTECTED]
|,4- ) )-,_. ,\ ( `'-' Igor Pechtchanski
'---''(_/--' `-'\_) fL a.k.a JaguaR-R-R-r-r-r-.-.-. Meow!
Oh, boy, virtual memory! Now I'm gonna make myself a really *big* RAMdisk!
-- /usr/games/fortune
Index: String++.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/String++.cc,v
retrieving revision 2.7
diff -u -p -r2.7 String++.cc
--- String++.cc 10 Nov 2002 03:56:05 -0000 2.7
+++ String++.cc 1 Feb 2003 23:39:27 -0000
@@ -18,7 +18,6 @@
#include "String++.h"
#include <string.h>
#include <ctype.h>
-#include "concat.h"
#include "io_stream.h"
#include <iostream>
#include <sstream>
Index: Makefile.am
===================================================================
RCS file: /cvs/cygwin-apps/setup/Makefile.am,v
retrieving revision 2.24
diff -u -p -r2.24 Makefile.am
--- Makefile.am 25 Nov 2002 00:41:24 -0000 2.24
+++ Makefile.am 1 Feb 2003 23:39:26 -0000
@@ -137,8 +137,6 @@ setup_SOURCES = \
compress_bz.h \
compress_gz.cc \
compress_gz.h \
- concat.cc \
- concat.h \
cygpackage.cc \
cygpackage.h \
desktop.cc \
Index: Makefile.in
===================================================================
RCS file: /cvs/cygwin-apps/setup/Makefile.in,v
retrieving revision 2.86
diff -u -p -r2.86 Makefile.in
--- Makefile.in 25 Nov 2002 00:41:24 -0000 2.86
+++ Makefile.in 1 Feb 2003 23:39:26 -0000
@@ -276,8 +276,6 @@ setup_SOURCES = \
compress_bz.h \
compress_gz.cc \
compress_gz.h \
- concat.cc \
- concat.h \
cygpackage.cc \
cygpackage.h \
desktop.cc \
@@ -447,32 +445,31 @@ am__setup_SOURCES_DIST = AntiVirus.cc An
archive_tar.cc archive_tar.h archive_tar_file.cc autoload.c \
category.cc category.h choose.cc choose.h cistring.cc \
cistring.h compress.cc compress.h compress_bz.cc compress_bz.h \
- compress_gz.cc compress_gz.h concat.cc concat.h cygpackage.cc \
- cygpackage.h desktop.cc desktop.h dialog.cc dialog.h \
- diskfull.cc diskfull.h download.cc download.h Exception.cc \
- Exception.h find.cc find.h FindVisitor.cc FindVisitor.h \
- filemanip.cc filemanip.h fromcwd.cc geturl.cc geturl.h hash.cc \
- hash.h ini.cc ini.h IniDBBuilder.cc IniDBBuilder.h \
- IniDBBuilderPackage.cc IniDBBuilderPackage.h inilex.cc \
- iniparse.cc iniparse.h IniParseFeedback.cc IniParseFeedback.h \
- IniParseFindVisitor.cc IniParseFindVisitor.h install.cc \
- io_stream.cc io_stream.h io_stream_cygfile.cc \
- io_stream_cygfile.h io_stream_file.cc io_stream_file.h \
- io_stream_memory.cc io_stream_memory.h IOStreamProvider.h \
- localdir.cc localdir.h log.cc log.h LogFile.cc LogFile.h \
- LogSingleton.cc LogSingleton.h main.cc md5.c md5.h MD5++.cc \
- MD5++.h mkdir.cc mkdir.h mklink2.cc mklink2.h mount.cc mount.h \
- msg.cc msg.h net.cc net.h netio.cc netio.h nio-ie5.cc nio-ie5.h \
- nio-file.cc nio-file.h nio-ftp.cc nio-ftp.h nio-http.cc \
- nio-http.h package_db.cc package_db.h package_meta.cc \
- package_meta.h package_source.cc package_source.h \
- package_version.cc package_version.h PackageSpecification.cc \
- PackageSpecification.h PackageTrust.h PickCategoryLine.cc \
- PickCategoryLine.h PickLine.cc PickLine.h PickPackageLine.cc \
- PickPackageLine.h PickView.cc PickView.h port.h postinstall.cc \
- proppage.cc proppage.h propsheet.cc propsheet.h res.rc \
- resource.h rfc1738.cc rfc1738.h root.cc root.h \
- ScanFindVisitor.cc ScanFindVisitor.h script.cc script.h \
+ compress_gz.cc compress_gz.h cygpackage.cc cygpackage.h \
+ desktop.cc desktop.h dialog.cc dialog.h diskfull.cc diskfull.h \
+ download.cc download.h Exception.cc Exception.h find.cc find.h \
+ FindVisitor.cc FindVisitor.h filemanip.cc filemanip.h \
+ fromcwd.cc geturl.cc geturl.h hash.cc hash.h ini.cc ini.h \
+ IniDBBuilder.cc IniDBBuilder.h IniDBBuilderPackage.cc \
+ IniDBBuilderPackage.h inilex.cc iniparse.cc iniparse.h \
+ IniParseFeedback.cc IniParseFeedback.h IniParseFindVisitor.cc \
+ IniParseFindVisitor.h install.cc io_stream.cc io_stream.h \
+ io_stream_cygfile.cc io_stream_cygfile.h io_stream_file.cc \
+ io_stream_file.h io_stream_memory.cc io_stream_memory.h \
+ IOStreamProvider.h localdir.cc localdir.h log.cc log.h \
+ LogFile.cc LogFile.h LogSingleton.cc LogSingleton.h main.cc \
+ md5.c md5.h MD5++.cc MD5++.h mkdir.cc mkdir.h mklink2.cc \
+ mklink2.h mount.cc mount.h msg.cc msg.h net.cc net.h netio.cc \
+ netio.h nio-ie5.cc nio-ie5.h nio-file.cc nio-file.h nio-ftp.cc \
+ nio-ftp.h nio-http.cc nio-http.h package_db.cc package_db.h \
+ package_meta.cc package_meta.h package_source.cc \
+ package_source.h package_version.cc package_version.h \
+ PackageSpecification.cc PackageSpecification.h PackageTrust.h \
+ PickCategoryLine.cc PickCategoryLine.h PickLine.cc PickLine.h \
+ PickPackageLine.cc PickPackageLine.h PickView.cc PickView.h \
+ port.h postinstall.cc proppage.cc proppage.h propsheet.cc \
+ propsheet.h res.rc resource.h rfc1738.cc rfc1738.h root.cc \
+ root.h ScanFindVisitor.cc ScanFindVisitor.h script.cc script.h \
setup_version.c simpsock.cc simpsock.h site.cc site.h source.cc \
source.h splash.cc splash.h state.cc state.h String++.cc \
String++.h threebar.cc threebar.h version.cc version.h win32.cc \
@@ -483,13 +480,13 @@ am_setup_OBJECTS = AntiVirus.$(OBJEXT) a
archive_tar.$(OBJEXT) archive_tar_file.$(OBJEXT) \
autoload.$(OBJEXT) category.$(OBJEXT) choose.$(OBJEXT) \
cistring.$(OBJEXT) compress.$(OBJEXT) compress_bz.$(OBJEXT) \
- compress_gz.$(OBJEXT) concat.$(OBJEXT) cygpackage.$(OBJEXT) \
- desktop.$(OBJEXT) dialog.$(OBJEXT) diskfull.$(OBJEXT) \
- download.$(OBJEXT) Exception.$(OBJEXT) find.$(OBJEXT) \
- FindVisitor.$(OBJEXT) filemanip.$(OBJEXT) fromcwd.$(OBJEXT) \
- geturl.$(OBJEXT) hash.$(OBJEXT) ini.$(OBJEXT) \
- IniDBBuilder.$(OBJEXT) IniDBBuilderPackage.$(OBJEXT) \
- inilex.$(OBJEXT) iniparse.$(OBJEXT) IniParseFeedback.$(OBJEXT) \
+ compress_gz.$(OBJEXT) cygpackage.$(OBJEXT) desktop.$(OBJEXT) \
+ dialog.$(OBJEXT) diskfull.$(OBJEXT) download.$(OBJEXT) \
+ Exception.$(OBJEXT) find.$(OBJEXT) FindVisitor.$(OBJEXT) \
+ filemanip.$(OBJEXT) fromcwd.$(OBJEXT) geturl.$(OBJEXT) \
+ hash.$(OBJEXT) ini.$(OBJEXT) IniDBBuilder.$(OBJEXT) \
+ IniDBBuilderPackage.$(OBJEXT) inilex.$(OBJEXT) \
+ iniparse.$(OBJEXT) IniParseFeedback.$(OBJEXT) \
IniParseFindVisitor.$(OBJEXT) install.$(OBJEXT) \
io_stream.$(OBJEXT) io_stream_cygfile.$(OBJEXT) \
io_stream_file.$(OBJEXT) io_stream_memory.$(OBJEXT) \
@@ -536,7 +533,7 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/autoload.Po ./$(DEPDIR)/category.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/choose.Po ./$(DEPDIR)/cistring.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/compress.Po ./$(DEPDIR)/compress_bz.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/compress_gz.Po ./$(DEPDIR)/concat.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/compress_gz.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/cygpackage.Po ./$(DEPDIR)/desktop.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/dialog.Po ./$(DEPDIR)/diskfull.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/download.Po ./$(DEPDIR)/filemanip.Po \
@@ -665,7 +662,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress_bz.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress_gz.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/concat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cygpackage.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/desktop.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialog.Po@am__quote@
