godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace export pack mode "Copy" with "Exec+Zip" 

- Make "Bundle" a separate option
- Change pack mode property hint to be more expressive
This commit is contained in:
eska 2016-01-10 23:28:01 +01:00
parent eb7901c8b8
commit 31778e7853
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/editor/editor_import_export.cpp
View File

@ -455,6 +455,9 @@ bool EditorExportPlatformPC::_set(const StringName& p_name, const Variant& p_val
} else if (n=="resources/pack_mode") { } else if (n=="resources/pack_mode") {
export_mode=ExportMode(int(p_value)); export_mode=ExportMode(int(p_value));
} else if (n=="resources/bundle_dependencies_(for_optical_disc)") {
bundle=p_value;
} else if (n=="binary/64_bits") { } else if (n=="binary/64_bits") {
use64=p_value; use64=p_value;
@ -478,6 +481,9 @@ bool EditorExportPlatformPC::_get(const StringName& p_name,Variant &r_ret) const
} else if (n=="resources/pack_mode") { } else if (n=="resources/pack_mode") {
r_ret=export_mode; r_ret=export_mode;
} else if (n=="resources/bundle_dependencies_(for_optical_disc)") {
r_ret=bundle;
} else if (n=="binary/64_bits") { } else if (n=="binary/64_bits") {
r_ret=use64; r_ret=use64;
@ -492,7 +498,8 @@ void EditorExportPlatformPC::_get_property_list( List<PropertyInfo> *p_list) con
p_list->push_back( PropertyInfo( Variant::STRING, "custom_binary/debug", PROPERTY_HINT_GLOBAL_FILE,binary_extension)); p_list->push_back( PropertyInfo( Variant::STRING, "custom_binary/debug", PROPERTY_HINT_GLOBAL_FILE,binary_extension));
p_list->push_back( PropertyInfo( Variant::STRING, "custom_binary/release", PROPERTY_HINT_GLOBAL_FILE,binary_extension)); p_list->push_back( PropertyInfo( Variant::STRING, "custom_binary/release", PROPERTY_HINT_GLOBAL_FILE,binary_extension));
p_list->push_back( PropertyInfo( Variant::INT, "resources/pack_mode", PROPERTY_HINT_ENUM,"Single Exec.,Exec+Pack (.pck),Copy,Bundles (Optical)")); p_list->push_back( PropertyInfo( Variant::INT, "resources/pack_mode", PROPERTY_HINT_ENUM,"Pack into executable,Pack into binary file (.pck),Pack into archive file (.zip)"));
p_list->push_back( PropertyInfo( Variant::BOOL, "resources/bundle_dependencies_(for_optical_disc)"));
p_list->push_back( PropertyInfo( Variant::BOOL, "binary/64_bits")); p_list->push_back( PropertyInfo( Variant::BOOL, "binary/64_bits"));
} }
@ -1274,26 +1281,32 @@ Error EditorExportPlatformPC::export_project(const String& p_path, bool p_debug,
} }
} }
String dstfile = p_path.replace_first("res://","").replace("\\","/");
if (export_mode!=EXPORT_EXE) { if (export_mode!=EXPORT_EXE) {
String dstfile=p_path.replace_first("res://","").replace("\\","/"); String dstfile_extension=export_mode==EXPORT_ZIP?".zip":".pck";
if (dstfile.find("/")!=-1) if (dstfile.find("/")!=-1)
dstfile=dstfile.get_base_dir()+"/data.pck"; dstfile=dstfile.get_base_dir()+"/data"+dstfile_extension;
else else
dstfile="data.pck"; dstfile="data"+dstfile_extension;
if (export_mode==EXPORT_PACK) {
memdelete(dst); memdelete(dst);
dst=FileAccess::open(dstfile,FileAccess::WRITE);
if (!dst) {
EditorNode::add_io_error("Can't write data pack to:\n "+p_path); dst=FileAccess::open(dstfile,FileAccess::WRITE);
return ERR_FILE_CANT_WRITE; if (!dst) {
EditorNode::add_io_error("Can't write data pack to:\n "+p_path);
return ERR_FILE_CANT_WRITE;
}
} }
} }
memdelete(src_exe); memdelete(src_exe);
Error err = save_pack(dst,export_mode==EXPORT_BUNDLES); Error err = export_mode==EXPORT_ZIP?save_zip(dstfile,bundle):save_pack(dst,bundle);
memdelete(dst); memdelete(dst);
return err; return err;
} }

4
tools/editor/editor_import_export.h
View File

@ -175,8 +175,7 @@ public:
enum ExportMode { enum ExportMode {
EXPORT_EXE, EXPORT_EXE,
EXPORT_PACK, EXPORT_PACK,
EXPORT_COPY, EXPORT_ZIP
EXPORT_BUNDLES
}; };
@ -198,6 +197,7 @@ private:
Ref<Texture> logo; Ref<Texture> logo;
ExportMode export_mode; ExportMode export_mode;
bool bundle;
protected: protected:
bool _set(const StringName& p_name, const Variant& p_value); bool _set(const StringName& p_name, const Variant& p_value);