Re: Setup patch to keep test version if test version installed

2015-02-03 Thread ASSI
Corinna Vinschen writes:
 Did you test this version?  Is it ok to become the release version of
 setup?

WJFFM.  I didn't test the downgrade scenario since none of my
installations have test or prev packages in setup.ini, though.


Regards,
Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada



Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
On Feb  3 16:09, Achim Gratz wrote:
 Achim Gratz writes:
  [TEST 2]
 
 [TEST 3]

*frown*


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgpSYYQo2uQAv.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Achim Gratz
[TEST] 

Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

DIY Stuff:
http://Synth.Stromeko.net/DIY.html


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Achim Gratz
[TEST 2]

Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

Samples for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Achim Gratz
Achim Gratz writes:
 [TEST 2]

[TEST 3]

Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

SD adaptation for Waldorf rackAttack V1.04R1:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
On Feb  3 08:04, Ken Brown wrote:
 On 2/3/2015 6:33 AM, Corinna Vinschen wrote:
 Hey guys,
 
 On Jan 28 21:23, Corinna Vinschen wrote:
 
https://cygwin.com/setup-test-x86.exe
https://cygwin.com/setup-test-x86_64.exe
 
 These should fix the aforementioned bug I introduced, as well as another
 subtil problem when checking and unchecking the Bin/Src boxes.  If both
 boxes were deselected, the package got uninstalled without showing up in
 the Pending view.  I worked around that by setting the package state
 explicitely to Uninstall if both boxes got deselected.
 
 This version also introduces an experimental option -m/--mirror-mode.
 
 There's something bugging me for a long time as well.  We're running our
 own Cygwin mirror on a local Linux box.  The directory is mounted via
 NFS on my Windows boxes.  So, rather than installing from internet, I
 Install from Local Directory, with the local directory being the
 NFS-mounted mirror directory.
 
 This works fine, except that, after parsing setup.ini, setup hangs
 unresponsive for about 2 minutes.  Only then the chooser window opens.
 
 It turned out that the 2 minutes are spent iterating throught the full
 set of packages and testing each package and each packageversion if the
 underlying package file exists in the download directory.
 
 Given that the directory is a mirror in my case, the test makes only
 marginal sense.  Therefore I added the -m option which avoids most file
 system access and only checks in a border case (installed version is not
 in setup.ini).
 
 If you're doing as I do, running a local mirror, you may welcome this
 option.  I just don't guarantee that it always works ;}  If you find a
 bug, don't hesitate to report it.
 
 Did you test this version?  Is it ok to become the release version of
 setup?
 
 It works fine for me.

Nice.  Are you a potential user of the -m option?


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgpX4GHl8bdyu.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
On Feb  3 14:56, ASSI wrote:
 Corinna Vinschen writes:
  Did you test this version?  Is it ok to become the release version of
  setup?
 
 WJFFM.  I didn't test the downgrade scenario since none of my
 installations have test or prev packages in setup.ini, though.

You're a user of the new -m option if I understood you correctly.
Does it work for you?

What about allowing to specify this in the GUI?  I was mulling over
adding a fourth option to the Choose A Download Source dialog:

 o Install from Internet
 o Download Without Installing
 o Install from Local Download Directory
 o Install from Local Mirror Directory

Option 3 is the same as before, but specifying Download Directory
to distinguish this from Mirror Directory.

Good/Bad/Ugly?


Thanks,
Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgpcng1if5ArM.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
Hey guys,

