ecos: host/tools/configtool/standalone/wxwin/appsettings.cpp annotate

annotate host/tools/configtool/standalone/wxwin/appsettings.cpp @ 3292:7f8e529b4d82 default tip

Fix FREESCALE_EDMA_NBYTES_MLOFFYES_MLOFF() so it works with negative offsets.

author	vae
date	Wed, 29 Apr 2015 23:31:48 +0000
parents	4b1912ce7f4f
children

rev	line source
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	1 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	2 // -------------------------------------------
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	3 // This file is part of the eCos host tools.
3277 047bbfee43f6 * standalone/wxwin/appsettings.cpp, jld parents: 2729 diff changeset	4 // Copyright (C) 1998, 1999, 2000, 2003, 2005, 2006, 2008, 2014 Free Software Foundation, Inc.
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	5 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	6 // This program is free software; you can redistribute it and/or modify
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	7 // it under the terms of the GNU General Public License as published by
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	8 // the Free Software Foundation; either version 2 or (at your option) any
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	9 // later version.
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	10 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	11 // This program is distributed in the hope that it will be useful, but
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	12 // WITHOUT ANY WARRANTY; without even the implied warranty of
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	14 // General Public License for more details.
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	15 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	16 // You should have received a copy of the GNU General Public License
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	17 // along with this program; if not, write to the
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	18 // Free Software Foundation, Inc., 51 Franklin Street,
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	19 // Fifth Floor, Boston, MA 02110-1301, USA.
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	20 // -------------------------------------------
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2515 diff changeset	21 // ####ECOSHOSTGPLCOPYRIGHTEND####
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	22 // appsettings.cpp :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	23 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	24 //===========================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	25 //#####DESCRIPTIONBEGIN####
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	26 //
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	27 // Author(s): julians, jld
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	28 // Contact(s): julians
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	29 // Date: 2000/08/29
199 920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	30 // Version: $Id: appsettings.cpp,v 1.27 2001/12/14 17:34:03 julians Exp $
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	31 // Purpose:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	32 // Description: Implementation file for the ecSettings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	33 // Requires:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	34 // Provides:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	35 // See also:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	36 // Known bugs:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	37 // Usage:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	38 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	39 //####DESCRIPTIONEND####
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	40 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	41 //===========================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	42
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	43 // ============================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	44 // declarations
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	45 // ============================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	46
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	47 // ----------------------------------------------------------------------------
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	48 // headers
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	49 // ----------------------------------------------------------------------------
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	50 #ifdef __GNUG__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	51 #pragma implementation "appsettings.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	52 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	53
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	54 // Includes other headers for precompiled compilation
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	55 #include "ecpch.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	56
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	57 #ifdef __BORLANDC__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	58 #pragma hdrstop
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	59 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	60
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	61 #include "wx/config.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	62 #include "wx/file.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	63
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	64 #include "appsettings.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	65 #include "configtree.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	66 #include "outputwin.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	67 #include "shortdescrwin.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	68 #include "mainwin.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	69
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	70 // For SystemInfo
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	71 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	72 #include <windows.h>
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	73 #include "wx/msw/winundef.h"
846 8bf039d894d8 * standalone/wxwin/appsettings.cpp, standalone/wxwin/makefile.gnu, jld parents: 839 diff changeset	74 #ifdef GetTempPath
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	75 #undef GetTempPath
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	76 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	77 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	78
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	79 /*
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	80 * User-changeable and other settings to be saved between sessions
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	81 */
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	82
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	83 IMPLEMENT_DYNAMIC_CLASS(ecSettings, wxObject)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	84
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	85 ecSettings::ecSettings()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	86 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	87 m_showToolBar = TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	88 m_frameSize = wxRect(0, 0, 600, 500);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	89 m_appName = _("eCos Configuration Tool");
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	90 m_showSplashScreen = TRUE;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	91 m_userName = wxEmptyString;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	92 m_serialNumber = 0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	93 m_frameStatus = ecSHOW_STATUS_NORMAL;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	94
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	95 m_treeSashSize = wxSize(400, 1000);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	96 m_conflictsSashSize = wxSize(1000, 80);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	97 m_propertiesSashSize = wxSize(1000, 80);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	98 m_shortDescrSashSize = wxSize(1000, 80);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	99 m_memorySashSize = wxSize(1000, 50);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	100 m_outputSashSize = wxSize(1000, 50);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	101 m_configPaneWidth = 200;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	102
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	103 m_showConflictsWindow = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	104 m_showPropertiesWindow = TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	105 m_showShortDescrWindow = TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	106 m_showMemoryWindow = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	107 m_showOutputWindow = TRUE;
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	108
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	109 m_showMacroNames = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	110
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	111 m_bUseCustomViewer = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	112 m_bUseExternalBrowser = FALSE;
2515 24c0267fbb70 * Utils/ChangeLog Utils/common/eCosStd.h, jld parents: 2466 diff changeset	113 m_eUseCustomBrowser = ecInternal;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	114 m_bHex = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	115 m_nRuleChecking = Immediate\|Deferred\|SuggestFixes ;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	116
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	117 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	118 m_strViewer = wxT("notepad");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	119 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	120
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	121 // Find dialog settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	122 m_findText = wxEmptyString;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	123 m_findMatchWholeWord = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	124 m_findMatchCase = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	125 m_findDirection = TRUE; // Down is TRUE, Up is FALSE
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	126 m_findSearchWhat = _("Macro names"); // Macro names, item names etc.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	127 m_findDialogPos = wxPoint(-1, -1);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	128
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	129 m_editSaveFileOnly = FALSE;
199 920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	130
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	131 // Packages dialog settings
2515 24c0267fbb70 * Utils/ChangeLog Utils/common/eCosStd.h, jld parents: 2466 diff changeset	132 m_omitHardwarePackages = TRUE;
199 920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	133 m_matchPackageNamesExactly = FALSE;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	134 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	135
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	136 // Copy constructor
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	137 ecSettings::ecSettings(const ecSettings& settings)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	138 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	139 Copy(settings);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	140 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	141
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	142 void ecSettings::Copy(const ecSettings& settings)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	143 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	144 m_showToolBar = settings.m_showToolBar;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	145 m_frameSize = settings.m_frameSize;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	146 m_showSplashScreen = settings.m_showSplashScreen;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	147 m_userName = settings.m_userName;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	148 m_serialNumber = settings.m_serialNumber;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	149
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	150 m_treeSashSize = settings.m_treeSashSize;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	151 m_conflictsSashSize = settings.m_conflictsSashSize;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	152 m_propertiesSashSize = settings.m_propertiesSashSize;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	153 m_memorySashSize = settings.m_memorySashSize;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	154 m_outputSashSize = settings.m_outputSashSize;
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	155 m_configPaneWidth = settings.m_configPaneWidth;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	156 m_showMacroNames = settings.m_showMacroNames;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	157
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	158 m_bUseCustomViewer = settings.m_bUseCustomViewer;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	159 m_bUseExternalBrowser = settings.m_bUseExternalBrowser;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	160 m_eUseCustomBrowser = settings.m_eUseCustomBrowser;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	161 m_bHex = settings.m_bHex;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	162 m_nRuleChecking = settings.m_nRuleChecking;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	163
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	164 // Find dialog settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	165 m_findText = settings.m_findText;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	166 m_findMatchWholeWord = settings.m_findMatchWholeWord;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	167 m_findMatchCase = settings.m_findMatchCase;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	168 m_findDirection = settings.m_findDirection; // Down is TRUE, Up is FALSE
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	169 m_findSearchWhat = settings.m_findSearchWhat;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	170 m_findDialogPos = settings.m_findDialogPos;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	171
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	172 // Run tests settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	173 m_runTestsSettings = settings.m_runTestsSettings;
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	174
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	175 m_userToolsDir = settings.m_userToolsDir;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	176 m_buildToolsDir = settings.m_buildToolsDir;
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	177
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	178 m_editSaveFileOnly = settings.m_editSaveFileOnly;
199 920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	179
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	180 // Packages dialog settings
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	181 m_omitHardwarePackages = settings.m_omitHardwarePackages;
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	182 m_matchPackageNamesExactly = settings.m_matchPackageNamesExactly;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	183 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	184
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	185 ecSettings::~ecSettings()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	186 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	187 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	188
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	189 // Do some initialisation within ecApp::OnInit
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	190 bool ecSettings::Init()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	191 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	192 return TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	193 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	194
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	195 // Get a name suitable for the configuration file on all platforms:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	196 // e.g. eCos Configuration Tool on Windows, .eCosConfigTool on Unix
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	197 wxString ecSettings::GetConfigAppName() const
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	198 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	199 #ifdef __WXGTK__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	200 return wxString(wxT("eCosConfigTool"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	201 #else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	202 return GetAppName();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	203 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	204 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	205
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	206
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	207 // Create new filename
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	208 wxString ecSettings::GenerateFilename(const wxString& rootName)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	209 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	210 wxString path;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	211 if (!m_lastFilename.IsEmpty())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	212 path = wxPathOnly(m_lastFilename);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	213 else
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	214 // path = wxGetApp().GetAppDir();
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	215 path = wxGetCwd();
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	216
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	217 wxString filename(path);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	218 if (filename.Last() != wxFILE_SEP_PATH )
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	219 filename += wxFILE_SEP_PATH;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	220 filename += rootName;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	221
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	222 wxString fullFilename = filename + wxT(".ecc");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	223 int i = 0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	224 wxString postfixStr;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	225 while (wxFileExists(fullFilename))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	226 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	227 i ++;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	228 postfixStr.Printf("%d", i);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	229 fullFilename = filename + postfixStr + wxT(".ecc");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	230 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	231
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	232 m_lastFilename = fullFilename;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	233 return fullFilename;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	234 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	235
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	236 // Load config info
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	237 bool ecSettings::LoadConfig()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	238 {
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	239 wxConfig config(wxGetApp().GetSettings().GetConfigAppName());
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	240
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	241 config.Read(_("/Window Status/FrameStatus"), & m_frameStatus);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	242 config.Read(_("/Window Status/ShowToolBar"), (bool*) & m_showToolBar);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	243 config.Read(_("/Window Status/ShowSplashScreen"), (bool*) & m_showSplashScreen);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	244 config.Read(_("/Window Status/ShowConflictsWindow"), (bool*) & m_showConflictsWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	245 config.Read(_("/Window Status/ShowPropertiesWindow"), (bool*) & m_showPropertiesWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	246 config.Read(_("/Window Status/ShowShortDescrWindow"), (bool*) & m_showShortDescrWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	247 config.Read(_("/Window Status/ShowMemoryWindow"), (bool*) & m_showMemoryWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	248 config.Read(_("/Window Status/ShowOutputWindow"), (bool*) & m_showOutputWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	249
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	250 config.Read(_("/Files/LastFile"), & m_lastFilename);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	251
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	252 config.Read(_("/Window Size/WindowX"), & m_frameSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	253 config.Read(_("/Window Size/WindowY"), & m_frameSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	254 config.Read(_("/Window Size/WindowWidth"), & m_frameSize.width);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	255 config.Read(_("/Window Size/WindowHeight"), & m_frameSize.height);
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	256
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	257 config.Read(_("/Window Size/TreeSashWidth"), & m_treeSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	258 config.Read(_("/Window Size/TreeSashHeight"), & m_treeSashSize.y);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	259 config.Read(_("/Window Size/ConfigPaneWidth"), & m_configPaneWidth);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	260 config.Read(_("/Window Size/ConflictsWidth"), & m_conflictsSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	261 config.Read(_("/Window Size/ConflictsHeight"), & m_conflictsSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	262 config.Read(_("/Window Size/PropertiesWidth"), & m_propertiesSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	263 config.Read(_("/Window Size/PropertiesHeight"), & m_propertiesSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	264 config.Read(_("/Window Size/ShortDescrWidth"), & m_shortDescrSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	265 config.Read(_("/Window Size/ShortDescrHeight"), & m_shortDescrSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	266 config.Read(_("/Window Size/OutputWidth"), & m_outputSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	267 config.Read(_("/Window Size/OutputHeight"), & m_outputSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	268 config.Read(_("/Window Size/MemoryWidth"), & m_memorySashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	269 config.Read(_("/Window Size/MemoryHeight"), & m_memorySashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	270
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	271 config.Read(_("/Options/ShowMacroNames"), (bool*) & m_showMacroNames);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	272 config.Read(_("/Options/UseCustomViewer"), (bool*) & m_bUseCustomViewer);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	273 config.Read(_("/Options/UseExternalBrowser"), (bool*) & m_bUseExternalBrowser);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	274
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	275 int tmp = (int) m_eUseCustomBrowser;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	276 config.Read(_("/Options/UseCustomBrowser"), & tmp);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	277 m_eUseCustomBrowser = (ecBrowserType) tmp;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	278
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	279 config.Read(_("/Options/Browser"), & m_strBrowser);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	280 config.Read(_("/Options/Viewer"), & m_strViewer);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	281 config.Read(_("/Options/HexDisplay"), (bool*) & m_bHex);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	282 config.Read(_("/Options/UseDefaultFonts"), (bool*) & m_windowSettings.m_useDefaults);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	283 config.Read(_("/Rule/Checking"), & m_nRuleChecking);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	284
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	285 // Find dialog settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	286 config.Read(_("/Find/Text"), & m_findText);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	287 config.Read(_("/Find/MatchWholeWord"), (bool*) & m_findMatchWholeWord);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	288 config.Read(_("/Find/MatchCase"), & m_findMatchCase);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	289 config.Read(_("/Find/Direction"), (bool*) & m_findDirection);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	290 config.Read(_("/Find/SearchWhat"), & m_findSearchWhat);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	291 config.Read(_("/Find/DialogX"), & m_findDialogPos.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	292 config.Read(_("/Find/DialogY"), & m_findDialogPos.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	293
199 920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	294 // Package dialog settings
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	295 config.Read(_("/Packages/OmitHardwarePackages"), & m_omitHardwarePackages);
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	296 config.Read(_("/Packages/MatchPackageNamesExactly"), & m_matchPackageNamesExactly);
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	297
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	298 // Run tests settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	299 m_runTestsSettings.LoadConfig(config);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	300
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	301 // Fonts
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	302 m_windowSettings.LoadConfig(config);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	303
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	304 if (!config.Read(_("/Paths/UserToolsDir"), & m_userToolsDir))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	305 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	306 // Use the default provided by the installer
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	307 config.Read(_("Default User Tools Path"), & m_userToolsDir);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	308 }
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	309
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	310 // Only to be used if we fail to find the information installed
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	311 // with the Configuration Tool.
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	312 config.Read(_("/Paths/BuildToolsDir"), & m_buildToolsDir);
911 e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	313 if (m_buildToolsDir.IsEmpty()) // first invocation by this user
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	314 {
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	315 // we have no clues as to the location of the build tools so
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	316 // test for ../../../gnutools relative to the configtool location
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	317 wxFileName gnutools = wxFileName (wxGetApp().GetAppDir(), wxEmptyString);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	318 gnutools.Normalize(); // remove trailing "./" if present
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	319 if (2 < gnutools.GetDirCount())
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	320 {
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	321 gnutools.RemoveDir (gnutools.GetDirCount()-1);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	322 gnutools.RemoveDir (gnutools.GetDirCount()-1);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	323 gnutools.RemoveDir (gnutools.GetDirCount()-1);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	324 gnutools.AppendDir (wxT("gnutools"));
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	325 if (gnutools.DirExists()) // we've found the gnutools
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	326 m_buildToolsDir = gnutools.GetFullPath();
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	327 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	328 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	329
951 3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	330 // look for *objcopy in and under the build tools directory
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	331 if (! m_buildToolsDir.IsEmpty())
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	332 {
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	333 wxArrayString objcopyFiles;
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	334 wxString objcopyFileSpec(wxT("objcopy"));
911 e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	335 #ifdef __WXMSW__
951 3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	336 objcopyFileSpec += wxT(".exe");
911 e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	337 #endif
951 3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	338 size_t objcopyCount = wxDir::GetAllFiles(m_buildToolsDir, &objcopyFiles, wxT("*") + objcopyFileSpec, wxDIR_FILES \| wxDIR_DIRS);
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	339 for (int count=0; count < objcopyCount; count++)
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	340 {
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	341 wxFileName file (objcopyFiles [count]);
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	342 wxString new_prefix (file.GetFullName().Left (file.GetFullName().Find(objcopyFileSpec)));
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	343 if ((! new_prefix.IsEmpty()) && ('-' == new_prefix.Last()))
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	344 new_prefix = new_prefix.Left (new_prefix.Len() - 1); // strip off trailing hyphen
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	345 m_arstrBinDirs.Set(new_prefix, file.GetPath(wxPATH_GET_VOLUME));
3021b4922c80 * standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp: jld parents: 931 diff changeset	346 }
911 e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	347 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	348
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	349 if (!config.Read(_("/Build/Make Options"), & m_strMakeOptions))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	350 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	351 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	352 SYSTEM_INFO SystemInfo;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	353 GetSystemInfo(&SystemInfo);
3278 4b1912ce7f4f * standalone/wxwin/appsettings.cpp, jld parents: 3277 diff changeset	354 m_strMakeOptions.Printf(_T("-j%ld"),SystemInfo.dwNumberOfProcessors);
2515 24c0267fbb70 * Utils/ChangeLog Utils/common/eCosStd.h, jld parents: 2466 diff changeset	355 #else
24c0267fbb70 * Utils/ChangeLog Utils/common/eCosStd.h, jld parents: 2466 diff changeset	356 long lProcessors;
24c0267fbb70 * Utils/ChangeLog Utils/common/eCosStd.h, jld parents: 2466 diff changeset	357 lProcessors = sysconf(_SC_NPROCESSORS_ONLN);
24c0267fbb70 * Utils/ChangeLog Utils/common/eCosStd.h, jld parents: 2466 diff changeset	358 m_strMakeOptions.Printf(_T("-j%ld"),lProcessors < 1 ? 1l : lProcessors);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	359 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	360 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	361
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	362 // Set default build tools binary directories as specified by the installer
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	363 ecFileName strDefaultBuildToolsPath;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	364
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	365 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	366 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	367 // This should look in HKEY_LOCAL_MACHINE
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	368
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	369 wxConfig config2(wxT("eCos"), wxEmptyString, wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE\|wxCONFIG_USE_LOCAL_FILE);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	370
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	371 wxString versionKey = GetInstallVersionKey();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	372 wxConfigPathChanger path(& config2, wxString(wxT("/")) + versionKey + wxT("/"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	373
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	374 if (!versionKey.IsEmpty() && config2.Read(wxT("Default Build Tools Path"), & strDefaultBuildToolsPath))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	375 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	376 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	377 wxString gccExe(wxT("*-gcc.exe"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	378 #else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	379 wxString gccExe(wxT("*-gcc"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	380 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	381
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	382 // Note that this is not a recursive search. Compilers for
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	383 // different targets may be in the same directory. This finds all targets.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	384
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	385 // look for *-gcc[.exe] in the default build tools directory
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	386 wxLogNull log;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	387 wxDir finder(strDefaultBuildToolsPath);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	388 wxString filename;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	389
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	390 if (finder.IsOpened())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	391 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	392 bool bMore = finder.GetFirst(& filename, gccExe);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	393 while (bMore)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	394 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	395 wxString targetName = filename.Left(filename.Find(wxT("-gcc")));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	396 m_arstrBinDirs.Set(targetName, strDefaultBuildToolsPath);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	397
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	398 bMore = finder.GetNext(& filename);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	399 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	400 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	401 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	402 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	403 #endif
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	404
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	405 #ifndef __WXMSW__
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	406 // Look in the PATH for build tools, under Unix
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	407 {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	408 wxString strPath;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	409 if (wxGetEnv(wxT("PATH"), & strPath))
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	410 {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	411 wxString gccExe(wxT("*-gcc"));
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	412
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	413 wxArrayString arstrPath;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	414 ecUtils::Chop(strPath, arstrPath, wxT(':'));
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	415
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	416 for (int i = arstrPath.GetCount()-1;i >= 0; --i)
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	417 { // Reverse order is important to treat path correctly
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	418 if (wxT(".") != arstrPath[i] && !arstrPath[i].IsEmpty())
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	419 {
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	420 wxLogNull log;
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	421 wxDir finder(arstrPath[i]);
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	422 wxString filename;
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	423
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	424 if (finder.IsOpened())
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	425 {
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	426 bool bMore = finder.GetFirst(& filename, gccExe);
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	427 while (bMore)
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	428 {
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	429 wxString targetName = filename.Left(filename.Find(wxT("-gcc")));
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	430 m_arstrBinDirs.Set(targetName, arstrPath[i]);
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	431
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	432 bMore = finder.GetNext(& filename);
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	433 }
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	434 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	435 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	436 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	437 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	438 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	439 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	440
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	441 // Read build tools directories (current user)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	442
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	443 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	444 wxConfigPathChanger path(& config, wxT("/Build Tools/"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	445 //config.SetPath(wxT("/Build Tools"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	446 wxString key(wxT(""));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	447 long index;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	448 bool bMore = config.GetFirstEntry(key, index);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	449 while (bMore)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	450 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	451 wxString value;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	452 if (config.Read(key, & value))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	453 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	454 m_arstrBinDirs.Set(key, value);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	455 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	456 bMore = config.GetNextEntry(key, index);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	457 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	458 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	459
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	460 // Read toolchain paths (local machine again)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	461 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	462 wxArrayString arstrToolChainPaths;
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	463
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	464 // Use eCos just as a test.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	465 //GetRepositoryRegistryClues(arstrToolChainPaths,_T("eCos"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	466 GetRepositoryRegistryClues(arstrToolChainPaths,_T("GNUPro eCos"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	467
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	468 size_t i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	469 for (i = (size_t) 0; i < arstrToolChainPaths.GetCount(); i++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	470 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	471 ecFileName strDir(arstrToolChainPaths[i]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	472 strDir += wxT("H-i686-cygwin32\\bin");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	473
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	474 if (strDir.IsDir())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	475 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	476 // This is a potential toolchain location. Look for *-gcc.exe
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	477 wxLogNull log;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	478 wxDir finder(strDefaultBuildToolsPath);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	479 wxString filename;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	480
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	481 if (finder.IsOpened())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	482 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	483 bool bMore = finder.GetFirst(& filename, wxT("*-gcc.exe"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	484 while (bMore)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	485 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	486 // TODO: if there is more than one path, we will have to
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	487 // check the existance of this target name in m_arstrBinDirs and
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	488 // append to the end, or something.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	489 wxString targetName = filename.Left(filename.Find(wxT("-gcc")));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	490 m_arstrBinDirs.Set(targetName, strDefaultBuildToolsPath);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	491
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	492 bMore = finder.GetNext(& filename);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	493 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	494 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	495 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	496 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	497
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	498 // The official user tools are now Cygwin 00r1. If you can't find these,
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	499 // try GNUPro unsupported.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	500 GetRepositoryRegistryClues(m_userToolPaths, wxT("GNUPro 00r1"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	501 if (m_userToolPaths.GetCount() == 0)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	502 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	503 GetRepositoryRegistryClues(m_userToolPaths, wxT("Cygwin 00r1"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	504 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	505
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	506 if (m_userToolPaths.GetCount() > 0)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	507 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	508 for ( i = (size_t) 0 ; i < m_userToolPaths.GetCount(); i++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	509 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	510 ecFileName str(m_userToolPaths[i]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	511 str += "H-i686-cygwin32\\bin";
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	512 if(str.IsDir())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	513 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	514 m_userToolPaths[i] = str;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	515 } else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	516 {
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	517 #if wxCHECK_VERSION(2, 6, 0)
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	518 m_userToolPaths.RemoveAt(i);
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	519 #else
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	520 m_userToolPaths.Remove(i);
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	521 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	522 i--;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	523 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	524 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	525 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	526 else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	527 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	528 GetRepositoryRegistryClues(m_userToolPaths, wxT("GNUPro unsupported"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	529
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	530 for ( i = (size_t) 0 ; i < m_userToolPaths.GetCount(); i++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	531 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	532 ecFileName str(m_userToolPaths[i]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	533 str += "H-i686-cygwin32\\bin";
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	534 if(str.IsDir())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	535 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	536 m_userToolPaths[i] = str;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	537 } else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	538 {
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	539 #if wxCHECK_VERSION(2, 6, 0)
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	540 m_userToolPaths.RemoveAt(i);
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	541 #else
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	542 m_userToolPaths.Remove(i);
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	543 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	544 i--;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	545 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	546 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	547 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	548 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	549
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	550 // Include the path in the set of potential user paths
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	551 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	552 wxString strPath;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	553 if (wxGetEnv(wxT("PATH"), & strPath))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	554 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	555 wxArrayString arstrPath;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	556 ecUtils::Chop(strPath, arstrPath, wxT(';'));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	557
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	558 for (int i = arstrPath.GetCount()-1;i >= 0; --i)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	559 { // Reverse order is important to treat path correctly
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	560
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	561 const ecFileName &strFolder = arstrPath[i];
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	562 if (wxT(".") != strFolder && !strFolder.IsEmpty())
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	563 {
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	564 ecFileName strFile(strFolder);
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	565 strFile += wxT("ls.exe");
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	566 if ( strFile.Exists() )
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	567 {
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	568 if (!wxArrayStringIsMember(m_userToolPaths, strFolder))
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	569 {
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	570 m_userToolPaths.Add(strFolder);
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	571 }
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	572
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	573 if ( m_userToolsDir.IsEmpty() )
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	574 {
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	575 m_userToolsDir = strFolder;
8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	576 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	577 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	578 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	579 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	580 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	581 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	582
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	583 // Load current repository from eCos Configuration Tool/Paths/RepositoryDir
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	584 {
816 b4a3f003fc22 * standalone/wxwin/appsettings.cpp: Look in the right place for the jld parents: 613 diff changeset	585 wxConfig eCosConfig(wxGetApp().GetSettings().GetConfigAppName(), wxEmptyString, wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE\|wxCONFIG_USE_LOCAL_FILE);
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	586 wxConfigPathChanger path(& config, wxT("/Repository/"));
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	587
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	588 //if (!eCosConfig.Read(wxT("Folder"), & m_strRepository))
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	589 if (!eCosConfig.Read(wxT("/Paths/RepositoryDir"), & m_strRepository))
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	590 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	591 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	592 // If we can't find the current folder, look for clues in the registry.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	593 wxArrayString arstr;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	594 switch (GetRepositoryRegistryClues(arstr, wxT("eCos")))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	595 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	596 case 0:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	597 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	598 case 1:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	599 default:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	600 m_strRepository = arstr[0];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	601 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	602 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	603 #elif defined(__WXGTK__)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	604 // If we can't find the current folder, look for the latest version
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	605 // in /opt/ecos
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	606 m_strRepository = FindLatestVersion();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	607 #else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	608 // Unsupported platform
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	609 m_strRepositor = wxEmptyString;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	610 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	611 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	612
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	613 // If we have set ECOS_REPOSITORY, this overrides whatever we have
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	614 // read or found.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	615 wxString envVarValue = wxGetenv(wxT("ECOS_REPOSITORY"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	616 if (!envVarValue.IsEmpty())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	617 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	618 // Note that ECOS_REPOSITORY has the packages (or ecc) folder in the name.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	619 // In order to be in the form that is compatible with configtool operation,
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	620 // it needs to have that stripped off.
931 d7c9117adc25 * standalone/wxwin/ecutils.cpp, standalone/wxwin/ecutils.h: Create jld parents: 911 diff changeset	621 envVarValue = ecUtils::PosixToNativePath(envVarValue); // accommodate posix-style ECOS_REPOSITORY value under Cygwin
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	622 wxString packagesName = wxFileNameFromPath(envVarValue);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	623 if (packagesName == wxT("ecc") \|\| packagesName == wxT("packages"))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	624 envVarValue = wxPathOnly(envVarValue);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	625
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	626 m_strRepository = envVarValue;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	627 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	628 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	629
911 e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	630 #ifdef __WXMSW__
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	631 if (m_userToolsDir.IsEmpty())
931 d7c9117adc25 * standalone/wxwin/ecutils.cpp, standalone/wxwin/ecutils.h: Create jld parents: 911 diff changeset	632 m_userToolsDir = GetCygwinInstallPath() + wxT("\\bin");
911 e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	633 #else
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	634 if (m_userToolsDir.IsEmpty())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	635 m_userToolsDir = wxT("/bin");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	636 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	637
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	638 return TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	639 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	640
911 e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	641 #ifdef __WXMSW__
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	642 wxString ecSettings::GetCygwinInstallPath()
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	643 {
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	644 HKEY hKey = 0;
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	645 DWORD type;
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	646 BYTE value[256];
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	647 DWORD sz = sizeof(value);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	648 wxString strCygwinInstallPath;
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	649
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	650 // look for the "/" mount point in the system registry settings
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	651 if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Cygnus Solutions\\Cygwin\\mounts v2\\/", 0, KEY_READ, &hKey)) {
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	652 if (ERROR_SUCCESS == RegQueryValueEx(hKey, "native", NULL, & type, value, & sz)) {
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	653 strCygwinInstallPath = (const char*) value;
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	654 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	655 RegCloseKey(hKey);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	656 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	657
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	658 // if not yet found, look for the "/" mount point in the user's registry settings
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	659 hKey = 0;
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	660 sz = sizeof(value);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	661 if (strCygwinInstallPath.IsEmpty() && (ERROR_SUCCESS == RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Cygnus Solutions\\Cygwin\\mounts v2\\/", 0, KEY_READ, &hKey))) {
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	662 if (ERROR_SUCCESS == RegQueryValueEx(hKey, "native", NULL, & type, value, & sz)) {
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	663 strCygwinInstallPath = (const char*) value;
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	664 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	665 RegCloseKey(hKey);
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	666 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	667
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	668 return strCygwinInstallPath;
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	669 }
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	670 #endif
e890ffec4503 * standalone/wxwin/appsettings.cpp, standalone/wxwin/appsettings.h: Look jld parents: 846 diff changeset	671
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	672 // Save config info
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	673 bool ecSettings::SaveConfig()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	674 {
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	675 wxConfig config(wxGetApp().GetSettings().GetConfigAppName());
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	676
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	677 config.Write(_("/Files/LastFile"), m_lastFilename);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	678
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	679 config.Write(_("/Window Status/FrameStatus"), (long) m_frameStatus);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	680 config.Write(_("/Window Status/ShowToolBar"), m_showToolBar);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	681 config.Write(_("/Window Status/ShowSplashScreen"), m_showSplashScreen);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	682 config.Write(_("/Window Status/ShowConflictsWindow"), m_showConflictsWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	683 config.Write(_("/Window Status/ShowPropertiesWindow"), m_showPropertiesWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	684 config.Write(_("/Window Status/ShowShortDescrWindow"), m_showShortDescrWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	685 config.Write(_("/Window Status/ShowMemoryWindow"), m_showMemoryWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	686 config.Write(_("/Window Status/ShowOutputWindow"), m_showOutputWindow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	687
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	688 config.Write(_("/Window Size/WindowX"), (long) m_frameSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	689 config.Write(_("/Window Size/WindowY"), (long) m_frameSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	690 config.Write(_("/Window Size/WindowWidth"), (long) m_frameSize.width);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	691 config.Write(_("/Window Size/WindowHeight"), (long) m_frameSize.height);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	692 config.Write(_("/Window Size/TreeSashWidth"), (long) m_treeSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	693 config.Write(_("/Window Size/TreeSashHeight"), (long) m_treeSashSize.y);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 165 diff changeset	694 config.Write(_("/Window Size/ConfigPaneWidth"), (long) m_configPaneWidth);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	695 config.Write(_("/Window Size/ConflictsWidth"), (long) m_conflictsSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	696 config.Write(_("/Window Size/ConflictsHeight"), (long) m_conflictsSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	697 config.Write(_("/Window Size/PropertiesWidth"), (long) m_propertiesSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	698 config.Write(_("/Window Size/PropertiesHeight"), (long) m_propertiesSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	699 config.Write(_("/Window Size/ShortDescrWidth"), (long) m_shortDescrSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	700 config.Write(_("/Window Size/ShortDescrHeight"), (long) m_shortDescrSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	701 config.Write(_("/Window Size/OutputWidth"), (long) m_outputSashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	702 config.Write(_("/Window Size/OutputHeight"), (long) m_outputSashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	703 config.Write(_("/Window Size/MemoryWidth"), (long) m_memorySashSize.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	704 config.Write(_("/Window Size/MemoryHeight"), (long) m_memorySashSize.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	705
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	706 config.Write(_("/Options/ShowMacroNames"), m_showMacroNames);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	707 config.Write(_("/Options/UseCustomViewer"), m_bUseCustomViewer);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	708 config.Write(_("/Options/UseExternalBrowser"), m_bUseExternalBrowser);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	709 config.Write(_("/Options/UseCustomBrowser"), (long) m_eUseCustomBrowser);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	710 config.Write(_("/Options/Browser"), m_strBrowser);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	711 config.Write(_("/Options/Viewer"), m_strViewer);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	712 config.Write(_("/Options/HexDisplay"), m_bHex);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	713 config.Write(_("/Options/UseDefaultFonts"), m_windowSettings.m_useDefaults);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	714
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	715 config.Write(_("/Rule/Checking"), (long) m_nRuleChecking);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	716
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	717 config.Write(_("/Paths/UserToolsDir"), m_userToolsDir);
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 160 diff changeset	718 config.Write(_("/Paths/BuildToolsDir"), m_buildToolsDir);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	719
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	720 config.Write(_("/Build/Make Options"), m_strMakeOptions);
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	721
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	722 // Find dialog settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	723 config.Write(_("/Find/Text"), m_findText);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	724 config.Write(_("/Find/MatchWholeWord"), m_findMatchWholeWord);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	725 config.Write(_("/Find/MatchCase"), m_findMatchCase);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	726 config.Write(_("/Find/Direction"), m_findDirection);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	727 config.Write(_("/Find/SearchWhat"), m_findSearchWhat);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	728 config.Write(_("/Find/DialogX"), (long) m_findDialogPos.x);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	729 config.Write(_("/Find/DialogY"), (long) m_findDialogPos.y);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	730
199 920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	731 // Package dialog settings
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	732 config.Write(_("/Packages/OmitHardwarePackages"), m_omitHardwarePackages);
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	733 config.Write(_("/Packages/MatchPackageNamesExactly"), m_matchPackageNamesExactly);
920b9b754b53 Merge from eCos master repository on 2001-12-15-12:00:33-GMT jlarmour parents: 184 diff changeset	734
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	735 // Save current repository to eCos Configuration Tool/Paths/RepositoryDir
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	736 // UNLESS it was overridden by ECOS_REPOSITORY
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	737 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	738 wxString envVarValue = wxGetenv(wxT("ECOS_REPOSITORY"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	739 if (m_strRepository == envVarValue)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	740 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	741 // Don't override the value in the local settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	742 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	743 else
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	744 config.Write(wxT("/Paths/RepositoryDir"), m_strRepository);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	745 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	746
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	747 // Run tests settings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	748 m_runTestsSettings.SaveConfig(config);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	749
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	750 // Fonts
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	751 m_windowSettings.SaveConfig(config);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	752
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	753 return TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	754 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	755
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	756 void ecSettings::ShowSettingsDialog(const wxString& page)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	757 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	758 #if 0
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	759 ecSettingsDialog* dialog = new ecSettingsDialog(wxGetApp().GetTopWindow());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	760 if (!page.IsEmpty())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	761 dialog->GetNotebook()->SetSelection(ecFindNotebookPage(dialog->GetNotebook(), page));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	762
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	763 int ret = dialog->ShowModal();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	764 dialog->Destroy();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	765 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	766 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	767
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	768 #ifndef MAX_PATH
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	769 #define MAX_PATH 1024
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	770 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	771
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	772 // TODO for non-Windows platforms
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	773 const ecFileName& ecSettings::DefaultExternalBrowser()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	774 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	775 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	776 static bool bFirstTime=TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	777 if(bFirstTime){
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 992 diff changeset	778 const ecFileName strFile(ecFileName::EC_GetTempPath()+wxT("index.html"));
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	779 wxFile f;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	780 if(f.Create(strFile, TRUE))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	781 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	782 f.Close();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	783 bool rc=((int) ::FindExecutable(strFile,wxT("."),m_strDefaultExternalBrowser.GetWriteBuf(MAX_PATH))>32);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	784 m_strDefaultExternalBrowser.UngetWriteBuf();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	785 if(!rc){
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	786 m_strDefaultExternalBrowser=wxT("");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	787 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	788 wxRemoveFile(strFile);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	789 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	790 bFirstTime=FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	791 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	792 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	793 return m_strDefaultExternalBrowser;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	794 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	795
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	796 ecFileName ecSettings::m_strDefaultExternalBrowser;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	797
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	798 // Go looking for potential candidates in SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	799 int ecSettings::GetRepositoryRegistryClues(wxArrayString& arstr, const wxString& pszPrefix)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	800 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	801 arstr.Clear();
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	802
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	803 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	804 wxConfig config(wxT("Windows"), wxT("Microsoft"), wxEmptyString, wxEmptyString, wxCONFIG_USE_GLOBAL_FILE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	805 config.SetPath(wxT("/CurrentVersion/App Paths"));
992 8f4717f85ff4 * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for jld parents: 951 diff changeset	806
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	807 wxString key(wxT(""));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	808 long index;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	809 bool bMore = config.GetFirstGroup(key, index);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	810 while (bMore)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	811 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	812 if (key.Find(pszPrefix) == 0)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	813 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	814 wxString value;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	815 //wxString key2(wxString(wxT("/")) + key + wxString(wxT("/Path")));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	816 wxString key2(key + wxString(wxT("/Path")));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	817 if (config.Read(key2, & value))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	818 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	819 arstr.Add(value);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	820 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	821 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	822 bMore = config.GetNextGroup(key, index);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	823 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	824 return arstr.GetCount();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	825 #else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	826 return 0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	827 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	828 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	829
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	830 // Finds the path of the latest installed eCos
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	831 wxString ecSettings::FindLatestVersion()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	832 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	833 #ifdef __WXGTK__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	834 wxString ecosRoot(wxT("/opt/ecos"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	835 wxLogNull log;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	836 wxDir dir(ecosRoot);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	837
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	838 wxString latestDir;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	839 wxString latestVersion;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	840
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	841 if (dir.IsOpened())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	842 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	843 wxString filename;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	844 bool cont = dir.GetFirst(& filename, wxT("ecos-*"), wxDIR_DIRS);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	845 while (cont)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	846 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	847 wxString ver(filename.Mid(5));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	848 if (latestVersion.IsEmpty() \|\| latestVersion.CompareTo(ver) < 0)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	849 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	850 latestVersion = ver;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	851 latestDir = ecosRoot + wxT("/") + filename;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	852 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	853
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	854 cont = dir.GetNext(& filename);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	855 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	856 }
839 706b0bdaf01c * standalone/wxwin/appsettings.cpp, standalone/wxwin/configtool.cpp: jld parents: 816 diff changeset	857 // if (latestDir.IsEmpty())
706b0bdaf01c * standalone/wxwin/appsettings.cpp, standalone/wxwin/configtool.cpp: jld parents: 816 diff changeset	858 // latestDir = wxGetCwd();
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	859 return latestDir;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	860 #else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	861 wxMessageBox(wxT("FindLatestVersion() is only implemented for Unix."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	862 return wxEmptyString;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	863 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	864 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	865
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	866 wxString ecSettings::GetInstallVersionKey ()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	867 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	868 #ifdef __WXMSW__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	869
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	870 #ifndef MAX_PATH
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	871 #define MAX_PATH 1024
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	872 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	873
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	874 wxString strKey = wxT("SOFTWARE\\eCos");
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	875 wxString strVersionKey = wxT("");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	876 wxString rc = wxT("");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	877 wxChar pszBuffer [MAX_PATH + 1];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	878 HKEY hKey;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	879
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	880 // get the greatest eCos version subkey
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	881 if (ERROR_SUCCESS == RegOpenKeyEx (HKEY_LOCAL_MACHINE, strKey, 0L, KEY_READ, &hKey)) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	882 DWORD dwIndex = 0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	883 while (ERROR_SUCCESS == RegEnumKey (hKey, dwIndex++, (LPTSTR) pszBuffer, sizeof (pszBuffer))) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	884 if (strVersionKey.CompareTo (pszBuffer) < 0) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	885 strVersionKey = pszBuffer;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	886 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	887 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	888 RegCloseKey (hKey);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	889 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	890 return strVersionKey;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	891 #else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	892 wxMessageBox(wxT("GetInstallVersionKey() is only implemented for Windows."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	893 return wxEmptyString;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	894 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	895 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	896
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	897 /*
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	898 * ecRunTestSettings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	899 * Settings relating to running tests
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	900 */
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	901
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	902 IMPLEMENT_DYNAMIC_CLASS(ecRunTestsSettings, wxObject)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	903
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	904 ecRunTestsSettings::ecRunTestsSettings():
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	905 m_ep(CeCosTest::ExecutionParameters::RUN),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	906 m_nTimeout(900),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	907 m_nDownloadTimeout(120),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	908 m_nTimeoutType(TIMEOUT_AUTOMATIC),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	909 m_nDownloadTimeoutType(TIMEOUT_SPECIFIED),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	910 m_bRemote(FALSE),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	911 m_bSerial(TRUE),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	912 m_nBaud(38400),
2515 24c0267fbb70 * Utils/ChangeLog Utils/common/eCosStd.h, jld parents: 2466 diff changeset	913 m_nLocalTCPIPPort(9000),
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	914 m_nReset(RESET_MANUAL),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	915 m_nResourcePort(1),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	916 m_nRemotePort(1),
3277 047bbfee43f6 * standalone/wxwin/appsettings.cpp, jld parents: 2729 diff changeset	917 m_bFarmed(TRUE),
047bbfee43f6 * standalone/wxwin/appsettings.cpp, jld parents: 2729 diff changeset	918 m_strPort(wxT("/dev/ttyS0")),
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	919 m_strRemoteHost(wxT("")),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	920 m_strResourceHost(wxT("")),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	921 m_strLocalTCPIPHost(wxT("")),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	922 m_strReset(wxT(""))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	923 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	924 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	925
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	926 ecRunTestsSettings::ecRunTestsSettings(const ecRunTestsSettings& settings)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	927 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	928 Copy(settings);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	929 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	930
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	931 void ecRunTestsSettings::Copy(const ecRunTestsSettings& settings)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	932 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	933 m_nTimeoutType = settings.m_nTimeoutType;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	934 m_nDownloadTimeoutType = settings.m_nDownloadTimeoutType;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	935 m_bRemote = settings.m_bRemote;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	936 m_bSerial = settings.m_bSerial;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	937 m_strPort = settings.m_strPort;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	938 m_nBaud = settings.m_nBaud;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	939 m_nLocalTCPIPPort = settings.m_nLocalTCPIPPort;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	940 m_nReset = settings.m_nReset;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	941 m_nResourcePort = settings.m_nResourcePort;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	942 m_nRemotePort = settings.m_nRemotePort;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	943 m_bFarmed = settings.m_bFarmed;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	944 m_strTarget = settings.m_strTarget;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	945 m_strRemoteHost = settings.m_strRemoteHost;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	946 m_strResourceHost = settings.m_strResourceHost;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	947 m_strLocalTCPIPHost = settings.m_strLocalTCPIPHost;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	948 m_strReset = settings.m_strReset;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	949 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	950
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	951 bool ecRunTestsSettings::LoadConfig(wxConfig& config)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	952 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	953 config.Read(_("/Run Tests/TimeoutType"), & m_nTimeoutType);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	954 config.Read(_("/Run Tests/DownloadTimeoutType"), & m_nDownloadTimeoutType);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	955 config.Read(_("/Run Tests/Remote"), (bool*) & m_bRemote);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	956 config.Read(_("/Run Tests/Serial"), (bool*) & m_bSerial);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	957 config.Read(_("/Run Tests/Port"), & m_strPort);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	958 config.Read(_("/Run Tests/Baud"), & m_nBaud);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	959 config.Read(_("/Run Tests/LocalTCPIPHost"), & m_strLocalTCPIPHost);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	960 config.Read(_("/Run Tests/LocalTCPIPPort"), & m_nLocalTCPIPPort);
613 f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	961 // Reset type is determined at run-time for standalone configtool
f83ca6359915 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 540 diff changeset	962 // config.Read(_("/Run Tests/ResetType"), & m_nReset);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	963 config.Read(_("/Run Tests/ResetString"), & m_strReset);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	964 config.Read(_("/Run Tests/ResourceHost"), & m_strResourceHost);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	965 config.Read(_("/Run Tests/ResourcePort"), & m_nResourcePort);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	966 config.Read(_("/Run Tests/RemoteHost"), & m_strRemoteHost);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	967 config.Read(_("/Run Tests/RemotePort"), & m_nRemotePort);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	968 config.Read(_("/Run Tests/Farmed"), (bool*) & m_bFarmed);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	969
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	970 return TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	971 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	972
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	973 bool ecRunTestsSettings::SaveConfig(wxConfig& config)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	974 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	975 config.Write(_("/Run Tests/TimeoutType"), (long) m_nTimeoutType);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	976 config.Write(_("/Run Tests/DownloadTimeoutType"), (long) m_nDownloadTimeoutType);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	977 config.Write(_("/Run Tests/Remote"), m_bRemote);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	978 config.Write(_("/Run Tests/Serial"), m_bSerial);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	979 config.Write(_("/Run Tests/Port"), m_strPort);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	980 config.Write(_("/Run Tests/Baud"), (long) m_nBaud);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	981 config.Write(_("/Run Tests/LocalTCPIPHost"), m_strLocalTCPIPHost);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	982 config.Write(_("/Run Tests/LocalTCPIPPort"), (long) m_nLocalTCPIPPort);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	983 config.Write(_("/Run Tests/ResetType"), (long) m_nReset);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	984 config.Write(_("/Run Tests/ResetString"), m_strReset);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	985 config.Write(_("/Run Tests/ResourceHost"), m_strResourceHost);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	986 config.Write(_("/Run Tests/ResourcePort"), (long) m_nResourcePort);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	987 config.Write(_("/Run Tests/RemoteHost"), m_strRemoteHost);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	988 config.Write(_("/Run Tests/RemotePort"), (long) m_nRemotePort);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	989 config.Write(_("/Run Tests/Farmed"), m_bFarmed);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	990
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	991 return TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	992 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	993

Mercurial > ecos

annotate host/tools/configtool/standalone/wxwin/appsettings.cpp @ 3292:7f8e529b4d82 default tip