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

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index cd25dc1ec316380d8b1f8fc75efe642dd0f063c3..36f6fa3334eea0d9f955c7b74567700cbaaa1049 100755 (executable)
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -223,7 +223,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

diff --git a/distmaker/dists/repo-report.sh b/distmaker/dists/repo-report.sh
index 1b61f66ba1e5660f5faa832c8a5a7a998136f679..4a14e41f72edebf355bf7ab35675bc36444530a6 100755 (executable)
--- a/distmaker/dists/repo-report.sh
+++ b/distmaker/dists/repo-report.sh
@@ -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"
 

diff --git a/distmaker/utils/repo-report.php b/distmaker/utils/repo-report.php
index 79fe891693a0aafa707ad9388c6aec2484b515a7..ef64012693d97a31caef6c762022171fbe41f4fa 100644 (file)
--- a/distmaker/utils/repo-report.php
+++ b/distmaker/utils/repo-report.php
@@ -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);