mirror of
https://github.com/lightsoutgames/godot-tts
synced 2024-10-03 09:45:57 +00:00
Merge branch 'master' into v0.6
This commit is contained in:
commit
705126ef2f
37
.github/workflows/build.yml
vendored
37
.github/workflows/build.yml
vendored
|
@ -2,35 +2,42 @@ name: Build
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: [ master ]
|
||||
branches: [master]
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
|
||||
build_linux:
|
||||
name: Build Linux
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libspeechd-dev
|
||||
cargo build --release --verbose
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libspeechd-dev
|
||||
cargo build --release
|
||||
|
||||
build_windows:
|
||||
name: Build Windows
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
choco install -y llvm
|
||||
cargo build --release --verbose
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
choco install -y llvm
|
||||
cargo build --release
|
||||
|
||||
build_macos:
|
||||
name: Build MacOS
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
cargo build --release
|
||||
|
||||
build_android:
|
||||
name: Build Android
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
./gradlew assemble
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
./gradlew assemble
|
||||
|
|
135
.github/workflows/release.yml
vendored
135
.github/workflows/release.yml
vendored
|
@ -3,78 +3,95 @@ name: Release
|
|||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
- "v*"
|
||||
|
||||
jobs:
|
||||
|
||||
build_linux:
|
||||
name: Build Linux
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libspeechd-dev
|
||||
cargo build --release --verbose
|
||||
mv target linux
|
||||
- uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: linux
|
||||
path: linux
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libspeechd-dev
|
||||
cargo build --release --verbose
|
||||
mv target linux
|
||||
- uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: linux
|
||||
path: linux
|
||||
|
||||
build_windows:
|
||||
name: Build Windows
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
choco install -y llvm
|
||||
cargo build --release --verbose
|
||||
move target windows
|
||||
- uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: windows
|
||||
path: windows
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
choco install -y llvm
|
||||
cargo build --release --verbose
|
||||
move target windows
|
||||
- uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: windows
|
||||
path: windows
|
||||
|
||||
build_macos:
|
||||
name: Build MacOS
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
cargo build --release
|
||||
mv target macos
|
||||
- uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: macos
|
||||
path: macos
|
||||
|
||||
package:
|
||||
name: Package
|
||||
runs-on: ubuntu-latest
|
||||
needs: [build_linux, build_windows]
|
||||
needs: [build_linux, build_windows, build_macos]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/download-artifact@v1
|
||||
with:
|
||||
name: linux
|
||||
- uses: actions/download-artifact@v1
|
||||
with:
|
||||
name: windows
|
||||
- run: |
|
||||
mkdir godot-tts
|
||||
cp godot-tts.gdnlib.release godot-tts/godot-tts.gdnlib
|
||||
mkdir -p godot-tts/target/release
|
||||
cp linux/release/*.so godot-tts/target/release
|
||||
cp windows/release/*.dll godot-tts/target/release
|
||||
cp LICENSE godot-tts
|
||||
cp TTS.gd godot-tts.g* godot-tts
|
||||
cp godot-tts.gdnlib.release godot-tts/godot-tts.gdnlib
|
||||
rm godot-tts/*.release
|
||||
cp -R android godot-tts
|
||||
zip -r9 godot-tts godot-tts
|
||||
- uses: actions/create-release@v1
|
||||
id: create_release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ github.ref }}
|
||||
release_name: Release ${{ github.ref }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
- uses: actions/upload-release-asset@v1
|
||||
id: upload-release-asset
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./godot-tts.zip
|
||||
asset_name: godot-tts.zip
|
||||
asset_content_type: application/zip
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/download-artifact@v1
|
||||
with:
|
||||
name: linux
|
||||
- uses: actions/download-artifact@v1
|
||||
with:
|
||||
name: windows
|
||||
- uses: actions/download-artifact@v1
|
||||
with:
|
||||
name: macos
|
||||
- run: |
|
||||
mkdir godot-tts
|
||||
cp godot-tts.gdnlib.release godot-tts/godot-tts.gdnlib
|
||||
mkdir -p godot-tts/target/release
|
||||
cp linux/release/*.so godot-tts/target/release
|
||||
cp windows/release/*.dll godot-tts/target/release
|
||||
cp macos/release/*.dylib godot-tts/target/release
|
||||
cp LICENSE godot-tts
|
||||
cp README.md godot-tts
|
||||
cp TTS.gd godot-tts.g* godot-tts
|
||||
cp godot-tts.gdnlib.release godot-tts/godot-tts.gdnlib
|
||||
rm godot-tts/*.release
|
||||
cp -R android godot-tts
|
||||
zip -r9 godot-tts godot-tts
|
||||
- uses: actions/create-release@v1
|
||||
id: create_release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ github.ref }}
|
||||
release_name: Release ${{ github.ref }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
- uses: actions/upload-release-asset@v1
|
||||
id: upload-release-asset
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./godot-tts.zip
|
||||
asset_name: godot-tts.zip
|
||||
asset_content_type: application/zip
|
||||
|
|
|
@ -10,7 +10,7 @@ crate-type = ["cdylib"]
|
|||
[dependencies]
|
||||
env_logger = "0.7"
|
||||
gdnative = "0.8"
|
||||
tts = "0.3"
|
||||
tts = "0.5"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
tolk = "0.2"
|
||||
tolk = "0.2"
|
||||
|
|
10
TTS.gd
10
TTS.gd
|
@ -7,9 +7,7 @@ var tts
|
|||
|
||||
signal done
|
||||
|
||||
|
||||
func _ready():
|
||||
pause_mode = Node.PAUSE_MODE_PROCESS
|
||||
func _init():
|
||||
if OS.get_name() == "Server" or OS.has_feature("JavaScript"):
|
||||
return
|
||||
elif Engine.has_singleton("AndroidTTS"):
|
||||
|
@ -22,6 +20,10 @@ func _ready():
|
|||
print_debug("TTS not available!")
|
||||
|
||||
|
||||
|
||||
func _ready():
|
||||
pause_mode = Node.PAUSE_MODE_PROCESS
|
||||
|
||||
func _get_min_rate():
|
||||
if OS.has_feature('JavaScript'):
|
||||
return 0.1
|
||||
|
@ -217,10 +219,8 @@ var _was_speaking = false
|
|||
|
||||
func _process(delta):
|
||||
if self.is_speaking:
|
||||
print("xxx Speaking")
|
||||
_was_speaking = true
|
||||
elif _was_speaking:
|
||||
print("xxx Done")
|
||||
emit_signal("done")
|
||||
_was_speaking = false
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@ Server.64="res://addons/godot-tts/target/debug/libgodot_tts.so"
|
|||
Windows.64="res://addons/godot-tts/target/debug/godot_tts.dll"
|
||||
UWP.64="res://addons/godot-tts/target/debug/godot_tts.dll"
|
||||
X11.64="res://addons/godot-tts/target/debug/libgodot_tts.so"
|
||||
OSX.64="res://addons/godot-tts/target/debug/libgodot_tts.dylib"
|
||||
|
||||
[dependencies]
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@ Server.64="res://addons/godot-tts/target/release/libgodot_tts.so"
|
|||
Windows.64="res://addons/godot-tts/target/release/godot_tts.dll"
|
||||
UWP.64="res://addons/godot-tts/target/release/godot_tts.dll"
|
||||
X11.64="res://addons/godot-tts/target/release/libgodot_tts.so"
|
||||
OSX.64="res://addons/godot-tts/target/release/libgodot_tts.dylib"
|
||||
|
||||
[dependencies]
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user