#pragma hdrstop
#endif
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// for all others, include the necessary headers
#ifndef WX_PRECOMP
- #include "wx/wx.h"
+ #include "wx/app.h"
+ #include "wx/log.h"
#endif
#include "wx/cmdline.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
#include "wx/ffile.h"
+#include "wx/filename.h"
#include "wx/wfstream.h"
-
-
-
-/*
-#if wxUSE_GUI
-#error "You must compile the resource compiler with wxBase!"
-#endif
-*/
-
-class XmlResApp : public wxApp
+class XmlResApp : public wxAppConsole
{
public:
+ // don't use builtin cmd line parsing:
+ virtual bool OnInit() { return true; }
-#if wxUSE_GUI
- bool OnInit();
-#else
virtual int OnRun();
-#endif
private:
int retCode;
};
-IMPLEMENT_APP(XmlResApp)
+IMPLEMENT_APP_CONSOLE(XmlResApp)
-#if wxUSE_GUI
-bool XmlResApp::OnInit()
-#else
int XmlResApp::OnRun()
-#endif
{
static const wxCmdLineEntryDesc cmdLineDesc[] =
{
{
case -1:
return 0;
+ #if 0
+ // break is unreachable because of return earlier
break;
+ #endif
case 0:
retCode = 0;
OutputGettext();
else
CompileRes();
-#if wxUSE_GUI
- return FALSE;
-#else
return retCode;
-#endif
+ #if 0
+ // break is unreachable because of return earlier
break;
+ #endif
+ #if 0
+ // default return moved outside of switch to avoid warning about lack of return in function
default:
-#if wxUSE_GUI
- return FALSE;
-#else
return 1;
-#endif
break;
+ #endif
}
+ return 1;
}
parOutput = _T("resource.xrs");
}
}
+ wxFileName fn(parOutput);
+ fn.Normalize();
+ parOutput = fn.GetFullPath();
parOutputPath = wxPathOnly(parOutput);
if (!parOutputPath) parOutputPath = _T(".");
parFuncname = _T("InitXmlResource");
for (size_t i = 0; i < cmdline.GetParamCount(); i++)
+ {
+#ifdef __WINDOWS__
+ wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE);
+ while (!fn.IsEmpty())
+ {
+ parFiles.Add(fn);
+ fn=wxFindNextFile();
+ }
+#else
parFiles.Add(cmdline.GetParam(i));
+#endif
+ }
}
wxString internalName = GetInternalFileName(parFiles[i], flist);
- doc.Save(parOutputPath + _T("/") + internalName);
+ doc.Save(parOutputPath + wxFILE_SEP_PATH + internalName);
flist.Add(internalName);
}
}
+// Does 'node' contain filename information at all?
+static bool NodeContainsFilename(wxXmlNode *node)
+{
+ // Any bitmaps:
+ if (node->GetName() == _T("bitmap"))
+ return TRUE;
+
+ // URLs in wxHtmlWindow:
+ if (node->GetName() == _T("url"))
+ return TRUE;
+
+ // wxBitmapButton:
+ wxXmlNode *parent = node->GetParent();
+ if (parent != NULL &&
+ parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
+ (node->GetName() == _T("focus") ||
+ node->GetName() == _T("disabled") ||
+ node->GetName() == _T("selected")))
+ return TRUE;
+
+ // wxBitmap or wxIcon toplevel resources:
+ if (node->GetName() == _T("object"))
+ {
+ wxString klass = node->GetPropVal(_T("class"), wxEmptyString);
+ if (klass == _T("wxBitmap") || klass == _T("wxIcon"))
+ return TRUE;
+ }
+
+ return FALSE;
+}
// find all files mentioned in structure, e.g. <bitmap>filename</bitmap>
void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath)
if (node == NULL) return;
if (node->GetType() != wxXML_ELEMENT_NODE) return;
- // Does 'node' contain filename information at all?
- bool containsFilename = (
- // Any bitmaps:
- (node->GetName() == _T("bitmap")) ||
- // URLs in wxHtmlWindow:
- (node->GetName() == _T("url")) ||
- // wxBitmapButton:
- (node->GetParent() != NULL &&
- node->GetParent()->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
- (node->GetName() == _T("focus") ||
- node->GetName() == _T("disabled") ||
- node->GetName() == _T("selected")))
- );
+ bool containsFilename = NodeContainsFilename(node);
wxXmlNode *n = node->GetChildren();
while (n)
if (wxIsAbsolutePath(n->GetContent()) || inputPath.empty())
fullname = n->GetContent();
else
- fullname = inputPath + _T("/") + n->GetContent();
+ fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
if (flagVerbose)
wxPrintf(_T("adding ") + fullname + _T("...\n"));
flist.Add(filename);
wxFileInputStream sin(fullname);
- wxFileOutputStream sout(parOutputPath + _T("/") + filename);
+ wxFileOutputStream sout(parOutputPath + wxFILE_SEP_PATH + filename);
sin.Read(sout); // copy the stream
}
void XmlResApp::DeleteTempFiles(const wxArrayString& flist)
{
for (size_t i = 0; i < flist.Count(); i++)
- wxRemoveFile(parOutputPath + _T("/") + flist[i]);
+ wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]);
}
if (flagVerbose)
wxPrintf(_T("compressing ") + parOutput + _T("...\n"));
-
- if (wxExecute(_T("zip -9 -j ") + wxString(flagVerbose ? _T("") : _T("-q ")) +
- parOutput + _T(" ") + files, TRUE) == -1)
+
+ wxString cwd = wxGetCwd();
+ wxSetWorkingDirectory(parOutputPath);
+ int execres = wxExecute(_T("zip -9 -j ") +
+ wxString(flagVerbose ? _T("") : _T("-q ")) +
+ parOutput + _T(" ") + files, TRUE);
+ wxSetWorkingDirectory(cwd);
+ if (execres == -1)
{
wxLogError(_T("Unable to execute zip program. Make sure it is in the path."));
wxLogError(_T("You can download it at http://www.cdrom.com/pub/infozip/"));
wxString output;
wxString tmp;
wxString snum;
- wxFFile file(filename, "rb");
+ wxFFile file(filename, wxT("rb"));
size_t lng = file.Length();
snum.Printf(_T("%i"), num);
void XmlResApp::MakePackageCPP(const wxArrayString& flist)
{
- wxFFile file(parOutput, "wt");
+ wxFFile file(parOutput, wxT("wt"));
size_t i;
if (flagVerbose)
_T("\n"));
for (i = 0; i < flist.Count(); i++)
- file.Write(FileToCppArray(flist[i], i));
+ file.Write(
+ FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
file.Write(_T("")
-_T("void " + parFuncname + "()\n")
+_T("void ") + parFuncname + wxT("()\n")
_T("{\n")
_T("\n")
_T(" // Check for memory FS. If not present, load the handler:\n")
_T(" {\n")
-_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n")
+_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n")
_T(" wxFileSystem fsys;\n")
-_T(" wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n")
-_T(" wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n")
+_T(" wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n")
+_T(" wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n")
_T(" if (f) delete f;\n")
_T(" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n")
_T(" }\n")
for (i = 0; i < flist.Count(); i++)
{
wxString s;
- s.Printf(_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/") + flist[i] +
- _T("\", xml_res_file_%i, xml_res_size_%i);\n"), i, i);
+ s.Printf(_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] +
+ _T("\"), xml_res_file_%i, xml_res_size_%i);\n"), i, i);
file.Write(s);
}
for (i = 0; i < parFiles.Count(); i++)
{
- file.Write(_T(" wxXmlResource::Get()->Load(\"memory:XRC_resource/") +
- GetInternalFileName(parFiles[i], flist) + _T("\");\n"));
+ file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") +
+ GetInternalFileName(parFiles[i], flist) + _T("\"));\n"));
}
file.Write(_T("}\n"));
wxString output;
wxString tmp;
wxString snum;
- wxFFile file(filename, "rb");
+ wxFFile file(filename, wxT("rb"));
size_t lng = file.Length();
snum.Printf(_T("%i"), num);
void XmlResApp::MakePackagePython(const wxArrayString& flist)
{
- wxFFile file(parOutput, "wt");
+ wxFFile file(parOutput, wxT("wt"));
size_t i;
if (flagVerbose)
file.Write(_T("def ") + parFuncname + _T("():\n"));
for (i = 0; i < flist.Count(); i++)
- file.Write(FileToPythonArray(flist[i], i));
+ file.Write(
+ FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
for (i = 0; i < flist.Count(); i++)
{
wxFFile fout;
if (!parOutput) fout.Attach(stdout);
- else fout.Open(parOutput, "wt");
+ else fout.Open(parOutput, wxT("wt"));
for (size_t i = 0; i < str.GetCount(); i++)
fout.Write(_T("_(\"") + str[i] + _T("\");\n"));
projects / wxWidgets.git / blobdiff