[lmi-commits] [5719] Adapt to the demise of Cygwin's legacy version

[Greg Chicares]

Revision: 5719
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5719
Author:   chicares
Date:     2013-04-24 15:36:25 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Adapt to the demise of Cygwin's legacy version

Modified Paths:
--------------
    lmi/trunk/INSTALL
    lmi/trunk/install_cygwin.bat

Modified: lmi/trunk/INSTALL
===================================================================
--- lmi/trunk/INSTALL   2013-04-23 11:48:21 UTC (rev 5718)
+++ lmi/trunk/INSTALL   2013-04-24 15:36:25 UTC (rev 5719)
@@ -41,38 +41,20 @@
   C:
   mkdir C:\cache_for_lmi
 
-Save the following three files into the 'C:\cache_for_lmi' directory:
+Save the following files into the 'C:\cache_for_lmi' directory:
 
-  http://www.cygwin.com/setup-legacy.exe
   http://www.cygwin.com/setup.exe
   http://svn.sv.nongnu.org/svn/lmi/lmi/trunk/install_cygwin.bat
 
 Copy and paste the following lines into the "Command prompt" window:
 
   cd C:\cache_for_lmi
-  install_cygwin >installed.txt
+  install_cygwin
 
-A messagebox warns:
+After a few minutes, you should see something like this at the end:
 
-  Attempt to install legacy version of Cygwin
-  ---------------------------
-  You are attempting to install a legacy version of Cygwin
-  on a modern version of Windows.  Press "OK" if this is
-  really want you want to do.  Otherwise press "Cancel".
-  See http://cygwin.com/ for more information.
+  "Cygwin installation seems to have succeeded"
 
-It may appear several times; press "OK" each time. When it finishes,
-copy and paste the following line into the "Command prompt" window:
-
-  type installed.txt
-
-You should see something like this:
-
-  "Anomalous 'C:\cygwin' directory present after iteration" 1
-  "Anomalous 'C:\cygwin' directory present after iteration" 2
-  "Cygwin 1.5 installation seems to have succeeded on iteration" 3
-  "Cygwin 1.7 installation seems to have succeeded"
-
 Close the "Command prompt" window.
 
 (2) Install lmi

Modified: lmi/trunk/install_cygwin.bat
===================================================================
--- lmi/trunk/install_cygwin.bat        2013-04-23 11:48:21 UTC (rev 5718)
+++ lmi/trunk/install_cygwin.bat        2013-04-24 15:36:25 UTC (rev 5719)
@@ -23,80 +23,25 @@
 
 @ECHO OFF
 
address@hidden Install both Cygwin-1.5 and Cygwin-1.7 . See file 'INSTALL'.
address@hidden
address@hidden Motivation: in case any problem is encountered with the current 
version,
address@hidden it is convenient to have the older version to fall back on.
address@hidden
address@hidden Cygwin-1.5's installer appears to be somewhat anomalous. Even 
when told
address@hidden to install to a nondefault directory, it creates 'C:\Cygwin' and 
puts
address@hidden some files and directories there. Deleting the unwanted 
directory and
address@hidden running the installer again decreases the anomaly; repeating 
those steps
address@hidden one more time produces an installation that seems to be valid. 
For the
address@hidden versions of msw that have been tested, three iterations are 
necessary, so
address@hidden for conservatism five are allowed. Postinstall script 
'autoconf2.5.sh'
address@hidden fails because '/usr/share/info/autoconf2.61.info.gz' doesn't 
exist, but
address@hidden it's acceptable if only that 'info' page is missing.
address@hidden
address@hidden For the 'rebaseall' commands, see:
address@hidden   http://cygwin.com/ml/cygwin/2012-01/msg00269.html
address@hidden   http://cygwin.com/ml/cygwin/2005-07/msg00825.html
address@hidden Install Cygwin. See file 'INSTALL'.
 
 IF EXIST C:\cygwin\NUL     GOTO FoundOldInstallation
-IF EXIST C:\cygwin-1_5\NUL GOTO FoundOldInstallation
-IF EXIST C:\cygwin-1_7\NUL GOTO FoundOldInstallation
+IF EXIST C:\cygwin-lmi\NUL GOTO FoundOldInstallation
 
 C:
 cd C:\cache_for_lmi
-
-FOR /L %%i IN (1,1,5) DO (
-  CALL :TryToInstall_1_5
-  IF NOT EXIST C:\cygwin\NUL (
-    echo Cygwin-1.5 installation seems to have succeeded on iteration %%i
-    ver | findstr /L "6.1."
-    IF ERRORLEVEL 1 GOTO Got_1_5
-    cd C:\cygwin-1_5\bin
-    C:\cygwin-1_5\bin\ash rebaseall
-    echo Cygwin-1.5 rebased
-    GOTO Got_1_5
-  )
-  echo Anomalous 'C:\cygwin' directory present after iteration %%i
-  rmdir /S /Q C:\cygwin
-)
-echo Cygwin-1.5 installation has failed
-GOTO End
-
-:TryToInstall_1_5
-cd C:\cache_for_lmi
-START "Installing Cygwin-1.5" /WAIT setup-legacy ^
-  --quiet-mode --no-shortcuts ^
-  --site ftp://mirror.mcs.anl.gov/pub/cygwin/ ^
-  --root C:/cygwin-1_5 --packages ^
-  cvs,doxygen,gdb,libtool,make,openssh,patch,rsync,subversion,unzip,wget,zsh
-GOTO:EOF
-
-:Got_1_5
-cd C:\cache_for_lmi
-START "Installing Cygwin-1.7" /WAIT setup ^
+START "Installing Cygwin" /WAIT setup ^
   --quiet-mode ^
   --site ftp://mirror.mcs.anl.gov/pub/cygwin/ ^
-  --root C:/cygwin-1_7 --packages ^
+  --root C:/cygwin-lmi --packages ^
   cvs,doxygen,gdb,libtool,make,openssh,patch,rsync,subversion,unzip,wget,zsh
-cd C:\cygwin-1_7\etc
+cd C:\cygwin-lmi\etc
 echo # >> fstab
 echo C:/opt/lmi/MinGW-20090203 /MinGW_        lmi_specific binary,user 0 0 >> 
fstab
 echo C:/opt/lmi                /opt/lmi       lmi_specific binary,user 0 0 >> 
fstab
 echo C:/lmi                    /lmi           lmi_specific binary,user 0 0 >> 
fstab
 echo C:/cache_for_lmi          /cache_for_lmi lmi_specific binary,user 0 0 >> 
fstab
-echo Cygwin-1.7 installation seems to have succeeded
address@hidden The '_autorebase' facility has made it unnecessary to invoke any
address@hidden explicit rebase command for non-legacy versions. See:
address@hidden   http://cygwin.com/ml/cygwin/2012-03/msg00700.html
address@hidden ver | findstr /L "6.1."
address@hidden IF ERRORLEVEL 1 GOTO End
address@hidden cd C:\cygwin-1_7\bin
address@hidden C:\cygwin-1_7\bin\dash -l -i -c "rebaseall"
address@hidden echo Cygwin-1.7 rebased
+echo Cygwin installation seems to have succeeded
 GOTO End
 
 :FoundOldInstallation