From bf71afcc22ee42405ae324e7c50b9aa7f814afa3 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 16 Mar 2022 22:36:29 -0700 Subject: [PATCH] What if we stopped publishing Drupal 6 releases in 2022? --- distmaker/distmaker.conf.dist | 1 - distmaker/distmaker.sh | 18 +---------------- distmaker/dists/drupal6_php5.sh | 35 --------------------------------- distmaker/dists/patchset.sh | 3 +-- distmaker/utils/repo-report.php | 4 ---- 5 files changed, 2 insertions(+), 59 deletions(-) delete mode 100755 distmaker/dists/drupal6_php5.sh diff --git a/distmaker/distmaker.conf.dist b/distmaker/distmaker.conf.dist index 452ea2e50b..df6d4c20ba 100644 --- a/distmaker/distmaker.conf.dist +++ b/distmaker/distmaker.conf.dist @@ -18,7 +18,6 @@ DM_VERSION= DM_REF_CORE=master DM_REF_BACKDROP=1.x-${DM_REF_CORE} DM_REF_DRUPAL=7.x-${DM_REF_CORE} -DM_REF_DRUPAL6=6.x-${DM_REF_CORE} DM_REF_DRUPAL8=${DM_REF_CORE} DM_REF_JOOMLA=${DM_REF_CORE} DM_REF_WORDPRESS=${DM_REF_CORE} diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh index e648d9e147..95ae8da186 100755 --- a/distmaker/distmaker.sh +++ b/distmaker/distmaker.sh @@ -37,7 +37,6 @@ source "$P/dists/common.sh" # Set no actions by default BPACK=0 D5PACK=0 -D56PACK=0 D7DIR=0 J5PACK=0 WP5PACK=0 @@ -58,7 +57,6 @@ display_usage() echo " l10n - generate internationalization data" echo " Backdrop - generate Backdrop PHP5 module" echo " Drupal|d5 - generate Drupal7 PHP5 module" - echo " Drupal6|d5.6 - generate Drupal6 PHP5 module" echo " d7_dir - generate Drupal7 PHP5 module, but output to a directory, no tarball" echo " Joomla|j5 - generate Joomla PHP5 module" echo " WordPress|wp5 - generate Wordpress PHP5 module" @@ -125,7 +123,7 @@ check_conf() echo "Current directory is : $THIS_DIR"; exit 1 else - export DM_SOURCEDIR DM_GENFILESDIR DM_TMPDIR DM_TARGETDIR DM_PHP DM_RSYNC DM_ZIP DM_VERSION DM_REF_CORE DM_REF_DRUPAL DM_REF_DRUPAL6 DM_REF_DRUPAL8 DM_REF_JOOMLA DM_REF_WORDPRESS DM_REF_PACKAGES + export DM_SOURCEDIR DM_GENFILESDIR DM_TMPDIR DM_TARGETDIR DM_PHP DM_RSYNC DM_ZIP DM_VERSION DM_REF_CORE DM_REF_DRUPAL DM_REF_DRUPAL8 DM_REF_JOOMLA DM_REF_WORDPRESS DM_REF_PACKAGES if [ ! -d "$DM_SOURCEDIR" ]; then echo; echo "ERROR! " DM_SOURCEDIR "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo; fi @@ -177,12 +175,6 @@ case $1 in SKPACK=1 ;; - # DRUPAL6 PHP5 - d5.6|Drupal6) - echo; echo "Generating Drupal6 PHP5 module"; echo; - D56PACK=1 - ;; - # JOOMLA PHP5 j5|Joomla) echo; echo "Generating Joomla PHP5 module"; echo; @@ -212,7 +204,6 @@ case $1 in echo; echo "Generating all the tarballs we've got (not the directories). "; echo; BPACK=1 D5PACK=1 - D56PACK=1 J5PACK=1 WP5PACK=1 PATCHPACK=1 @@ -270,12 +261,6 @@ if [ "$BPACK" = 1 ]; then bash $P/dists/backdrop_php5.sh fi -if [ "$D56PACK" = 1 ]; then - echo; echo "Packaging for Drupal6, PHP5 version"; echo; - dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL6" - bash $P/dists/drupal6_php5.sh -fi - if [ "$D5PACK" = 1 ]; then echo; echo "Packaging for Drupal7, PHP5 version"; echo; dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL" @@ -316,7 +301,6 @@ if [ "$REPOREPORT" = 1 ]; then env \ L10NPACK="$L10NPACK" \ BPACK="$BPACK" \ - D56PACK="$D56PACK" \ D5PACK="$D5PACK" \ D7DIR="$D7DIR" \ SKPACK="$SKPACK" \ diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh deleted file mode 100755 index 6c9d94cc78..0000000000 --- a/distmaker/dists/drupal6_php5.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -set -ex - -P=`dirname $0` -CFFILE=$P/../distmaker.conf -if [ ! -f $CFFILE ] ; then - echo "NO DISTMAKER.CONF FILE!" - exit 1 -else - . $CFFILE -fi -. "$P/common.sh" - -SRC=$DM_SOURCEDIR -TRG=$DM_TMPDIR/civicrm - -# copy all the stuff -dm_reset_dirs "$TRG" -cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php -dm_generate_version "$TRG/civicrm-version.php" Drupal6 -dm_install_core "$SRC" "$TRG" -dm_install_coreext "$SRC" "$TRG" $(dm_core_exts) -dm_install_packages "$SRC/packages" "$TRG/packages" -dm_install_vendor "$SRC/vendor" "$TRG/vendor" -dm_install_bower "$SRC/bower_components" "$TRG/bower_components" -dm_install_drupal "$SRC/drupal" "$TRG/drupal" -dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments" - -# gen tarball -cd $TRG/.. -dm_assert_no_symlinks civicrm -tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-drupal6.tar.gz civicrm - -# clean up -rm -rf $TRG diff --git a/distmaker/dists/patchset.sh b/distmaker/dists/patchset.sh index 4bde81e28d..7ec0402efc 100644 --- a/distmaker/dists/patchset.sh +++ b/distmaker/dists/patchset.sh @@ -23,9 +23,8 @@ TRG="$DM_TMPDIR/civicrm-$DM_VERSION" # export patch files for each repo dm_reset_dirs "$TRG" -mkdir -p "$TRG"/civicrm-{core,drupal-6,drupal-7,drupal-8,backdrop,packages,joomla,wordpress} +mkdir -p "$TRG"/civicrm-{core,drupal-7,drupal-8,backdrop,packages,joomla,wordpress} dm_export_patches "$SRC" "$TRG/civicrm-core" $REFTAG..$DM_REF_CORE -# dm_export_patches "$SRC/drupal" "$TRG/civicrm-drupal-6" 6.x-$REFTAG..$DM_REF_DRUPAL6 dm_export_patches "$SRC/drupal" "$TRG/civicrm-drupal-7" 7.x-$REFTAG..$DM_REF_DRUPAL dm_export_patches "$SRC/drupal-8" "$TRG/civicrm-drupal-8" $REFTAG..$DM_REF_DRUPAL8 dm_export_patches "$SRC/backdrop" "$TRG/civicrm-backdrop" 1.x-$REFTAG..$DM_REF_BACKDROP diff --git a/distmaker/utils/repo-report.php b/distmaker/utils/repo-report.php index 7c3d51279b..efb8008f58 100644 --- a/distmaker/utils/repo-report.php +++ b/distmaker/utils/repo-report.php @@ -35,7 +35,6 @@ $data = 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' => repo("$DM_SOURCEDIR/drupal-8", getenv('DM_REF_DRUPAL8')), 'civicrm-joomla' => repo("$DM_SOURCEDIR/joomla", getenv('DM_REF_JOOMLA')), @@ -50,9 +49,6 @@ if (getenv('BPACK')) { 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"; } -- 2.25.1