This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Fix configtool user tools warning message box
- From: John Dallaway <jld at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Thu, 24 Apr 2003 12:12:09 +0100
- Subject: Fix configtool user tools warning message box
- Organization: eCosCentric Limited
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.32.2.18
diff -u -5 -r1.32.2.18 ChangeLog
--- ChangeLog 17 Apr 2003 14:16:11 -0000 1.32.2.18
+++ ChangeLog 24 Apr 2003 11:05:59 -0000
@@ -1,5 +1,12 @@
+2003-04-24 John Dallaway <jld at ecoscentric dot com>
+
+ * standalone/wxwin/mainwin.cpp: Fix behaviour of user tools warning
+ message box.
+
+ * standalone/wxwin/makefile.gnu: Deduce OS type using uname tool.
+
2003-04-17 John Dallaway <jld at ecoscentric dot com>
* standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp:
Rationalise the treatment of the build tools directory during startup
and when using the build tools dialog.
Index: standalone/wxwin/mainwin.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/mainwin.cpp,v
retrieving revision 1.10.2.5
diff -u -5 -r1.10.2.5 mainwin.cpp
--- standalone/wxwin/mainwin.cpp 17 Apr 2003 14:16:12 -0000 1.10.2.5
+++ standalone/wxwin/mainwin.cpp 24 Apr 2003 11:06:06 -0000
@@ -1232,13 +1232,12 @@
if (map.Find(strPrefix, value) && (wxNOT_FOUND == arstrPaths.Index(value)))
arstrPaths.Add(value);
wxString msg;
msg.Printf(_("Enter the location of the %s build tools\n"
- "folder. You can\n"
- "type in a path or use the Browse button to\n"
- "navigate to a folder."),
+ "folder. You can type in a path or use the\n"
+ "Browse button to navigate to a folder."),
(const wxChar*) (strPrefix.IsEmpty() ? wxString(wxT("native")) : strPrefix));
wxString caption(_("Build Tools Path"));
ecFolderDialog dialog(wxGetApp().GetSettings().m_buildToolsDir, arstrPaths, msg, this, ecID_BUILD_TOOLS_DIALOG, caption);
if (dialog.ShowModal() == wxID_OK)
@@ -1317,11 +1316,11 @@
wxString msg;
msg.Printf(wxT("%s does not appear to contain the user tools - use this folder anyway?"), (const wxChar*) path);
if(strFile.Exists() ||
- (wxID_YES == wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_QUESTION|wxYES_NO)))
+ (wxYES == wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_QUESTION|wxYES_NO)))
{
wxGetApp().GetSettings().m_userToolsDir = path;
}
}
}
Index: standalone/wxwin/makefile.gnu
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/makefile.gnu,v
retrieving revision 1.2.2.6
diff -u -5 -r1.2.2.6 makefile.gnu
--- standalone/wxwin/makefile.gnu 6 Apr 2003 20:52:03 -0000 1.2.2.6
+++ standalone/wxwin/makefile.gnu 24 Apr 2003 11:06:08 -0000
@@ -2,11 +2,11 @@
# Author: John Dallaway <jld at ecoscentric dot com>
# Copyright: Copyright (c) John Dallaway 2003
# Usage:
# cd emptydir
-# make -f /path/to/this/makefile WXDIR=/path/to/wx/installation INSTALLDIR=/path/to/ecos/tools [ ECOSSRCDIR=/path/to/ecos/tools/src ] [ TCLDIR=/path/to/tcl/installation ] [ OSTYPE=cygwin ] [ DEBUG=1 ]
+# make -f /path/to/this/makefile WXDIR=/path/to/wx/installation INSTALLDIR=/path/to/ecos/tools [ ECOSSRCDIR=/path/to/ecos/tools/src ] [ TCLDIR=/path/to/tcl/installation ] [ DEBUG=1 ]
INSTALLDIR=INSTALLDIR_not_defined
WXDIR=WXDIR_not_defined
CTBUILDDIR=$(shell pwd)
@@ -22,11 +22,11 @@
-I$(ECOSSRCDIR)/tools/Utils/common \
-I$(ECOSSRCDIR)/tools/ecostest/common \
-DecUSE_EXPERIMENTAL_CODE=$(USEEXPERIMENTALCODE)
EXTRALDFLAGS=-L$(TCLDIR)/lib -L$(INSTALLDIR)/lib -lcdl -lcyginfra -ltcl
-ifeq "$(OSTYPE)" "cygwin"
+ifneq (,$(findstring CYGWIN, $(shell uname)))
PROGRAM=configtool.exe
CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags` -D_WIN32 -D__WIN32__ -DSTRICT
LDFLAGS=`$(WXDIR)/bin/wx-config --libs` -lshlwapi -Wl,--subsystem,windows
EXTRAOBJECTS=$(CTBUILDDIR)/configtoolres.o
else