Skip to content

Commit

Permalink
move docs to fs/
Browse files Browse the repository at this point in the history
and just keep a symlink at the top level
  • Loading branch information
totaam committed Oct 24, 2022
1 parent a270c9f commit 23a0555
Show file tree
Hide file tree
Showing 79 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions docs
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion packaging/MacOS/make-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ echo " * fixup pixbuf loader"
sed -i '' -e "s+@executable_path/++g" "${RSCDIR}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"

echo " * docs"
if [ -d "${JHBUILD_PREFIX}/share/xpra/doc" ]; then
if [ -d "${JHBUILD_PREFIX}/share/doc/xpra" ]; then
mkdir -p ${RSCDIR}/share/doc/xpra
rsync -rplogt ${JHBUILD_PREFIX}/share/doc/xpra/* ${RSCDIR}/share/doc/xpra/
fi
Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1746,12 +1746,8 @@ def addconf(name, dst_name=None):
copytodir("fs/etc/dbus-1/system.d/xpra.conf", "/etc/dbus-1/system.d")

if docs_ENABLED:
if WIN32 or OSX:
#keep everything in our own directory:
doc_dir = f"{self.install_dir}/share/xpra/doc"
else:
doc_dir = f"{self.install_dir}/share/doc/xpra/"
convert_doc_dir("./docs", doc_dir)
doc_dir = f"{self.install_dir}/share/doc/xpra/"
convert_doc_dir("./fs/share/doc/xpra", doc_dir)

if data_ENABLED:
for d in ("http-headers", "content-type", "content-categories", "content-parent"):
Expand Down

0 comments on commit 23a0555

Please sign in to comment.