1 files changed, 96 insertions, 36 deletions

diff --git a/tools/builds.pm b/tools/builds.pm
index 75d34dc079..0b7c768888 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -16,7 +16,7 @@ $releasenotes="/wiki/ReleaseNotes315";
 #    icon => 'modelname3',               # optional (uses modelname3's icon)
 #    voice => 'modelname4'               # optional (uses modelname4's voice)
 #    release => '3.14',                  # optional (final release version, if different from above)
-#    manualok => 1,                      # optional (builds manual even if target is not stable)
+#    manualok => 1,                      # optional (defaults 1 for status 3 and 0 for rest)
 # }
 
 %builds = (
@@ -71,10 +71,12 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'gogearhdd1630' => {
         name => 'Philips GoGear HDD1630',
+        manualok => 0,
         status => 3,
     },
     'gogearhdd6330' => {
         name => 'Philips GoGear HDD6330',
+        manualok => 0,
         status => 3,
     },
     'gogearsa9200' => {
@@ -369,6 +371,7 @@ $releasenotes="/wiki/ReleaseNotes315";
     'creativezenxfi3' => {
         name => 'Creative Zen X-Fi3',
         status => 3,
+        manualok => 0,
     },
     'sonynwze350' => {
         name => 'Sony NWZ-E350',
@@ -378,10 +381,12 @@ $releasenotes="/wiki/ReleaseNotes315";
     'sonynwze360' => {
         name => 'Sony NWZ-E360',
         status => 3,
+        manualok => 0,
     },
     'sonynwze370' => {
         name => 'Sony NWZ-E370/E380',
         status => 3,
+        manualok => 0,
     },
     'sonynwze450' => {
         name => 'Sony NWZ-E450',
@@ -424,11 +429,13 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'creativezenxfi' => {
         name => 'Creative Zen X-Fi',
-        status => 3
+        status => 3,
+        manualok => 0,
     },
     'creativezenxfistyle' => {
         name => 'Creative Zen X-Fi Style',
-        status => 3
+        status => 3,
+        manualok => 0,
     },
     'creativezen' => {
         name => 'Creative Zen',
@@ -436,24 +443,30 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'creativezenmozaic' => {
         name => 'Creative Zen Mozaic',
-        status => 3
+        status => 3,
+        manualok => 0,
     },
     'agptekrocker' => {
         name => 'Agptek Rocker',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'xduoox3' => {
         name => 'xDuoo X3',
         status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'xduoox3ii' => {
         name => 'xDuoo X3ii',
-        status => 2,
+        manualok => 0,     # Remove when manual is written
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'xduoox20' => {
         name => 'xDuoo X20',
-        status => 2,
+        manualok => 0,     # Remove when manual is written
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'fiiom3klinux' => {
         name => 'FiiO M3K (Linux)',
@@ -461,16 +474,17 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'fiiom3k' => {
         name => 'FiiO M3K',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'aigoerosq' => {
         name => 'AIGO EROS Q / K (Hosted)',
-        status => 2,
+        status => 2,  # Do we promote this to stable?
     },
     'erosqnative' => {
         name => 'AIGO EROS Q / K (Native)',
-        status => 2,
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'ihifi770' => {
         name => 'Xuelin iHIFI 770',
@@ -486,8 +500,8 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'shanlingq1' => {
         name => 'Shanling Q1',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
 );
 
@@ -511,7 +525,18 @@ sub usablebuilds {
     my @list;
 
     for my $b (sort byname keys %builds) {
-        push @list, $b if ($builds{$b}{status} >= 2 || defined($builds{$b}{manualok}));
+        push @list, $b if ($builds{$b}{status} >= 2);
+    }
+
+    return @list;
+}
+
+sub manualbuilds {
+    my @list;
+
+    for my $b (sort byname keys %builds) {
+        push @list, $b if (($builds{$b}{status} > 2 && !defined($builds{$b}{manualok})) ||
+                          (defined($builds{$b}{manualok}) && ($builds{$b}{manualok} > 0)));
     }
 
     return @list;
@@ -572,21 +597,45 @@ sub simbuilds {
         'lang' => 'english',
         'name' => 'UK English',
         'short' => 'en-gb',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'festival' => '--language english',
             'espeak' => '-ven-gb -k 5',
             'gtts' => '-l en -t co.uk',
-            'piper' => 'en_GB-cori-high.onnx',
+            'piper' => 'en_GB-semaine-medium.onnx',
         },
         'enabled' => 1,
     },
     # Everything else in alphabetical order
+    'bulgarian' => {
+        'lang' => 'bulgarian',
+        'name' => 'Български (Bulgarian)',
+        'short' => 'bg',
+        'defengine' => 'espeak',  # XXX Switch to gtts when buildserver is updated
+        'engines' => {
+            'espeak' => '-vbg',
+            'gtts' => '-l bg',
+            # No piper voice yet.
+        },
+        'enabled' => 1,
+    },
+    'chinese-simp' => {  # Mandarin?
+        'lang' => 'chinese-simp',
+        'name' => '简体中文 (Chinese Simplified)',
+        'short' => 'zh_cn',
+        'defengine' => 'piper',
+        'engines' => {
+            'espeak' => '-vzh',
+            'gtts' => '-l zh',
+            'piper' => 'zh_CN-huayan-medium.onnx',
+        },
+        'enabled' => 1,
+    },
     'czech' => {
         'lang' => 'czech',
         'name' => 'Čeština (Czech)',
         'short' => 'cs',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vcs',
             'gtts' => '-l cs',
@@ -598,7 +647,7 @@ sub simbuilds {
         'lang' => 'dansk',
         'name' => 'Dansk (Danish)',
         'short' => 'da',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vda',
             'gtts' => '-l da',
@@ -610,7 +659,7 @@ sub simbuilds {
         'lang' => 'deutsch',
         'name' => 'Deutsch (German)',
         'short' => 'de',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vde',
             'gtts' => '-l de',
@@ -634,7 +683,7 @@ sub simbuilds {
         'lang' => 'english-us',
         'name' => 'American English',
         'short' => 'en-us',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'festival' => '--language english',
             'espeak' => '-ven-us -k 5',
@@ -647,7 +696,7 @@ sub simbuilds {
         'lang' => 'espanol',
         'name' => 'Spanish (Peninsular)',
         'short' => 'es-es',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'festival' => '--language spanish',
             'espeak' => '-ves -k 5',
@@ -672,7 +721,7 @@ sub simbuilds {
         'lang' => 'francais',
         'name' => 'Français (French)',
         'short' => 'fr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vfr-fr',
             'gtts' => '-l fr',
@@ -684,7 +733,7 @@ sub simbuilds {
         'lang' => 'greek',
         'name' => 'Ελληνικά (Greek)',
         'short' => 'el',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vel',
             'gtts' => '-l el',
@@ -696,7 +745,7 @@ sub simbuilds {
         'lang' => 'italiano',
         'name' => 'Italiano (Italian)',
         'short' => 'it',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vit',
             'gtts' => '-l it',
@@ -704,11 +753,22 @@ sub simbuilds {
         },
         'enabled' => 1,
     },
+    'korean' => {  #
+        'lang' => 'korean',
+        'name' => '한국어 (Korean)',
+        'short' => 'ko',
+        'defengine' => 'espeak',
+        'engines' => {
+            'espeak' => '-vko',
+            'gtts' => '-l ko',
+        },
+        'enabled' => 1,
+    },
     'nederlands' => {
         'lang' => 'nederlands',
         'name' => 'Nederlands (Dutch)',
         'short' => 'nl',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vnl',
             'gtts' => '-l nl',
@@ -720,7 +780,7 @@ sub simbuilds {
         'lang' => 'norsk',
         'name' => 'Norsk (Norwegian)',
         'short' => 'no',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vno',
             'gtts' => '-l no',
@@ -732,7 +792,7 @@ sub simbuilds {
         'lang' => 'polski',
         'name' => 'Polski (Polish)',
         'short' => 'pl',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vpl',
             'gtts' => '-l pl',
@@ -744,7 +804,7 @@ sub simbuilds {
         'lang' => 'russian',
         'name' => 'Русский (Russian)',
         'short' => 'ru',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vru',
             'gtts' => '-l ru',
@@ -768,7 +828,7 @@ sub simbuilds {
         'lang' => 'srpski',
         'name' => 'српски (Serbian)',
         'short' => 'sr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vsr',
             'gtts' => '-l sr',
@@ -780,7 +840,7 @@ sub simbuilds {
         'lang' => 'svenska',
         'name' => 'Svenska (Swedish)',
         'short' => 'sr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vsv',
             'gtts' => '-l sv',
@@ -792,7 +852,7 @@ sub simbuilds {
         'lang' => 'turkce',
         'name' => 'Türkçe (Turkish)',
         'short' => 'tr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vtr',
             'gtts' => '-l tr',
@@ -802,14 +862,14 @@ sub simbuilds {
     },
 );
 
-sub bylang {
-    return uc $voices{$a}{lang} cmp uc $voices{$b}{lang};
+sub byshortname {
+    return uc $voices{$a}{short} cmp uc $voices{$b}{short};
 }
 
 sub allvoices {
     my @list;
 
-    for my $b (sort bylang keys %voices) {
+    for my $b (sort byshortname keys %voices) {
         push @list, $b if (defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
     }
 
@@ -820,7 +880,7 @@ sub voicesforlang($) {
     my $l = shift @_;
     my @list;
 
-    for my $b (sort bylang keys %voices) {
+    for my $b (sort byshortname keys %voices) {
         push @list, $b if ($voices{$b}{lang} eq $b && defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
     }