kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove code warrior and fixed GUI isues

Browse Source
This commit is contained in:
Ken Martin 2002-12-03 14:09:56 -05:00
parent ec1b07015e
commit 37aed9f6c5
6 changed files with 64 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CMakeLists.txt
View File

@ -18,10 +18,8 @@ cmSourceGroup.cxx
cmListFileCache.cxx cmListFileCache.cxx
cmGlobalGenerator.cxx cmGlobalGenerator.cxx
cmGlobalUnixMakefileGenerator.cxx cmGlobalUnixMakefileGenerator.cxx
cmGlobalCodeWarriorGenerator.cxx
cmLocalGenerator.cxx cmLocalGenerator.cxx
cmLocalUnixMakefileGenerator.cxx cmLocalUnixMakefileGenerator.cxx
cmLocalCodeWarriorGenerator.cxx
cmake.h cmake.h
cmakewizard.h cmakewizard.h
cmMakeDepend.h cmMakeDepend.h
@ -39,10 +37,8 @@ cmSourceGroup.h
cmListFileCache.h cmListFileCache.h
cmGlobalGenerator.h cmGlobalGenerator.h
cmGlobalUnixMakefileGenerator.h cmGlobalUnixMakefileGenerator.h
cmGlobalCodeWarriorGenerator.h
cmLocalGenerator.h cmLocalGenerator.h
cmLocalUnixMakefileGenerator.h cmLocalUnixMakefileGenerator.h
cmLocalCodeWarriorGenerator.h
) )
# configure the .h file # configure the .h file

50
Source/MFCDialog/CMakeSetup.rc
View File