On Jan 28 21:23, Corinna Vinschen wrote:
 
   https://cygwin.com/setup-test-x86.exe
   https://cygwin.com/setup-test-x86_64.exe
 
 These should fix the aforementioned bug I introduced, as well as another
 subtil problem when checking and unchecking the Bin/Src boxes.  If both
 boxes were deselected, the package got uninstalled without showing up in
 the Pending view.  I worked around that by setting the package state
 explicitely to Uninstall if both boxes got deselected.
 
 This version also introduces an experimental option -m/--mirror-mode.
 
 There's something bugging me for a long time as well.  We're running our
 own Cygwin mirror on a local Linux box.  The directory is mounted via
 NFS on my Windows boxes.  So, rather than installing from internet, I
 Install from Local Directory, with the local directory being the
 NFS-mounted mirror directory.
 
 This works fine, except that, after parsing setup.ini, setup hangs
 unresponsive for about 2 minutes.  Only then the chooser window opens.
 
 It turned out that the 2 minutes are spent iterating throught the full
 set of packages and testing each package and each packageversion if the
 underlying package file exists in the download directory.
 
 Given that the directory is a mirror in my case, the test makes only
 marginal sense.  Therefore I added the -m option which avoids most file
 system access and only checks in a border case (installed version is not
 in setup.ini).
 
 If you're doing as I do, running a local mirror, you may welcome this
 option.  I just don't guarantee that it always works ;}  If you find a
 bug, don't hesitate to report it.

Did you test this version?  Is it ok to become the release version of
setup?


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgpYp_tBdEwmE.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Achim Gratz
Corinna Vinschen writes:
 You're a user of the new -m option if I understood you correctly.
 Does it work for you?

Yes, very well indeed.

 What about allowing to specify this in the GUI?  I was mulling over
 adding a fourth option to the Choose A Download Source dialog:

  o Install from Internet
  o Download Without Installing
  o Install from Local Download Directory
  o Install from Local Mirror Directory

 Option 3 is the same as before, but specifying Download Directory
 to distinguish this from Mirror Directory.

 Good/Bad/Ugly?

I'm not sure it's useful in the GUI-only scenario when someone just
double-clicks the icon.  At least in my case that use is strictly for
script-controlled installations.  It will be hard for people to tell
what the difference is between Download and Mirror directory and which
they should use.  People who know what they're doing can just as easily
make a shortcut that adds the -m option.

BTW, there seems to be a regression that I don't understand: when a
wrong option is given, a message to this effect should be emitted and
then the parameter usage.  This used to work, but even though the code
did not change this is not happening anymore.  I've rolled back to the
old version of setup, but not cygwin1.dll, so if its not the compiler it
would be a change in the DLL that is responsible.  I suspect there is
some race with the output since also in the case of --help the output
from setup somehow mixes in with the prompt from cmd and you have to
press Enter a second time to get the prompt back.


Regards,
Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

Samples for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
On Feb  3 17:07, Achim Gratz wrote:
 Corinna Vinschen writes:
  You're a user of the new -m option if I understood you correctly.
  Does it work for you?
 
 Yes, very well indeed.
 
  What about allowing to specify this in the GUI?  I was mulling over
  adding a fourth option to the Choose A Download Source dialog:
 
   o Install from Internet
   o Download Without Installing
   o Install from Local Download Directory
   o Install from Local Mirror Directory
 
  Option 3 is the same as before, but specifying Download Directory
  to distinguish this from Mirror Directory.
 
  Good/Bad/Ugly?
 
 I'm not sure it's useful in the GUI-only scenario when someone just
 double-clicks the icon.  At least in my case that use is strictly for
 script-controlled installations.  It will be hard for people to tell
 what the difference is between Download and Mirror directory and which
 they should use.  People who know what they're doing can just as easily
 make a shortcut that adds the -m option.
 
 BTW, there seems to be a regression that I don't understand: when a
 wrong option is given, a message to this effect should be emitted and
 then the parameter usage.  This used to work, but even though the code
 did not change this is not happening anymore.  I've rolled back to the
 old version of setup, but not cygwin1.dll, so if its not the compiler it
 would be a change in the DLL that is responsible.

How so?  Setup is not a Cygwin application.


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgpJ6zd43JUCk.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Achim Gratz
Corinna Vinschen writes:
 On Feb  3 16:09, Achim Gratz wrote:
 Achim Gratz writes:
  [TEST 2]
 
 [TEST 3]

 *frown*

Sorry for that, but the mail server I use needed a configuration change
and this is the only mailing list that was affected so I had to test
directly.  Things are back to normal, I can reply and post again from
Gnus.


Regards,
Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Achim Gratz
Corinna Vinschen writes:
 How so?  Setup is not a Cygwin application.

