Skip to content

Commit

Permalink
git subrepo pull assembly
Browse files Browse the repository at this point in the history 
subrepo:
  subdir:   "assembly"
  merged:   "dfd21d1853"
upstream:
  origin:   "[email protected]:daisy/pipeline-assembly.git"
  branch:   "master"
  commit:   "cac8f03f95"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
  • Loading branch information
@bertfrees
bertfrees committed Nov 11, 2024
1 parent 37c2011 commit 84f6998
Show file tree
Hide file tree
Showing 7 changed files with 262 additions and 90 deletions.
2 changes: 1 addition & 1 deletion assembly/.gitrepo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
remote = [email protected]:daisy/pipeline-assembly.git
branch = master
commit = cac8f03f95d4ec82d2bbe935e5b2439840037301
parent = 78f67e0b16e748e00c1bc0a9423ffa924979f76d
parent = 535dcdf3ac5f48a5cea010f9d43c203746fc727e
cmdver = 0.3.1
82 changes: 56 additions & 26 deletions assembly/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,34 +112,64 @@ ifeq ($(OS), MACOSX)
if (identities.isEmpty()) \
err.println("No identity found to sign code"); \
else { \
// replace signature of binary files within jars \
String id = identities.size() == 1 ? identities.get(0) : null; \
File tmpDir = new File("target/codesign-workaround/"); \
File jar = new File("target/jars/common/com.microsoft.cognitiveservices.speech.client-sdk-1.27.0.jar"); \
File unzipDir = new File(tmpDir, jar.getName().replaceAll(".jar$$", "")); \
mkdirs(unzipDir); \
// FIXME: not using unzip() because it currently does not preserve file permissions \
//unzip(jar, unzipDir); \
exitOnError(captureOutput(err::println, unzipDir, "unzip", jar.getAbsolutePath())); \
// replace signature of *.extension.kws.ort.dylib files \
for (File f : glob(unzipDir.getPath() + "/ASSETS/osx-*/*.extension.kws.ort.dylib")) { \
exitOnError(captureOutput(err::println, "codesign", "--remove-signature", f.getPath())); \
if (id == null) { \
err.println("Choose identity to sign code (move with arrows and press ENTER):"); \
try { \
id = identities.get(prompt(identityDescriptions)); \
} catch (IOException e) { \
System.exit(1); \
} \
LinkedList<String> paths = new LinkedList<>(); \
LinkedList<File> unpacked = new LinkedList<>(); \
for (String p : new String[]{ \
"com.microsoft.cognitiveservices.speech.client-sdk-*.jar/ASSETS/osx-*/*.extension.kws.ort.dylib", \
"net.java.dev.jna.jna-*.jar/com/sun/jna/darwin-*/libjnidispatch.jnilib", \
"org.daisy.libs.io.bit3.jsass-*.jar/darwin-*/libjsass.dylib", \
"*.audio-encoder-lame-*.jar/macosx/lame", \
"mac/*.libhyphen-utils-*-mac.jar/native/macosx/*/libhyphen.dylib", \
"mac/*.liblouis-utils-*-mac.jar/native/macosx/*/liblouis.dylib", \
"mac/*.liblouis-utils-*-mac.jar/native/macosx/*/liblouisutdml/file2brl", \
"mac/*.liblouis-utils-*-mac.jar/native/macosx/*/liblouisutdml/*.dylib", \
"*.tts-adapter-acapela-3.1.5.jar/jnaerator-0.11-p1.jar/com/sun/jna/darwin/libjnidispatch.jnilib" \
}) \
paths.add("target/jars/common/" + p); \
while (!paths.isEmpty()) { \
String p = paths.pop(); \
String jarPath = p.substring(0, p.indexOf(".jar") + 4); \
File jar = glob(jarPath).get(0); \
File unpackDir = new File(jar.getParentFile(), jar.getName().replaceAll(".jar$$", "")); \
if (!unpackDir.exists()) { \
mkdirs(unpackDir); \
// FIXME: not using unzip() because it currently does not preserve file permissions \
//unzip(jar, unpackDir); \
exitOnError(captureOutput(err::println, unpackDir, "unzip", jar.getAbsolutePath())); \
unpacked.push(unpackDir); } \
p = p.substring(jarPath.length()); \
if (p.contains(".jar")) \
paths.add(unpackDir.getPath() + p); \
else { \
for (File f : glob(unpackDir.getPath() + p)) { \
exitOnError(captureOutput(err::println, "codesign", "--remove-signature", f.getPath())); \
if (id == null) { \
err.println("Choose identity to sign code (move with arrows and press ENTER):"); \
try { \
id = identities.get(prompt(identityDescriptions)); \
} catch (IOException e) { \
System.exit(1); \
} \
} \
if (f.getName().matches(".*\\.(dylib|jnilib)$$")) \
exitOnError(captureOutput(err::println, "codesign", "-s", id, "-v", f.getPath())); \
else \
exitOnError(captureOutput(err::println, "codesign", "--options", "runtime", \
"-s", id, "-v", f.getPath())); \
exitOnError(captureOutput(err::println, "codesign", "--verify", "-v", f.getPath())); \
if (!f.getName().matches(".*\\.(dylib|jnilib)$$")) \
exitOnError(captureOutput(err::println, "codesign", "--display", "-v", f.getPath())); } \
} \
exitOnError(captureOutput(err::println, "codesign", "-s", id, "-v", f.getPath())); } \
// delete META-INF folder with signature files \
rm(new File(unzipDir, "META-INF")); \
File fixedJar = new File(tmpDir, jar.getName()); \
exitOnError( \
captureOutput(err::println, "jar", "cvf", fixedJar.getPath(), "-C", unzipDir.getPath(), ".")); \
rm(jar); \
cp(fixedJar, jar); \
rm(tmpDir); \
} \
for (File f : unpacked) { \
File jar = new File(f.getAbsolutePath() + ".jar"); \
rm(jar); \
exitOnError( \
captureOutput(err::println, "ditto", "-c", "-k", f.getPath(), jar.getPath())); \
rm(f); \
} \
}
endif
exec("$(MVN)", "assembly:single", "-Passemble-mac-zip");
Expand Down
76 changes: 76 additions & 0 deletions assembly/NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,83 @@
Changes in release v1.14.20
===========================

## Framework

- **NEW** API for voice previews
- **NEW** Allow setting `org.daisy.pipeline.tts.config` property through settings API
- **FIX** Remove error stack traces from webservice responses
- **FIX** Java API: Make job input parser more relaxed about boolean option values

## Modules

- **NEW** Support for Microsoft natural voices over [NaturalVoicesSAPIAdapter](https://github.com/gexgd0419/NaturalVoiceSAPIAdapter)
- **FIX** Support standard CSS's `voice-family` property (backward compatibility with the old behavior is ensured)
- **FIX** Compatibility with espeak-ng
- **FIX** Wrong doctype declaration of SMIL files in output of DAISY 3 to DAISY 2.02
- **FIX** Indent TTS log output
- Various other bugfixes and improvements

## Details

See [all the closed issues of this release](https://github.com/orgs/daisy/projects/6). To view using the [Github CLI](https://cli.github.com/): `gh project --owner daisy item-list 6`

Changes in release v1.14.19
===========================

## Framework

- **NEW** API to list TTS services and their status (available, disabled or error)
- **NEW** Access to Sass variables defined in user agent style sheets via `/stylesheet-parameters` API

## Modules

- **NEW** DOCX (MS Word) to DTBook script: this brings some of the functionality of the Word Save-as-DAISY addin to Pipeline
- **NEW** Option for speaking image alt text
- **NEW** "Style sheet parameters" option supported on more scripts (DTBook to DAISY 3, DTBook to EPUB 3, EPUB 3 Enhancer and EPUB to DAISY)
- **NEW** New syntax for "Style sheet parameters" option
- **FIX** Improved error diagnostics for Google and Azure TTS services
- **FIX** Improved logging of the status of TTS services in general (only show relevant services, shorten error messages)
- **FIX** Handle text in `sidebar` not within `p` in DTBook to ODT
- **FIX** DAISY 3 and DAISY 2.02 MegaVoice multi-level scripts do not try to produce files with forbidden characters in their name anymore
- **FIX** Fix NCC metadata in output of DAISY 3 to DAISY 2.02
- **FIX** Support for `rel="pronunciation"` links in DTBook to DAISY 3
- **FIX** Support for Apple Silicon processors
- Changes to braille production scripts, see release notes of braille modules [v1.14.26](https://github.com/daisy/pipeline-modules/blob/master/braille/NEWS.md#v11426)

## Details

See [all the closed issues of this release](https://github.com/orgs/daisy/projects/5). To view using the [Github CLI](https://cli.github.com/): `gh project --owner daisy item-list 5`

Changes in release v1.14.18
===========================

## Framework

- **NEW** API for analyzing CSS style sheets and exposing Sass variables.

## Modules

- **NEW** Script options to specify user lexicons
- **NEW** Global setting for default user lexicon
- **NEW** Global setting for default speaking rate
- **FIX** Major simplification of configuration of braille scripts, see release notes of braille modules [v1.14.24](https://github.com/daisy/pipeline-modules/blob/master/braille/NEWS.md#v11424) and [v1.14.25](https://github.com/daisy/pipeline-modules/blob/master/braille/NEWS.md#v11425)
- **FIX** Fix bugs in handling of language during voice selection.
- **FIX** Fix bugs in processing of aural CSS.
- **FIX** Improved usability of the DAISY 3 and DAISY 2.02 MegaVoice multi-level scripts.
- **FIX** Improve support for DPUB ARIA
- **FIX** Preserve external hyperlinks in EPUB
- **FIX** Include page source identification metadata in EPUB created from DTBook
- Other bugfixes and optimizations

## Details

See [all the closed issues of this release](https://github.com/orgs/daisy/projects/4). To view using the [Github CLI](https://cli.github.com/): `gh project --owner daisy item-list 4`

Changes in release v1.14.17
===========================

## Framework

- **NEW** API for getting and setting TTS and other properties globally

## Modules
Expand Down
12 changes: 9 additions & 3 deletions assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>assembly</artifactId>
<version>1.14.20-SNAPSHOT</version>
<version>1.14.21-SNAPSHOT</version>
<packaging>jar</packaging>
<name>DAISY Pipeline 2 :: Assembly</name>
<description>Builds the main distribution of the DAISY Pipeline 2.</description>
Expand Down Expand Up @@ -69,17 +69,23 @@
<dependency>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-bom</artifactId>
<version>1.14.20-SNAPSHOT</version>
<version>1.14.20</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-bom</artifactId>
<version>1.14.27</version>
<version>1.14.29</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- temporary until updated to modules 1.14.29 -->
<dependency>
<groupId>com.microsoft.cognitiveservices.speech</groupId>
<artifactId>client-sdk</artifactId>
<version>1.37.0</version>
</dependency>
<!-- missing from framework-bom -->
<dependency>
<groupId>com.nwalsh</groupId>
Expand Down
Loading

0 comments on commit 84f6998

Please sign in to comment.