Changeset 99045 in vbox for trunk

Timestamp:

Mar 19, 2023 3:01:05 AM (21 months ago)

Author:

vboxsync

Message:

manual/Makefile.kmk: Copy the dita-ot for each invocation (using new script dita-ot-copy-exec.sh), but try to hardlink the files where possible. Also added a hack to prevent hhc.exe from being searched for and ran during the htmlhelp/qhelp processing. [fix] bugref:10302

Location:

trunk/doc/manual

Files:

• Makefile.kmk (modified) (1 diff)
• dita-ot-copy-exec.sh (modified) (1 diff)

trunk/doc/manual/Makefile.kmk

@@ -779 +779 @@
         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/saxon/saxon9-dom.jar' \
         $2 \
-        -- $(SHELL) $(VBOX_PATH_MANUAL_SRC)/dita-ot-copy-exec.sh "$(VBOX_DITA_ORIGINAL_PATH)" "$1" \
+        -- $(ASH) $(VBOX_PATH_MANUAL_SRC)/dita-ot-copy-exec.sh "$(VBOX_DITA_ORIGINAL_PATH)" "$1" \
         -- $(VBOX_JAVA) -jar "$1/lib/dost.jar" "/ditadir:$1" # "/outercontrol:fail" ?
 

trunk/doc/manual/dita-ot-copy-exec.sh

@@ -92 +92 @@
     for MY_FILE in *;
     do
-        if test -d "${MY_SRCTREE}/${MY_FILE}"; then
+        if test "${MY_FILE}" = "*"; then
+            # For empty directories we get '*' back. Ignore it.
+        elif test -d "${MY_SRCTREE}/${MY_FILE}"; then
             case "${MY_SRCTREE}/${MY_FILE}" in
                 *\ *)