Good point.  Then I've no idea at all, save the compiler.


Regards,
Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

Factory and User Sound Singles for Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Ken Brown

On 2/3/2015 6:33 AM, Corinna Vinschen wrote:

Hey guys,

On Jan 28 21:23, Corinna Vinschen wrote:


   https://cygwin.com/setup-test-x86.exe
   https://cygwin.com/setup-test-x86_64.exe

These should fix the aforementioned bug I introduced, as well as another
subtil problem when checking and unchecking the Bin/Src boxes.  If both
boxes were deselected, the package got uninstalled without showing up in
the Pending view.  I worked around that by setting the package state
explicitely to Uninstall if both boxes got deselected.

This version also introduces an experimental option -m/--mirror-mode.

There's something bugging me for a long time as well.  We're running our
own Cygwin mirror on a local Linux box.  The directory is mounted via
NFS on my Windows boxes.  So, rather than installing from internet, I
Install from Local Directory, with the local directory being the
NFS-mounted mirror directory.

This works fine, except that, after parsing setup.ini, setup hangs
unresponsive for about 2 minutes.  Only then the chooser window opens.

It turned out that the 2 minutes are spent iterating throught the full
set of packages and testing each package and each packageversion if the
underlying package file exists in the download directory.

Given that the directory is a mirror in my case, the test makes only
marginal sense.  Therefore I added the -m option which avoids most file
system access and only checks in a border case (installed version is not
in setup.ini).

If you're doing as I do, running a local mirror, you may welcome this
option.  I just don't guarantee that it always works ;}  If you find a
bug, don't hesitate to report it.


Did you test this version?  Is it ok to become the release version of
setup?


It works fine for me.

Ken


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
On Feb  3 21:37, Achim Gratz wrote:
 Corinna Vinschen writes:
  On Feb  3 18:08, Achim Gratz wrote:
  Corinna Vinschen writes:
   How so?  Setup is not a Cygwin application.
  
  Good point.  Then I've no idea at all, save the compiler.
 
  I had a look into this and even rearranged the behaviour when --help
  output is requested...
 
  However, I'm mildly sure this behaviour didn't change in the last couple
  of years.  The reason is that setup is not a console application but a
  GUI application.  When running a GUI application from CMD, CMD will
  detach.  Of course, when --help output is requested, setup calls
  AllocConsole, but that's too late.  This does not occur in a Cygwin
  shell becasue Cygwin always waits for process completion unless the
  process is sent to the background.
 
  I now made the latest setup 2.864 available as standard setup version
  on sourceware and removed the test releases.
 
 I'm not sure we're talking about the same thing.  I've recently added
 code to print an error message along with the parameter usage when a
 wrong option or other non-parseable stuff was given instead of simply
 exiting with no indication other than the non-zero exit code.  The
 changes you've just installed look good to me, but they don't touch the
 exit path in question:
 
 --8---cut here---start-8---
  if (!GetOption::GetInstance ().Process (argc,_argv, NULL))
 -  exit (1);
 +  {
 + GetOption::GetInstance ().ParameterUsage (cerr
 +\nError during option 
 processing.
 +\nCommand Line 
 Options:\n);
 + exit (1);
 +  }
 --8---cut here---end---8---
 
 I guess with those changes one could now use Log (LOG_TIMESTAMP) instead
 of cerr in that place and hopefully the output would appear again?  I
 was pretty certain I tested that in both mintty and CMD, but maybe
 not...

I was referring explicitely to the CMD prompt being too early.  I didn't
test the situation when specifying a wrong option, sorry.  The point in
the file where this occurs is somewhat early.  At this point the log
stuff isn't initialized and AttachConsole hasn't been called.  I'll 
look into that, maybe it can be fixed easily.


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgpMA3MMGdE_g.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
On Feb  3 18:08, Achim Gratz wrote:
 Corinna Vinschen writes:
  How so?  Setup is not a Cygwin application.
 
 Good point.  Then I've no idea at all, save the compiler.

I had a look into this and even rearranged the behaviour when --help
output is requested...

