Skip to content

Commit f34df20

Browse files
authored
[luau] update to 0.669 (#45017)
1 parent 043d415 commit f34df20

5 files changed

Lines changed: 15 additions & 11 deletions

File tree

ports/luau/cmake-config-export.patch

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 5286fd9..9f5544b 100644
2+
index 03f235c..75aa1ec 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -65,31 +65,31 @@ add_library(Luau.VM.Internals INTERFACE)
5+
@@ -67,31 +67,31 @@ add_library(Luau.VM.Internals INTERFACE)
66

77
include(Sources.cmake)
88

@@ -41,16 +41,16 @@ index 5286fd9..9f5544b 100644
4141
target_link_libraries(Luau.EqSat PUBLIC Luau.Common)
4242

4343
target_compile_features(Luau.CodeGen PRIVATE cxx_std_17)
44-
@@ -98,7 +98,7 @@ target_link_libraries(Luau.CodeGen PRIVATE Luau.VM Luau.VM.Internals) # Code gen
44+
@@ -100,7 +100,7 @@ target_link_libraries(Luau.CodeGen PRIVATE Luau.VM Luau.VM.Internals) # Code gen
4545
target_link_libraries(Luau.CodeGen PUBLIC Luau.Common)
4646

4747
target_compile_features(Luau.VM PRIVATE cxx_std_11)
4848
-target_include_directories(Luau.VM PUBLIC VM/include)
4949
+target_include_directories(Luau.VM PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/VM/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
5050
target_link_libraries(Luau.VM PUBLIC Luau.Common)
5151

52-
target_include_directories(isocline PUBLIC extern/isocline/include)
53-
@@ -183,22 +183,6 @@ if(MSVC AND LUAU_BUILD_CLI)
52+
target_compile_features(Luau.Require PUBLIC cxx_std_17)
53+
@@ -194,22 +194,6 @@ if(MSVC AND LUAU_BUILD_CLI)
5454
set_target_properties(Luau.Repl.CLI PROPERTIES LINK_FLAGS_DEBUG /STACK:2097152)
5555
endif()
5656

@@ -73,7 +73,7 @@ index 5286fd9..9f5544b 100644
7373
# On Windows and Android threads are provided, on Linux/Mac/iOS we use pthreads
7474
add_library(osthreads INTERFACE)
7575
if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin|iOS")
76-
@@ -288,3 +272,54 @@ foreach(LIB Luau.Ast Luau.Compiler Luau.Config Luau.Analysis Luau.EqSat Luau.Cod
76+
@@ -299,3 +283,54 @@ foreach(LIB Luau.Ast Luau.Compiler Luau.Config Luau.Analysis Luau.EqSat Luau.Cod
7777
endif()
7878
endif()
7979
endforeach()
@@ -130,9 +130,8 @@ index 5286fd9..9f5544b 100644
130130
+)
131131
diff --git b/cmake/unofficial-luau-config.cmake b/cmake/unofficial-luau-config.cmake
132132
new file mode 100644
133-
index 0000000..2680ef3
133+
index 0000000..13fd463
134134
--- /dev/null
135135
+++ b/cmake/unofficial-luau-config.cmake
136136
@@ -0,0 +1 @@
137137
+include(${CMAKE_CURRENT_LIST_DIR}/unofficial-luau-targets.cmake)
138-
\ No newline at end of file

ports/luau/portfile.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO luau-lang/luau
66
REF ${VERSION}
7-
SHA512 4076d108555eb003a494cd2c0d37122a5b70719891784cf8ef499e5af1234de7386d3c717c836edf07b017c1f857826437e3e9c22adec096a9f0e7ddab87caad
7+
SHA512 eec53ad49d632d9c73eb8df497018c935c5e8b0a75be3c54608c4b0d11c59b47cb546db71c62eab1941974e97af3f8d009a0ac2b2cde933988fa27c1d6a28939
88
HEAD_REF master
99
PATCHES
1010
cmake-config-export.patch

ports/luau/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "luau",
3-
"version": "0.668",
3+
"version": "0.669",
44
"description": "A fast, small, safe, gradually typed embeddable scripting language derived from Lua",
55
"homepage": "https://github.com/luau-lang/luau",
66
"license": "MIT",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5813,7 +5813,7 @@
58135813
"port-version": 1
58145814
},
58155815
"luau": {
5816-
"baseline": "0.668",
5816+
"baseline": "0.669",
58175817
"port-version": 0
58185818
},
58195819
"luminoengine": {

versions/l-/luau.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "f22c8d5770eea6f4c79c14fa4fce37bac6fc13a1",
5+
"version": "0.669",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "63af8fb1e2f8799340c6dca0ca453cbea2a598d4",
510
"version": "0.668",

0 commit comments

Comments
 (0)