Attachment 294288 Details for Bug 431953 – Proposed patch to spec file. Includes two new patches.

[patch] Proposed patch to spec file. Includes two new patches.

cmake-2.4.8-2.spec.patch (text/plain), 30.13 KB, created by Laurent Rineau on 2008-02-07 23:26:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laurent Rineau

Created: 2008-02-07 23:26:38 UTC

Size: 30.13 KB

patch

obsolete

>? .build--.log
>? .build-2.4.8-1.fc8.log
>? .build-2.4.8-2.fc8.log
>? cmake-2.4.8
>? cmake-2.4.8-1.fc8.src.rpm
>? cmake-2.4.8-2.fc8.src.rpm
>? cmake-2.4.8-2.spec.patch
>? cmake-2.4.8-CMakeSetup-unicode.patch.new
>? i686
>Index: cmake-2.4.8-CMakeSetup-unicode.patch
>===================================================================
>RCS file: cmake-2.4.8-CMakeSetup-unicode.patch
>diff -N cmake-2.4.8-CMakeSetup-unicode.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ cmake-2.4.8-CMakeSetup-unicode.patch	7 Feb 2008 23:07:17 -0000
>@@ -0,0 +1,600 @@
>+diff -up cmake-2.4.8/Source/WXDialog/CMakeSetup.cpp.unicode cmake-2.4.8/Source/WXDialog/CMakeSetup.cpp
>+--- cmake-2.4.8/Source/WXDialog/CMakeSetup.cpp.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/CMakeSetup.cpp	2008-02-07 20:15:28.000000000 +0100
>+@@ -98,8 +98,8 @@ bool CMakeSetupApp::OnInit()
>+     }
>+ 
>+     // set vendor name and app for config
>+-    SetVendorName("Kitware");
>+-    SetAppName("CMakeSetup");
>++    SetVendorName(_("Kitware"));
>++    SetAppName(_("CMakeSetup"));
>+         
>+     CMakeSetupFrm *MyFrame = new CMakeSetupFrm(NULL);
>+     
>+diff -up cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.cpp.unicode cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.cpp
>+--- cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.cpp.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.cpp	2008-02-07 20:15:28.000000000 +0100
>+@@ -152,8 +152,8 @@ void MFCMessageCallback(const char* m, c
>+ 
>+     if(fm)
>+     {
>+-        wxString what = m, msg;
>+-        if(what.StartsWith("CMake Error: "))
>++        wxString what = wxString::FromAscii(m);
>++        if(what.StartsWith(_("CMake Error: ")))
>+             fm->LogMessage(-1, m);
>+         else
>+             fm->LogMessage(1, m);
>+@@ -273,7 +273,7 @@ bool CMakeSetupFrm::Create( wxWindow* pa
>+     m_noRefresh = false;
>+     m_quitAfterGenerating = false;
>+ 
>+-    m_config = new wxConfig("CMakeSetup");
>++    m_config = new wxConfig(_("CMakeSetup"));
>+ 
>+     wxIcon icon(CMakeIcon_xpm);
>+     SetIcon(icon);
>+@@ -307,7 +307,7 @@ CMakeSetupFrm::~CMakeSetupFrm()
>+     // clear the config first
>+     for(size_t i = 0 ; i < CM_MAX_RECENT_PATHS; i++)
>+     {
>+-        str.Printf("%s%i", _(CM_RECENT_BUILD_PATH), i);
>++        str.Printf(_("%s%i"), _(CM_RECENT_BUILD_PATH), i);
>+         m_config->Write(str, _(""));
>+     }
>+ 
>+@@ -315,7 +315,7 @@ CMakeSetupFrm::~CMakeSetupFrm()
>+     int i = (m_recentPaths.Count() >= CM_MAX_RECENT_PATHS ? CM_MAX_RECENT_PATHS : m_recentPaths.Count());
>+     while(i > 0)
>+     {
>+-        str.Printf("%s%i", _(CM_RECENT_BUILD_PATH), i);
>++        str.Printf(_("%s%i"), _(CM_RECENT_BUILD_PATH), i);
>+         m_config->Write(str, m_recentPaths[i - 1]);
>+         i--;
>+     }
>+@@ -326,7 +326,7 @@ CMakeSetupFrm::~CMakeSetupFrm()
>+         // allow max to be written
>+         if(j < CM_MAX_SEARCH_QUERIES)
>+         {
>+-            str.Printf("%s%i", _(CM_SEARCH_QUERY), j);
>++            str.Printf(_("%s%i"), _(CM_SEARCH_QUERY), j);
>+             m_config->Write(str, m_cmSearchQuery->GetString(j));
>+         }
>+         else
>+@@ -428,14 +428,14 @@ void CMakeSetupFrm::LogMessage(int logki
>+         {
>+             wxTextAttr colattr(*wxBLUE);
>+             m_cmLog->SetDefaultStyle(colattr);
>+-            (*m_cmLog) << msg;
>++            (*m_cmLog) << wxString::FromAscii(msg);
>+             m_cmLog->SetDefaultStyle(defattr);
>+         }
>+         break;
>+ 
>+     // progress
>+     case 0:
>+-        (*m_cmLog) << msg;
>++        (*m_cmLog) << wxString::FromAscii(msg);
>+         break;
>+ 
>+     // error
>+@@ -443,7 +443,7 @@ void CMakeSetupFrm::LogMessage(int logki
>+         {
>+             wxTextAttr colattr(*wxRED);
>+             m_cmLog->SetDefaultStyle(colattr);
>+-            (*m_cmLog) << msg;
>++            (*m_cmLog) << wxString::FromAscii(msg);
>+             m_cmLog->SetDefaultStyle(defattr);
>+         }
>+         break;
>+@@ -616,7 +616,7 @@ void CMakeSetupFrm::CreateControls()
>+ void CMakeSetupFrm::DoInitFrame(cmCommandLineInfo &cm, const wxString &fn)
>+ { 
>+     // path to where cmake.exe is
>+-    // m_PathToExecutable = cm.GetPathToExecutable().c_str();
>++    // m_PathToExecutable = cm.GetPathToExecutable().ToAscii();
>+     m_PathToExecutable = fn;
>+ 
>+     // adjust size of last bar, to display % progress
>+@@ -653,7 +653,7 @@ void CMakeSetupFrm::DoInitFrame(cmComman
>+     m_cmake->GetRegisteredGenerators(names);
>+     for(std::vector<std::string>::iterator i = names.begin(); i != names.end(); ++i)
>+     {
>+-        name = i->c_str();
>++        name = wxString::FromAscii(i->c_str());
>+         m_cmGeneratorChoice->Append(name);
>+     }
>+     
>+@@ -699,8 +699,8 @@ void CMakeSetupFrm::DoInitFrame(cmComman
>+     m_cmGeneratorChoice->SetStringSelection(generator);
>+     
>+     wxString str;
>+-    //str.Printf("CMake %d.%d - %s", cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
>+-    str.Printf("CMakeSetup v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
>++    //str.Printf(_("CMake %d.%d - %s"), cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
>++    str.Printf(_("CMakeSetup v%i.%i%s"), CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
>+ 
>+     SetTitle(str);
>+     wxString path;
>+@@ -708,7 +708,7 @@ void CMakeSetupFrm::DoInitFrame(cmComman
>+     // get last 5 used projects
>+     for(size_t i = 0; i < CM_MAX_RECENT_PATHS; i++)
>+     {
>+-        path.Printf("%s%i", _(CM_RECENT_BUILD_PATH), i);
>++        path.Printf(_("%s%i"), _(CM_RECENT_BUILD_PATH), i);
>+         if(m_config->Read(path, &str))
>+             AppendPathToRecentList(str);
>+     }
>+@@ -716,7 +716,7 @@ void CMakeSetupFrm::DoInitFrame(cmComman
>+     // get query items
>+     for(size_t i = 0; i < CM_MAX_SEARCH_QUERIES; i++)
>+     {
>+-        path.Printf("%s%i", _(CM_SEARCH_QUERY), i);
>++        path.Printf(_("%s%i"), _(CM_SEARCH_QUERY), i);
>+         if(m_config->Read(path, &str))
>+             m_cmSearchQuery->Append(str);
>+     }
>+@@ -737,13 +737,13 @@ void CMakeSetupFrm::DoInitFrame(cmComman
>+     {
>+         if(cm.m_WhereSource.size() > 0 )
>+         {
>+-            m_cmProjectPath->SetValue(cm.m_WhereSource.c_str());
>++            m_cmProjectPath->SetValue(cm.m_WhereSource);
>+             sourceDirLoaded = true;
>+         }   
>+     
>+         if (cm.m_WhereBuild.size() > 0 )
>+         {
>+-            m_cmBuildPath->SetValue(cm.m_WhereBuild.c_str());
>++            m_cmBuildPath->SetValue(cm.m_WhereBuild);
>+             buildDirLoaded = true;
>+         }
>+             
>+@@ -754,7 +754,7 @@ void CMakeSetupFrm::DoInitFrame(cmComman
>+         m_cmShowAdvanced->SetValue(false);
>+         
>+         // TODO: Interpret directory from dropped shortcut
>+-        //this->ChangeDirectoriesFromFile(cmdInfo->m_LastUnknownParameter.c_str());
>++        //this->ChangeDirectoriesFromFile(cmdInfo->m_LastUnknownParameter.ToAscii());
>+     }
>+ 
>+     if (cm.m_ExitAfterLoad)
>+@@ -801,7 +801,7 @@ void CMakeSetupFrm::LoadCacheFromDiskToG
>+     cmCacheManager *cachem = m_cmake->GetCacheManager();
>+     if(cachem && !builddir.Trim().IsEmpty())
>+     {
>+-        if(cachem->LoadCache(builddir.c_str()))
>++        if(cachem->LoadCache(builddir.ToAscii()))
>+             AppendPathToRecentList(builddir);
>+ 
>+         // represent this cache in the grid, but not before we
>+@@ -812,7 +812,7 @@ void CMakeSetupFrm::LoadCacheFromDiskToG
>+         cmCacheManager::CacheIterator it = cachem->GetCacheIterator("CMAKE_GENERATOR");
>+         if(!it.IsAtEnd())
>+         {
>+-            wxString curGen = it.GetValue();
>++            wxString curGen = wxString::FromAscii(it.GetValue());
>+             m_cmGeneratorChoice->SetStringSelection(curGen);
>+         }
>+     }
>+@@ -930,7 +930,7 @@ bool CMakeSetupFrm::PerformCacheRun()
>+         // check to see if it is still in the CMake cache
>+         // if it is still in the cache then it is no longer new
>+         wxPropertyItem *item = m_cmOptions->GetItem(j);
>+-        if ( !it.Find((const char*)item->GetPropName().c_str()) )
>++        if ( !it.Find((const char*)item->GetPropName().ToAscii()) )
>+             m_cmOptions->RemoveProperty(item);
>+         else
>+         {
>+@@ -985,7 +985,7 @@ void CMakeSetupFrm::FillCacheGUIFromCach
>+         // check to see if it is still in the CMake cache
>+         // if it is still in the cache then it is no longer new
>+         wxPropertyItem *item = m_cmOptions->GetItem(j);
>+-        if ( !it.Find((const char*)item->GetPropName().c_str()) )
>++        if ( !it.Find((const char*)item->GetPropName().ToAscii()) )
>+             m_cmOptions->RemoveProperty(item);
>+         else
>+             j++;
>+@@ -1017,7 +1017,7 @@ void CMakeSetupFrm::FillCacheGUIFromCach
>+                     OnOff = wxT("OFF");
>+ 
>+                 m_cmOptions->AddProperty(key,
>+-                                         OnOff.c_str(),
>++                                         OnOff.ToAscii(),
>+                                          i.GetProperty("HELPSTRING"),
>+                                          wxPropertyList::CHECKBOX, "ON|OFF",
>+                                          reverseOrder,
>+@@ -1051,7 +1051,7 @@ void CMakeSetupFrm::FillCacheGUIFromCach
>+       
>+         case cmCacheManager::INTERNAL:
>+             {
>+-                wxPropertyItem *pItem = m_cmOptions->FindPropertyByName(key);
>++                wxPropertyItem *pItem = m_cmOptions->FindPropertyByName(wxString::FromAscii(key));
>+                 if(pItem)
>+                     m_cmOptions->RemoveProperty(pItem);
>+             }
>+@@ -1071,7 +1071,7 @@ void CMakeSetupFrm::OnExitTimer(wxTimerE
>+ 
>+ void CMakeSetupFrm::OnButtonBrowseProject( wxCommandEvent& event )
>+ {
>+-    const wxString& dir = wxDirSelector("Select project directory", m_cmProjectPath->GetValue());
>++    const wxString& dir = wxDirSelector(_("Select project directory"), m_cmProjectPath->GetValue());
>+     if(!dir.IsEmpty())
>+         m_cmProjectPath->SetValue(dir);
>+ }
>+@@ -1082,7 +1082,7 @@ void CMakeSetupFrm::OnButtonBrowseProjec
>+ 
>+ void CMakeSetupFrm::OnButtonBrowseBuild( wxCommandEvent& event )
>+ {
>+-    const wxString& dir = wxDirSelector("Select build directory", m_cmBuildPath->GetValue());
>++    const wxString& dir = wxDirSelector(_("Select build directory"), m_cmBuildPath->GetValue());
>+     if(!dir.IsEmpty())
>+         m_cmBuildPath->SetValue(dir);
>+ }
>+@@ -1143,7 +1143,7 @@ int CMakeSetupFrm::RunCMake(bool generat
>+     }
>+ 
>+     // check if the directory exists, if not, create it
>+-    if(!cmSystemTools::FileExists(builddir.c_str()))
>++    if(!cmSystemTools::FileExists(builddir.ToAscii()))
>+     {
>+         wxString str;
>+         str << wxT("Build directory does not exist, should I create it?\n\nDirectory: ") << builddir;
>+@@ -1151,7 +1151,7 @@ int CMakeSetupFrm::RunCMake(bool generat
>+         int answer = wxMessageBox(str, wxT("Create directory"), wxYES_NO, this);
>+         if (answer == wxYES)
>+         {
>+-            if(!cmSystemTools::MakeDirectory(builddir.c_str()))
>++            if(!cmSystemTools::MakeDirectory(builddir.ToAscii()))
>+             {
>+                 // could not create, tell and abort
>+                 wxMessageBox(wxT("Could not create directory"), wxT("Error"), wxOK | wxICON_ERROR, this);
>+@@ -1190,7 +1190,7 @@ int CMakeSetupFrm::RunCMake(bool generat
>+         if(m_cmake->Generate() != 0)
>+         {
>+             wxMessageBox(err, wxT("Error"), wxOK | wxICON_ERROR, this);
>+-            cmSystemTools::Error(err.c_str());
>++            cmSystemTools::Error(err.ToAscii());
>+             value = -1;
>+         }
>+         else
>+@@ -1202,18 +1202,18 @@ int CMakeSetupFrm::RunCMake(bool generat
>+     else
>+     {
>+         // set paths 
>+-        m_cmake->SetHomeDirectory(m_cmProjectPath->GetValue().c_str());
>+-        m_cmake->SetStartDirectory(m_cmProjectPath->GetValue().c_str());
>+-        m_cmake->SetHomeOutputDirectory(m_cmBuildPath->GetValue().c_str());
>+-        m_cmake->SetStartOutputDirectory(m_cmBuildPath->GetValue().c_str());
>++        m_cmake->SetHomeDirectory(m_cmProjectPath->GetValue().ToAscii());
>++        m_cmake->SetStartDirectory(m_cmProjectPath->GetValue().ToAscii());
>++        m_cmake->SetHomeOutputDirectory(m_cmBuildPath->GetValue().ToAscii());
>++        m_cmake->SetStartOutputDirectory(m_cmBuildPath->GetValue().ToAscii());
>+         
>+-        m_cmake->SetGlobalGenerator(m_cmake->CreateGlobalGenerator(m_cmGeneratorChoice->GetValue().c_str()));
>+-        m_cmake->SetCMakeCommand(m_PathToExecutable.c_str());
>++        m_cmake->SetGlobalGenerator(m_cmake->CreateGlobalGenerator(m_cmGeneratorChoice->GetValue().ToAscii()));
>++        m_cmake->SetCMakeCommand(m_PathToExecutable.ToAscii());
>+         m_cmake->LoadCache();
>+         if(m_cmake->Configure() != 0)
>+         {
>+             wxMessageBox(err, wxT("Error"), wxOK | wxICON_ERROR, this);
>+-            cmSystemTools::Error(err.c_str());
>++            cmSystemTools::Error(err.ToAscii());
>+         }
>+         
>+         // update the GUI with any new values in the caused by the
>+@@ -1246,7 +1246,7 @@ void CMakeSetupFrm::SaveCacheFromGUI()
>+   
>+     // write the cache to disk
>+     if(!m_cmBuildPath->GetValue().Trim().IsEmpty())
>+-        cachem->SaveCache(m_cmBuildPath->GetValue().c_str());
>++        cachem->SaveCache(m_cmBuildPath->GetValue().ToAscii());
>+ }
>+ 
>+ void CMakeSetupFrm::FillCacheManagerFromCacheGUI()
>+@@ -1257,7 +1257,7 @@ void CMakeSetupFrm::FillCacheManagerFrom
>+     for(size_t i = 0; i < m_cmOptions->GetCount(); i++)
>+     {
>+         wxPropertyItem* item = m_cmOptions->GetItem(i); 
>+-        if ( it.Find((const char*)item->GetPropName().c_str()) )
>++        if ( it.Find((const char*)item->GetPropName().ToAscii()) )
>+         {
>+             // if value is enclosed in single quotes ('foo') then remove them
>+             // they were used to enforce the fact that it had 'invisible' 
>+@@ -1266,10 +1266,10 @@ void CMakeSetupFrm::FillCacheManagerFrom
>+                 item->GetCurValue().GetChar(0) == '\'' && 
>+                 item->GetCurValue().GetChar(item->GetCurValue().Len() - 1) == '\'') 
>+             {
>+-                it.SetValue(item->GetCurValue().Mid(1, item->GetCurValue().Len() - 2).c_str());
>++                it.SetValue(item->GetCurValue().Mid(1, item->GetCurValue().Len() - 2).ToAscii());
>+             }
>+             else
>+-                it.SetValue(item->GetCurValue().c_str());
>++                it.SetValue(item->GetCurValue().ToAscii());
>+         }
>+     }
>+ }
>+@@ -1364,7 +1364,7 @@ void CMakeSetupFrm::DoDeleteCache()
>+         m_cmOptions->SetProjectGenerated(false);
>+         
>+         if(!m_cmBuildPath->GetValue().Trim().IsEmpty() && m_cmake != 0)
>+-            m_cmake->GetCacheManager()->DeleteCache(m_cmBuildPath->GetValue().Trim());
>++            m_cmake->GetCacheManager()->DeleteCache(m_cmBuildPath->GetValue().Trim().ToAscii());
>+       
>+         LoadCacheFromDiskToGUI();   
>+         UpdateWindowState();
>+@@ -1467,12 +1467,12 @@ void CMakeSetupFrm::DoReloadCache()
>+     m_cmSearchQuery->SetValue(_(""));
>+     m_noRefresh = false;
>+ 
>+-    std::string path = buildpath.c_str();
>++    std::string path = buildpath.ToAscii().data();
>+     cmSystemTools::ConvertToUnixSlashes(path);
>+ 
>+     // adjust the cmake instance
>+-    m_cmake->SetHomeOutputDirectory(buildpath.c_str());
>+-    m_cmake->SetStartOutputDirectory(buildpath.c_str());
>++    m_cmake->SetHomeOutputDirectory(buildpath.ToAscii());
>++    m_cmake->SetStartOutputDirectory(buildpath.ToAscii());
>+ 
>+     std::string cache_file = path;
>+     cache_file += "/CMakeCache.txt";
>+@@ -1485,7 +1485,7 @@ void CMakeSetupFrm::DoReloadCache()
>+         it.Find("CMAKE_HOME_DIRECTORY"))
>+     {
>+         path = ConvertToWindowsPath(it.GetValue());
>+-        m_cmProjectPath->SetValue(path.c_str());
>++        m_cmProjectPath->SetValue(wxString::FromAscii(path.c_str()));
>+     }
>+ 
>+     m_cmOptions->RemoveAll();
>+@@ -1690,11 +1690,11 @@ void CMakeSetupFrm::OnAboutClick( wxComm
>+     std::vector<std::string> names; 
>+     m_cmake->GetRegisteredGenerators(names);
>+     for(std::vector<std::string>::iterator i = names.begin(); i != names.end(); ++i)
>+-        generators.Add(i->c_str());
>++        generators.Add(wxString::FromAscii(i->c_str()));
>+ 
>+     wxString cmversion, cmsversion;
>+-    cmversion.Printf("v%i.%i %s", cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
>+-    cmsversion.Printf("v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
>++    cmversion.Printf(_("v%i.%i %s"), cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
>++    cmsversion.Printf(_("v%i.%i%s"), CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
>+ 
>+     dlg->SetAboutText(cmversion, cmsversion, generators);
>+ 
>+diff -up cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.h.unicode cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.h
>+--- cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.h.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/CMakeSetupFrame.h	2008-02-07 20:15:28.000000000 +0100
>+@@ -166,7 +166,7 @@ public:
>+         if(bar)
>+         {
>+             wxString str;
>+-            str.Printf("%2.1f %%", (progress * 100));
>++            str.Printf(_("%2.1f %%"), (progress * 100));
>+             bar->SetStatusText(str, 1);
>+         }
>+     };
>+diff -up cmake-2.4.8/Source/WXDialog/config.h.unicode cmake-2.4.8/Source/WXDialog/config.h
>+--- cmake-2.4.8/Source/WXDialog/config.h.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/config.h	2008-02-07 20:15:28.000000000 +0100
>+@@ -20,19 +20,19 @@
>+ #ifndef __CMAKE_CONFIG_H__
>+ #define __CMAKE_CONFIG_H__
>+ 
>+-#define CM_LASTPROJECT_PATH   "LastProjectPath"         // last project path for CMakeLists.txt in edit box
>+-#define CM_LASTBUILD_PATH     "LastBuildPath"           // last build path for cache in edit box
>++#define CM_LASTPROJECT_PATH   _("LastProjectPath")         // last project path for CMakeLists.txt in edit box
>++#define CM_LASTBUILD_PATH     _("LastBuildPath")           // last build path for cache in edit box
>+ #define CM_MAX_RECENT_PATHS   5                         // max amount most recent used paths in menu
>+ #define CM_MAX_SEARCH_QUERIES 10                        // max amount of entries in search query window
>+ #define CM_RECENT_BUILD_PATH  "LastRecentPath"          // will be enumerated like LastRecentPath0 LastRecentPath1 etc
>+ #define CM_SEARCH_QUERY       "SearchQuery"             // will be enumerated like SearchQuery0 SearchQuery1 etc
>+-#define CM_XSIZE              "CMakeXSize"              // x size of window
>+-#define CM_YSIZE              "CMakeYSize"              // y size of window
>+-#define CM_XPOS               "CMakeXPos"               // x pos of window
>+-#define CM_YPOS               "CMakeYPos"               // y pos of window
>+-#define CM_SPLITTERPOS        "CMakeSplitterPos"        // position of splitter window
>++#define CM_XSIZE              _("CMakeXSize")              // x size of window
>++#define CM_YSIZE              _("CMakeYSize")              // y size of window
>++#define CM_XPOS               _("CMakeXPos")               // x pos of window
>++#define CM_YPOS               _("CMakeYPos")               // y pos of window
>++#define CM_SPLITTERPOS        _("CMakeSplitterPos")        // position of splitter window
>+ 
>+-#define CM_CLOSEAFTERGEN      "CMakeCloseAfterGenerate" // close CMake after succesful generation (old behaviour)
>++#define CM_CLOSEAFTERGEN      _("CMakeCloseAfterGenerate") // close CMake after succesful generation (old behaviour)
>+ #define CM_CLOSEAFTERGEN_DEF  false                     // inherit default false when not present
>+ 
>+ #define CM_RECENT_BUILD_ITEM  10000                     // ID of menu item for recent builds
>+diff -up cmake-2.4.8/Source/WXDialog/CommandLineInfo.cpp.unicode cmake-2.4.8/Source/WXDialog/CommandLineInfo.cpp
>+--- cmake-2.4.8/Source/WXDialog/CommandLineInfo.cpp.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/CommandLineInfo.cpp	2008-02-07 20:23:26.000000000 +0100
>+@@ -41,8 +41,8 @@ cmCommandLineInfo::cmCommandLineInfo()
>+     m_WhereBuild = _("");
>+     m_AdvancedValues = false;
>+     m_GeneratorChoiceString.Empty();
>+-    m_LastUnknownParameter = "";
>+-    m_ValidArguments = "";
>++    m_LastUnknownParameter = _("");
>++    m_ValidArguments = _("");
>+     m_ExitAfterLoad = false;
>+ } 
>+ 
>+@@ -52,7 +52,7 @@ cmCommandLineInfo::~cmCommandLineInfo()
>+ }
>+ 
>+ ///////////////////////////////////////////////////////////////
>+-bool cmCommandLineInfo::ParseCommandLine(int argc, char* argv[])
>++bool cmCommandLineInfo::ParseCommandLine(int argc, wxChar* argv[])
>+ {
>+     bool result = true;
>+     wxString cachePath;
>+@@ -88,7 +88,7 @@ bool cmCommandLineInfo::ParseCommandLine
>+         }
>+     }
>+ 
>+-    m_ExecutablePath = cmSystemTools::GetFilenamePath(argv[0]).c_str();
>++    m_ExecutablePath = wxString::FromAscii(cmSystemTools::GetFilenamePath(wxString(argv[0]).ToAscii().data()).c_str());
>+ 
>+     return true;
>+ }
>+@@ -98,18 +98,18 @@ int cmCommandLineInfo::GetBoolValue(cons
>+ 
>+     wxString value = v.Lower();
>+   
>+-    if (!value.Cmp("1") || 
>+-        !value.Cmp("on") || 
>+-        !value.Cmp("true") || 
>+-        !value.Cmp("yes"))
>++    if (!value.Cmp(_("1")) || 
>++        !value.Cmp(_("on")) || 
>++        !value.Cmp(_("true")) || 
>++        !value.Cmp(_("yes")))
>+     {
>+         // true
>+         return 1;
>+     }
>+-    else if (!value.Cmp("0") || 
>+-             !value.Cmp("off") || 
>+-             !value.Cmp("false") || 
>+-             !value.Cmp("no"))
>++    else if (!value.Cmp(_("0")) || 
>++             !value.Cmp(_("off")) || 
>++             !value.Cmp(_("false")) || 
>++             !value.Cmp(_("no")))
>+     {
>+         // false
>+         return -1;
>+@@ -122,7 +122,7 @@ int cmCommandLineInfo::GetBoolValue(cons
>+ ///////////////////////////////////////////////////////////////
>+ // Parse param
>+ 
>+-size_t cmCommandLineInfo::ParseSwitch(char **argv, int arg_index, int argc)
>++size_t cmCommandLineInfo::ParseSwitch(wxChar **argv, int arg_index, int argc)
>+ {        
>+     wxString param = argv[arg_index];
>+     
>+diff -up cmake-2.4.8/Source/WXDialog/PropertyList.cpp.unicode cmake-2.4.8/Source/WXDialog/PropertyList.cpp
>+--- cmake-2.4.8/Source/WXDialog/PropertyList.cpp.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/PropertyList.cpp	2008-02-07 20:15:28.000000000 +0100
>+@@ -356,10 +356,10 @@ void wxPropertyList::AddProperty(const c
>+     // add or update the property item
>+     for(size_t i = 0; i < m_PropertyItems.Count(); i++)
>+     {
>+-        if(m_PropertyItems[i]->GetPropName().IsSameAs(name))
>++        if(m_PropertyItems[i]->GetPropName().IsSameAs(wxString::FromAscii(name)))
>+         {
>+             pItem = m_PropertyItems[i];
>+-            if(!pItem->GetCurValue().IsSameAs(value))
>++            if(!pItem->GetCurValue().IsSameAs(wxString::FromAscii(value)))
>+             {
>+                 pItem->SetCurValue(value);
>+                 pItem->SetHelpString(helpString);
>+@@ -377,7 +377,11 @@ void wxPropertyList::AddProperty(const c
>+     // if it is not found, then create a new one
>+     if(!pItem)
>+     {
>+-        pItem = new wxPropertyItem(name, value, helpString, type, comboItems);
>++        pItem = new wxPropertyItem(wxString::FromAscii(name),
>++                                   wxString::FromAscii(value),
>++                                   wxString::FromAscii(helpString),
>++                                   type,
>++                                   wxString::FromAscii(comboItems));
>+         pItem->SetAdvanced(advanced);
>+   
>+         AddPropItem(pItem, 1);
>+@@ -607,7 +611,7 @@ bool wxPropertyList::UpdatePropertyItem(
>+         SetCellValue(row,1, pItem->GetCurValue());
>+     }
>+ 
>+-    if(pItem->GetCurValue().IsSameAs("IGNORE"))
>++    if(pItem->GetCurValue().IsSameAs(_("IGNORE")))
>+     {
>+         // ignored cell is completely dimmed
>+         wxColour col(192,192,192);
>+@@ -662,13 +666,13 @@ void wxPropertyList::OnCellChange( wxGri
>+         // write back bool
>+         if(pItem->GetItemType() == CHECKBOX)
>+         {
>+-            if(GetCellValue(row, 1).IsSameAs("1"))
>++            if(GetCellValue(row, 1).IsSameAs(_("1")))
>+                 pItem->SetCurValue("ON");
>+             else
>+                 pItem->SetCurValue("OFF");
>+         }
>+         else
>+-            pItem->SetCurValue(GetCellValue(row, 1));
>++            pItem->SetCurValue(GetCellValue(row, 1).ToAscii());
>+     
>+         UpdatePropertyItem(pItem, row);
>+         event.Skip();
>+@@ -828,7 +832,7 @@ void wxPropertyList::BrowseSelectedItem(
>+                 
>+                 if(!str.IsEmpty())
>+                 {
>+-                    pItem->SetCurValue(str.c_str());
>++                    pItem->SetCurValue(str.ToAscii());
>+                     UpdatePropertyItem(pItem, i);
>+                 }
>+             }
>+diff -up cmake-2.4.8/Source/WXDialog/CommandLineInfo.h.unicode cmake-2.4.8/Source/WXDialog/CommandLineInfo.h
>+--- cmake-2.4.8/Source/WXDialog/CommandLineInfo.h.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/CommandLineInfo.h	2008-02-07 20:20:14.000000000 +0100
>+@@ -35,7 +35,7 @@ public:
>+   virtual ~cmCommandLineInfo();
>+ 
>+   // Parse the command line
>+-  bool ParseCommandLine(int argc, char* argv[]);
>++  bool ParseCommandLine(int argc, wxChar* argv[]);
>+ 
>+   // Retrieve the path of executable
>+   wxString GetPathToExecutable() { return this->m_ExecutablePath; }
>+@@ -52,7 +52,7 @@ public:
>+ 
>+ private:
>+   // Parse one argument
>+-  size_t ParseSwitch(char **argv, int arg_index, int argc);
>++  size_t ParseSwitch(wxChar **argv, int arg_index, int argc);
>+ 
>+   // Return boolean value of the string
>+   static int GetBoolValue(const wxString&);
>+diff -up cmake-2.4.8/Source/WXDialog/aboutdlg.cpp.unicode cmake-2.4.8/Source/WXDialog/aboutdlg.cpp
>+--- cmake-2.4.8/Source/WXDialog/aboutdlg.cpp.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/aboutdlg.cpp	2008-02-07 20:15:28.000000000 +0100
>+@@ -160,7 +160,7 @@ void CMAboutDlg::SetAboutText(const wxSt
>+     // compile list of generators in a bulleted list
>+     wxString gens = _("<ul>");
>+     for(size_t i = 0; i < generators.Count(); i++)
>+-        gens << "<li><u>" << generators[i] << "</u></li>";
>++        gens << _("<li><u>") << generators[i] << _("</u></li>");
>+     gens << _("</ul>");
>+ 
>+     // replace stuff
>+diff -up cmake-2.4.8/Source/WXDialog/PropertyList.h.unicode cmake-2.4.8/Source/WXDialog/PropertyList.h
>+--- cmake-2.4.8/Source/WXDialog/PropertyList.h.unicode	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/PropertyList.h	2008-02-07 20:15:28.000000000 +0100
>+@@ -119,11 +119,11 @@ public:
>+     };
>+     
>+     void SetCurValue(const char *str) {
>+-        m_curValue = str;
>++        m_curValue = wxString::FromAscii(str);
>+     };
>+     
>+     void SetPropName(const char *str) {
>+-        m_propName = str;
>++        m_propName = wxString::FromAscii(str);
>+     };
>+ 
>+     void SetAdvanced(bool value) {
>+@@ -131,7 +131,7 @@ public:
>+     };
>+ 
>+     void SetHelpString(const char *str) {
>+-        m_HelpString = str;
>++        m_HelpString = wxString::FromAscii(str);
>+     };
>+ 
>+     bool GetAdvanced() const {
>Index: cmake-2.4.8-wxdialog.patch
>===================================================================
>RCS file: cmake-2.4.8-wxdialog.patch
>diff -N cmake-2.4.8-wxdialog.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ cmake-2.4.8-wxdialog.patch	7 Feb 2008 23:07:17 -0000
>@@ -0,0 +1,26 @@
>+diff -up cmake-2.4.8/Source/WXDialog/CMakeLists.txt.wxdialog cmake-2.4.8/Source/WXDialog/CMakeLists.txt
>+--- cmake-2.4.8/Source/WXDialog/CMakeLists.txt.wxdialog	2008-01-21 19:59:55.000000000 +0100
>++++ cmake-2.4.8/Source/WXDialog/CMakeLists.txt	2008-02-07 20:43:23.000000000 +0100
>+@@ -60,11 +60,11 @@ IF(wxWidgets_FOUND)
>+     ${CMake_BINARY_DIR}/Source/kwsys )
>+   
>+     IF(APPLE)
>+-      ADD_EXECUTABLE(WXDialog MACOSX_BUNDLE  ${CMAKE_SRCS})
>++      ADD_EXECUTABLE(CMakeSetup MACOSX_BUNDLE  ${CMAKE_SRCS})
>+     ELSE(APPLE)
>+-      ADD_EXECUTABLE(WXDialog WIN32  ${CMAKE_SRCS})
>++      ADD_EXECUTABLE(CMakeSetup WIN32  ${CMAKE_SRCS})
>+     ENDIF(APPLE)
>+-    INSTALL_TARGETS(/bin WXDialog)
>++    INSTALL_TARGETS(/bin CMakeSetup)
>+   
>+   # not required on MSVS beause bound to _DEBUG, 
>+   # but other compiler may need it.
>+@@ -82,6 +82,6 @@ IF(wxWidgets_FOUND)
>+     
>+     # if the checkbox view functionality is not desired,
>+     # exclude this part from the smple
>+-  TARGET_LINK_LIBRARIES(WXDialog ${wxWidgets_LIBRARIES} cmsys CMakeLib)
>++  TARGET_LINK_LIBRARIES(CMakeSetup ${wxWidgets_LIBRARIES} cmsys CMakeLib)
>+         
>+ ENDIF(wxWidgets_FOUND)
>Index: cmake.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/cmake/F-8/cmake.spec,v
>retrieving revision 1.23
>diff -u -r1.23 cmake.spec
>--- cmake.spec	24 Jan 2008 23:39:57 -0000	1.23
>+++ cmake.spec	7 Feb 2008 23:07:17 -0000
>@@ -1,6 +1,6 @@
> Name:		cmake
> Version:	2.4.8
>-Release:	1%{?dist}
>+Release:	2%{?dist}
> Summary:	Cross-platform make system
> 
> Group:		Development/Tools
>@@ -10,9 +10,11 @@
> Source2:        macros.cmake
> Patch0:         cmake-2.4.2-fedora.patch
> Patch1:         cmake-2.4.5-xmlrpc.patch
>+Patch2:         cmake-2.4.8-CMakeSetup-unicode.patch
>+Patch3:         cmake-2.4.8-wxdialog.patch
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  ncurses-devel, libX11-devel
>-BuildRequires:  curl-devel, expat-devel, xmlrpc-c-devel, zlib-devel
>+BuildRequires:  curl-devel, expat-devel, xmlrpc-c-devel, zlib-devel, wxGTK-devel
> Requires:       rpm
> 
> 
>@@ -24,11 +26,18 @@
> to support complex environments requiring system configuration, pre-processor 
> generation, code generation, and template instantiation.
> 
>+%package -n cmakesetup
>+Summary: CMakeSetup
>+Group: Development/Tools
>+%description -n cmakesetup
>+%{summary}.
> 
> %prep
> %setup -q
> %patch -p1 -b .fedora
> %patch1 -p1 -b .xmlrpc
>+%patch2 -p1 -b .unicode
>+%patch3 -p1 -b .wxdialog
> 
> 
> %build
>@@ -37,6 +46,7 @@
> ./bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
>             --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
>             --system-libs
>+./Bootstrap.cmk/cmake . -C./Bootstrap.cmk/InitialCacheFlags.cmake -DCMAKE_USE_SYSTEM_LIBRARIES=1 -DBUILD_WXDialog=ON
> make VERBOSE=1 %{?_smp_mflags}
> 
> 
>@@ -68,8 +78,14 @@
> %{_mandir}/man1/*.1*
> %{_datadir}/emacs/
> 
>+%files -n cmakesetup
>+%defattr(-,root,root,-)
>+%{_bindir}/CMakeSetup
> 
> %changelog
>+* Fri Feb  8 2008 Laurent Rineau <laurent.rineau__fedora@normalesup.org> - 2.4.8-2
>+- Enable the wxWidgets version of CMakeSetup.
>+
> * Tue Jan 22 2008 Orion Poplawski <orion@cora.nwra.com> - 2.4.8-1
> - Update to 2.4.8
>

Actions: View | Diff

Attachments on bug 431953: 294288