Commit f9702176 authored by totten's avatar totten

CRM-19417 - distmaker - JSON format should better match upgrade checker

parent a714ed5f
......@@ -299,7 +299,16 @@ fi
if [ "$REPOREPORT" = 1 ]; then
echo; echo "Preparing repository report"; echo;
bash $P/dists/repo-report.sh
env \
L10NPACK="$L10NPACK" \
BPACK="$BPACK" \
D56PACK="$D56PACK" \
D5PACK="$D5PACK" \
D7DIR="$D7DIR" \
SKPACK="$SKPACK" \
J5PACK="$J5PACK" \
WP5PACK="$WP5PACK" \
bash $P/dists/repo-report.sh
fi
unset DM_SOURCEDIR DM_GENFILESDIR DM_TARGETDIR DM_TMPDIR DM_PHP DM_RSYNC DM_VERSION DM_ZIP
......
......@@ -24,5 +24,13 @@ env \
DM_REF_JOOMLA="$DM_REF_JOOMLA" \
DM_REF_WORDPRESS="$DM_REF_WORDPRESS" \
DM_REF_PACKAGES="$DM_REF_PACKAGES" \
L10NPACK="$L10NPACK" \
BPACK="$BPACK" \
D56PACK="$D56PACK" \
D5PACK="$D5PACK" \
D7DIR="$D7DIR" \
SKPACK="$SKPACK" \
J5PACK="$J5PACK" \
WP5PACK="$WP5PACK" \
php "$DM_SOURCEDIR/distmaker/utils/repo-report.php" > "$REPORT"
......@@ -10,15 +10,44 @@ function repo($path, $branch) {
}
$DM_SOURCEDIR = getenv('DM_SOURCEDIR');
$DM_VERSION = getenv('DM_VERSION');
$data = array(
'version' => getenv('DM_VERSION'),
'version' => $DM_VERSION,
'timestamp' => array(
'pretty' => date('r'),
'epoch' => time(),
),
'civicrm-core' => repo("$DM_SOURCEDIR", getenv('DM_REF_CORE')),
'civicrm-packages' => repo("$DM_SOURCEDIR/packages", getenv('DM_REF_PACKAGES')),
'tar' => array(),
'git' => array(
'civicrm-backdrop@1.x' => repo("$DM_SOURCEDIR/backdrop", getenv('DM_REF_BACKDROP')),
'civicrm-core' => repo("$DM_SOURCEDIR", getenv('DM_REF_CORE')),
'civicrm-drupal@6.x' => repo("$DM_SOURCEDIR/drupal", getenv('DM_REF_DRUPAL6')),
'civicrm-drupal@7.x' => repo("$DM_SOURCEDIR/drupal", getenv('DM_REF_DRUPAL')),
//'civicrm-drupal@8.x' => repo("$DM_SOURCEDIR/drupal", getenv('DM_REF_DRUPAL8')),
'civicrm-packages' => repo("$DM_SOURCEDIR/packages", getenv('DM_REF_PACKAGES')),
'civicrm-wordpress' => repo("$DM_SOURCEDIR/WordPress", getenv('DM_REF_WORDPRESS')),
),
);
if (getenv('BPACK')) {
$data['tar']['Backdrop'] = "civicrm-$DM_VERSION-backdrop-unstable.tar.gz";
}
if (getenv('J5PACK')) {
$data['tar']['Joomla'] = "civicrm-$DM_VERSION-joomla.zip";
}
if (getenv('D56PACK')) {
$data['tar']['Drupal6'] = "civicrm-$DM_VERSION-drupal6.tar.gz";
}
if (getenv('D5PACK')) {
$data['tar']['Drupal'] = "civicrm-$DM_VERSION-drupal.tar.gz";
}
if (getenv('WPPACK')) {
$data['tar']['WordPresse'] = "civicrm-$DM_VERSION-wordpress.zip";
}
if (getenv('L10NPACK')) {
$data['tar']['L10n'] = "civicrm-$DM_VERSION-l10n.tar.gz";
}
ksort($data);
$data['sig'] = md5(json_encode($data));
$data['rev'] = md5(json_encode($data));
echo json_encode($data);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment