Skip to content

Move internal lua modules to aegisub/internal/ #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arch1t3cht merged 1 commit into from
Mar 27, 2026
Merged

Move internal lua modules to aegisub/internal/ #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions automation/include/aegisub/clipboard.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
-- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

local check = require 'aegisub.argcheck'
local ffi_util = require 'aegisub.ffi'
local check = require 'aegisub.internal.argcheck'
local ffi_util = require 'aegisub.internal.ffi'
local impl = aegisub.__init_clipboard()

return {
Expand Down
0 automation/include/aegisub/argcheck.moon → ...on/include/aegisub/internal/argcheck.moon
View file
Open in desktop
File renamed without changes.
0 automation/include/aegisub/ffi.moon → automation/include/aegisub/internal/ffi.moon
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions automation/include/aegisub/internal/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copy files to build directory for testing purposes
lua_files = files(
'argcheck.moon',
'ffi.moon',
)

foreach f: lua_files
configure_file(input: f, output: '@PLAINNAME@', copy: true)
endforeach
4 changes: 2 additions & 2 deletions automation/include/aegisub/lfs.moon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

impl = require 'aegisub.__lfs_impl'

check = require 'aegisub.argcheck'
check = require 'aegisub.internal.argcheck'
ffi = require 'ffi'
ffi_util = require 'aegisub.ffi'
ffi_util = require 'aegisub.internal.ffi'

for k, v in pairs impl
impl[k] = ffi_util.err_arg_to_multiple_return v
Expand Down
4 changes: 2 additions & 2 deletions automation/include/aegisub/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Copy files to build directory for testing purposes
lua_files = files(
'argcheck.moon',
'clipboard.lua',
'ffi.moon',
'lfs.moon',
're.moon',
'unicode.moon',
Expand All @@ -12,3 +10,5 @@ lua_files = files(
foreach f: lua_files
configure_file(input: f, output: '@PLAINNAME@', copy: true)
endforeach

subdir('internal')
4 changes: 2 additions & 2 deletions automation/include/aegisub/re.moon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ type = type

bit = require 'bit'
ffi = require 'ffi'
ffi_util = require 'aegisub.ffi'
check = require 'aegisub.argcheck'
ffi_util = require 'aegisub.internal.ffi'
check = require 'aegisub.internal.argcheck'

ffi.cdef[[
typedef struct agi_re_flag {
Expand Down
4 changes: 2 additions & 2 deletions automation/include/aegisub/unicode.moon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

impl = require 'aegisub.__unicode_impl'

check = require 'aegisub.argcheck'
check = require 'aegisub.internal.argcheck'
ffi = require 'ffi'
ffi_util = require 'aegisub.ffi'
ffi_util = require 'aegisub.internal.ffi'

err_buff = ffi.new 'char *[1]'
conv_func = (f) -> check'string' (str) ->
Expand Down
2 changes: 1 addition & 1 deletion automation/include/aegisub/util.moon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sformat = string.format
tonumber = tonumber
type = type

check = require 'aegisub.argcheck'
check = require 'aegisub.internal.argcheck'

local *

Expand Down
7 changes: 5 additions & 2 deletions automation/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@ install_data(
install_dir: automation_dir / 'include')

install_data(
'include/aegisub/argcheck.moon',
'include/aegisub/clipboard.lua',
'include/aegisub/ffi.moon',
'include/aegisub/lfs.moon',
'include/aegisub/re.moon',
'include/aegisub/unicode.moon',
'include/aegisub/util.moon',
install_dir: automation_dir / 'include' / 'aegisub')

install_data(
'include/aegisub/internal/argcheck.moon',
'include/aegisub/internal/ffi.moon',
install_dir: automation_dir / 'include' / 'aegisub' / 'internal')
2 changes: 1 addition & 1 deletion automation/tests/modules/argcheck.moon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
--
-- Aegisub Project http://www.aegisub.org/

check = require 'aegisub.argcheck'
check = require 'aegisub.internal.argcheck'

describe 'argcheck', ->
it 'should permit simple valid calls', ->
Expand Down
5 changes: 3 additions & 2 deletions packages/win_installer/fragment_automation.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ DestDir: {app}\automation\autoload; Source: {#SOURCE_ROOT}\automation\autoload\s
DestDir: {app}\automation\demos; Source: {#SOURCE_ROOT}\automation\demos\future-windy-blur.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: macros\demos
DestDir: {app}\automation\demos; Source: {#SOURCE_ROOT}\automation\demos\raytracer.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: macros\demos

DestDir: {app}\automation\include\aegisub; Source: {#SOURCE_ROOT}\automation\include\aegisub\argcheck.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main
DestDir: {app}\automation\include\aegisub\internal; Source: {#SOURCE_ROOT}\automation\include\aegisub\internal\argcheck.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main
DestDir: {app}\automation\include\aegisub\internal; Source: {#SOURCE_ROOT}\automation\include\aegisub\internal\ffi.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main

DestDir: {app}\automation\include\aegisub; Source: {#SOURCE_ROOT}\automation\include\aegisub\clipboard.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main
DestDir: {app}\automation\include\aegisub; Source: {#SOURCE_ROOT}\automation\include\aegisub\ffi.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main
DestDir: {app}\automation\include\aegisub; Source: {#SOURCE_ROOT}\automation\include\aegisub\lfs.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main
DestDir: {app}\automation\include\aegisub; Source: {#SOURCE_ROOT}\automation\include\aegisub\re.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main
DestDir: {app}\automation\include\aegisub; Source: {#SOURCE_ROOT}\automation\include\aegisub\unicode.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly; Components: main
Expand Down
Loading