<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/6a6129cfcb0ccf165f561b4835cce49eec643d48">https://github.com/macports/macports-infrastructure/commit/6a6129cfcb0ccf165f561b4835cce49eec643d48</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6a6129c mprsyncup: Generate PortIndex.json next to PortIndex
</span>6a6129c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6a6129cfcb0ccf165f561b4835cce49eec643d48
</span>Author: arjunsalyan <arjunsalyan@icloud.com>
AuthorDate: Mon Jun 17 12:57:01 2019 +0530
<span style='display:block; white-space:pre;color:#404040;'> mprsyncup: Generate PortIndex.json next to PortIndex
</span>---
jobs/mprsyncup | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/jobs/mprsyncup b/jobs/mprsyncup
</span><span style='display:block; white-space:pre;color:#808080;'>index d69e9ef..dceef52 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/jobs/mprsyncup
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/jobs/mprsyncup
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +44,7 @@ OPENSSL="/usr/bin/openssl"
</span> AWK="/usr/bin/awk"
STAT="/opt/local/bin/gstat"
BASENAME="/usr/bin/basename"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+TCLSH="/opt/local/bin/port-tclsh"
</span>
# Paths we'll work on:
ROOT=/var/tmp/macports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +53,15 @@ GITROOT=/var/tmp/macports
</span> TBASE=${GITROOT}/trunk/base
RBASE=${GITROOT}/release/base
PORTS=${GITROOT}/release/ports
<span style='display:block; white-space:pre;background:#e0ffe0;'>+CONTRIB=${GITROOT}/release/contrib
</span> RSYNCROOT=/rsync/macports
PORTINDEX=${PREFIX}/bin/portindex
PATH=${PREFIX}/bin:/bin:/usr/bin:/usr/sbin:/opt/local/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Files to be used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PORTINDEX2JSON=${CONTRIB}/portindex2json/portindex2json.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Platforms we generate indexes for. This is intentionally split on
# whitespace later.
PLATFORMS="8_powerpc 8_i386 9_powerpc 9_i386 10_i386 11_i386 12_i386 13_i386 14_i386 15_i386 16_i386 17_i386 18_i386"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +69,7 @@ PLATFORMS="8_powerpc 8_i386 9_powerpc 9_i386 10_i386 11_i386 12_i386 13_i386 14_
</span> # Sources information:
BASEURL=https://github.com/macports/macports-base.git
PORTSURL=https://github.com/macports/macports-ports.git
<span style='display:block; white-space:pre;background:#e0ffe0;'>+CONTRIBURL=https://github.com/macports/macports-contrib.git
</span> RELEASE_URL_FILE=config/RELEASE_URL
# private key to use for signing
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,6 +153,17 @@ else
</span> ${GIT} clone -q --depth 1 "${PORTSURL}" "${PORTS}"
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update release/contrib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ -d "${CONTRIB}"/.git ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${CONTRIB}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GIT} pull -q
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GIT} clone -q "${CONTRIBURL}" "${CONTRIB}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if [ "${RBASE_CHANGED}" -eq 1 ]; then
PORTS_CHANGED=1
(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,6 +196,13 @@ if [ "${PORTS_CHANGED}" -eq 1 ]; then
</span> | expand -t 40,48,56,64,72,80 &
done
wait
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # generate json for each platform-specific index
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for PLATFORM in $PLATFORMS; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INDEX="PortIndex_darwin_${PLATFORM}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${TCLSH} "${PORTINDEX2JSON}" "${INDEX}"/PortIndex > "${INDEX}"/PortIndex.json &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wait
</span> )
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,7 +229,7 @@ if [ "${RBASE_CHANGED}" -eq 1 ]; then
</span> sign "${ROOT}"/base.tar
fi
if [ "${PORTS_CHANGED}" -eq 1 ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${TAR} -C "${RSYNCROOT}"/release/ -czf "${ROOT}"/ports.tar.gz ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${TAR} --exclude 'PortIndex*/PortIndex.json' -C "${RSYNCROOT}"/release/ -czf "${ROOT}"/ports.tar.gz ports
</span>
${TAR} --exclude 'PortIndex*' -C "${RSYNCROOT}"/release/ -cf "${ROOT}"/ports.tar ports
for INDEX_DIR in "${RSYNCROOT}"/release/ports/PortIndex_*; do
</pre><pre style='margin:0'>
</pre>