From a7501aebf828434a26ae2d77845255e009ba14c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 22 Jun 2002 23:33:12 +0000 Subject: [PATCH] forgot to check in new wxrc -- as a side effect, this commit also fixes the bug with deleting source files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/wxrc/wxrc.cpp | 67 ++++++++++++++++++++++++------------- utils/wxrc/wxrc.cpp | 67 ++++++++++++++++++++++++------------- 2 files changed, 86 insertions(+), 48 deletions(-) diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp index 597fd09602..be111857cd 100644 --- a/contrib/utils/wxrc/wxrc.cpp +++ b/contrib/utils/wxrc/wxrc.cpp @@ -58,6 +58,7 @@ private: wxArrayString PrepareTempFiles(); void FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath); + wxString GetInternalFileName(const wxString& name, const wxArrayString& flist); void DeleteTempFiles(const wxArrayString& flist); void MakePackageZIP(const wxArrayString& flist); void MakePackageCPP(const wxArrayString& flist); @@ -181,6 +182,28 @@ void XmlResApp::CompileRes() } +wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayString& flist) +{ + wxString name2 = name; + name2.Replace(":", "_"); + name2.Replace("/", "_"); + name2.Replace("\\", "_"); + name2.Replace("*", "_"); + name2.Replace("?", "_"); + + wxString s = wxFileNameFromPath(parOutput) + "$" + name2; + + if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND) + { + for (int i = 0;; i++) + { + s.Printf(wxFileNameFromPath(parOutput) + "$%03i-" + name2, i); + if (!wxFileExists(s) || flist.Index(s) != wxNOT_FOUND) + break; + } + } + return s; +} wxArrayString XmlResApp::PrepareTempFiles() { @@ -205,8 +228,10 @@ wxArrayString XmlResApp::PrepareTempFiles() FindFilesInXML(doc.GetRoot(), flist, path); - doc.Save(parOutputPath + "/" + name + ".xrc"); - flist.Add(name + ".xrc"); + wxString internalName = GetInternalFileName(parFiles[i], flist); + + doc.Save(parOutputPath + "/" + internalName); + flist.Add(internalName); } return flist; @@ -233,18 +258,14 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt // ...and known to contain filename { wxString fullname; - wxString filename = n->GetContent(); if (wxIsAbsolutePath(n->GetContent())) fullname = n->GetContent(); else fullname = inputPath + "/" + n->GetContent(); + + if (flagVerbose) + wxPrintf("adding " + fullname + "...\n"); - filename.Replace("/", "_"); - filename.Replace("\\", "_"); - filename.Replace("*", "_"); - filename.Replace("?", "_"); + wxString filename = GetInternalFileName(n->GetContent(), flist); n->SetContent(filename); - - if (flagVerbose) - wxPrintf("adding " + filename + "...\n"); flist.Add(filename); @@ -342,20 +363,20 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist) wxPrintf("creating C++ source file " + parOutput + "...\n"); file.Write("\ -#include \"wx/wxprec.h\"\n\ +#include \n\ \n\ #ifdef __BORLANDC__\n\ #pragma hdrstop\n\ #endif\n\ \n\ #ifndef WX_PRECOMP\n\ - #include \"wx/wx.h\"\n\ + #include \n\ #endif\n\ \ -#include \"wx/filesys.h\"\n\ -#include \"wx/fs_mem.h\"\n\ -#include \"wx/xrc/xmlres.h\"\n\ -#include \"wx/xrc/xh_all.h\"\n\ +#include \n\ +#include \n\ +#include \n\ +#include \n\ \n"); for (i = 0; i < flist.Count(); i++) @@ -367,10 +388,10 @@ void " + parFuncname + "()\n\ \n\ // Check for memory FS. If not present, load the handler:\n\ {\n\ - wxMemoryFSHandler::AddFile(\"xml_resource/dummy_file\", \"dummy one\");\n\ + wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n\ wxFileSystem fsys;\n\ - wxFSFile *f = fsys.OpenFile(\"memory:xml_resource/dummy_file\");\n\ - wxMemoryFSHandler::RemoveFile(\"xml_resource/dummy_file\");\n\ + wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n\ + wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n\ if (f) delete f;\n\ else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n\ }\n\ @@ -379,17 +400,15 @@ void " + parFuncname + "()\n\ for (i = 0; i < flist.Count(); i++) { wxString s; - s.Printf(" wxMemoryFSHandler::AddFile(\"xml_resource/" + flist[i] + + s.Printf(" wxMemoryFSHandler::AddFile(\"XRC_resource/" + flist[i] + "\", xml_res_file_%i, xml_res_size_%i);\n", i, i); file.Write(s); } for (i = 0; i < parFiles.Count(); i++) { - wxString name, ext, path; - wxSplitPath(parFiles[i], &path, &name, &ext); - file.Write(" wxXmlResource::Get()->Load(\"memory:xml_resource/" + - name + ".xrc" + "\");\n"); + file.Write(" wxXmlResource::Get()->Load(\"memory:XRC_resource/" + + GetInternalFileName(parFiles[i], flist) + "\");\n"); } file.Write("}\n"); diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 597fd09602..be111857cd 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -58,6 +58,7 @@ private: wxArrayString PrepareTempFiles(); void FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath); + wxString GetInternalFileName(const wxString& name, const wxArrayString& flist); void DeleteTempFiles(const wxArrayString& flist); void MakePackageZIP(const wxArrayString& flist); void MakePackageCPP(const wxArrayString& flist); @@ -181,6 +182,28 @@ void XmlResApp::CompileRes() } +wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayString& flist) +{ + wxString name2 = name; + name2.Replace(":", "_"); + name2.Replace("/", "_"); + name2.Replace("\\", "_"); + name2.Replace("*", "_"); + name2.Replace("?", "_"); + + wxString s = wxFileNameFromPath(parOutput) + "$" + name2; + + if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND) + { + for (int i = 0;; i++) + { + s.Printf(wxFileNameFromPath(parOutput) + "$%03i-" + name2, i); + if (!wxFileExists(s) || flist.Index(s) != wxNOT_FOUND) + break; + } + } + return s; +} wxArrayString XmlResApp::PrepareTempFiles() { @@ -205,8 +228,10 @@ wxArrayString XmlResApp::PrepareTempFiles() FindFilesInXML(doc.GetRoot(), flist, path); - doc.Save(parOutputPath + "/" + name + ".xrc"); - flist.Add(name + ".xrc"); + wxString internalName = GetInternalFileName(parFiles[i], flist); + + doc.Save(parOutputPath + "/" + internalName); + flist.Add(internalName); } return flist; @@ -233,18 +258,14 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt // ...and known to contain filename { wxString fullname; - wxString filename = n->GetContent(); if (wxIsAbsolutePath(n->GetContent())) fullname = n->GetContent(); else fullname = inputPath + "/" + n->GetContent(); + + if (flagVerbose) + wxPrintf("adding " + fullname + "...\n"); - filename.Replace("/", "_"); - filename.Replace("\\", "_"); - filename.Replace("*", "_"); - filename.Replace("?", "_"); + wxString filename = GetInternalFileName(n->GetContent(), flist); n->SetContent(filename); - - if (flagVerbose) - wxPrintf("adding " + filename + "...\n"); flist.Add(filename); @@ -342,20 +363,20 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist) wxPrintf("creating C++ source file " + parOutput + "...\n"); file.Write("\ -#include \"wx/wxprec.h\"\n\ +#include \n\ \n\ #ifdef __BORLANDC__\n\ #pragma hdrstop\n\ #endif\n\ \n\ #ifndef WX_PRECOMP\n\ - #include \"wx/wx.h\"\n\ + #include \n\ #endif\n\ \ -#include \"wx/filesys.h\"\n\ -#include \"wx/fs_mem.h\"\n\ -#include \"wx/xrc/xmlres.h\"\n\ -#include \"wx/xrc/xh_all.h\"\n\ +#include \n\ +#include \n\ +#include \n\ +#include \n\ \n"); for (i = 0; i < flist.Count(); i++) @@ -367,10 +388,10 @@ void " + parFuncname + "()\n\ \n\ // Check for memory FS. If not present, load the handler:\n\ {\n\ - wxMemoryFSHandler::AddFile(\"xml_resource/dummy_file\", \"dummy one\");\n\ + wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n\ wxFileSystem fsys;\n\ - wxFSFile *f = fsys.OpenFile(\"memory:xml_resource/dummy_file\");\n\ - wxMemoryFSHandler::RemoveFile(\"xml_resource/dummy_file\");\n\ + wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n\ + wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n\ if (f) delete f;\n\ else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n\ }\n\ @@ -379,17 +400,15 @@ void " + parFuncname + "()\n\ for (i = 0; i < flist.Count(); i++) { wxString s; - s.Printf(" wxMemoryFSHandler::AddFile(\"xml_resource/" + flist[i] + + s.Printf(" wxMemoryFSHandler::AddFile(\"XRC_resource/" + flist[i] + "\", xml_res_file_%i, xml_res_size_%i);\n", i, i); file.Write(s); } for (i = 0; i < parFiles.Count(); i++) { - wxString name, ext, path; - wxSplitPath(parFiles[i], &path, &name, &ext); - file.Write(" wxXmlResource::Get()->Load(\"memory:xml_resource/" + - name + ".xrc" + "\");\n"); + file.Write(" wxXmlResource::Get()->Load(\"memory:XRC_resource/" + + GetInternalFileName(parFiles[i], flist) + "\");\n"); } file.Write("}\n"); -- 2.45.2