However, I'm mildly sure this behaviour didn't change in the last couple
of years.  The reason is that setup is not a console application but a
GUI application.  When running a GUI application from CMD, CMD will
detach.  Of course, when --help output is requested, setup calls
AllocConsole, but that's too late.  This does not occur in a Cygwin
shell becasue Cygwin always waits for process completion unless the
process is sent to the background.

I now made the latest setup 2.864 available as standard setup version
on sourceware and removed the test releases.


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgpGXc_MG3SXy.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Achim Gratz
Corinna Vinschen writes:
 On Feb  3 18:08, Achim Gratz wrote:
 Corinna Vinschen writes:
  How so?  Setup is not a Cygwin application.
 
 Good point.  Then I've no idea at all, save the compiler.

 I had a look into this and even rearranged the behaviour when --help
 output is requested...

 However, I'm mildly sure this behaviour didn't change in the last couple
 of years.  The reason is that setup is not a console application but a
 GUI application.  When running a GUI application from CMD, CMD will
 detach.  Of course, when --help output is requested, setup calls
 AllocConsole, but that's too late.  This does not occur in a Cygwin
 shell becasue Cygwin always waits for process completion unless the
 process is sent to the background.

 I now made the latest setup 2.864 available as standard setup version
 on sourceware and removed the test releases.

I'm not sure we're talking about the same thing.  I've recently added
code to print an error message along with the parameter usage when a
wrong option or other non-parseable stuff was given instead of simply
exiting with no indication other than the non-zero exit code.  The
changes you've just installed look good to me, but they don't touch the
exit path in question:

--8---cut here---start-8---
 if (!GetOption::GetInstance ().Process (argc,_argv, NULL))
-  exit (1);
+  {
+   GetOption::GetInstance ().ParameterUsage (cerr
+  \nError during option 
processing.
+  \nCommand Line 
Options:\n);
+   exit (1);
+  }
--8---cut here---end---8---

I guess with those changes one could now use Log (LOG_TIMESTAMP) instead
of cerr in that place and hopefully the output would appear again?  I
was pretty certain I tested that in both mintty and CMD, but maybe
not...


Regards,
Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

SD adaptation for Waldorf Blofeld V1.15B11:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada


Re: [HEADSUP] Dropping libopenssl098 from distro [gcc bug]

2015-02-03 Thread Corinna Vinschen
On Feb  2 10:46, Ken Brown wrote:
 On 1/30/2015 11:40 AM, Ken Brown wrote:
 On 1/30/2015 8:25 AM, Ken Brown wrote:
 On 1/30/2015 4:41 AM, Corinna Vinschen wrote:
 On Jan 29 15:25, Ken Brown wrote:
 I'm attaching the patches that I applied (on top of Reini's patches) in
 order to make the build succeed.  I also had to use libdb4.5 instead of
 libdb4.8.
 
 Is that ok?  I mean, shouldn't a package always try to use the latest
 version?  What's the problem you're observing ?  Maybe Volker can help
 here?
 
 The clisp-2.48 code uses some macros and structures that are defined in the
 db4.5 headers but have changed or disappeared in db4.8.  I'll see if I can
 figure out how to update the code for db4.8.
 
 OK, that wasn't so hard.  I'm attaching the patch that I applied, in case 
 Reini
 or Volker has a chance to look at it.  All 76 tests for the berkeley-db 
 module
 passed.
 
 I've now begun working on the 64-bit build.  I found a few minor things I
 had to change, and the build was pretty far along, when I apparently hit a
 gcc bug:
 
 gcc -I/home/kbrown/src/cygclisp/clisp-2.48-5.x86_64/build/gllib -ggdb -O2
 -pipe -Wimplicit-function-declaration -W -Wswitch -Wcomment -Wpointer-arith
 -Wimplicit -Wreturn-type -Wmissing-declarations -Wno-sign-compare
 -Wno-format-nonliteral -O -falign-functions=4 -DUNICODE -I.
 -I$(/home/kbrown/src/cygclisp/clisp-2.48-5.x86_64/build/clisp -K boot -B
 /home/kbrown/src/cygclisp/clisp-2.48-5.x86_64/build -N
 /home/kbrown/src/cygclisp/clisp-2.48-5.x86_64/build/locale -E UTF-8
 -Epathname 1:1 -Emisc 1:1 -norc -q -b)/linkkit -c regexi.m.c -o regexi.o
 regexi.c: In function ‘C_subr_regexp_regexp_compile’:
 regexi.c:56:1: error: unrecognizable insn:
  }
  ^
 (insn 348 347 349 41 (set (reg/f:DI 259)
 (plus:DI (symbol_ref:DI (module__regexp__subr_tab) [flags 0x2]
 var_decl 0x6fffbfad360 module__regexp__subr_tab)
 (reg:DI 260))) regexi.c:54 -1
  (expr_list:REG_EQUAL (const:DI (plus:DI (symbol_ref:DI
 (module__regexp__subr_tab) [flags 0x2] var_decl 0x6fffbfad360
 module__regexp__subr_tab)
 (const_int 281474976710768 [0x10070])))
 (nil)))
 regexi.c:56:1: internal compiler error: in extract_insn, at recog.c:2154
 Please submit a full bug report,
 with preprocessed source if appropriate.
 See http://gcc.gnu.org/bugs.html for instructions.