@ -1,4 +1,4 @@
//Microsoft Developer Studio generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "resource.h" #include "resource.h"
@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE MOVEABLE PURE 1 TEXTINCLUDE
BEGIN BEGIN
"resource.h\0" "resource.h\0"
END END
2 TEXTINCLUDE MOVEABLE PURE 2 TEXTINCLUDE
BEGIN BEGIN
"#include ""afxres.h""\r\n" "#include ""afxres.h""\r\n"
"\0" "\0"
END END
3 TEXTINCLUDE MOVEABLE PURE 3 TEXTINCLUDE
BEGIN BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n" "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
"#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_OLE_RESOURCES\r\n"
@ -66,15 +66,15 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDR_MAINFRAME ICON DISCARDABLE "res\\CMakeSetupDialog.ico" IDR_MAINFRAME ICON "res\\CMakeSetupDialog.ico"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Dialog // Dialog
// //
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55 IDD_ABOUTBOX DIALOG 0, 0, 235, 55
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About CMakeSetup" CAPTION "About CMakeSetup"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
@ -86,11 +86,11 @@ BEGIN
END END
IDD_CMakeSetupDialog_DIALOG DIALOGEX 0, 0, 446, 241 IDD_CMakeSetupDialog_DIALOG DIALOGEX 0, 0, 446, 241
STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE |
WS_SYSMENU | WS_THICKFRAME WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "CMakeSetupDialog" CAPTION "CMakeSetupDialog"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN BEGIN
COMBOBOX IDC_WhereSource,96,6,169,66,CBS_DROPDOWN | COMBOBOX IDC_WhereSource,96,6,169,66,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
@ -110,17 +110,18 @@ BEGIN
IDC_MouseHelpCaption,112,190,243,27 IDC_MouseHelpCaption,112,190,243,27
LTEXT "Static",IDC_CMAKE_VERSION,3,227,92,13,SS_CENTERIMAGE LTEXT "Static",IDC_CMAKE_VERSION,3,227,92,13,SS_CENTERIMAGE
PUSHBUTTON "OK",IDC_OK,166,223,51,15 PUSHBUTTON "OK",IDC_OK,166,223,51,15
COMBOBOX IDC_Generator,340,7,102,50,CBS_DROPDOWN | CBS_SORT | COMBOBOX IDC_Generator,345,7,97,50,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Help",IDC_HELP_BUTTON,278,223,51,15 PUSHBUTTON "Help",IDC_HELP_BUTTON,278,223,51,15
CONTROL "Show Advanced Values",IDC_AdvancedValues,"Button", CONTROL "Show Advanced Values",IDC_AdvancedValues,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,305,28,98,9 BS_AUTOCHECKBOX | WS_TABSTOP,305,28,98,9
RTEXT "Static",IDC_PROGRESS,341,226,100,12,SS_CENTERIMAGE RTEXT "Static",IDC_PROGRESS,341,226,100,12,SS_CENTERIMAGE
LTEXT "Build For:",IDC_BuildForLabel,305,8,28,11 RTEXT "Build For:",IDC_BuildForLabel,305,8,34,11,
SS_CENTERIMAGE
END END
IDD_CMAKE_HELP_DIALOG DIALOG DISCARDABLE 0, 0, 365, 183 IDD_CMAKE_HELP_DIALOG DIALOG 0, 0, 365, 183
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "CMake Help" CAPTION "CMake Help"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
@ -130,7 +131,6 @@ BEGIN
END END
#ifndef _MAC
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Version // Version
@ -153,13 +153,13 @@ BEGIN
BEGIN BEGIN
BLOCK "040904B0" BLOCK "040904B0"
BEGIN BEGIN
VALUE "FileDescription", "CMakeSetup MFC Application\0" VALUE "FileDescription", "CMakeSetup MFC Application"
VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "CMakeSetup\0" VALUE "InternalName", "CMakeSetup"
VALUE "LegalCopyright", "Copyright (C) 2000\0" VALUE "LegalCopyright", "Copyright (C) 2000"
VALUE "OriginalFilename", "CMakeSetup.EXE\0" VALUE "OriginalFilename", "CMakeSetup.EXE"
VALUE "ProductName", "CMakeSetup Application\0" VALUE "ProductName", "CMakeSetup Application"
VALUE "ProductVersion", "1, 0, 0, 1\0" VALUE "ProductVersion", "1, 0, 0, 1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@ -168,8 +168,6 @@ BEGIN
END END
END END
#endif // !_MAC
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
@ -177,7 +175,7 @@ END
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO MOVEABLE PURE GUIDELINES DESIGNINFO
BEGIN BEGIN
IDD_ABOUTBOX, DIALOG IDD_ABOUTBOX, DIALOG
BEGIN BEGIN
@ -209,7 +207,7 @@ END
// String Table // String Table
// //
STRINGTABLE DISCARDABLE STRINGTABLE
BEGIN BEGIN
IDS_ABOUTBOX "&About CMakeSetup..." IDS_ABOUTBOX "&About CMakeSetup..."
IDS_CREATESHORTCUT "&Create shortcut" IDS_CREATESHORTCUT "&Create shortcut"

