diff --git a/Makefile.am b/Makefile.am index f727ebef..11597b22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,14 +125,14 @@ espeak-data/phontab: src/espeakedit espeak-data/dir.stamp espeak-data/dictsource ##### android language data packs: -res/raw/espeakdata.zip: espeak-data/dir.stamp espeak-data/phontab dictionaries +android/res/raw/espeakdata.zip: espeak-data/dir.stamp espeak-data/phontab dictionaries rm -f $@ zip -r $@ \ espeak-data/intonations \ espeak-data/phondata espeak-data/phonindex espeak-data/phontab \ espeak-data/*_dict espeak-data/voices -android: res/raw/espeakdata.zip +android: android/res/raw/espeakdata.zip ##### dictionaries: diff --git a/README.md b/README.md index 67708ac0..9a8e1306 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,14 @@ configured correctly: 1. Build the `libttsespeak.so` file by running: + $ cd android $ ndk-build 2. Open Eclipse. 3. Create a new workspace. 4. Import the espeak folder as an exising Android project. 5. Build the espeak apk within Eclipse. -In order to build the `espeak-data.zip` and `espeak-data-en_only.zip` data files, you need to run the following commands: +In order to build the `espeakdata.zip` file in `android/res/raw`, you need to run the following commands: $ ./autogen.sh $ ./configure --prefix=/usr @@ -35,8 +36,10 @@ In order to build the `espeak-data.zip` and `espeak-data-en_only.zip` data files The generated `eSpeakActivity.apk` can be installed like any other apk build via eclipse, such as by using the `Run` menu option. -After running, `eSpeakActivity` will download the `espeak-data.zip` file. To -enable eSpeak, you need to: +After running, `eSpeakActivity` will extract the `espeakdata.zip` file into its +own data directory to set up the available voices. + +To enable eSpeak, you need to: 1. go into the Android `Text-to-Speech settings` UI; 2. enable `eSpeak TTS` in the `Engines` section; diff --git a/.classpath b/android/.classpath similarity index 100% rename from .classpath rename to android/.classpath diff --git a/.project b/android/.project similarity index 100% rename from .project rename to android/.project diff --git a/AndroidManifest.xml b/android/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to android/AndroidManifest.xml diff --git a/jni/Android.mk b/android/jni/Android.mk similarity index 97% rename from jni/Android.mk rename to android/jni/Android.mk index 7d3e3255..5a128502 100644 --- a/jni/Android.mk +++ b/android/jni/Android.mk @@ -20,7 +20,7 @@ BLACKLIST_SRC_FILES := \ %/voicedlg.cpp \ %/vowelchart.cpp -ESPEAK_SRC_PATH := ../src +ESPEAK_SRC_PATH := ../../src ESPEAK_SRC_FILES := \ $(subst $(LOCAL_PATH)/$(ESPEAK_SRC_PATH),$(ESPEAK_SRC_PATH),$(wildcard $(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/*.c*)) diff --git a/jni/Application.mk b/android/jni/Application.mk similarity index 100% rename from jni/Application.mk rename to android/jni/Application.mk diff --git a/jni/include/Log.h b/android/jni/include/Log.h similarity index 100% rename from jni/include/Log.h rename to android/jni/include/Log.h diff --git a/jni/include/TtsEngine.h b/android/jni/include/TtsEngine.h similarity index 100% rename from jni/include/TtsEngine.h rename to android/jni/include/TtsEngine.h diff --git a/jni/jni/com_google_espeakengine.cpp b/android/jni/jni/com_google_espeakengine.cpp similarity index 100% rename from jni/jni/com_google_espeakengine.cpp rename to android/jni/jni/com_google_espeakengine.cpp diff --git a/jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp b/android/jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp similarity index 100% rename from jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp rename to android/jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp diff --git a/project.properties b/android/project.properties similarity index 100% rename from project.properties rename to android/project.properties diff --git a/res/drawable-hdpi/ic_sysbar_quicksettings.png b/android/res/drawable-hdpi/ic_sysbar_quicksettings.png similarity index 100% rename from res/drawable-hdpi/ic_sysbar_quicksettings.png rename to android/res/drawable-hdpi/ic_sysbar_quicksettings.png diff --git a/res/drawable-hdpi/ic_volume.png b/android/res/drawable-hdpi/ic_volume.png similarity index 100% rename from res/drawable-hdpi/ic_volume.png rename to android/res/drawable-hdpi/ic_volume.png diff --git a/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png b/android/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png similarity index 100% rename from res/drawable-hdpi/ic_volume_bluetooth_ad2p.png rename to android/res/drawable-hdpi/ic_volume_bluetooth_ad2p.png diff --git a/res/drawable-hdpi/ic_volume_bluetooth_in_call.png b/android/res/drawable-hdpi/ic_volume_bluetooth_in_call.png similarity index 100% rename from res/drawable-hdpi/ic_volume_bluetooth_in_call.png rename to android/res/drawable-hdpi/ic_volume_bluetooth_in_call.png diff --git a/res/drawable-hdpi/ic_volume_small.png b/android/res/drawable-hdpi/ic_volume_small.png similarity index 100% rename from res/drawable-hdpi/ic_volume_small.png rename to android/res/drawable-hdpi/ic_volume_small.png diff --git a/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png similarity index 100% rename from res/drawable-hdpi/icon.png rename to android/res/drawable-hdpi/icon.png diff --git a/res/drawable-hdpi/stat_sys_tether_bluetooth.png b/android/res/drawable-hdpi/stat_sys_tether_bluetooth.png similarity index 100% rename from res/drawable-hdpi/stat_sys_tether_bluetooth.png rename to android/res/drawable-hdpi/stat_sys_tether_bluetooth.png diff --git a/res/drawable/icon.png b/android/res/drawable/icon.png similarity index 100% rename from res/drawable/icon.png rename to android/res/drawable/icon.png diff --git a/res/layout/download_voice_data.xml b/android/res/layout/download_voice_data.xml similarity index 100% rename from res/layout/download_voice_data.xml rename to android/res/layout/download_voice_data.xml diff --git a/res/layout/main.xml b/android/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to android/res/layout/main.xml diff --git a/res/raw/espeakdata.zip b/android/res/raw/espeakdata.zip similarity index 100% rename from res/raw/espeakdata.zip rename to android/res/raw/espeakdata.zip diff --git a/res/values-af/strings.xml b/android/res/values-af/strings.xml similarity index 100% rename from res/values-af/strings.xml rename to android/res/values-af/strings.xml diff --git a/res/values-am/strings.xml b/android/res/values-am/strings.xml similarity index 100% rename from res/values-am/strings.xml rename to android/res/values-am/strings.xml diff --git a/res/values-ar/strings.xml b/android/res/values-ar/strings.xml similarity index 100% rename from res/values-ar/strings.xml rename to android/res/values-ar/strings.xml diff --git a/res/values-bg/strings.xml b/android/res/values-bg/strings.xml similarity index 100% rename from res/values-bg/strings.xml rename to android/res/values-bg/strings.xml diff --git a/res/values-ca/strings.xml b/android/res/values-ca/strings.xml similarity index 100% rename from res/values-ca/strings.xml rename to android/res/values-ca/strings.xml diff --git a/res/values-cs/strings.xml b/android/res/values-cs/strings.xml similarity index 100% rename from res/values-cs/strings.xml rename to android/res/values-cs/strings.xml diff --git a/res/values-da/strings.xml b/android/res/values-da/strings.xml similarity index 100% rename from res/values-da/strings.xml rename to android/res/values-da/strings.xml diff --git a/res/values-de/strings.xml b/android/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to android/res/values-de/strings.xml diff --git a/res/values-el/strings.xml b/android/res/values-el/strings.xml similarity index 100% rename from res/values-el/strings.xml rename to android/res/values-el/strings.xml diff --git a/res/values-en-rGB/strings.xml b/android/res/values-en-rGB/strings.xml similarity index 100% rename from res/values-en-rGB/strings.xml rename to android/res/values-en-rGB/strings.xml diff --git a/res/values-es-rUS/strings.xml b/android/res/values-es-rUS/strings.xml similarity index 100% rename from res/values-es-rUS/strings.xml rename to android/res/values-es-rUS/strings.xml diff --git a/res/values-es/strings.xml b/android/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to android/res/values-es/strings.xml diff --git a/res/values-fa/strings.xml b/android/res/values-fa/strings.xml similarity index 100% rename from res/values-fa/strings.xml rename to android/res/values-fa/strings.xml diff --git a/res/values-fi/strings.xml b/android/res/values-fi/strings.xml similarity index 100% rename from res/values-fi/strings.xml rename to android/res/values-fi/strings.xml diff --git a/res/values-fr/strings.xml b/android/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to android/res/values-fr/strings.xml diff --git a/res/values-hi/strings.xml b/android/res/values-hi/strings.xml similarity index 100% rename from res/values-hi/strings.xml rename to android/res/values-hi/strings.xml diff --git a/res/values-hr/strings.xml b/android/res/values-hr/strings.xml similarity index 100% rename from res/values-hr/strings.xml rename to android/res/values-hr/strings.xml diff --git a/res/values-hu/strings.xml b/android/res/values-hu/strings.xml similarity index 100% rename from res/values-hu/strings.xml rename to android/res/values-hu/strings.xml diff --git a/res/values-in/strings.xml b/android/res/values-in/strings.xml similarity index 100% rename from res/values-in/strings.xml rename to android/res/values-in/strings.xml diff --git a/res/values-it/strings.xml b/android/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to android/res/values-it/strings.xml diff --git a/res/values-iw/strings.xml b/android/res/values-iw/strings.xml similarity index 100% rename from res/values-iw/strings.xml rename to android/res/values-iw/strings.xml diff --git a/res/values-ja/strings.xml b/android/res/values-ja/strings.xml similarity index 100% rename from res/values-ja/strings.xml rename to android/res/values-ja/strings.xml diff --git a/res/values-ko/strings.xml b/android/res/values-ko/strings.xml similarity index 100% rename from res/values-ko/strings.xml rename to android/res/values-ko/strings.xml diff --git a/res/values-lt/strings.xml b/android/res/values-lt/strings.xml similarity index 100% rename from res/values-lt/strings.xml rename to android/res/values-lt/strings.xml diff --git a/res/values-lv/strings.xml b/android/res/values-lv/strings.xml similarity index 100% rename from res/values-lv/strings.xml rename to android/res/values-lv/strings.xml diff --git a/res/values-ms/strings.xml b/android/res/values-ms/strings.xml similarity index 100% rename from res/values-ms/strings.xml rename to android/res/values-ms/strings.xml diff --git a/res/values-nb/strings.xml b/android/res/values-nb/strings.xml similarity index 100% rename from res/values-nb/strings.xml rename to android/res/values-nb/strings.xml diff --git a/res/values-nl/strings.xml b/android/res/values-nl/strings.xml similarity index 100% rename from res/values-nl/strings.xml rename to android/res/values-nl/strings.xml diff --git a/res/values-pl/strings.xml b/android/res/values-pl/strings.xml similarity index 100% rename from res/values-pl/strings.xml rename to android/res/values-pl/strings.xml diff --git a/res/values-pt-rPT/strings.xml b/android/res/values-pt-rPT/strings.xml similarity index 100% rename from res/values-pt-rPT/strings.xml rename to android/res/values-pt-rPT/strings.xml diff --git a/res/values-pt/strings.xml b/android/res/values-pt/strings.xml similarity index 100% rename from res/values-pt/strings.xml rename to android/res/values-pt/strings.xml diff --git a/res/values-ro/strings.xml b/android/res/values-ro/strings.xml similarity index 100% rename from res/values-ro/strings.xml rename to android/res/values-ro/strings.xml diff --git a/res/values-ru/strings.xml b/android/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to android/res/values-ru/strings.xml diff --git a/res/values-sk/strings.xml b/android/res/values-sk/strings.xml similarity index 100% rename from res/values-sk/strings.xml rename to android/res/values-sk/strings.xml diff --git a/res/values-sl/strings.xml b/android/res/values-sl/strings.xml similarity index 100% rename from res/values-sl/strings.xml rename to android/res/values-sl/strings.xml diff --git a/res/values-sr/strings.xml b/android/res/values-sr/strings.xml similarity index 100% rename from res/values-sr/strings.xml rename to android/res/values-sr/strings.xml diff --git a/res/values-sv/strings.xml b/android/res/values-sv/strings.xml similarity index 100% rename from res/values-sv/strings.xml rename to android/res/values-sv/strings.xml diff --git a/res/values-sw/strings.xml b/android/res/values-sw/strings.xml similarity index 100% rename from res/values-sw/strings.xml rename to android/res/values-sw/strings.xml diff --git a/res/values-th/strings.xml b/android/res/values-th/strings.xml similarity index 100% rename from res/values-th/strings.xml rename to android/res/values-th/strings.xml diff --git a/res/values-tl/strings.xml b/android/res/values-tl/strings.xml similarity index 100% rename from res/values-tl/strings.xml rename to android/res/values-tl/strings.xml diff --git a/res/values-tr/strings.xml b/android/res/values-tr/strings.xml similarity index 100% rename from res/values-tr/strings.xml rename to android/res/values-tr/strings.xml diff --git a/res/values-uk/strings.xml b/android/res/values-uk/strings.xml similarity index 100% rename from res/values-uk/strings.xml rename to android/res/values-uk/strings.xml diff --git a/res/values-vi/strings.xml b/android/res/values-vi/strings.xml similarity index 100% rename from res/values-vi/strings.xml rename to android/res/values-vi/strings.xml diff --git a/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to android/res/values-zh-rCN/strings.xml diff --git a/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml similarity index 100% rename from res/values-zh-rTW/strings.xml rename to android/res/values-zh-rTW/strings.xml diff --git a/res/values-zu/strings.xml b/android/res/values-zu/strings.xml similarity index 100% rename from res/values-zu/strings.xml rename to android/res/values-zu/strings.xml diff --git a/res/values/donottranslate.xml b/android/res/values/donottranslate.xml similarity index 100% rename from res/values/donottranslate.xml rename to android/res/values/donottranslate.xml diff --git a/res/values/strings.xml b/android/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to android/res/values/strings.xml diff --git a/res/xml/preferences.xml b/android/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to android/res/xml/preferences.xml diff --git a/res/xml/tts_engine.xml b/android/res/xml/tts_engine.xml similarity index 100% rename from res/xml/tts_engine.xml rename to android/res/xml/tts_engine.xml diff --git a/src/com/googlecode/eyesfree/espeak/CheckVoiceData.java b/android/src/com/googlecode/eyesfree/espeak/CheckVoiceData.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/CheckVoiceData.java rename to android/src/com/googlecode/eyesfree/espeak/CheckVoiceData.java diff --git a/src/com/googlecode/eyesfree/espeak/DownloadVoiceData.java b/android/src/com/googlecode/eyesfree/espeak/DownloadVoiceData.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/DownloadVoiceData.java rename to android/src/com/googlecode/eyesfree/espeak/DownloadVoiceData.java diff --git a/src/com/googlecode/eyesfree/espeak/GetSampleText.java b/android/src/com/googlecode/eyesfree/espeak/GetSampleText.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/GetSampleText.java rename to android/src/com/googlecode/eyesfree/espeak/GetSampleText.java diff --git a/src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java b/android/src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java rename to android/src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java diff --git a/src/com/googlecode/eyesfree/espeak/TtsService.java b/android/src/com/googlecode/eyesfree/espeak/TtsService.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/TtsService.java rename to android/src/com/googlecode/eyesfree/espeak/TtsService.java diff --git a/src/com/googlecode/eyesfree/espeak/TtsSettingsActivity.java b/android/src/com/googlecode/eyesfree/espeak/TtsSettingsActivity.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/TtsSettingsActivity.java rename to android/src/com/googlecode/eyesfree/espeak/TtsSettingsActivity.java diff --git a/src/com/googlecode/eyesfree/espeak/eSpeak.java b/android/src/com/googlecode/eyesfree/espeak/eSpeak.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/eSpeak.java rename to android/src/com/googlecode/eyesfree/espeak/eSpeak.java diff --git a/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java b/android/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/eSpeakActivity.java rename to android/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java diff --git a/src/com/googlecode/eyesfree/espeak/providers/SettingsProvider.java b/android/src/com/googlecode/eyesfree/espeak/providers/SettingsProvider.java similarity index 100% rename from src/com/googlecode/eyesfree/espeak/providers/SettingsProvider.java rename to android/src/com/googlecode/eyesfree/espeak/providers/SettingsProvider.java