Oh, that's too bad.  I hope somebody from the gcc folks take a look.


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat


pgp1XFEaAhZUv.pgp
Description: PGP signature


Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Corinna Vinschen
On Feb  3 22:04, Corinna Vinschen wrote:
 On Feb  3 21:37, Achim Gratz wrote:
  Corinna Vinschen writes:
   On Feb  3 18:08, Achim Gratz wrote:
   Corinna Vinschen writes:
How so?  Setup is not a Cygwin application.
   
   Good point.  Then I've no idea at all, save the compiler.
  
   I had a look into this and even rearranged the behaviour when --help
   output is requested...
  
   However, I'm mildly sure this behaviour didn't change in the last couple
   of years.  The reason is that setup is not a console application but a
   GUI application.  When running a GUI application from CMD, CMD will
   detach.  Of course, when --help output is requested, setup calls
   AllocConsole, but that's too late.  This does not occur in a Cygwin
   shell becasue Cygwin always waits for process completion unless the
   process is sent to the background.
  
   I now made the latest setup 2.864 available as standard setup version
   on sourceware and removed the test releases.
  
  I'm not sure we're talking about the same thing.  I've recently added
  code to print an error message along with the parameter usage when a
  wrong option or other non-parseable stuff was given instead of simply
  exiting with no indication other than the non-zero exit code.  The
  changes you've just installed look good to me, but they don't touch the
  exit path in question:
  
  --8---cut here---start-8---
   if (!GetOption::GetInstance ().Process (argc,_argv, NULL))
  -  exit (1);
  +  {
  +   GetOption::GetInstance ().ParameterUsage (cerr
  +  \nError during option 
  processing.
  +  \nCommand Line 
  Options:\n);
  +   exit (1);
  +  }
  --8---cut here---end---8---
  
  I guess with those changes one could now use Log (LOG_TIMESTAMP) instead
  of cerr in that place and hopefully the output would appear again?  I
  was pretty certain I tested that in both mintty and CMD, but maybe
  not...
 
 I was referring explicitely to the CMD prompt being too early.  I didn't
 test the situation when specifying a wrong option, sorry.  The point in
 the file where this occurs is somewhat early.  At this point the log
 stuff isn't initialized and AttachConsole hasn't been called.  I'll 
 look into that, maybe it can be fixed easily.

Try this:

