Rewrite respack in pure C++, this is required to make cross-compiling sane.

Originally committed to SVN as r5165.

aegisub/tools/Makefile

@@ -3,8 +3,6 @@ include ../Makefile.inc
 PROGRAM = common-respack
 
 SRC			+= common-respack.cpp
-CPPFLAGS	+= $(CPPFLAGS_WX)
-LDFLAGS		+= $(LDFLAGS_WX)
 
 ifdef $(BUILD_DARWIN)
 bin_PROGRAMS += osx-bundle-restart-helper

aegisub/tools/common-respack.cpp

@@ -1,154 +1,118 @@
-// Copyright (c) 2009, Thomas Goyne
+// Copyright (c) 2010, Amar Takhar <verm@aegisub.org>
-// All rights reserved.
 //
-// Redistribution and use in source and binary forms, with or without
+// Permission to use, copy, modify, and distribute this software for any
-// modification, are permitted provided that the following conditions are met:
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
 //
-// * Redistributions of source code must retain the above copyright notice,
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-//   this list of conditions and the following disclaimer.
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// * Redistributions in binary form must reproduce the above copyright notice,
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-//   this list of conditions and the following disclaimer in the documentation
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-//   and/or other materials provided with the distribution.
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// * Neither the name of the Aegisub Group nor the names of its contributors
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-//   may be used to endorse or promote products derived from this software
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//   without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// -----------------------------------------------------------------------------
-//
-// AEGISUB
-//
-// Website: http://aegisub.cellosoft.com
-// Contact: mailto:zeratul@cellosoft.com
 //
+// $Id$
 
+/// @file common-respack.cpp
+/// @brief Load any file into a byte array.
+/// @ingroup util
+
+#include <iterator>
 #include <fstream>
 #include <iostream>
-#include <wx/dir.h>
+#include <string>
-#include <wx/filename.h>
-#include <wx/string.h>
-#include <wx/regex.h>
-#include <wx/arrstr.h>
-using namespace std;
 
-class FileIterator {
-private:
-	unsigned int currentItem;
-	bool inDir;
-	wxDir currentDir;
-	wxArrayString items;
-public:
-	FileIterator(int argc, const char **argv);
-	bool Next(wxString *filename);
-};
 
