Merge branch 'russo-2025:master' into master

Author: DioKyrie-Git

.github/workflows/manual-release.yml

@@ -51,7 +51,7 @@ jobs:
           version: weekly.2025.48
 
       - name: Build Project
-        run: v -prod -g -gc none -o "bin/papyrus" compiler.v
+        run: v -prod -g -gc none -o "bin/papyrus-compiler" compiler.v
 
       - name: Get the date
         id: date

AGENTS.md

@@ -101,13 +101,13 @@ The compiler processes files through these stages in order:
 ### Build
 ```bash
 # Debug build
-v -o "bin\papyrus.exe" compiler.v
+v -o "bin\papyrus-compiler.exe" compiler.v
 
 # Production build (optimized, no GC)
-v -o "bin\papyrus.exe" -prod -g -gc none compiler.v
+v -o "bin\papyrus-compiler.exe" -prod -g -gc none compiler.v
 
 # Debug with symbols
-v -g -gc none -o "bin\papyrus.exe" compiler.v
+v -g -gc none -o "bin\papyrus-compiler.exe" compiler.v
 ```
 
 ### Run Tests

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Next Release
 
+### New Features
+
+- Added support for multiple output directories - you can now specify multiple `-o` flags to copy compiled .pex files to multiple locations. #18
+
 ...
 
 ## V 0.0.4

README.RU.md

@@ -29,7 +29,7 @@
 3. Используйте следующий синтаксис для работы с компилятором:
 
 ```
-papyrus <command> [arguments]
+papyrus-compiler <command> [arguments]
 ```
 
 ### Команды:
@@ -58,30 +58,30 @@ papyrus <command> [arguments]
 
 #### Компиляция всех скриптов в директории с игнорированием кэша:
 ```bash
-papyrus compile -nocache -i "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -o "../test-files/compiled/skyrimSources"
+papyrus-compiler compile -nocache -i "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -o "../test-files/compiled/skyrimSources"
 ```
 Эта команда компилирует все скрипты (кэш игнорируется), расположенные в `D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source`, и помещает скомпилированные `.pex` файлы в каталог `../test-files/compiled/skyrimSources`.
 
 #### Компиляция всех скриптов в директории:
 ```bash
-papyrus compile -i "../../RH-workspace/scripts" -o "../../RH-workspace/compiled"
+papyrus-compiler compile -i "../../RH-workspace/scripts" -o "../../RH-workspace/compiled"
 ```
 Эта команда компилирует все скрипты, расположенные в `../../RH-workspace/scripts`, и помещает скомпилированные `.pex` файлы в каталог `../../RH-workspace/compiled`.
 
 #### Компиляция скриптов с использованием файлов заголовков/импортов:
 ```bash
-papyrus compile -nocache -h "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -i "../test-files/compiler" -o "../test-files/compiled" 
+papyrus-compiler compile -nocache -h "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -i "../test-files/compiler" -o "../test-files/compiled" 
 ```
 Эта команда скомпилирует все скрипты из каталога `../test-files/compiler` в каталог `../test-files/compiled`, а недостающая информация об объектах (`Form`, `ObjectReference`, `Actor` и т.д.) будет взята из `.psc` файлов в каталоге `D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source`.
 
 #### Чтение скомпилированного `.pex` файла:
 ```bash
-papyrus read "../test-files/compiled/ABCD.pex"
+papyrus-compiler read "../test-files/compiled/ABCD.pex"
 ```
 
 #### Создание JSON-дампа `.pex` файлов:
 ```bash
-papyrus create-dump "../folder_with_pex_files"
+papyrus-compiler create-dump "../folder_with_pex_files"
 ```
 Создает JSON-файл `dump.json`, содержащий некоторую информацию обо всех `.pex` файлах, расположенных в каталоге `../folder_with_pex_files`. Вот как это будет выглядеть:
 ```json
@@ -133,7 +133,7 @@ Function EquipItem(Form akItem, bool abPreventRemoval = false, bool abSilent = f
 - [V compiler d0dc13e (weekly.2025.48)](https://github.com/vlang/v/releases/tag/weekly.2025.48)
 
 ```bash
-v -o "bin\papyrus.exe" -prod -g -gc none compiler.v
+v -o "bin\papyrus-compiler.exe" -prod -g -gc none compiler.v
 ```
 
 ## Тестирование

README.md

@@ -29,7 +29,7 @@ The compiler was created for the following purposes:
 3. Use the following syntax to work with the compiler:
 
 ```
-papyrus <command> [arguments]
+papyrus-compiler <command> [arguments]
 ```
 
 ### Commands:
@@ -57,30 +57,30 @@ Below are several examples demonstrating the use of various compiler commands an
 
 #### Compile all scripts in a directory, ignoring the cache:
 ```bash