Index: main.cc
===
RCS file: /cvs/cygwin-apps/setup/main.cc,v
retrieving revision 2.79
diff -u -p -r2.79 main.cc
--- main.cc 3 Feb 2015 19:51:49 -   2.79
+++ main.cc 3 Feb 2015 21:27:31 -
@@ -227,17 +227,16 @@ WinMain (HINSTANCE h,
   _argv = __argv;
 
   try {
+bool help_option = false;
+bool invalid_option = false;
 char cwd[MAX_PATH];
 GetCurrentDirectory (MAX_PATH, cwd);
 local_dir = std::string (cwd);
 
 if (!GetOption::GetInstance ().Process (argc,_argv, NULL))
-  {
-   GetOption::GetInstance ().ParameterUsage (cerr
-  \nError during option 
processing.
-  \nCommand Line 
Options:\n);
-   exit (1);
-  }
+  help_option = invalid_option = true;
+else if (HelpOption)
+  help_option = true;
 
 if (!((string) Arch).size ())
   {
@@ -264,7 +263,7 @@ WinMain (HINSTANCE h,
 unattended_mode = PackageManagerOption ? chooseronly
: (UnattendedOption ? unattended : attended);
 
-if (unattended_mode || HelpOption)
+if (unattended_mode || help_option)
   set_cout ();
 
 /* Get System info */
@@ -275,7 +274,7 @@ WinMain (HINSTANCE h,
supposed to elevate. */
 nt_sec.initialiseWellKnownSIDs ();
 /* Check if we have to elevate. */
-bool elevate = !HelpOption  version.dwMajorVersion = 6
+bool elevate = !help_option  version.dwMajorVersion = 6
!NoAdminOption  !nt_sec.isRunAsAdmin ();
 
 /* Start logging only if we don't elevate.  Same for setting default
@@ -284,7 +283,7 @@ WinMain (HINSTANCE h,
 const char *sep = isdirsep (local_dir[local_dir.size () - 1])
?  : \\;
 /* Don't create log files for help output only. */
-if (!elevate  !HelpOption)
+if (!elevate  !help_option)
   {
theLog-setFile (LOG_BABBLE, local_dir + sep + setup.log.full,
 false);
@@ -293,8 +292,10 @@ WinMain (HINSTANCE h,
 setup_version  endLog;
   }
 
-if (HelpOption)
+if (help_option)
   {
+   if (invalid_option)
+ Log (LOG_PLAIN)  \nError during option processing.  endLog;
Log (LOG_PLAIN)  \nCommand Line Options:\n  endLog;
GetOption::GetInstance ().ParameterUsage (Log (LOG_PLAIN));
Log (LOG_PLAIN)  endLog;


Corinna

-- 
Corinna Vinschen  Please, send mails regarding Cygwin to

Re: Setup patch to keep test version if test version installed

2015-02-03 Thread Ken Brown

On 2/3/2015 10:27 AM, Corinna Vinschen wrote:

On Feb  3 08:04, Ken Brown wrote:

On 2/3/2015 6:33 AM, Corinna Vinschen wrote:

Hey guys,

On Jan 28 21:23, Corinna Vinschen wrote:


   https://cygwin.com/setup-test-x86.exe
   https://cygwin.com/setup-test-x86_64.exe

These should fix the aforementioned bug I introduced, as well as another
subtil problem when checking and unchecking the Bin/Src boxes.  If both
boxes were deselected, the package got uninstalled without showing up in
the Pending view.  I worked around that by setting the package state
explicitely to Uninstall if both boxes got deselected.

This version also introduces an experimental option -m/--mirror-mode.

There's something bugging me for a long time as well.  We're running our
own Cygwin mirror on a local Linux box.  The directory is mounted via
NFS on my Windows boxes.  So, rather than installing from internet, I
Install from Local Directory, with the local directory being the
NFS-mounted mirror directory.

This works fine, except that, after parsing setup.ini, setup hangs
unresponsive for about 2 minutes.  Only then the chooser window opens.

It turned out that the 2 minutes are spent iterating throught the full
set of packages and testing each package and each packageversion if the
underlying package file exists in the download directory.

Given that the directory is a mirror in my case, the test makes only
marginal sense.  Therefore I added the -m option which avoids most file
system access and only checks in a border case (installed version is not
in setup.ini).

If you're doing as I do, running a local mirror, you may welcome this
option.  I just don't guarantee that it always works ;}  If you find a
bug, don't hesitate to report it.


Did you test this version?  Is it ok to become the release version of
setup?


It works fine for me.


Nice.  Are you a potential user of the -m option?


No, so I couldn't test that.  But it seems that others have tested it by now.

Ken