ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added addons build config to Xcode project + added better error handling to the unzip function so it fails instead of crashing iun a couple places (xapantu: more work needed on error handling)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5610 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-07-01 16:50:34 +00:00
parent acf4092444
commit fb0bda3fe4
5 changed files with 116 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/addons/addons.cpp
View File

@@ -330,8 +330,15 @@ void Addons::Install()
mkdir(std::string(dest_file + this->m_addons_list[this->index].name).c_str(), 0777);
#endif
//extract the zip in the addons folder called like the addons name
extract_zip(file_manager->getConfigDir() + "/" + this->m_addons_list[this->index].name,
dest_file + this->m_addons_list[this->index].name + "/");
std::string from = file_manager->getConfigDir() + "/" + this->m_addons_list[this->index].name;
std::string to = dest_file + this->m_addons_list[this->index].name + "/";
const bool success = extract_zip(from, to);
if (!success)
{
// TODO: show a message in the interface
std::cerr << "Failed to unzip " << from << " to " << to << std::endl;
return;
}
this->m_addons_list[this->index].installed = true;
this->m_addons_list[this->index].installed_version = this->m_addons_list[this->index].version;

25
src/addons/zip.cpp
View File

@@ -45,7 +45,8 @@ s32 IFileSystem_copyFileToFile(IWriteFile* dst, IReadFile* src)
return r;
}
void extract_zip(std::string from, std::string to)
bool extract_zip(std::string from, std::string to)
{
//get the stk irrlicht device
IrrlichtDevice * device = irr_driver->getDevice();
@@ -58,11 +59,29 @@ void extract_zip(std::string from, std::string to)
IFileArchive * zipfile = pfs->getFileArchive(0);
//extract the file where there is the others file name
IReadFile* srcFile = pfs->createAndOpenFile("file_list");
if (srcFile == NULL)
{
std::cerr << "Could not open 'file_list', sorry. @"
<< __FILE__ << ":" << __LINE__ << std::endl;
return false;
}
IWriteFile* dstFile = pfs->createAndWriteFile(std::string(to + "file_list").c_str());
if (dstFile == NULL)
{
std::cerr << "Could not create '" << std::string(to + "file_list").c_str() << "', sorry. @"
<< __FILE__ << ":" << __LINE__ << std::endl;
if (srcFile != NULL) srcFile->drop();
return false;
}
std::cout << from.c_str() << std::endl;
//....
if (IFileSystem_copyFileToFile(dstFile, srcFile) < 0)
; // error
{
std::cerr << "IFileSystem_copyFileToFile failed @" << __FILE__ << ":" << __LINE__ << std::endl;
if (srcFile != NULL) srcFile->drop();
if (dstFile != NULL) dstFile->drop();
return false;
}
srcFile->drop();
dstFile->drop();
@@ -93,5 +112,7 @@ void extract_zip(std::string from, std::string to)
}
//remove the zip from the filesystem to save memory and avoid problem with a name conflict
pfs->removeFileArchive(from.c_str());
return true;
}
#endif

2
src/addons/zip.hpp
View File

@@ -19,7 +19,7 @@
#define HEADER_ZIP_HPP
/** Extract a zip. */
void extract_zip(std::string, std::string);
bool extract_zip(std::string, std::string);
#endif
#endif

71
src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj
View File