-papyrus compile -nocache -i "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -o "../test-files/compiled/skyrimSources"
+papyrus-compiler compile -nocache -i "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -o "../test-files/compiled/skyrimSources"
 ```
 This command compiles all scripts (ignoring the cache) located in `D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source` and places the compiled `.pex` files in the `../test-files/compiled/skyrimSources` directory.
 
 #### Compile all scripts in a directory:
 ```bash
-papyrus compile -i "../../RH-workspace/scripts" -o "../../RH-workspace/compiled"
+papyrus-compiler compile -i "../../RH-workspace/scripts" -o "../../RH-workspace/compiled"
 ```
 This command compiles all scripts located in `../../RH-workspace/scripts` and places the compiled `.pex` files in the `../../RH-workspace/compiled` directory.
 
 #### Compile scripts using header/import files:
 ```bash
-papyrus compile -nocache -h "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -i "../test-files/compiler" -o "../test-files/compiled" 
+papyrus-compiler compile -nocache -h "D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source" -i "../test-files/compiler" -o "../test-files/compiled" 
 ```
 This command will compile all scripts from the `../test-files/compiler` directory to the `../test-files/compiled` directory, and missing information about objects (`Form`, `ObjectReference`, `Actor`, etc.) will be taken from `.psc` files in the `D:\Steam\steamapps\common\Skyrim Special Edition\Data\Scripts\Source` directory.
 
 #### Reading a compiled `.pex` file:
 ```bash
-papyrus read "../test-files/compiled/ABCD.pex"
+papyrus-compiler read "../test-files/compiled/ABCD.pex"
 ```
 
 #### Creating a JSON dump of `.pex` files:
 ```bash
-papyrus create-dump "../folder_with_pex_files"
+papyrus-compiler create-dump "../folder_with_pex_files"
 ```
 Creates a JSON file `dump.json` containing some information about all `.pex` files located in the `../folder_with_pex_files` directory. Here's what it will look like:
 ```json
