From 7d1746bbda7b8fd8b55bb8693126fdd1a99e8530 Mon Sep 17 00:00:00 2001 From: Jean Schmidt Date: Thu, 25 Jul 2024 19:58:31 +0200 Subject: [PATCH] Replace runners prefix amz2023. --- .ci/scripts/gather_test_models.py | 18 +- .github/workflows/_unittest.yml | 2 +- .github/workflows/android.yml | 8 +- .github/workflows/doc-build.yml | 2 +- .github/workflows/docker-builds.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/pull.yml | 22 +- .github/workflows/trunk.yml | 6 +- .../android/ExecuTorchDemo/gradlew.bat | 190 +++++++++--------- .../demo-apps/android/LlamaDemo/gradlew.bat | 190 +++++++++--------- .../rust/fixups/libsqlite3-sys/fixups.toml | 38 ++-- .../windows_aarch64_gnullvm/fixups.toml | 16 +- .../fixups/windows_x86_64_gnu/fixups.toml | 16 +- .../fixups/windows_x86_64_gnullvm/fixups.toml | 16 +- .../fixups/windows_x86_64_msvc/fixups.toml | 16 +- 15 files changed, 272 insertions(+), 272 deletions(-) diff --git a/.ci/scripts/gather_test_models.py b/.ci/scripts/gather_test_models.py index 55289140c40..689a5beca7e 100755 --- a/.ci/scripts/gather_test_models.py +++ b/.ci/scripts/gather_test_models.py @@ -14,19 +14,19 @@ from examples.xnnpack import MODEL_NAME_TO_OPTIONS DEFAULT_RUNNERS = { - "linux": "linux.2xlarge", + "linux": "amz2023.linux.2xlarge", "macos": "macos-m1-stable", } CUSTOM_RUNNERS = { "linux": { # This one runs OOM on smaller runner, the root cause is unclear (T163016365) - "w2l": "linux.12xlarge", - "ic4": "linux.12xlarge", - "resnet50": "linux.12xlarge", - "llava": "linux.12xlarge", + "w2l": "amz2023.linux.12xlarge", + "ic4": "amz2023.linux.12xlarge", + "resnet50": "amz2023.linux.12xlarge", + "llava": "amz2023.linux.12xlarge", # This one causes timeout on smaller runner, the root cause is unclear (T161064121) - "dl3": "linux.12xlarge", - "emformer_join": "linux.12xlarge", + "dl3": "amz2023.linux.12xlarge", + "emformer_join": "amz2023.linux.12xlarge", } } @@ -116,7 +116,7 @@ def export_models_for_ci() -> dict[str, dict]: "build-tool": "buck2", "model": "mv3", "backend": backend, - "runner": "linux.2xlarge", + "runner": "amz2023.linux.2xlarge", "timeout": DEFAULT_TIMEOUT, } models["include"].append(record) @@ -145,7 +145,7 @@ def export_models_for_ci() -> dict[str, dict]: "build-tool": "cmake", "model": name, "backend": backend, - "runner": DEFAULT_RUNNERS.get(target_os, "linux.2xlarge"), + "runner": DEFAULT_RUNNERS.get(target_os, "amz2023.linux.2xlarge"), "timeout": DEFAULT_TIMEOUT, } diff --git a/.github/workflows/_unittest.yml b/.github/workflows/_unittest.yml index a53026bc129..b857bdce746 100644 --- a/.github/workflows/_unittest.yml +++ b/.github/workflows/_unittest.yml @@ -16,7 +16,7 @@ jobs: linux: uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: ${{ inputs.docker-image }} submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 7b3d8ab9a89..54e58b3fdef 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -28,7 +28,7 @@ jobs: matrix: tokenizer: [bpe, tiktoken] with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12-android submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -49,7 +49,7 @@ jobs: # Upload artifacts to S3. The artifacts are needed not only by the device farm but also TorchChat upload-artifacts: needs: build-llm-demo - runs-on: linux.2xlarge + runs-on: amz2023.linux.2xlarge steps: - name: Download the artifacts from GitHub uses: actions/download-artifact@v3 @@ -81,7 +81,7 @@ jobs: # Running Android emulator directly on the runner and not using Docker run-emulator: needs: build-llm-demo - runs-on: amz2023.linux.4xlarge + runs-on: amz2023.amz2023.linux.4xlarge env: ANDROID_NDK_VERSION: r26c API_LEVEL: 34 @@ -161,7 +161,7 @@ jobs: tokenizer: [bpe] with: device-type: android - runner: linux.2xlarge + runner: amz2023.linux.2xlarge test-infra-ref: '' # This is the ARN of ExecuTorch project on AWS project-arn: arn:aws:devicefarm:us-west-2:308535385114:project:02a2cf0f-6d9b-45ee-ba1a-a086587469e6 diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 7a3b862b217..6c55efa827d 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -22,7 +22,7 @@ jobs: - build-tool: buck2 with: job-name: Build doc - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' repository: pytorch/executorch diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index f773f3aca88..5f292b82a3c 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -28,7 +28,7 @@ concurrency: jobs: docker-build: - runs-on: [self-hosted, linux.2xlarge] + runs-on: [self-hosted, amz2023.linux.2xlarge] timeout-minutes: 240 strategy: fail-fast: false diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7cb2cf69b8b..4dab7f1117d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,7 @@ jobs: lintrunner: uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-linter fetch-depth: 0 ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 36099ca6515..614442db717 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -40,7 +40,7 @@ jobs: - build-tool: cmake fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-gcc9 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -93,7 +93,7 @@ jobs: mode: [portable, xnnpack+custom, xnnpack+custom+qe] fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -123,7 +123,7 @@ jobs: - build-tool: cmake fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12-android submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -147,7 +147,7 @@ jobs: - build-tool: cmake fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -172,7 +172,7 @@ jobs: - build-tool: cmake fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -193,7 +193,7 @@ jobs: strategy: fail-fast: false with: - runner: linux.12xlarge + runner: amz2023.linux.12xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -230,7 +230,7 @@ jobs: - build-tool: cmake fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -253,7 +253,7 @@ jobs: - build-tool: cmake fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -279,7 +279,7 @@ jobs: strategy: fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-gcc9 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -311,7 +311,7 @@ jobs: strategy: fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -349,7 +349,7 @@ jobs: include: - build-tool: buck2 with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-arm-sdk submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index 9b28d26048b..d805654a294 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -114,7 +114,7 @@ jobs: - build-tool: cmake fail-fast: false with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12 submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -132,7 +132,7 @@ jobs: name: test-arm-backend-delegation uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-arm-sdk submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -158,7 +158,7 @@ jobs: name: test-arm-reference-delegation uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: - runner: linux.2xlarge + runner: amz2023.linux.2xlarge docker-image: executorch-ubuntu-22.04-arm-sdk submodules: 'true' ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} diff --git a/examples/demo-apps/android/ExecuTorchDemo/gradlew.bat b/examples/demo-apps/android/ExecuTorchDemo/gradlew.bat index b4fb785a6d0..ae92ce0f742 100644 --- a/examples/demo-apps/android/ExecuTorchDemo/gradlew.bat +++ b/examples/demo-apps/android/ExecuTorchDemo/gradlew.bat @@ -1,95 +1,95 @@ -@REM Copyright (c) Meta Platforms, Inc. and affiliates. -@REM All rights reserved. -@REM -@REM This source code is licensed under the BSD-style license found in the -@REM LICENSE file in the root directory of this source tree. - -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@REM Copyright (c) Meta Platforms, Inc. and affiliates. +@REM All rights reserved. +@REM +@REM This source code is licensed under the BSD-style license found in the +@REM LICENSE file in the root directory of this source tree. + +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/demo-apps/android/LlamaDemo/gradlew.bat b/examples/demo-apps/android/LlamaDemo/gradlew.bat index b4fb785a6d0..ae92ce0f742 100644 --- a/examples/demo-apps/android/LlamaDemo/gradlew.bat +++ b/examples/demo-apps/android/LlamaDemo/gradlew.bat @@ -1,95 +1,95 @@ -@REM Copyright (c) Meta Platforms, Inc. and affiliates. -@REM All rights reserved. -@REM -@REM This source code is licensed under the BSD-style license found in the -@REM LICENSE file in the root directory of this source tree. - -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@REM Copyright (c) Meta Platforms, Inc. and affiliates. +@REM All rights reserved. +@REM +@REM This source code is licensed under the BSD-style license found in the +@REM LICENSE file in the root directory of this source tree. + +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/shim/third-party/rust/fixups/libsqlite3-sys/fixups.toml b/shim/third-party/rust/fixups/libsqlite3-sys/fixups.toml index b82bb848a22..e78c72fd340 100644 --- a/shim/third-party/rust/fixups/libsqlite3-sys/fixups.toml +++ b/shim/third-party/rust/fixups/libsqlite3-sys/fixups.toml @@ -1,19 +1,19 @@ -# libsqlite3-sys uses a bindgen binding to libsqlite. -# We can't easily import bindgen because of its libclang dependency, -# so in the meantime we need to use pre-generated bindgen files. - -extra_mapped_srcs = {"sqlite3/bindgen_bundled_version.rs" = "src/bindgen.rs"} - -[env] -OUT_DIR = "." - -[[buildscript]] -[buildscript.cxx_library] -name = "sqlite3" -srcs = ["sqlite3/sqlite3.c"] -headers = ["sqlite3/*.h"] -preprocessor_flags = [ - "-DSQLITE_ENABLE_COLUMN_METADATA", - "-DSQLITE_ENABLE_FTS3", - "-DSQLITE_ENABLE_RTREE", -] +# libsqlite3-sys uses a bindgen binding to libsqlite. +# We can't easily import bindgen because of its libclang dependency, +# so in the meantime we need to use pre-generated bindgen files. + +extra_mapped_srcs = {"sqlite3/bindgen_bundled_version.rs" = "src/bindgen.rs"} + +[env] +OUT_DIR = "." + +[[buildscript]] +[buildscript.cxx_library] +name = "sqlite3" +srcs = ["sqlite3/sqlite3.c"] +headers = ["sqlite3/*.h"] +preprocessor_flags = [ + "-DSQLITE_ENABLE_COLUMN_METADATA", + "-DSQLITE_ENABLE_FTS3", + "-DSQLITE_ENABLE_RTREE", +] diff --git a/shim/third-party/rust/fixups/windows_aarch64_gnullvm/fixups.toml b/shim/third-party/rust/fixups/windows_aarch64_gnullvm/fixups.toml index f40e9f9cbe6..2cf72155ee0 100644 --- a/shim/third-party/rust/fixups/windows_aarch64_gnullvm/fixups.toml +++ b/shim/third-party/rust/fixups/windows_aarch64_gnullvm/fixups.toml @@ -1,8 +1,8 @@ -buildscript = [] - -[platform_fixup.'cfg(all(target_os = "linux", target_arch = "aarch64"))'] -version = "=0.48.0" -[[platform_fixup.'cfg(all(target_os = "linux", target_arch = "aarch64"))'.buildscript]] -[platform_fixup.'cfg(all(target_os = "linux", target_arch = "aarch64"))'.buildscript.prebuilt_cxx_library] -name = "libwindows" -static_libs = ["lib/libwindows.0.48.0.a"] +buildscript = [] + +[platform_fixup.'cfg(all(target_os = "linux", target_arch = "aarch64"))'] +version = "=0.48.0" +[[platform_fixup.'cfg(all(target_os = "linux", target_arch = "aarch64"))'.buildscript]] +[platform_fixup.'cfg(all(target_os = "linux", target_arch = "aarch64"))'.buildscript.prebuilt_cxx_library] +name = "libwindows" +static_libs = ["lib/libwindows.0.48.0.a"] diff --git a/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml b/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml index b25e7f05fa5..a96cd332821 100644 --- a/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml +++ b/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml @@ -1,8 +1,8 @@ -buildscript = [] - -[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'] -version = "=0.48.0" -[[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'.buildscript]] -[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'.buildscript.prebuilt_cxx_library] -name = "libwindows" -static_libs = ["lib/libwindows.0.48.0.a"] +buildscript = [] + +[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'] +version = "=0.48.0" +[[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'.buildscript]] +[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'.buildscript.prebuilt_cxx_library] +name = "libwindows" +static_libs = ["lib/libwindows.0.48.0.a"] diff --git a/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml b/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml index a5579b6930e..2b23adc73c0 100644 --- a/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml +++ b/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml @@ -1,8 +1,8 @@ -buildscript = [] - -[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'] -version = "=0.48.0" -[[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.buildscript]] -[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.buildscript.prebuilt_cxx_library] -name = "libwindows" -static_libs = ["lib/libwindows.0.48.0.a"] +buildscript = [] + +[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'] +version = "=0.48.0" +[[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.buildscript]] +[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.buildscript.prebuilt_cxx_library] +name = "libwindows" +static_libs = ["lib/libwindows.0.48.0.a"] diff --git a/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml b/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml index 8e8dea35165..dd8b33112b3 100644 --- a/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml +++ b/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml @@ -1,8 +1,8 @@ -buildscript = [] - -[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'] -version = "=0.48.0" -[[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'.buildscript]] -[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'.buildscript.prebuilt_cxx_library] -name = "windows" -static_libs = ["lib/windows.0.48.0.lib"] +buildscript = [] + +[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'] +version = "=0.48.0" +[[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'.buildscript]] +[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'.buildscript.prebuilt_cxx_library] +name = "windows" +static_libs = ["lib/windows.0.48.0.lib"]