-FileIterator::FileIterator(int argc, const char **argv)
+inline void clean(std::string &str) {
- : currentItem(2), inDir(false), currentDir(), items(argc, argv) {
+	// Remove path.
-	 if (argc == 2) {
+	std::string::size_type pos = str.rfind('/');
-		// No names passed on the command line, so read them from stdin
+	if (pos != std::string::npos) {
-		char buffer[1024];
+		str = str.substr(pos+1, str.size());
-		while (cin.getline(buffer, 1024), cin.good()) {
+	}
-			items.Add(buffer);
+
+	// Chop extension.
+	pos = str.rfind('.');
+	if (pos != std::string::npos) {
+		str = str.substr(0, pos);
+	}
+
+	for (unsigned int i = 0; i != str.size(); i++) {
+		int c = (int)str[i];
+		if (((c >= 65) && (c <= 90)) ||   /* A-Z */
+			((c >= 97) && (c <= 122)) ||  /* a-z */
+			((c >= 48) && (c <= 57)) ||   /* 0-9 */
+			(c == 95)) {                  /* _ */
+
+			continue;
+		} else {
+			str.erase(i, 1);
 		}
 	}
 }
 
-bool FileIterator::Next(wxString *filename) {
-	// Currently iterating through a directory, just return the next file in that directory (if any)
-	if (inDir) {
-		if (currentDir.GetNext(filename)) {
-			wxString path = currentDir.GetName();
-			*filename = wxFileName(path, *filename).GetFullPath();
-			return true;
-		}
-		inDir = false;
-	}
-
-	// No more items
-	if (currentItem >= items.GetCount()) return false;
-		
-	wxFileName next;
-	wxString current = items[currentItem];
-	currentItem++;
-	
-	// Test if it's a directory
-	if (wxFileName::DirExists(current)) {
-		currentDir.Open(current);
-		if (currentDir.GetFirst(filename, "", wxDIR_FILES)) {
-			wxString path = currentDir.GetName();
-			*filename = wxFileName(path, *filename).GetFullPath();
-			inDir = true;
-			return true;
-		}
-		// dir is empty, process next item instead
-		return Next(filename);
-	}
-	// Test if it's a file
-	if (wxFileName::FileExists(current)) {
-		*filename = current;
-		return true;
-	}
-	
-	// Entry is neither a file nor a directory, just skip it
-	return Next(filename);
-}
 
 int main(int argc, const char *argv[]) {
-	if (argc < 2) {
+	// Need at least 3 arguments
+	if (argc != 4) {
+		std::cout << "Usage: <manifest>[in] <c++ file>[out] <header>[out]" << std::endl;
 		return 1;
 	}
-	wxFileName headerFileName(argv[1]);
-	headerFileName.SetExt(L"h");
-	ofstream outH(headerFileName.GetFullPath().char_str());
-	ofstream outC(argv[1]);
 
-	outC << "#include \"libresrc.h\"" << endl;
+	std::cout << "Manifest: " << argv[1] << "  CPP: " << argv[2] << "  Header: " << argv[3] << std::endl;
 
-	wxRegEx nameCleaner("[^A-Za-z_0-9]");
+	std::ifstream file_manifest(argv[1]);
-	wxString filename;
+	std::ofstream file_cpp(argv[2]);
-	FileIterator iter(argc, argv);
+	std::ofstream file_h(argv[3]);
 
-		outC << "#include \"libresrc.h\"" << endl;
-	while (iter.Next(&filename)) {
-		ifstream infile(filename.char_str(), ios::binary);
-		infile.seekg(0, ios::end);
-		int infile_end = infile.tellg();
-		infile.seekg(0, ios::beg);
 
-		wxFileName file(filename);
 
-		wxString identifier = file.GetName();
+	// If the manifest has a path use that as the base for finding files.
+	std::string manifest(argv[1]);
+	std::string path_base;
 
-		// Hack to work around inserting files in the current directory
+	std::string::size_type pos = manifest.rfind('/');
-		if (file.GetDirs().Last() != ".")
+	if (pos != std::string::npos) {
-			identifier.Append("_" + file.GetDirs().Last());
+		path_base = manifest.substr(0, pos+1);
+	}
 
-		nameCleaner.ReplaceAll(&identifier, "_");
 
-		std::string tmp(identifier.mb_str());
+	file_cpp << "#include \"libresrc.h\"" << std::endl;
-		outC << "const unsigned char " << tmp << "[] = {";
+
-		bool first = true;
+
-		char c[1];
+	std::string file;
-		while (infile.read(c, 1).gcount() > 0) {
+	while (file_manifest) {
-			if (!first) outC << ",";
+		std::getline(file_manifest, file);
-			outC << (int)*(unsigned char *)c;
+		if (file.empty()) continue;
-			first = false;
+
+		std::ifstream ifp((path_base + file).c_str());
+		std::istreambuf_iterator<char> ifp_i(ifp);
+		std::istreambuf_iterator<char> eof;
+
+
+		if (!ifp.is_open()) {
+			std::cout << "Error opening file: " << file << std::endl;
+			return 1;
 		}
-		outC << "};" << endl;
+
-		outH << "extern const unsigned char " << tmp << "[" << infile_end << "];" << endl;
+		std::string ident(file);
+		clean(ident);
+
+		file_cpp << "const unsigned char " << ident << "[] = {";
+
+		int length = 0;
+		while (ifp_i != eof) {
+			if (length > 0) file_cpp << ",";
+			file_cpp << (int)*ifp_i;
+
+			++ifp_i;
+			length++;
+		}
+
+		file_cpp << "};" << std::endl;
+		file_h << "extern const unsigned char " << ident << "[" << length << "];" << std::endl;
+
 	}
 
 	return 0;
 }
-