[update] base-files (2.1)
Fixed some of the issues folks have been emailing about, regtool -q, quotes, defaults for other shells, mk[passwd|group[_l_d]], could somebody upload? Thanks, J. http://homepage.ntlworld.com/j-n-s.morrison/john/cygwin/base-files/md5sum md5sum for base-file-2.1-1.tar.bz2 = 8771444c65cdf9c7154a217416a4e4f3 http://homepage.ntlworld.com/j-n-s.morrison/john/cygwin/base-files/base-fil es-2.1-1.tar.bz2 md5sum for setup.hint = 9b2695ab19b83cc2eb27e346801a114c http://homepage.ntlworld.com/j-n-s.morrison/john/cygwin/base-files/setup.hi nt sdesc: A set of important system configuration and setup files ldesc: A set of important system configuration and setup files requires: ash fileutils sh-utils textutils findutils sed category: base == Information in this email and any attachments are confidential, and may not be copied or used by anyone other than the addressee, nor disclosed to any third party without our permission. There is no intention to create any legally binding contract or other binding commitment through the use of this electronic communication unless it is issued in accordance with the Experian Limited standard terms and conditions of purchase or other express written agreement between Experian Limited and the recipient Experian Limited (registration number 653331) Registered office: Talbot House, Talbot Street, Nottingham NG1 5HF
Re: [setup PATCH] Work with gcc-3.3.1
Robert Collins wrote: On Tue, 2003-08-19 at 07:17, Max Bowsher wrote: +2003-08-18 Max Bowsher [EMAIL PROTECTED] + + * win32.h: Undefine NOMINMAX before defining it, as libstdc++-v3 3.3.1 + defines NOMINMAX itself. Does it define it the same way? I'd rather we did #ifndef NOMINMAX #define NOMINMAX #endif OK, We can do that. The actual user of the define (windef.h) doesn't care about it's value, though. Committing as per the above. Max.
Ping: [mknetrel suggestion] Move --enable-haifa from main script to extra/gcc2
Max Bowsher wrote: Max Bowsher wrote: Max Bowsher wrote: --enable-haifa is only applicable to gcc2, therefore having it in the main script can be misleading. Thanks for the commit to bin/mknetrel. --enable-haifa should probably also be added into CONFIGOPTS in extra/gcc2, to record the fact that Cygwin gcc2 was built with that option. This was not committed. Since there is a possibility gcc2 may be rebuilt for 1.5.0, this should *definitely* be committed. Ping? If there is disagreement, please let me know, so at least I am sure this mail hasn't disassappeared into some hyperaticve spam filter, or something. Max.
Ping: [setup PATCH] Rework do_download [next_dialog removal (2b)]
Ping?
Robert, did you miss this one?
I ask because it should be fairly simple to review, being an application of
the general pronciples already approved in 2a to another region of code.
If it is queued waiting for you to have time, please let me know.
After this, there is only one more trivial commit to actually remove the
definition of next_dialog itself.
Max.
+2003-07-30 Max Bowsher [EMAIL PROTECTED]
+
+ * download.cc (do_download_thread): Return bool. Move program flow
+ logic to threebar.cc.
+ (do_download_thread_reflector): Put returned bool in lParam.
+ * threebar.cc: Include msg.h.
+ (WM_APP_DOWNLOAD_THREAD_COMPLETE): Rework for new meaning of lParam,
+ incorporating program flow logic from download.cc.
Index: download.cc
===
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/download.cc,v
retrieving revision 2.37
diff -u -p -r2.37 download.cc
--- download.cc 7 Apr 2003 12:46:55 - 2.37
+++ download.cc 30 Jul 2003 22:03:05 -
@@ -221,7 +221,7 @@ download_one (packagesource pkgsource,
return 1;
}
-static void
+static bool
do_download_thread (HINSTANCE h, HWND owner)
{
int errors = 0;
@@ -302,25 +302,7 @@ do_download_thread (HINSTANCE h, HWND ow
}
}
- if (errors)
-{
- if (yesno (owner, IDS_DOWNLOAD_INCOMPLETE) == IDYES)
- {
- next_dialog = IDD_SITE;
- return;
- }
-}
-
- if (source == IDC_SOURCE_DOWNLOAD)
-{
- if (errors)
- exit_msg = IDS_DOWNLOAD_INCOMPLETE;
- else if (!unattended_mode)
- exit_msg = IDS_DOWNLOAD_COMPLETE;
- next_dialog = 0;
-}
- else
-next_dialog = IDD_S_INSTALL;
+ return (errors == 0);
}
static DWORD WINAPI
@@ -329,10 +311,11 @@ do_download_reflector (void *p)
HANDLE *context;
context = (HANDLE *) p;
- do_download_thread ((HINSTANCE) context[0], (HWND) context[1]);
+ bool succeeded = do_download_thread ((HINSTANCE) context[0],
+ (HWND) context[1]);
// Tell the progress page that we're done downloading
- Progress.PostMessage (WM_APP_DOWNLOAD_THREAD_COMPLETE, 0,
next_dialog);
+ Progress.PostMessage (WM_APP_DOWNLOAD_THREAD_COMPLETE, 0, succeeded);
ExitThread(0);
}
Index: threebar.cc
===
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/threebar.cc,v
retrieving revision 2.7
diff -u -p -r2.7 threebar.cc
--- threebar.cc 30 Jul 2003 21:49:53 - 2.7
+++ threebar.cc 30 Jul 2003 22:05:48 -
@@ -27,6 +27,7 @@
#include threebar.h
#include cistring.h
#include state.h
+#include msg.h
bool ThreeBarProgressPage::Create ()
{
@@ -148,21 +149,32 @@ ThreeBarProgressPage::OnMessageApp (UINT
}
case WM_APP_DOWNLOAD_THREAD_COMPLETE:
{
- if (lParam == IDD_S_INSTALL)
+ if (!lParam)
{
- // Download is complete and we want to go on to the install.
- Window::PostMessage (WM_APP_START_INSTALL);
+ if (yesno (GetHWND(), IDS_DOWNLOAD_INCOMPLETE) == IDYES)
+ {
+ // Download failed for some reason,
+ // go back to site selection page
+ GetOwner ()-SetActivePageByID (IDD_SITE);
+ break;
+ }
}
- else if (lParam != 0)
+
+ if (source == IDC_SOURCE_DOWNLOAD)
{
- // Download failed for some reason, go back to site selection page
- GetOwner ()-SetActivePageByID (lParam);
+ if (!lParam)
+ exit_msg = IDS_DOWNLOAD_INCOMPLETE;
+ else if (!unattended_mode)
+ exit_msg = IDS_DOWNLOAD_COMPLETE;
+ // Was a download-only, and is complete or failed.
+ GetOwner ()-PressButton (PSBTN_CANCEL);
}
else
{
- // Was a download-only, and is complete or failed.
- GetOwner ()-PressButton (PSBTN_CANCEL);
+ // Download is complete and we want to go on to the install.
+ Window::PostMessage (WM_APP_START_INSTALL);
}
+
break;
}
case WM_APP_START_INSTALL:
Re: [update] base-files (2.1)
Morrison, John [EMAIL PROTECTED] wrote: Fixed some of the issues folks have been emailing about, regtool -q, quotes, defaults for other shells, mk[passwd|group[_l_d]], could somebody upload? Done. -- Elfyn
RE: [update] base-files (2.1)
From: Elfyn McBratney Morrison, John [EMAIL PROTECTED] wrote: Fixed some of the issues folks have been emailing about, regtool -q, quotes, defaults for other shells, mk[passwd|group[_l_d]], could somebody upload? Done. Thanks :D J.
Re: [update] base-files (2.1)
John Morrison [EMAIL PROTECTED] wrote: From: Elfyn McBratney Morrison, John [EMAIL PROTECTED] wrote: Fixed some of the issues folks have been emailing about, regtool -q, quotes, defaults for other shells, mk[passwd|group[_l_d]], could somebody upload? Done. Thanks :D My pleasure :-P -- Elfyn
