Merge remote-tracking branch 'master' into wip/rename

Conflicts: .reuse/dep5 Cargo.toml api/cpp/README.md api/cpp/docs/conf.py api/rs/slint/Cargo.toml docs/development.md
task-jp · Feb 2, 2022 · ad4eea9 · ad4eea9
2 parents 62b269a + 0aa1ce2
commit ad4eea9
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 370 deletions.
diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Set up rgb crate rustdoc link
       run: |
-        rgb_version=`grep 'rgb = '  sixtyfps_runtime/corelib/Cargo.toml | sed 's/^.*"\(.*\)"/\1/'`
+        rgb_version=`grep 'rgb = '  internal/core/Cargo.toml | sed 's/^.*"\(.*\)"/\1/'`
         echo "RUSTDOCFLAGS=$RUSTDOCFLAGS --extern-html-root-url rgb=https://docs.rs/rgb/$rgb_version/ -Z unstable-options" >> $GITHUB_ENV
     - name: Setup Node.js
       uses: actions/setup-node@v1

diff --git a/.github/workflows/updgrade_version.yaml b/.github/workflows/updgrade_version.yaml
@@ -23,13 +23,13 @@ jobs:
         git ls-files | grep Cargo.toml | xargs sed -i 's/\(sixtyfps.*version = \)"=[0-9]*\.[0-9]*\.[0-9]*"/\1"=${{ github.event.inputs.new_version }}"/'
 
         # Update the version in CmakeLists.txt
-        sed -i 's/ VERSION [0-9]*\.[0-9]*\.[0-9]*$/ VERSION ${{ github.event.inputs.new_version }}/' api/sixtyfps-cpp/CMakeLists.txt
-        sed -i "s/(CPACK_PACKAGE_VERSION_MAJOR [0-9]*)/(CPACK_PACKAGE_VERSION_MAJOR `echo ${{ github.event.inputs.new_version }} | sed "s/\([0-9]*\)\.\([0-9]*\).\([0-9]*\)/\1/"`)/" api/sixtyfps-cpp/CMakeLists.txt
-        sed -i "s/(CPACK_PACKAGE_VERSION_MINOR [0-9]*)/(CPACK_PACKAGE_VERSION_MINOR `echo ${{ github.event.inputs.new_version }} | sed "s/\([0-9]*\)\.\([0-9]*\).\([0-9]*\)/\2/"`)/" api/sixtyfps-cpp/CMakeLists.txt
-        sed -i "s/(CPACK_PACKAGE_VERSION_PATCH [0-9]*)/(CPACK_PACKAGE_VERSION_PATCH `echo ${{ github.event.inputs.new_version }} | sed "s/\([0-9]*\)\.\([0-9]*\).\([0-9]*\)/\3/"`)/" api/sixtyfps-cpp/CMakeLists.txt
+        sed -i 's/ VERSION [0-9]*\.[0-9]*\.[0-9]*$/ VERSION ${{ github.event.inputs.new_version }}/' api/cpp/CMakeLists.txt
+        sed -i "s/(CPACK_PACKAGE_VERSION_MAJOR [0-9]*)/(CPACK_PACKAGE_VERSION_MAJOR `echo ${{ github.event.inputs.new_version }} | sed "s/\([0-9]*\)\.\([0-9]*\).\([0-9]*\)/\1/"`)/" api/cpp/CMakeLists.txt
+        sed -i "s/(CPACK_PACKAGE_VERSION_MINOR [0-9]*)/(CPACK_PACKAGE_VERSION_MINOR `echo ${{ github.event.inputs.new_version }} | sed "s/\([0-9]*\)\.\([0-9]*\).\([0-9]*\)/\2/"`)/" api/cpp/CMakeLists.txt
+        sed -i "s/(CPACK_PACKAGE_VERSION_PATCH [0-9]*)/(CPACK_PACKAGE_VERSION_PATCH `echo ${{ github.event.inputs.new_version }} | sed "s/\([0-9]*\)\.\([0-9]*\).\([0-9]*\)/\3/"`)/" api/cpp/CMakeLists.txt
 
         # The version is also in these files
-        sed -i "s/^version = \"[0-9]*\.[0-9]*\.[0-9]*\"/version = \"${{ github.event.inputs.new_version }}\"/" api/sixtyfps-cpp/docs/conf.py
+        sed -i "s/^version = \"[0-9]*\.[0-9]*\.[0-9]*\"/version = \"${{ github.event.inputs.new_version }}\"/" api/cpp/docs/conf.py
 
         # Version in package.json files
         git ls-files | grep package.json | xargs sed -i 's/"version": ".*"/"version": "${{ github.event.inputs.new_version }}"/'

diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,6 @@ members = [
     'examples/slide_puzzle',
     'examples/todo/rust',
     'helper_crates/const-field-offset',
-    'helper_crates/document-features',
     'helper_crates/vtable',
     'helper_crates/vtable/macro',
     'internal/backends/gl',

diff --git a/api/cpp/README.md b/api/cpp/README.md
@@ -37,7 +37,7 @@ FetchContent_Declare(
     SixtyFPS
     GIT_REPOSITORY https://github.com/sixtyfpsui/sixtyfps.git
     GIT_TAG v0.1.6
-    SOURCE_SUBDIR api/cpp
+    SOURCE_SUBDIR api/sixtyfps-cpp
 )
 FetchContent_MakeAvailable(SixtyFPS)
 ```
@@ -113,7 +113,7 @@ FetchContent_Declare(
     SixtyFPS
     GIT_REPOSITORY https://github.com/sixtyfpsui/sixtyfps.git
     GIT_TAG v0.1.6
-    SOURCE_SUBDIR api/cpp
+    SOURCE_SUBDIR api/sixtyfps-cpp
 )
 FetchContent_MakeAvailable(SixtyFPS)
 

diff --git a/api/cpp/docs/cpp_migration.md b/api/cpp/docs/cpp_migration.md
@@ -10,6 +10,10 @@ In version 0.2.0 we have increased the minimum version of C++. You need to have
 
 If you are building SixtyFPS from source, you need to make sure that your Rust installation is up-to-date. If you have installed Rust using `rustup`, then you can upgrade to the latest Version of Rust by running `rustup update`.
 
+### CMakeLists.txt
+
+ - When using `FetchContent`, the `SOURCE_SUBDIR` has changed from `api/sixtyfps-cpp` to `api/cpp` 
+
 ### Models
 
 `Model::row_data` returns now a `std::optional<ModelData>` and can thus be used with indices that are out of bounds.

diff --git a/api/rs/slint/Cargo.toml b/api/rs/slint/Cargo.toml
@@ -53,11 +53,12 @@ slint-macros = { version = "=0.2.0", path = "../macros" }
 slint-backend-selector-internal = { version = "=0.2.0", path="../../../internal/backends/selector" }
 
 const-field-offset = { version = "0.1.2", path = "../../../helper_crates/const-field-offset" }
-document-features = { version = "0.1.0", path = "../../../helper_crates/document-features" }
+document-features = "0.1.0"
 vtable = { version = "0.1.5", path = "../../../helper_crates/vtable" }
 
 once_cell = { version = "1.5", default-features = false, features = ["alloc"] }
 pin-weak = { version = "1.1", default-features = false }
 
 [package.metadata.docs.rs]
 rustdoc-args = [ "--html-in-header", "docs/resources/slint-docs-preview.html", "--html-in-header", "docs/resources/slint-docs-highlight.html" ]
+
diff --git a/helper_crates/document-features/Cargo.toml b/helper_crates/document-features/Cargo.toml