language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename the sixtyfps-compiler crate

Browse source
This commit is contained in:
Simon Hausmann 2022-02-02 09:07:16 +01:00
parent 809fbfc7a6
commit 017da5b3b4
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/cpp/CMakeLists.txt
View file

@ -19,7 +19,7 @@ list(PREPEND CMAKE_MODULE_PATH ${Corrosion_SOURCE_DIR}/cmake)
find_package(Rust 1.56 REQUIRED MODULE)
corrosion_import_crate(MANIFEST_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../Cargo.toml"
CRATES sixtyfps-compiler sixtyfps-cpp)
CRATES slint-compiler sixtyfps-cpp)
set_property(
TARGET sixtyfps-cpp
@ -29,7 +29,7 @@ set_property(
)
set_property(
TARGET sixtyfps-compiler
TARGET slint-compiler
PROPERTY CORROSION_USE_HOST_BUILD 1
)
@ -147,7 +147,7 @@ target_include_directories(SixtyFPS INTERFACE
$<INSTALL_INTERFACE:include/sixtyfps>
)
add_executable(SixtyFPS::sixtyfps-compiler ALIAS sixtyfps-compiler)
add_executable(SixtyFPS::slint-compiler ALIAS slint-compiler)
include(${CMAKE_CURRENT_LIST_DIR}/cmake/SixtyFPSMacro.cmake)
export(TARGETS SixtyFPS sixtyfps-cpp
@ -174,7 +174,7 @@ if(WIN32)
${CMAKE_BINARY_DIR}/bin/${config_subdir_genex}$<TARGET_FILE_NAME:sixtyfps-cpp-shared>)
endif()
install(PROGRAMS $<TARGET_FILE:sixtyfps-compiler> TYPE BIN)
install(PROGRAMS $<TARGET_FILE:slint-compiler> TYPE BIN)
set(SIXTYFPS_LIB_PROPERTIES "")
foreach(prop

4
api/cpp/README.md
View file

@ -175,10 +175,10 @@ export MainWindow := Window {
}
```
We can compile this code using the `sixtyfps-compiler` binary:
We can compile this code using the `slint-compiler` binary:
```sh
sixtyfps-compiler my_application_ui.60 > my_application_ui.h
slint-compiler my_application_ui.60 > my_application_ui.h
```
Note: You would usually not type this command yourself, this is done automatically by the build system.

4
api/cpp/cmake/SixtyFPSConfig.cmake.in
View file

@ -14,8 +14,8 @@ endif()
add_library(sixtyfps-cpp-shared SHARED IMPORTED)
set_target_properties(sixtyfps-cpp-shared PROPERTIES @SIXTYFPS_LIB_PROPERTIES@)
add_executable(SixtyFPS::sixtyfps-compiler IMPORTED GLOBAL)
set_target_properties(SixtyFPS::sixtyfps-compiler PROPERTIES IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_BINDIR@/sixtyfps-compiler${CMAKE_EXECUTABLE_SUFFIX}")
add_executable(SixtyFPS::slint-compiler IMPORTED GLOBAL)
set_target_properties(SixtyFPS::slint-compiler PROPERTIES IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_BINDIR@/slint-compiler${CMAKE_EXECUTABLE_SUFFIX}")
set(_IMPORT_PREFIX)

8
api/cpp/cmake/SixtyFPSMacro.cmake
View file

@ -14,10 +14,10 @@ function(SIXTYFPS_TARGET_60_SOURCES target)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_60_BASE_NAME}.h
COMMAND SixtyFPS::sixtyfps-compiler ${_60_ABSOLUTE}
COMMAND SixtyFPS::slint-compiler ${_60_ABSOLUTE}
-o ${_60_BASE_NAME_REL}.h --depfile ${_60_BASE_NAME_REL}.d
--style ${SIXTYFPS_STYLE}
DEPENDS SixtyFPS::sixtyfps-compiler ${_60_ABSOLUTE}
DEPENDS SixtyFPS::slint-compiler ${_60_ABSOLUTE}
COMMENT "Generating ${_60_BASE_NAME}.h"
DEPFILE ${CMAKE_CURRENT_BINARY_DIR}/${_60_BASE_NAME}.d
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
@ -27,10 +27,10 @@ function(SIXTYFPS_TARGET_60_SOURCES target)
file(GLOB ALL_60S "${_60_DIR}/*.60")
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_60_BASE_NAME}.h
COMMAND SixtyFPS::sixtyfps-compiler ${_60_ABSOLUTE}
COMMAND SixtyFPS::slint-compiler ${_60_ABSOLUTE}
-o ${CMAKE_CURRENT_BINARY_DIR}/${_60_BASE_NAME}.h
--style ${SIXTYFPS_STYLE}
DEPENDS SixtyFPS::sixtyfps-compiler ${_60_ABSOLUTE} ${ALL_60S}
DEPENDS SixtyFPS::slint-compiler ${_60_ABSOLUTE} ${ALL_60S}
COMMENT "Generating ${_60_BASE_NAME}.h"
)
endif(CMAKE_GENERATOR STREQUAL "Ninja")

2
internal/common/Cargo.toml
View file

@ -7,7 +7,7 @@ version = "0.2.0"
authors = ["SixtyFPS <info@sixtyfps.io>"]
edition = "2021"
license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)"
description = "Helper crate for sharing code & data structures between slint-core-internal and sixtyfps-compiler"
description = "Helper crate for sharing code & data structures between slint-core-internal and slint-compiler"
repository = "https://github.com/sixtyfpsui/sixtyfps"
homepage = "https://sixtyfps.io"

4
tools/compiler/Cargo.toml
View file

@ -2,7 +2,7 @@
# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
[package]
name = "sixtyfps-compiler"
name = "slint-compiler"
version = "0.2.0"
authors = ["SixtyFPS <info@sixtyfps.io>"]
edition = "2021"
@ -13,7 +13,7 @@ homepage = "https://sixtyfps.io"
publish = false
[[bin]]
name = "sixtyfps-compiler"
name = "slint-compiler"
path = "main.rs"
[dependencies]