Skip to content

Commit 95552db

Browse files
author
A Wokaty
committed
Set bioc, experiments to use extractManuals; copy html manuals
1 parent aedb577 commit 95552db

5 files changed

+20
-5
lines changed

propagation/3.22/prepareRepos-bioc.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MEAT0_PATH="/home/biocbuild/bbs-3.22-bioc/MEAT0"
77
# Manuals were already copied from
88
# /home/biocbuild/public_html/BBS/3.22/bioc/OUTGOING/manuals
99
# by updateReposPkgs-bioc.sh so don't need to be extracted.
10-
EXTRACT_MANUALS="FALSE"
10+
EXTRACT_MANUALS="TRUE"
1111
REPOS_ROOT="$VIEW_ROOT/bioc"
1212
REPOS_URL="$VIEW_URL/bioc"
1313
STATS_URL="https://bioconductor.org/packages/stats/bioc"

propagation/3.22/prepareRepos-data-experiment.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MEAT0_PATH="/home/biocbuild/bbs-3.22-data-experiment/MEAT0"
77
# Manuals were already copied from
88
# /home/biocbuild/public_html/BBS/3.22/data-experiment/OUTGOING/manuals
99
# by updateReposPkgs-data-experiment.sh so don't need to be extracted.
10-
EXTRACT_MANUALS="FALSE"
10+
EXTRACT_MANUALS="TRUE"
1111
REPOS_ROOT="$VIEW_ROOT/data/experiment"
1212
REPOS_URL="$VIEW_URL/data/experiment"
1313
STATS_URL=""

propagation/3.22/updateReposPkgs-bioc.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ WIN_CONTRIB="$REPOS_ROOT/bin/windows/contrib/$R_VERSION"
1717
MAC_BIG_SUR_x86_64_CONTRIB="$REPOS_ROOT/bin/macosx/big-sur-x86_64/contrib/$R_VERSION"
1818
MAC_BIG_SUR_arm64_CONTRIB="$REPOS_ROOT/bin/macosx/big-sur-arm64/contrib/$R_VERSION"
1919

20+
META_SRC="$SRC_CONTRIB/Meta"
21+
META_R_EXPR="source('/home/biocbuild/BBS/utils/makeMetaDbs.R')"
22+
MEAT_PATH="/home/biocbuild/bbs-$BIOC_VERSION-bioc/meat"
23+
2024
if [ ! -f "$PROPAGATION_DB_FILE" ]; then
2125
echo "ERROR: $PROPAGATION_DB_FILE not found. Did postrun.sh run?"
2226
exit 1
@@ -58,6 +62,17 @@ update_repo "$MAC_BIG_SUR_arm64_CONTRIB" "mac.binary.big-sur-arm64" "tgz"
5862

5963
echo ""
6064

65+
echo ""
66+
echo "========================================================================"
67+
/bin/date
68+
echo "------------------------------------------------------------------------"
69+
70+
echo "Updating $META_SRC with aliases and cross refences dbs..."
71+
$Rscript -e "$META_R_EXPR; try(makeMetaDbs('$PROPAGATION_DB_FILE', '$MEAT_PATH', '$REPOS_ROOT', '$META_SRC'))"
72+
73+
echo ""
74+
75+
6176
## FIXME: Why aren't manuals propagated based on the same criteria as source
6277
## packages? Looks like the former are propagated based on their timestamps
6378
## only (see below) while for source packages we use the more refined
@@ -68,7 +83,7 @@ MANUALS_DEST="$REPOS_ROOT/manuals"
6883
MANUALS_SRC="$BBS_OUTGOING_DIR/manuals"
6984
echo "Updating $BIOC_VERSION/bioc repo with reference manuals..."
7085
for i in `ls $MANUALS_SRC`; do
71-
pkg=`echo $i| awk '{split($0,a,".pdf"); print(a[1])}'`
86+
pkg=`echo $i| awk '{split($0,a,".(html|pdf)"); print(a[1])}'`
7287
mkdir -p $MANUALS_DEST/$pkg/man
7388
cp --update --verbose $MANUALS_SRC/$i $MANUALS_DEST/$pkg/man
7489
done

propagation/3.22/updateReposPkgs-data-annotation.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ MANUALS_DEST="$REPOS_ROOT/manuals"
5454
MANUALS_SRC="$BBS_OUTGOING_DIR/manuals"
5555
echo "Updating $BIOC_VERSION/data/annotation repo with reference manuals..."
5656
for i in `ls $MANUALS_SRC`; do
57-
pkg=`echo $i| awk '{split($0,a,".pdf"); print(a[1])}'`
57+
pkg=`echo $i| awk '{split($0,a,".(html|pdf)"); print(a[1])}'`
5858
mkdir -p $MANUALS_DEST/$pkg/man
5959
cp --update --verbose $MANUALS_SRC/$i $MANUALS_DEST/$pkg/man
6060
done

propagation/3.22/updateReposPkgs-data-experiment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ MANUALS_DEST="$REPOS_ROOT/manuals"
5454
MANUALS_SRC="$BBS_OUTGOING_DIR/manuals"
5555
echo "Updating $BIOC_VERSION/data/experiment repo with reference manuals..."
5656
for i in `ls $MANUALS_SRC`; do
57-
pkg=`echo $i| awk '{split($0,a,".pdf"); print(a[1])}'`
57+
pkg=`echo $i| awk '{split($0,a,".(html|pdf)"); print(a[1])}'`
5858
mkdir -p $MANUALS_DEST/$pkg/man
5959
cp --update --verbose $MANUALS_SRC/$i $MANUALS_DEST/$pkg/man
6060
done

0 commit comments

Comments
 (0)