[Osgeo4w-commits] r1168 - trunk/setup

[svn_osgeo4w at osgeo.org]

Author: jef
Date: 2010-12-30 13:01:55 -0800 (Thu, 30 Dec 2010)
New Revision: 1168

Modified:
   trunk/setup/configure.in
   trunk/setup/fr_configure
   trunk/setup/main.cc
   trunk/setup/package.sh
   trunk/setup/propsheet.cc
   trunk/setup/threebar.cc
Log:
add visual reboot notification

Modified: trunk/setup/configure.in
===================================================================
--- trunk/setup/configure.in	2010-08-06 23:06:49 UTC (rev 1167)
+++ trunk/setup/configure.in	2010-12-30 21:01:55 UTC (rev 1168)
@@ -17,7 +17,7 @@
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([setup], [0], [cygwin-apps at cygwin.com])
+AC_INIT([setup], [0], [osgeo4w-dev at lists.osgeo.org])
 AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR([cfgaux])
 AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.9 foreign no-define -Wall -Wno-portability])

Modified: trunk/setup/fr_configure
===================================================================
--- trunk/setup/fr_configure	2010-08-06 23:06:49 UTC (rev 1167)
+++ trunk/setup/fr_configure	2010-12-30 21:01:55 UTC (rev 1168)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./configure -C --disable-shared --host=i686-pc-mingw32 --build=i686-pc-cygwin CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" 
+./configure -C --disable-shared --host=i686-pc-mingw32 --build=i686-pc-cygwin CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" LDFLAGS="-L/usr/lib/w32api"

Modified: trunk/setup/main.cc
===================================================================
--- trunk/setup/main.cc	2010-08-06 23:06:49 UTC (rev 1167)
+++ trunk/setup/main.cc	2010-12-30 21:01:55 UTC (rev 1168)
@@ -36,6 +36,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #include "resource.h"
 #include "dialog.h"
 #include "state.h"

Modified: trunk/setup/package.sh
===================================================================
--- trunk/setup/package.sh	2010-08-06 23:06:49 UTC (rev 1167)
+++ trunk/setup/package.sh	2010-12-30 21:01:55 UTC (rev 1168)
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-VER=1.0.5-3
+VER=1.0.6-4
 
-strip setup.exe
-upx setup.exe
+strip -s setup.exe
+upx --best setup.exe
 
 rm -rf release
 mkdir release

Modified: trunk/setup/propsheet.cc
===================================================================
--- trunk/setup/propsheet.cc	2010-08-06 23:06:49 UTC (rev 1167)
+++ trunk/setup/propsheet.cc	2010-12-30 21:01:55 UTC (rev 1168)
@@ -426,7 +426,7 @@
 PropSheet::SetActivePage (int i)
 {
   // Posts a message to the message queue, so this won't block
-  return static_cast < bool > (::PropSheet_SetCurSel (GetHWND (), NULL, i));
+  return static_cast < bool > (PropSheet_SetCurSel (GetHWND (), NULL, i));
 }
 
 bool
@@ -434,18 +434,18 @@
 {
   // Posts a message to the message queue, so this won't block
   return static_cast < bool >
-    (::PropSheet_SetCurSelByID (GetHWND (), resource_id));
+    (PropSheet_SetCurSelByID (GetHWND (), resource_id));
 }
 
 void
 PropSheet::SetButtons (DWORD flags)
 {
   // Posts a message to the message queue, so this won't block
-  ::PropSheet_SetWizButtons (GetHWND (), flags);
+  PropSheet_SetWizButtons (GetHWND (), flags);
 }
 
 void
 PropSheet::PressButton (int button)
 {
-  ::PropSheet_PressButton (GetHWND (), button);
+  PropSheet_PressButton (GetHWND (), button);
 }

Modified: trunk/setup/threebar.cc
===================================================================
--- trunk/setup/threebar.cc	2010-08-06 23:06:49 UTC (rev 1167)
+++ trunk/setup/threebar.cc	2010-12-30 21:01:55 UTC (rev 1168)
@@ -31,6 +31,9 @@
 
 #include "ControlAdjuster.h"
 
+#include "io_stream_file.h"
+#include "msg.h"
+
 /*
   Sizing information.
  */
@@ -208,6 +211,12 @@
       }
     case WM_APP_POSTINSTALL_THREAD_COMPLETE:
       {
+        if ( io_stream::exists ("cygfile:///etc/reboot") ) {
+          io_stream::remove("cygfile:///etc/reboot");
+          log (LOG_TIMESTAMP) << "A script detected that a reboot is due" << endLog;
+          note (GetHWND(), IDS_REBOOT_REQUIRED);
+        }
+
 	// Re-enable and "Push" the Next button
 	GetOwner ()->SetButtons (PSWIZB_NEXT);
 	GetOwner ()->PressButton (PSBTN_NEXT);