[PATCH] Re: [setup] Inaccurate message: See /setup.log.full

[Igor Pechtchanski]

Ping? (Just making sure this was seen).
Igor

On Fri, 24 Jan 2003, Igor Pechtchanski wrote:

> > [snip]
> >
> > And I just realized that with all the code I quoted in the past two
> > messages, I might as well have written a patch...  *g*  Oh, well.
>
> And here's that patch.  Just for the fun of it... *g*
> Igor
>
> ChangeLog:
> 2002-10-17  Igor Pechtchanski <[EMAIL PROTECTED]>
>
> * res.rc (IDS_INSTALL_INCOMPLETE): Change hard-coded
> log filename to %s.
> * LogFile.cc (LogFile::exit): Pass log filename for
> LOG_BABBLE to note().
> (LogFile::getFile): New function.
> * LogFile.h (LogFile::getFile): New function.

-- 
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: LogFile.cc
===
RCS file: /cvs/cygwin-apps/setup/LogFile.cc,v
retrieving revision 2.6
diff -u -p -r2.6 LogFile.cc
--- LogFile.cc  25 Nov 2002 00:41:24 -  2.6
+++ LogFile.cc  25 Jan 2003 03:10:41 -
@@ -31,6 +31,7 @@ static const char *cvsid =
 #include 
 #include 
 #include "AntiVirus.h"
+#include "mount.h"
 
 using namespace std;
 
@@ -101,6 +102,20 @@ LogFile::setFile (int minlevel, String c
   files.insert (t);
 }
 