@@ -282,6 +282,7 @@
95D950D30FE473CA002E10AD /* user_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95D950D00FE473CA002E10AD /* user_config.cpp */; };
95DFC5021106933B00A043A9 /* slip_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DFC5001106933B00A043A9 /* slip_stream.cpp */; };
95E246BE111A2959000C965D /* confirm_resolution_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95E246BC111A2959000C965D /* confirm_resolution_dialog.cpp */; };
95E6A0C011DCF37800AE088A /* addons_loading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95E6A0BE11DCF37800AE088A /* addons_loading.cpp */; };
95ECA10010124C5000D47C5F /* button_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95ECA0EC10124C5000D47C5F /* button_widget.cpp */; };
95ECA10110124C5000D47C5F /* check_box_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95ECA0EE10124C5000D47C5F /* check_box_widget.cpp */; };
95ECA10210124C5000D47C5F /* icon_button_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95ECA0F010124C5000D47C5F /* icon_button_widget.cpp */; };
@@ -387,6 +388,7 @@
952A1544103F66D600B1895D /* water_splash.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = water_splash.hpp; path = ../../graphics/water_splash.hpp; sourceTree = SOURCE_ROOT; };
952A1552103F68D000B1895D /* profile_world.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = profile_world.cpp; path = ../../modes/profile_world.cpp; sourceTree = SOURCE_ROOT; };
952A1553103F68D000B1895D /* profile_world.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = profile_world.hpp; path = ../../modes/profile_world.hpp; sourceTree = SOURCE_ROOT; };
953606C411DCF1A500791F01 /* SuperTuxKart-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SuperTuxKart-Info copy.plist"; sourceTree = "<group>"; };
953789710FC7829100DD1F8E /* graph_node.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = graph_node.hpp; path = ../../tracks/graph_node.hpp; sourceTree = SOURCE_ROOT; };
953789720FC7829100DD1F8E /* graph_node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = graph_node.cpp; path = ../../tracks/graph_node.cpp; sourceTree = SOURCE_ROOT; };
953789800FC7831400DD1F8E /* quad.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = quad.hpp; path = ../../tracks/quad.hpp; sourceTree = SOURCE_ROOT; };
@@ -1065,6 +1067,8 @@
95DFC5011106933B00A043A9 /* slip_stream.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = slip_stream.hpp; path = ../../graphics/slip_stream.hpp; sourceTree = SOURCE_ROOT; };
95E246BC111A2959000C965D /* confirm_resolution_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = confirm_resolution_dialog.cpp; path = ../../states_screens/dialogs/confirm_resolution_dialog.cpp; sourceTree = SOURCE_ROOT; };
95E246BD111A2959000C965D /* confirm_resolution_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = confirm_resolution_dialog.hpp; path = ../../states_screens/dialogs/confirm_resolution_dialog.hpp; sourceTree = SOURCE_ROOT; };
95E6A0BE11DCF37800AE088A /* addons_loading.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons_loading.cpp; path = ../../states_screens/dialogs/addons_loading.cpp; sourceTree = SOURCE_ROOT; };
95E6A0BF11DCF37800AE088A /* addons_loading.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = addons_loading.hpp; path = ../../states_screens/dialogs/addons_loading.hpp; sourceTree = SOURCE_ROOT; };
95ECA0EC10124C5000D47C5F /* button_widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = button_widget.cpp; path = ../../guiengine/widgets/button_widget.cpp; sourceTree = SOURCE_ROOT; };
95ECA0ED10124C5000D47C5F /* button_widget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = button_widget.hpp; path = ../../guiengine/widgets/button_widget.hpp; sourceTree = SOURCE_ROOT; };
95ECA0EE10124C5000D47C5F /* check_box_widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = check_box_widget.cpp; path = ../../guiengine/widgets/check_box_widget.cpp; sourceTree = SOURCE_ROOT; };
@@ -1123,6 +1127,7 @@
1AB674ADFE9D54B511CA2CBB /* Products */,
9551CA100FC1BB6400DB481B /* SuperTuxKart-Info.plist */,
9507E9B60FC1CCE900BD2B92 /* stk.icns */,
953606C411DCF1A500791F01 /* SuperTuxKart-Info copy.plist */,
);
name = STK_XCode;
sourceTree = "<group>";
@@ -1352,6 +1357,8 @@
children = (
956541DF10DD628C00C83E99 /* add_device_dialog.cpp */,
956541E010DD628C00C83E99 /* add_device_dialog.hpp */,
95E6A0BE11DCF37800AE088A /* addons_loading.cpp */,
95E6A0BF11DCF37800AE088A /* addons_loading.hpp */,
95E246BC111A2959000C965D /* confirm_resolution_dialog.cpp */,
95E246BD111A2959000C965D /* confirm_resolution_dialog.hpp */,
95833237101243ED00C5137E /* enter_player_name_dialog.cpp */,
@@ -2604,6 +2611,7 @@
9551B27A11DC0D6A002DD140 /* addons.cpp in Sources */,
9551B27B11DC0D6A002DD140 /* network.cpp in Sources */,
9551B27C11DC0D6A002DD140 /* zip.cpp in Sources */,
95E6A0C011DCF37800AE088A /* addons_loading.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2648,6 +2656,67 @@
};
name = Release;
};
953606C511DCF1B900791F01 /* Debug_with_addons */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH)";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
/usr/local/include,
"$(HEADER_SEARCH_PATHS_QUOTED_1)",
"$(HEADER_SEARCH_PATHS_QUOTED_2)",
);
HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../supertuxkart2/src\"";
HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../supertuxkart2/src/bullet/src\"";
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
name = Debug_with_addons;
};
953606C611DCF1B900791F01 /* Debug_with_addons */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9551C9F80FC1B87600DB481B /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_DEBUGGING_SYMBOLS = full;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_ENABLE_SYMBOL_SEPARATION = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SHADOW = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
GCC_WARN_UNUSED_PARAMETER = NO;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "SuperTuxKart-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-DDEBUG=1",
"-DADDONS_MANAGER=1",
);
OTHER_CFLAGS_QUOTED_FOR_TARGET_1 = "-DPACKAGE=\"\\\"supertuxkart\\\"\"";
OTHER_LDFLAGS = (
"$(inherited)",
"-lcurl",
);
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = SuperTuxKart;
};
name = Debug_with_addons;
};
9551C8240FC1B70000DB481B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9551C9F80FC1B87600DB481B /* Config.xcconfig */;
@@ -2729,6 +2798,7 @@
isa = XCConfigurationList;
buildConfigurations = (
1DEB923608733DC60010E9CD /* Debug */,
953606C511DCF1B900791F01 /* Debug_with_addons */,
1DEB923708733DC60010E9CD /* Release */,
);
defaultConfigurationIsVisible = 0;
@@ -2738,6 +2808,7 @@
isa = XCConfigurationList;
buildConfigurations = (
9551C8240FC1B70000DB481B /* Debug */,
953606C611DCF1B900791F01 /* Debug_with_addons */,
9551C8250FC1B70000DB481B /* Release */,
);
defaultConfigurationIsVisible = 0;

24
src/ide/Xcode/SuperTuxKart-Info.plist
View File

@@ -4,21 +4,21 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>CFBundleName</key>
<string>SuperTuxKart</string>
<key>CFBundleIconFile</key>
<string>stk.icns</string>
<key>CFBundleExecutable</key>
<string>supertuxkart</string>
<key>CFBundleVersion</key>
<string>0.7</string>
<key>CFBundleIconFile</key>
<string>stk.icns</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>SuperTuxKart</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.7</string>
<key>CFBundleVersion</key>
<string>0.7</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
</plist>