Release v1.15.1

.mvn/settings.xml

@@ -50,9 +50,29 @@
 				</repository>
 			</repositories>
 		</profile>
+		<profile>
+			<id>staged-releases</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>sonatype-nexus-staging</id>
+					<name>Nexus Release Repository</name>
+					<url>https://oss.sonatype.org/content/groups/staging/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+		</profile>
 	</profiles>
 	<activeProfiles>
 		<activeProfile>central-https</activeProfile>
 		<activeProfile>snapshots</activeProfile>
+		<activeProfile>staged-releases</activeProfile>
 	</activeProfiles>
 </settings>

NEWS.md

@@ -1,3 +1,18 @@
+Changes in release v1.15.1
+===========================
+
+## Modules
+
+- **NEW** DTBook to eBraille script
+- **FIX** Better gap length between sentences for Azure voices
+- **FIX** User lexicon feature was broken
+- **FIX** Issue handling EPUBs that have spaces in file names
+- **FIX** Issues in Word to DTBook regarding page numbers and character styles translation
+- **FIX** ncc:maxPageNormal metadata created by DAISY 3 to DAISY 2.02
+- **FIX** Don't insert cryptic annotations at frontmatter start in DTBook to EPUB 3
+- Changes to braille production scripts, see release notes of braille modules [v1.15.1](https://github.com/daisy/pipeline-modules/blob/master/braille/NEWS.md#v1151)
+- Various other bugfixes and improvements
+
 Changes in release v1.15.0
 ===========================
 

deps.mk

@@ -1,12 +1,5 @@
-# this hack is needed to make this file includable from the super project
-ifeq ($(patsubst %.exe,%,$(notdir $(SHELL))),eval-java)
 assembly/SOURCES := $(assembly/BASEDIR)/pom.xml \
-                    $(shell Files.walk(Paths.get("src")).filter(Files::isRegularFile).forEach(f -> println(f.toString().replace(" ", "\\ ")));)
-else
-assembly/SOURCES := $(assembly/BASEDIR)/pom.xml \
-                    $(shell [ -d $(assembly/BASEDIR)/src/main/ ] && \
-                            find $(assembly/BASEDIR)/src/main/ -type f | sed 's/ /\\ /g')
-endif
+                    $(shell Files.walk(Paths.get("$(assembly/BASEDIR)/src")).filter(Files::isRegularFile).forEach(f -> println(f.toString().replace(" ", "\\ ")));)
 
 .SECONDARY : assembly/SOURCES
 assembly/SOURCES : $(assembly/SOURCES)

make/enable-java-shell.mk

@@ -2,38 +2,77 @@ ifneq ($(firstword $(sort $(MAKE_VERSION) 3.82)), 3.82)
 $(error "GNU Make 3.82 is required to run this script")
 endif
 
-ifeq ($(OS),Windows_NT)
-SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe
+ifneq (,$(findstring Windows,$(OS))$(findstring WINDOWS,$(OS)))
+EVAL_JAVA := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe
+SHELL := $(EVAL_JAVA)
 else
+ifneq ($(patsubst %.exe,%,$(notdir $(SHELL))),eval-java)
 UNAME_S := $(shell uname -s)
-UNAME_P := $(shell uname -p)
+UNAME_P := $(shell uname -m)
 ifeq ($(UNAME_S),Darwin)
 ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),)
-SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_arm64/eval-java
+EVAL_JAVA := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_arm64/eval-java
 else
-SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_amd64/eval-java
+EVAL_JAVA := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_amd64/eval-java
 endif
 else
-ifeq ($(UNAME_S),Linux)
 ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),)
-SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_arm64/eval-java
+EVAL_JAVA := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_arm64/eval-java
 else
-SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_amd64/eval-java
+EVAL_JAVA := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_amd64/eval-java
 endif
+endif
+ifneq ($(shell                                                                                   \
+    if ! $(EVAL_JAVA) --verify 2>/dev/null; then                                                 \
+        echo "$(EVAL_JAVA) can not be executed on this platform. Compiling it from source" >&2;  \
+        echo "cc $(dir $(lastword $(MAKEFILE_LIST)))eval-java.c -o $(EVAL_JAVA)" >&2;            \
+        cc $(dir $(lastword $(MAKEFILE_LIST)))eval-java.c -o $(EVAL_JAVA);                       \
+    fi;                                                                                          \
+    echo $$?                                                                                     ),0)
+$(error Failed to compile eval-java.c)
 else
-SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe
+SHELL := $(EVAL_JAVA)
 endif
 endif
 endif
+
 .SHELLFLAGS :=
 
+# Reset environment variables to avoid pass-through, when one Makefile
+# invokes make in another directory.
+CLASSPATH :=
+IMPORTS :=
+STATIC_IMPORTS :=
+JAVA_REPL_PORT :=
+unexport CLASSPATH IMPORTS STATIC_IMPORTS JAVA_REPL_PORT
+
 JAVA_VERSION := $(shell println(getJavaVersion());)
 
 ifeq ($(JAVA_VERSION),)
 # probably because java not found or exited with a UnsupportedClassVersionError
-$(error "Java 8 is required to run this script")
+$(error Java 8 is required to run this script)
 else ifeq ($(shell println($(JAVA_VERSION) >= 8);), false)
-$(error "Java 8 is required to run this script")
+$(error Java 8 is required to run this script)
 endif
 
 OS := $(shell println(getOS());)
+
+ifneq ($(OS), WINDOWS)
+export JAVA_REPL_KILL_AFTER_IDLE := 10
+# The following is not enabled by default, because starting the server
+# now means that any changes to environment variables after the
+# include of enable-java-shell.mk will not be noticed by
+# java-eval. This includes the environment variables JAVA_HOME, IMPORTS
+# and STATIC_IMPORTS, and any other environment variables used by a
+# recipe. Users may optionally include this line in their Makefile, at
+# a position of their liking.
+#export JAVA_REPL_PORT := $(shell --spawn-repl-server)
+endif
+
+# utility function for helping with the migration from bash to java shell
+define \n
+
+
+endef
+quote-for-java = "$(subst ${\n},\n,$(subst ",\",$(subst \,\\,$(1))))"
+bash = exec("bash", "-c", $(call quote-for-java,$1));