+static String bad_file = "the log";
+
+String const &
+LogFile::getFile (int minlevel) const
+{
+  for (FileSet::iterator i = files.begin();
+   i != files.end(); ++i)
+{
+  if (i->level == minlevel)
+return i->key;
+}
+  return bad_file;
+}
+
 void
 LogFile::exit (int const exit_code)
 {
@@ -114,8 +129,9 @@ LogFile::exit (int const exit_code)
 #endif
   been_here = 1;
   
+  String log_full = cygpath(getFile(LOG_BABBLE));
   if (exit_msg)
-note (NULL, exit_msg);
+note (NULL, exit_msg, log_full.cstr_oneuse());
   
   log (LOG_TIMESTAMP) << "Ending cygwin install" << endLog;
 
Index: LogFile.h
===
RCS file: /cvs/cygwin-apps/setup/LogFile.h,v
retrieving revision 2.3
diff -u -p -r2.3 LogFile.h
--- LogFile.h   10 Nov 2002 03:56:05 -  2.3
+++ LogFile.h   25 Jan 2003 03:10:41 -
@@ -23,6 +23,7 @@ public:
   LogFile();
   void clearFiles(); // delete all target filenames
   void setFile (int minlevel, String const &path, bool append);
+  String const & getFile (int minlevel) const;
   /* Some platforms don't call destructors. So this call exists
* which guarantees to flush any log data...
* but doesn't call generic C++ destructors
Index: res.rc
===
RCS file: /cvs/cygwin-apps/setup/res.rc,v
retrieving revision 2.45
diff -u -p -r2.45 res.rc
--- res.rc  19 Jan 2003 20:31:53 -  2.45
+++ res.rc  25 Jan 2003 03:11:05 -
@@ -483,7 +483,7 @@ BEGIN
 IDS_DOWNLOAD_FAILED "Unable to download %s"
 IDS_DOWNLOAD_INCOMPLETE "Download Incomplete.  Try again?"
 IDS_INSTALL_ERROR  "Installation error (%s), Continue with other packages?"
-IDS_INSTALL_INCOMPLETE  "Installation incomplete.  Check /setup.log.full for 
details"
+IDS_INSTALL_INCOMPLETE  "Installation incomplete.  Check %s for details"
 IDS_VERSION_INFO"Setup.exe version %1"
 IDS_CYGWIN_SETUP"Cygwin Setup"
 IDS_CYGWIN_SETUP_WITH_PROGRESS "%1!d!%% - Cygwin Setup"

-h help option for setup

[Max Bowsher]

I propose applying this to setup. It doesn't work (because setup is not a
console application) unless run from a CYGWIN=tty shell, but its better than
nothing, and doesn't break anything else.


Max.



Index: main.cc
===
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/main.cc,v
retrieving revision 2.23
diff -u -p -r2.23 main.cc
--- main.cc 25 Nov 2002 00:41:25 - 2.23
+++ main.cc 19 Jan 2003 13:51:32 -
@@ -66,6 +66,7 @@ int next_dialog;
 HINSTANCE hinstance;

 static BoolOption UnattendedOption (false, 'q', "quiet-mode", "Unattended
setup mode");
+static BoolOption HelpOption (false, 'h', "help", "Display command line
options");

 /* Maximum size of a SID on NT/W2K. */
 #define MAX_SID_LEN 40
@@ -212,6 +213,8 @@ main (int argc, char **argv)
   if (!GetOption::GetInstance().Process (argc,_argv))
 theLog->exit(1);
 // #endif
+
+  if (HelpOption) { GetOption::GetInstance().ParameterUsage(std::cout);
exit (0); }

   unattended_mode = UnattendedOption;

Re: setup: Colour code package trust levels

[Robert Collins]

On Sat, 2003-02-01 at 10:33, Max Bowsher wrote:
> Below is a patch which adds colour coding to the package picker.
> 
> Should I conditionalize it on a boolean command line option, or do we need
> to be able to specify which colours to use, as opposed to whether to use
> colours?

Deisgn wise, we definately need a single location for colour choice -
static members of PickPackageLine accessed via methods seem like a
reasonable place to start with. We can move them from there if need be.

I'll play with this tomorrow and give you UI feedback then.

Rob
-- 
GPG key available at: .



signature.asc
Description: This is a digitally signed message part

setup: Colour code package trust levels

[Max Bowsher]

Below is a patch which adds colour coding to the package picker.

Should I conditionalize it on a boolean command line option, or do we need
to be able to specify which colours to use, as opposed to whether to use
colours?



Max.

Index: PickPackageLine.cc
===
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/PickPackageLine.cc,v
retrieving revision 2.9
diff -u -p -r2.9 PickPackageLine.cc
--- PickPackageLine.cc 2002/07/13 14:00:37 2.9
+++ PickPackageLine.cc 2002/11/10 09:49:13
@@ -78,6 +78,13 @@ PickPackageLine::paint (HDC hdc, int x,
   SelectClipRgn (hdc, oldClip2);
   if (pkg.installed)
 {
+  COLORREF oldclr;
+  /**/ if (pkg.installed.Name().size() == 0) oldclr = SetTextColor(hdc,
RGB(0,0,0));
+  else if (pkg.installed == pkg.curr) oldclr = SetTextColor(hdc,
RGB(0,0,127));
+  else if (pkg.installed == pkg.prev) oldclr = SetTextColor(hdc,
RGB(127,127,0));
+  else if (pkg.installed == pkg.exp)  oldclr = SetTextColor(hdc,
RGB(0,127,127));
+  else /*  */ oldclr = SetTextColor(hdc,
RGB(255,0,0));
+
   IntersectClipRect (hdc, x + theView.headers[theView.current_col].x,
 r,
 x + theView.headers[theView.current_col].x +
@@ -90,9 +97,17 @@ PickPackageLine::paint (HDC hdc, int x,
   BitBlt (hdc, x + theView.headers[theView.new_col].x + HMARGIN / 2,
by, 11, 11, theView.bitmap_dc, 0, 0, SRCCOPY);
   SelectClipRgn (hdc, oldClip2);
+  SetTextColor(hdc, oldclr);
 }

   String s = pkg.action_caption ();
+  {
+  COLORREF oldclr;
+  /**/ if (pkg.desired.Name().size() == 0) oldclr = SetTextColor(hdc,
RGB(0,0,0));
+  else if (pkg.desired == pkg.curr) oldclr = SetTextColor(hdc,
RGB(0,0,127));
+  else if (pkg.desired == pkg.prev) oldclr = SetTextColor(hdc,
RGB(127,127,0));
+  else if (pkg.desired == pkg.exp)  oldclr = SetTextColor(hdc,
RGB(0,127,127));
+  else /**/ oldclr = SetTextColor(hdc,
RGB(255,0,0));
   IntersectClipRect (hdc, x + theView.headers[theView.new_col].x,
r,
x + theView.headers[theView.new_col].x +
@@ -106,6 +121,8 @@ PickPackageLine::paint (HDC hdc, int x,
RTARROW_WIDTH + HMARGIN / 2, by, 11, 11, theView.bitmap_dc, 0, 0,
SRCCOPY);
   SelectClipRgn (hdc, oldClip2);
+  SetTextColor(hdc, oldclr);
+  }

   int checked;

maintainer questions: fvwm, net-snmp, UW-imapd

[Abraham Backus]

I want to check the list to see if there are active 
maintainers of any of these packages before I decide to start work on any of 
them.
 
Net-snmp and UW-imapd aren't currently in our 
distribution, but I've seen some discussions of these two packages in the 
list.  Is anyone actively working on creating these packages for cygwin 
setup?  The binaries that I have for UW-imapd are from http://sourceforge.net/projects/uw-imap-cygwin/.
 
The fvwm currently in cygwin setup is out of date 
by a few versions (current version on www.fvwm.org is 2.4.15).  Is there someone 
actively maintaining this package?
 
Again, I'm not complaining, just volunteering to 
"step up" if nobody else is :)
 
thanks!
-Abe

CMake 1.6.1-1

[William A. Hoffman]

There has been a new release of the official cmake 1.6.1.
This is a major release from 1.4.7 to 1.6.1.  
Version 1.6 
includes a number of new features to help make project management 
easier. Version 1.6 includes TRY_COMPILE and TRY_RUN  which can be

used to test for features of the compiler or system that you are on.

The MACRO command allows repeated CMakeLists code to be encapsulated

into a macro. If you need to perform very complex operations the 
LOAD_COMMAND command allows you to write your own CMake command 
using a C API that can be compiled and loaded into CMake as part 
of the configuration process. 

Here are the required files:
ftp://www.cmake.org/pub/cmake/cygwin/setup.hint
ftp://www.cmake.org/pub/cmake/cygwin/cmake-1.6.1-1.tar.bz2
ftp://www.cmake.org/pub/cmake/cygwin/cmake-1.6.1-1-src.tar.bz2


# CMake setup.hint file for cygwin setup.exe program
category: Devel 
requires: libncurses6 cygwin 
sdesc: "A cross platform build manger" 
ldesc: "CMake is a cross platform build manager. It allows you to
specify build parameters for C and C++ programs in a cross platform
manner. For Cygwin Makefiles will be generated. CMake is also capable of
generating Microsoft project files, nmake, and Borland makefiles. CMake
can also perform system inspection operations like finding installed
libraries and header files." 
prev: 1.4.7-1
curr: 1.6.1-1

setup - trivial patch - missing spaces in log

[Max Bowsher]

Problem: Log lines like:
For filefile://M:\max\Install\cygwin/release/procps/procps-010801-2.tar.bz2
ini
digest isefd567eab6b24452c2d38b7596fd1724 file digest is
efd567eab6b24452c2d38b7
596fd1724

Fix:

Index: install.cc
===
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/install.cc,v
retrieving revision 2.53
diff -u -p -r2.53 install.cc
--- install.cc 9 Nov 2002 13:44:53 - 2.53
+++ install.cc 31 Jan 2003 19:41:57 -
@@ -217,7 +217,7 @@ install_one_source (packagemeta & pkgm,
   md5 tempMD5;
   tempMD5.set (tempdigest);

-  log (LOG_BABBLE, String ("For file") + source.Cached() + " ini digest
is" + source.md5.print() + " file digest is " + tempMD5.print());
+  log (LOG_BABBLE, String ("For file ") + source.Cached() + " ini
digest is " + source.md5.print() + " file digest is " + tempMD5.print());

   if (source.md5 != tempMD5)
throw new Exception ("__LINE__ __FILE__", (String ("Checksum failure for
") + source.Cached()).cstr_oneuse(), APPERR_CORRUPT_PACKAGE);


OK?


Max.

Re: Integrating Ralf's rebase into setup.exe

[Jason Tishler]

Ralf,

On Fri, Jan 31, 2003 at 12:23:55AM +0100, Ralf Habacker wrote:
> Applied and checked in. 

Thanks!

Jason

-- 
PGP/GPG Key: http://www.tishler.net/jason/pubkey.asc or key servers
Fingerprint: 7A73 1405 7F2B E669 C19D  8784 1AFD E4CC ECF4 8EF6

Re: Possible bug in setup.exe 2.303 when downloading via ftp

[Pavel Tsekov]

On Fri, 31 Jan 2003, Pavel Tsekov wrote:

> Yesterday I've tried to install Cygwin from scratch on Win2k Pro / SP3 
> with the experimental setup 2.303. This was a fresh copy of Win2k, just 
[...]
> rama.progeny.com:ftp   CLOSE_WAIT
> rama.progeny.com:49984 ESTABLISHED

I've just tried with the stable setup and it behaves the same way.

Possible bug in setup.exe 2.303 when downloading via ftp

[Pavel Tsekov]

Hello,

Yesterday I've tried to install Cygwin from scratch on Win2k Pro / SP3 
with the experimental setup 2.303. This was a fresh copy of Win2k, just 
installed on the machine, and next I've tried to install Cygwin. I chose 
'Install from Internet' and as a download site ftp://archive.progeny.com. 
On the package chooser screen I haven't touched anything i.e. I wanted 
only packages from Base to be installed. I've tried twice with the same 
settings and both tries were unsuccessful. What happens is that at some
point during the package download, setup would hang, when it reaches the 
last block of data for a given package i.e. it displays something like 
1005 of 1013 k. Ok, I launched a cmd window and typed 'netstat' - I saw 
the following:

rama.progeny.com:ftp   CLOSE_WAIT
rama.progeny.com:49984 ESTABLISHED

I left setup for several hours but nothing changed. It would just sit 
there and wait on that screen :)

If anyone is going to try to hunt this, please, try to connect to 
ftp://archive.progeny.com  - I suspect maybe it's something in the 
behaviour of their ftp server which fools setup.

Re: exim-4.12-3

[Pavel Tsekov]

On Fri, 31 Jan 2003, Pierre A. Humblet wrote:

> http://home.attbi.com/~phumblet/exim-4.12-3.tar.bz2
> http://home.attbi.com/~phumblet/exim-4.12-3-src.tar.bz2
> http://home.attbi.com/~phumblet/setup.hint

Uploaded.

exim-4.12-3

[Pierre A. Humblet]

I have updated exim to use the latest openssl and have
also put a temporary workaround for the chown bug.

Pierre

http://home.attbi.com/~phumblet/exim-4.12-3.tar.bz2
http://home.attbi.com/~phumblet/exim-4.12-3-src.tar.bz2
http://home.attbi.com/~phumblet/setup.hint

# Exim-4.12-3 setup.hint
sdesc: "A Mail Transfer Agent."
ldesc: "Mail Transfer Agent with sendmail like command line 
arguments and a single configuration file.
Features: flexible retry algorithms, header & envelope rewriting,
multiple deliveries down single connection or multiple deliveries in
parallel, regular expressions in configuration parameters, file
lookups, supports sender and/or receiver verification, selective
relaying, virtual domains and built-in mail filtering.

See www.exim.org.
This port is compiled with tls/ssl support."
category: Mail
requires: cygwin gdbm openssl