From 7f5b10d39bba60a7f35b8e67c24473352105c3f9 Mon Sep 17 00:00:00 2001
From: Filippo Cremonese <filippocremonese@rev.ng>
Date: Mon, 14 Sep 2020 17:32:01 +0200
Subject: [PATCH] Fixed env var usage in llvm-documentation
---
.../components/llvm_documentation.lib.yml | 23 +++++++++++--------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/.orchestra/config/components/llvm_documentation.lib.yml b/.orchestra/config/components/llvm_documentation.lib.yml
index aeb1aa6..9181ca5 100644
--- a/.orchestra/config/components/llvm_documentation.lib.yml
+++ b/.orchestra/config/components/llvm_documentation.lib.yml
@@ -10,14 +10,12 @@ builds:
- llvm
configure: |
rm -rf "$BUILD_DIR"
- cp -r "$SOURCE_DIR" "$BUILD_DIR"
- # mkdir -p "$BUILD_DIR"
- # clone llvm-project "$BUILD_DIR"
+ mkdir -p $(dirname "$BUILD_DIR")
+ cp -farl "$SOURCE_DIR" "$BUILD_DIR"
+ mkdir -p "$BUILD_DIR/build"
sed 's|FILE_PATTERNS|#FILE_PATTERNS|' -i "$BUILD_DIR"/*/docs/doxygen.cfg.in
- mkdir -p "$BUILD_DIR/build"
-
cd "$BUILD_DIR/build";
cmake "$BUILD_DIR/llvm" \
-DCMAKE_BUILD_TYPE="Debug" \
@@ -34,7 +32,7 @@ builds:
fi
cd $BUILD_DIR/build/docs/doxygen/html
- sed -i 's|$(XCODE_INSTALL)/usr/bin/docsetutil|'$ORCHESTRA'/helpers/docsetutil|' Makefile
+ sed -i 's|$(XCODE_INSTALL)/usr/bin/docsetutil|'$ORCHESTRA_DOTDIR'/helpers/docsetutil|' Makefile
sed -i 's|XCODE_INSTALL="$(shell xcode-select -print-path)"||' Makefile
sed -i 's|<string>doxygen</string>|<string>llvm</string>|' Info.plist
(@= make @)
@@ -47,7 +45,7 @@ builds:
cd $BUILD_DIR/build/tools/clang/docs/doxygen/html
- sed -i 's|$(XCODE_INSTALL)/usr/bin/docsetutil|'$ORCHESTRA'/helpers/docsetutil|' Makefile
+ sed -i 's|$(XCODE_INSTALL)/usr/bin/docsetutil|'$ORCHESTRA_DOTDIR'/helpers/docsetutil|' Makefile
sed -i 's|XCODE_INSTALL="$(shell xcode-select -print-path)"||' Makefile
sed -i 's|<string>doxygen</string>|<string>clang</string>|' Info.plist
(@= make @)
@@ -58,10 +56,17 @@ builds:
"dynsections.js"
mkdir -p "${DESTDIR}${ORCHESTRA_ROOT}/share/doc/llvm"
- cp -ar "$BUILD_DIR/build/docs/doxygen/html/llvm.docset" "${DESTDIR}${ORCHESTRA_ROOT}/share/doc/llvm"
+ cp -farl "$BUILD_DIR/build/docs/doxygen/html/llvm.docset" "${DESTDIR}${ORCHESTRA_ROOT}/share/doc/llvm"
mkdir -p "${DESTDIR}${ORCHESTRA_ROOT}/share/doc/clang"
- cp -ar "$BUILD_DIR/build/tools/clang/docs/doxygen/html/clang.docset" "${DESTDIR}${ORCHESTRA_ROOT}/share/doc/clang"
+ cp -farl "$BUILD_DIR/build/tools/clang/docs/doxygen/html/clang.docset" "${DESTDIR}${ORCHESTRA_ROOT}/share/doc/clang"
+
+ cat <<EOF
+ To install the Zeal docset run do the following:
+ ZEAL_PATH="\${XDG_DATA_HOME:-\$HOME/.local/share}/Zeal/Zeal/docsets/"
+ ln -s \$(realpath -m --relative-to "\$ZEAL_PATH" \$ORCHESTRA_ROOT/share/doc/llvm/llvm.docset) "\$ZEAL_PATH"
+ ln -s \$(realpath -m --relative-to "\$ZEAL_PATH" \$ORCHESTRA_ROOT/share/doc/llvm/clang.docset) "\$ZEAL_PATH"
+ EOF
#@ end
---
--
GitLab