63
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -171,6 +171,8 @@ void CMakeSetupDialog::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CMakeSetupDialog) //{{AFX_DATA_MAP(CMakeSetupDialog)
DDX_Control(pDX, IDC_CMAKE_VERSION, m_VersionDisplay);
DDX_Control(pDX, IDC_PROGRESS, m_StatusDisplay);
DDX_Control(pDX, IDC_AdvancedValues, m_AdvancedValuesControl); DDX_Control(pDX, IDC_AdvancedValues, m_AdvancedValuesControl);
DDX_Control(pDX, IDC_BuildForLabel, m_BuildForLabel); DDX_Control(pDX, IDC_BuildForLabel, m_BuildForLabel);
DDX_Control(pDX, IDC_BROWSE_SOURCE, m_BrowseSource); DDX_Control(pDX, IDC_BROWSE_SOURCE, m_BrowseSource);
@ -186,7 +188,6 @@ void CMakeSetupDialog::DoDataExchange(CDataExchange* pDX)
DDX_Control(pDX, IDC_WhereBuild, m_WhereBuildControl); DDX_Control(pDX, IDC_WhereBuild, m_WhereBuildControl);
DDX_Control(pDX, IDC_LIST2, m_CacheEntriesList); DDX_Control(pDX, IDC_LIST2, m_CacheEntriesList);
DDX_Control(pDX, IDC_MouseHelpCaption, m_MouseHelp); DDX_Control(pDX, IDC_MouseHelpCaption, m_MouseHelp);
DDX_Control(pDX, IDC_CMAKE_VERSION, m_VersionDisplay);
DDX_Control(pDX, IDC_BuildProjects, m_Configure); DDX_Control(pDX, IDC_BuildProjects, m_Configure);
DDX_CBStringExact(pDX, IDC_Generator, m_GeneratorChoiceString); DDX_CBStringExact(pDX, IDC_Generator, m_GeneratorChoiceString);
DDX_Check(pDX, IDC_AdvancedValues, m_AdvancedValues); DDX_Check(pDX, IDC_AdvancedValues, m_AdvancedValues);
@ -918,56 +919,58 @@ void CMakeSetupDialog::OnSize(UINT nType, int cx, int cy)
m_AdvancedValuesControl.GetWindowRect(&cRect); m_AdvancedValuesControl.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_AdvancedValuesControl.SetWindowPos(&wndTop, cRect.left + deltax, m_AdvancedValuesControl.SetWindowPos(&wndTop, cRect.left + deltax,
cRect.top, cRect.top,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS |
SWP_NOSIZE | SWP_NOZORDER);
m_BuildForLabel.GetWindowRect(&cRect); m_BuildForLabel.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_BuildForLabel.SetWindowPos(&wndTop, cRect.left + deltax, m_BuildForLabel.SetWindowPos(&wndTop, cRect.left + deltax,
cRect.top, cRect.top,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE | SWP_NOZORDER);
m_GeneratorChoice.GetWindowRect(&cRect); m_GeneratorChoice.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_GeneratorChoice.SetWindowPos(&wndTop, cRect.left + deltax, m_GeneratorChoice.SetWindowPos(&wndTop, cRect.left + deltax,
cRect.top, cRect.top,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE | SWP_NOZORDER);
m_BrowseSource.GetWindowRect(&cRect); m_BrowseSource.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_BrowseSource.SetWindowPos(&wndTop, cRect.left + deltax, m_BrowseSource.SetWindowPos(&wndTop, cRect.left + deltax,
cRect.top, cRect.top,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE | SWP_NOZORDER);
m_BrowseBuild.GetWindowRect(&cRect); m_BrowseBuild.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_BrowseBuild.SetWindowPos(&wndTop, cRect.left + deltax, m_BrowseBuild.SetWindowPos(&wndTop, cRect.left + deltax,
cRect.top, cRect.top,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE | SWP_NOZORDER);
m_WhereSourceControl.GetWindowRect(&cRect); m_WhereSourceControl.GetWindowRect(&cRect);
m_WhereSourceControl.SetWindowPos(&wndTop, cRect.left, cRect.top, m_WhereSourceControl.SetWindowPos(&wndTop, cRect.left, cRect.top,
cRect.Width() + deltax, cRect.Width() + deltax,
cRect.Height() + deltay, cRect.Height() + deltay,
SWP_NOCOPYBITS |
SWP_NOMOVE | SWP_NOZORDER); SWP_NOMOVE | SWP_NOZORDER);
m_WhereBuildControl.GetWindowRect(&cRect); m_WhereBuildControl.GetWindowRect(&cRect);
m_WhereBuildControl.SetWindowPos(&wndTop, cRect.left, cRect.top, m_WhereBuildControl.SetWindowPos(&wndTop, cRect.left, cRect.top,
cRect.Width() + deltax, cRect.Width() + deltax,
cRect.Height() + deltay, cRect.Height() + deltay,
SWP_NOMOVE | SWP_NOZORDER); SWP_NOCOPYBITS |
SWP_NOMOVE | SWP_NOZORDER);
m_ListFrame.GetWindowRect(&cRect); m_ListFrame.GetWindowRect(&cRect);
m_ListFrame.SetWindowPos(&wndTop, cRect.left, cRect.top, m_ListFrame.SetWindowPos(&wndTop, cRect.left, cRect.top,
cRect.Width() + deltax, cRect.Width() + deltax,
cRect.Height() + deltay, cRect.Height() + deltay,
SWP_NOMOVE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOZORDER);
m_CacheEntriesList.GetWindowRect(&cRect); m_CacheEntriesList.GetWindowRect(&cRect);
m_CacheEntriesList.SetWindowPos(&wndTop, cRect.left, cRect.top, m_CacheEntriesList.SetWindowPos(&wndTop, cRect.left, cRect.top,
cRect.Width() + deltax, cRect.Width() + deltax,
cRect.Height() + deltay, cRect.Height() + deltay,
SWP_NOMOVE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOZORDER);
m_VersionDisplay.SetWindowPos(&wndTop, 5, cy-23, 0, 0,
SWP_NOSIZE | SWP_NOZORDER);
deltax = int(deltax + m_deltaXRemainder); deltax = int(deltax + m_deltaXRemainder);
m_deltaXRemainder = float(deltax%2); m_deltaXRemainder = float(deltax%2);
@ -976,32 +979,44 @@ void CMakeSetupDialog::OnSize(UINT nType, int cx, int cy)
m_MouseHelp.SetWindowPos(&wndTop, cRect.left + deltax/2, m_MouseHelp.SetWindowPos(&wndTop, cRect.left + deltax/2,
cRect.top + deltay, cRect.top + deltay,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE | SWP_NOZORDER);
m_VersionDisplay.GetWindowRect(&cRect);
m_VersionDisplay.SetWindowPos(&wndBottom, 5, cy-23,
cRect.Width() + deltax/2, cRect.Height(),
SWP_NOCOPYBITS);
m_StatusDisplay.GetWindowRect(&cRect);
this->ScreenToClient(&cRect);
m_StatusDisplay.SetWindowPos(&wndBottom, cRect.left + deltax/2,
cRect.top + deltay,
cRect.Width() + deltax/2, cRect.Height(),
SWP_NOCOPYBITS);
m_Configure.GetWindowRect(&cRect); m_Configure.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_Configure.SetWindowPos(&wndTop, cRect.left + deltax/2, m_Configure.SetWindowPos(&wndTop, cRect.left + deltax/2,
cRect.top + deltay, cRect.top + deltay,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE);
m_CancelButton.GetWindowRect(&cRect); m_CancelButton.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_CancelButton.SetWindowPos(&wndTop, cRect.left + deltax/2, m_CancelButton.SetWindowPos(&wndTop, cRect.left + deltax/2,
cRect.top + deltay, cRect.top + deltay,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE);
m_OKButton.GetWindowRect(&cRect); m_OKButton.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_OKButton.SetWindowPos(&wndTop, cRect.left + deltax/2, m_OKButton.SetWindowPos(&wndTop, cRect.left + deltax/2,
cRect.top + deltay, cRect.top + deltay,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE);
m_HelpButton.GetWindowRect(&cRect); m_HelpButton.GetWindowRect(&cRect);
this->ScreenToClient(&cRect); this->ScreenToClient(&cRect);
m_HelpButton.SetWindowPos(&wndTop, cRect.left + deltax/2, m_HelpButton.SetWindowPos(&wndTop, cRect.left + deltax/2,
cRect.top + deltay, cRect.top + deltay,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOZORDER); SWP_NOCOPYBITS | SWP_NOSIZE);
} }
} }

1
Source/MFCDialog/CMakeSetupDialog.h
View File

@ -75,6 +75,7 @@ protected:
CPropertyList m_CacheEntriesList; CPropertyList m_CacheEntriesList;
CStatic m_MouseHelp; CStatic m_MouseHelp;
CStatic m_VersionDisplay; CStatic m_VersionDisplay;
CStatic m_StatusDisplay;
CButton m_Configure; CButton m_Configure;
CString m_GeneratorChoiceString; CString m_GeneratorChoiceString;
BOOL m_AdvancedValues; BOOL m_AdvancedValues;

4
Source/Makefile.in
View File

@ -25,8 +25,6 @@ cmRegularExpression.o \
cmSourceFile.o \ cmSourceFile.o \
cmSystemTools.o \ cmSystemTools.o \
cmDirectory.o \ cmDirectory.o \
cmGlobalCodeWarriorGenerator.o \
cmLocalCodeWarriorGenerator.o \
cmGlobalUnixMakefileGenerator.o \ cmGlobalUnixMakefileGenerator.o \
cmLocalUnixMakefileGenerator.o \ cmLocalUnixMakefileGenerator.o \
cmCommands.o \ cmCommands.o \
@ -52,8 +50,6 @@ cmRegularExpression.o : $(DEPENDS)
cmSourceFile.o : $(DEPENDS) cmSourceFile.o : $(DEPENDS)
cmDirectory.o : $(DEPENDS) cmDirectory.o : $(DEPENDS)
cmCustomCommand.o : $(DEPENDS) cmCustomCommand.o : $(DEPENDS)
cmGlobalCodeWarriorGenerator.o : $(DEPENDS)
cmLocalCodeWarriorGenerator.o : $(DEPENDS)
cmGlobalUnixMakefileGenerator.o : $(DEPENDS) cmGlobalUnixMakefileGenerator.o : $(DEPENDS)
cmLocalUnixMakefileGenerator.o : $(DEPENDS) cmLocalUnixMakefileGenerator.o : $(DEPENDS)
cmCommands.o : $(DEPENDS) $(srcdir)/*Command*.cxx cmCommands.o : $(DEPENDS) $(srcdir)/*Command*.cxx

7
Source/cmake.cxx
View File

@ -30,7 +30,6 @@
#include "cmGlobalNMakeMakefileGenerator.h" #include "cmGlobalNMakeMakefileGenerator.h"
#include "cmWin32ProcessExecution.h" #include "cmWin32ProcessExecution.h"
#else #else
#include "cmGlobalCodeWarriorGenerator.h"
#include "cmGlobalUnixMakefileGenerator.h" #include "cmGlobalUnixMakefileGenerator.h"
#endif #endif
@ -622,7 +621,6 @@ void cmake::GetRegisteredGenerators(std::vector<std::string>& names)
names.push_back(cmGlobalBorlandMakefileGenerator::GetActualName()); names.push_back(cmGlobalBorlandMakefileGenerator::GetActualName());
names.push_back(cmGlobalNMakeMakefileGenerator::GetActualName()); names.push_back(cmGlobalNMakeMakefileGenerator::GetActualName());
#else #else
names.push_back(cmGlobalCodeWarriorGenerator::GetActualName());
names.push_back(cmGlobalUnixMakefileGenerator::GetActualName()); names.push_back(cmGlobalUnixMakefileGenerator::GetActualName());
#endif #endif
} }
@ -652,11 +650,6 @@ cmGlobalGenerator* cmake::CreateGlobalGenerator(const char* name)
ret->SetCMakeInstance(this); ret->SetCMakeInstance(this);
} }
#else #else
if (!strcmp(name,cmGlobalCodeWarriorGenerator::GetActualName()))
{
ret = new cmGlobalCodeWarriorGenerator;
ret->SetCMakeInstance(this);
}
if (!strcmp(name,cmGlobalUnixMakefileGenerator::GetActualName())) if (!strcmp(name,cmGlobalUnixMakefileGenerator::GetActualName()))
{ {
ret = new cmGlobalUnixMakefileGenerator; ret = new cmGlobalUnixMakefileGenerator;