Bladeren bron

tools: do not assume directory separator

Daniele Bartolini 5 jaren geleden
bovenliggende
commit
553f4de4c5
3 gewijzigde bestanden met toevoegingen van 12 en 12 verwijderingen
  1. 3 3
      tools/level_editor/level.vala
  2. 2 2
      tools/level_editor/level_editor.vala
  3. 7 7
      tools/level_editor/project.vala

+ 3 - 3
tools/level_editor/level.vala

@@ -84,7 +84,7 @@ namespace Crown
 		/// Loads the empty level template.
 		public void load_empty_level()
 		{
-			load(_project.toolchain_dir() + "/" + "core/editors/levels/empty.level");
+			load(Path.build_filename(_project.toolchain_dir(), "core/editors/levels/empty.level"));
 
 			_filename = null;
 		}
@@ -500,11 +500,11 @@ namespace Crown
 			Database prefab_db = new Database();
 
 			// Try to load from toolchain directory first
-			File file = File.new_for_path(_project.toolchain_dir() + "/" + name + ".unit");
+			File file = File.new_for_path(Path.build_filename(_project.toolchain_dir(), name + ".unit"));
 			if (file.query_exists())
 				prefab_db.load(file.get_path());
 			else
-				prefab_db.load(_project.source_dir() + "/" + name + ".unit");
+				prefab_db.load(Path.build_filename(_project.source_dir(), name + ".unit"));
 
 			// Recursively load all sub-prefabs
 			Value? prefab = prefab_db.get_property(GUID_ZERO, "prefab");

+ 2 - 2
tools/level_editor/level_editor.vala

@@ -427,7 +427,7 @@ namespace Crown
 
 			if (_level_resource != "")
 			{
-				string level_path = _project.source_dir() + "/" + _level_resource + ".level";
+				string level_path = Path.build_filename(_project.source_dir(), _level_resource + ".level");
 				if (!GLib.FileUtils.test(level_path, FileTest.EXISTS) || !GLib.FileUtils.test(level_path, FileTest.IS_REGULAR))
 				{
 					stdout.printf("Level resource '%s' does not exist.\n", _level_resource);
@@ -1115,7 +1115,7 @@ namespace Crown
 					if (compiler.get_exit_status() == 0)
 					{
 						GLib.File engine_exe = File.new_for_path(ENGINE_EXE);
-						GLib.File engine_exe_dest = File.new_for_path(data_dir.get_path() + "/" + ENGINE_EXE);
+						GLib.File engine_exe_dest = File.new_for_path(Path.build_filename(data_dir.get_path(), ENGINE_EXE));
 						engine_exe.copy(engine_exe_dest, FileCopyFlags.OVERWRITE);
 
 						_console_view.logi("editor", "Project deployed to `%s`".printf(data_dir.get_path()));

+ 7 - 7
tools/level_editor/project.vala

@@ -60,8 +60,8 @@ namespace Crown
 			_toolchain_dir = File.new_for_path(toolchain_dir);
 			_data_dir      = File.new_for_path(_source_dir.get_path() + "_" + _platform);
 
-			_level_editor_test_level = File.new_for_path(_source_dir.get_path() + "/" + "_level_editor_test.level");
-			_level_editor_test_package = File.new_for_path(_source_dir.get_path() + "/" + "_level_editor_test.package");
+			_level_editor_test_level = File.new_for_path(Path.build_filename(_source_dir.get_path(), "_level_editor_test.level"));
+			_level_editor_test_package = File.new_for_path(Path.build_filename(_source_dir.get_path(), "_level_editor_test.package"));
 
 			// Cleanup source directory from previous runs' garbage
 			delete_garbage();
@@ -311,7 +311,7 @@ end
 			string importer_settings_path = null;
 			{
 				GLib.File file_src = File.new_for_path(filenames.nth_data(0));
-				GLib.File file_dst = File.new_for_path(destination_dir + "/" + file_src.get_basename());
+				GLib.File file_dst = File.new_for_path(Path.build_filename(destination_dir, file_src.get_basename()));
 
 				string resource_filename = _source_dir.get_relative_path(file_dst);
 				string resource_name     = resource_filename.substring(0, resource_filename.last_index_of_char('.'));
@@ -379,7 +379,7 @@ end
 					continue;
 
 				GLib.File file_src = File.new_for_path(filename_i);
-				GLib.File file_dst = File.new_for_path(destination_dir + "/" + file_src.get_basename());
+				GLib.File file_dst = File.new_for_path(Path.build_filename(destination_dir, file_src.get_basename()));
 
 				string resource_filename = _source_dir.get_relative_path(file_dst);
 				string resource_name     = resource_filename.substring(0, resource_filename.last_index_of_char('.'));
@@ -655,7 +655,7 @@ end
 					continue;
 
 				GLib.File file_src = File.new_for_path(filename_i);
-				GLib.File file_dst = File.new_for_path(destination_dir + "/" + file_src.get_basename());
+				GLib.File file_dst = File.new_for_path(Path.build_filename(destination_dir, file_src.get_basename()));
 
 				string resource_filename = _source_dir.get_relative_path(file_dst);
 				string resource_name     = resource_filename.substring(0, resource_filename.last_index_of_char('.'));
@@ -821,7 +821,7 @@ end
 					continue;
 
 				GLib.File file_src = File.new_for_path(filename_i);
-				GLib.File file_dst = File.new_for_path(destination_dir + "/" + file_src.get_basename());
+				GLib.File file_dst = File.new_for_path(Path.build_filename(destination_dir, file_src.get_basename()));
 
 				string resource_filename = _source_dir.get_relative_path(file_dst);
 				string resource_name     = resource_filename.substring(0, resource_filename.last_index_of_char('.'));
@@ -850,7 +850,7 @@ end
 					continue;
 
 				GLib.File file_src = File.new_for_path(filename_i);
-				GLib.File file_dst = File.new_for_path(destination_dir + "/" + file_src.get_basename());
+				GLib.File file_dst = File.new_for_path(Path.build_filename(destination_dir, file_src.get_basename()));
 
 				string resource_filename = _source_dir.get_relative_path(file_dst);
 				string resource_name     = resource_filename.substring(0, resource_filename.last_index_of_char('.'));