@@ -132,7 +132,7 @@ Scripts from the directory specified by the `-h "..."` argument will NOT be comp
 - [V compiler d0dc13e (weekly.2025.48)](https://github.com/vlang/v/releases/tag/weekly.2025.48)
 
 ```bash
-v -o "bin\papyrus.exe" -prod -g -gc none compiler.v
+v -o "bin\papyrus-compiler.exe" -prod -g -gc none compiler.v
 ```
 
 ## Testing

modules/builder/builder.v

@@ -68,7 +68,12 @@ pub fn (mut b Builder) run() bool {
 	b.print("used header dirs ${b.pref.header_dirs}")
 
 	b.files, b.files_names = find_all_src_files(b.pref.paths)
-	
+
+	// Warn if using multiple output directories with -original flag
+	if b.pref.output_dirs.len > 1 && b.pref.backend == .original {
+		b.print("Warning: Using multiple output directories with -original flag is not fully supported. Files will only be compiled to the first directory.")
+	}
+
 	match b.pref.backend {
 		.check,
 		.pex {

modules/builder/original.v

@@ -15,7 +15,7 @@ fn (mut b Builder) compile_original() {
 	header_dirs = header_dirs[..header_dirs.len-1]
 
 	for file in b.files {
-		cmd := '"${compiler_exe_path}" "${file}" -quiet -i="${header_dirs}" -o="${b.pref.output_dir}" -f="${compiler_flags_path}"'
+		cmd := '"${compiler_exe_path}" "${file}" -quiet -i="${header_dirs}" -o="${b.pref.output_dirs[0]}" -f="${compiler_flags_path}"'
 
 		b.print("executing: `${cmd}`")
 

modules/builder/pex.v

@@ -99,7 +99,8 @@ fn (mut b Builder) compile_pex() {
 fn (mut b Builder) gen_to_pex_file(mut parsed_file ast.File, mut buff_bytes pex.Buffer) {
 	if is_outdated(parsed_file, b.pref) {
 		output_file_name := parsed_file.file_name + ".pex"
-		output_file_path := os.join_path(b.pref.output_dir, output_file_name)
+		// Use first output directory for writing
+		output_file_path := os.join_path(b.pref.output_dirs[0], output_file_name)
 
 		mut pex_file := b.generator.gen(mut parsed_file)
 
@@ -114,6 +115,16 @@ fn (mut b Builder) gen_to_pex_file(mut parsed_file ast.File, mut buff_bytes pex.
 			util.fatal_error("failed to write file: ${err}")
 		}
 		file.close()
+
+		// Copy to additional output directories
+		if b.pref.output_dirs.len > 1 {
+			for j in 1 .. b.pref.output_dirs.len {
+				copy_path := os.join_path(b.pref.output_dirs[j], output_file_name)
+				os.cp(output_file_path, copy_path) or {
+					util.fatal_error("failed to copy file to ${copy_path}: ${err}")
+				}
+			}
+		}
 	}
 }
 

modules/papyrus/errors/errors.v

@@ -35,19 +35,20 @@ pub:
 	reporter  Reporter
 }
 
-pub const msg_invalid_output_path = "Error: Invalid path specified for the -o flag. Please provide a valid directory path where compiled files should be saved.";
-pub const msg_invalid_input_path = "Error: Invalid path specified for the -i flag. Please provide a valid directory or file path containing the .psc scripts to compile.";
-pub const msg_invalid_headers_path = "Error: Invalid path specified for the -h flag. Please provide a valid directory path containing header/import .psc files.";
+pub const msg_invalid_output_path = "Error: Invalid path specified for the -o flag. Please provide a valid directory path where compiled files should be saved."
+pub const msg_invalid_input_path = "Error: Invalid path specified for the -i flag. Please provide a valid directory or file path containing the .psc scripts to compile."
+pub const msg_invalid_headers_path = "Error: Invalid path specified for the -h flag. Please provide a valid directory path containing header/import .psc files."
 pub const msg_duplicate_input_flag = "Error: Duplicate -i flag detected with the same path. Please ensure each -i flag points to a unique directory or file."
-pub const msg_duplicate_output_flag = "Error: The -o flag has already been specified. Please provide only one output directory.";
-pub const msg_missing_input = "Error: Missing mandatory -i flag. Please specify the directory or file containing .psc scripts to compile.";
-pub const msg_missing_output = "Error: Missing mandatory -o flag. Please specify the directory where compiled .pex files should be saved.";
+pub const msg_duplicate_output_flag = "Error: The -o flag has already been specified. Please provide only one output directory."
+pub const msg_missing_input = "Error: Missing mandatory -i flag. Please specify the directory or file containing .psc scripts to compile."
+pub const msg_missing_output = "Error: Missing mandatory -o flag. Please specify the directory where compiled .pex files should be saved."
+pub const msg_warning_multiple_output_with_original = "Warning: Using multiple output directories with -original flag is not fully supported. Files will only be compiled to the first directory."
 //TODO
-pub const msg_wrong_number_of_arguments = "Error: Incorrect number of arguments for the command. Please refer to the documentation for the correct usage.";
+pub const msg_wrong_number_of_arguments = "Error: Incorrect number of arguments for the command. Please refer to the documentation for the correct usage."
 //TODO
-pub const msg_missing_or_incorrect_argument = "Error: Missing or incorrect argument. Please check the syntax of your command.";
-pub const msg_missing_or_incorrect_command = "Error: Invalid command. Please use one of the following commands: compile, read, disassembly, create-dump, help.";
-pub const msg_invalid_path_disassembly = "Error: Invalid path specified for the disassembly command. Please provide a valid file path for the .pex file.";
-pub const msg_invalid_path_read = "Error: Invalid path specified for the read command. Please provide a valid file path for the .pex file.";
-pub const msg_invalid_path_create_dump = "Error: Invalid path specified for create-dump. Please provide a valid directory path containing .pex files.";
+pub const msg_missing_or_incorrect_argument = "Error: Missing or incorrect argument. Please check the syntax of your command."
+pub const msg_missing_or_incorrect_command = "Error: Invalid command. Please use one of the following commands: compile, read, disassembly, create-dump, help."
+pub const msg_invalid_path_disassembly = "Error: Invalid path specified for the disassembly command. Please provide a valid file path for the .pex file."
+pub const msg_invalid_path_read = "Error: Invalid path specified for the read command. Please provide a valid file path for the .pex file."
+pub const msg_invalid_path_create_dump = "Error: Invalid path specified for create-dump. Please provide a valid directory path containing .pex files."
 

modules/pref/pref.v

@@ -47,7 +47,7 @@ pub fn (m RunMode) str() string {
 pub struct Preferences {
 pub mut:
 	paths				[]string	// folders with files to compile
-	output_dir			string		// folder for output files
+	output_dirs			[]string	// folders for output files
 	mode				RunMode = .compile
 	backend				Backend = .pex
 	no_cache			bool
@@ -71,7 +71,9 @@ pub fn (p Preferences) cmd_str() string {
 		b.write_string("-i \"${path}\" ")
 	}
 
-	b.write_string("-o \"${p.output_dir}\" ")
+	for dir in p.output_dirs {
+		b.write_string("-o \"${dir}\" ")
+	}
 
 	for dir in p.header_dirs {
 		b.write_string("-h \"${dir}\" ")
@@ -124,17 +126,13 @@ fn (mut p Preferences) parse_compile_args(args []string) {
 			"-output" {
 				i++
 
-				if p.output_dir != "" {
-					error(errors.msg_duplicate_output_flag) // path
-				}
-
 				path := os.real_path(args[i])
 
 				if !os.is_dir(path) {
 					error(errors.msg_invalid_output_path) // path
 				}
 
-				p.output_dir = path
+				p.output_dirs << path
 				i++
 			}
 			"-h",
@@ -192,7 +190,7 @@ fn (mut p Preferences) parse_compile_args(args []string) {
 		error(errors.msg_missing_input)
 	}
 
-	if p.output_dir == "" {
+	if p.output_dirs.len == 0 {
 		error(errors.msg_missing_output)
 	}
 }