Skip to content

Commit

Permalink
simplify $VERSION in build manifests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dzuelke
dzuelke committed Mar 10, 2016
1 parent 83fdbcc commit 6252f22
Show file tree
Hide file tree
Showing 46 changed files with 19 additions and 86 deletions.
2 changes: 1 addition & 1 deletion support/build/apache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source $(dirname $BASH_SOURCE)/_util/include/manifest.sh

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
dep_version=${VERSION}
dep_version=${dep_formula#"${dep_name}-"}
dep_package=${dep_name}-${dep_version}
dep_dirname=httpd-${dep_version}
dep_archive_name=${dep_dirname}.tar.gz
Expand Down
2 changes: 0 additions & 2 deletions support/build/apache-2.4.18
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php/

VERSION=2.4.18

source $(dirname $0)/apache
2 changes: 1 addition & 1 deletion support/build/composer
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -eu

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
dep_version=${VERSION}
dep_version=${dep_formula#"${dep_name}-"}
dep_package=${dep_name}-${dep_version}

echo "-----> Bundling Composer (${dep_version})..."
Expand Down
2 changes: 0 additions & 2 deletions support/build/composer-1.0.0-beta1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-min

VERSION=1.0.0-beta1

source $(dirname $0)/composer
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.10
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33

VERSION=4.0.10

source $(dirname $0)/apcu
11 changes: 6 additions & 5 deletions support/build/extensions/no-debug-non-zts-20121212/blackfire
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ bin_dir=${OUT_PREFIX}/bin

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
if [[ -n "${VERSION:-}" ]]; then
probe_version=${VERSION}
echo "Using explicit version ${VERSION}"
if [[ "$dep_formula" != "$dep_name" ]]; then
probe_version=${dep_formula##*"/${dep_name}-"}

echo "Using explicit version ${probe_version}"
else
probe_version=`curl -I -A "Heroku" -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/${series/\./} | grep 'X-Blackfire-Release-Version: ' | sed "s%X-Blackfire-Release-Version: %%" | sed s%.$%%`
cat <<-EOF
Expand All @@ -55,7 +56,7 @@ else
fi
dep_version=${probe_version}
dep_package=ext-${dep_name}-${dep_version}
if [[ -n "${VERSION:-}" ]]; then
if [[ "$dep_formula" != "$dep_name" ]]; then
dep_manifest=${dep_package}_php-$series.composer.json
else
dep_manifest=ext-${dep_name}_php-$series.composer.json
Expand Down Expand Up @@ -113,7 +114,7 @@ python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-e

print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")"

if [[ -z "${VERSION:-}" ]]; then
if [[ "$dep_formula" == "$dep_name" ]]; then
cat <<-EOF
!!! WARNING !!! If you just deployed using --overwrite and without --publish:
Expand Down
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/blackfire-1.9.2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php/

VERSION=1.9.2

source $(dirname $0)/blackfire
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/event-2.0.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33

VERSION=2.0.0

source $(dirname $0)/event
2 changes: 1 addition & 1 deletion support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo "-----> Merging dependencies..."

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=memcached
dep_version=2.2.0
dep_version=${dep_formula##*"/${dep_name}-"}
dep_package=ext-${dep_name}-${dep_version}
series=5.5
dep_manifest=${dep_package}_php-$series.composer.json
Expand Down
6 changes: 3 additions & 3 deletions support/build/extensions/no-debug-non-zts-20121212/memcached-bare
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ set -eu
export PATH=${OUT_PREFIX}/bin:${PATH}

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=memcached
dep_version=${VERSION}
dep_name=memcached-bare
dep_version=${dep_formula##*"/${dep_name}-"}
dep_package=ext-${dep_name}-${dep_version}
dep_dirname=php-memcached-${dep_version}
dep_archive_name=${dep_version}.tar.gz
Expand All @@ -30,7 +30,7 @@ pushd ${dep_dirname}
phpize
./configure \
--prefix=${OUT_PREFIX} \
--enable-${dep_name} \
--enable-memcached \
--with-libmemcached-dir=${OUT_PREFIX}
make -s -j 9
# php was a build dep, and it's in $OUT_PREFIX. nuke that, then make install so all we're left with is the extension
Expand Down
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33, libraries/libmemcached

VERSION=2.2.0

source $(dirname $0)/memcached-bare
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.12
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33

VERSION=1.6.12

source $(dirname $0)/mongo
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/mongodb-1.1.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33

VERSION=1.1.3

source $(dirname $0)/mongodb
2 changes: 1 addition & 1 deletion support/build/extensions/no-debug-non-zts-20121212/newrelic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ZEND_MODULE_API_VERSION=${ZEND_MODULE_API_VERSION#no-debug-non-zts-}

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
dep_version=${VERSION}
dep_version=${dep_formula##*"/${dep_name}-"}
dep_package=ext-${dep_name}-${dep_version}
dep_dirname=newrelic-php5-${dep_version}-linux
dep_archive_name=${dep_dirname}.tar.gz
Expand Down
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/newrelic-4.23.4.113
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php/

VERSION=4.23.4.113

source $(dirname $0)/newrelic
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33

VERSION=1.2.3

source $(dirname $0)/oauth
2 changes: 1 addition & 1 deletion support/build/extensions/no-debug-non-zts-20121212/phalcon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export PATH=${OUT_PREFIX}/bin:${PATH}

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
dep_version=${VERSION}
dep_version=${dep_formula##*"/${dep_name}-"}
dep_package=ext-${dep_name}-${dep_version}
dep_dirname=cphalcon-${dep_name}-v${dep_version}
dep_archive_name=${dep_name}-v${dep_version}.tar.gz
Expand Down
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.10
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33

VERSION=2.0.10

source $(dirname $0)/phalcon
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/redis-2.2.7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.5.33

VERSION=2.2.7

source $(dirname $0)/redis
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.10
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=4.0.10

source $(dirname $0)/../no-debug-non-zts-20121212/apcu
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/blackfire-1.9.2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php/

VERSION=1.9.2

source $(dirname $0)/blackfire
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/event-2.0.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=2.0.0

source $(dirname $0)/../no-debug-non-zts-20121212/event
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=3.4.1

source $(dirname $0)/../no-debug-non-zts-20121212/imagick
2 changes: 1 addition & 1 deletion support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo "-----> Merging dependencies..."

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=memcached
dep_version=2.2.0
dep_version=${dep_formula##*"/${dep_name}-"}
dep_package=ext-${dep_name}-${dep_version}
series=5.6
dep_manifest=${dep_package}_php-$series.composer.json
Expand Down
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19, libraries/libmemcached

VERSION=2.2.0

source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.12
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=1.6.12

source $(dirname $0)/../no-debug-non-zts-20121212/mongo
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/mongodb-1.1.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=1.1.3

source $(dirname $0)/../no-debug-non-zts-20121212/mongodb
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/newrelic-4.23.4.113
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php/

VERSION=4.23.4.113

source $(dirname $0)/../no-debug-non-zts-20121212/newrelic
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=1.2.3

source $(dirname $0)/../no-debug-non-zts-20121212/oauth
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.10
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=2.0.10

source $(dirname $0)/../no-debug-non-zts-20121212/phalcon
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20131226/redis-2.2.7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-5.6.19

VERSION=2.2.7

source $(dirname $0)/../no-debug-non-zts-20121212/redis
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-7.0.4

VERSION=5.1.3

source $(dirname $0)/../no-debug-non-zts-20121212/apcu
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20151012/blackfire-1.9.2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php/

VERSION=1.9.2

source $(dirname $0)/blackfire
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20151012/event-2.0.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-7.0.4

VERSION=2.0.0

source $(dirname $0)/../no-debug-non-zts-20121212/event
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-7.0.4

VERSION=3.4.1

source $(dirname $0)/../no-debug-non-zts-20121212/imagick
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20151012/mongodb-1.1.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-7.0.4

VERSION=1.1.3

source $(dirname $0)/../no-debug-non-zts-20121212/mongodb
2 changes: 0 additions & 2 deletions support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: php-7.0.4

VERSION=2.0.0

source $(dirname $0)/../no-debug-non-zts-20121212/oauth
2 changes: 1 addition & 1 deletion support/build/extensions/pecl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ OUT_PREFIX=$1
export PATH=${OUT_PREFIX}/bin:${PATH}

dep_formula=${0#$WORKSPACE_DIR/}
dep_version=${VERSION}
dep_version=${dep_formula##*"/${dep_name}-"}
dep_package=ext-${dep_name}-${dep_version}
dep_dirname=${dep_name}-${dep_version}
dep_archive_name=${dep_dirname}.tgz
Expand Down
2 changes: 1 addition & 1 deletion support/build/hhvm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ STACK=${STACK:-"cedar"}

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
dep_version=${VERSION}
dep_version=${dep_formula#"${dep_name}-"}
dep_package=${dep_name}-${dep_version}
dep_dirname=hhvm_${dep_version}
if [[ $STACK == "cedar" ]]; then
Expand Down
2 changes: 0 additions & 2 deletions support/build/hhvm-3.5.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,4 @@
# libxslt1.1
# zlib1g

VERSION=3.5.1

source $(dirname $0)/hhvm
2 changes: 1 addition & 1 deletion support/build/nginx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source $(dirname $BASH_SOURCE)/_util/include/manifest.sh

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
dep_version=${VERSION}
dep_version=${dep_formula#"${dep_name}-"}
dep_package=${dep_name}-${dep_version}
dep_dirname=nginx-${dep_version}
dep_archive_name=${dep_dirname}.tar.gz
Expand Down
2 changes: 0 additions & 2 deletions support/build/nginx-1.8.1
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php/

VERSION=1.8.1

source $(dirname $0)/nginx
2 changes: 1 addition & 1 deletion support/build/php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ OUT_PREFIX=$1

dep_formula=${0#$WORKSPACE_DIR/}
dep_name=$(basename $BASH_SOURCE)
dep_version=${VERSION}
dep_version=${dep_formula#"${dep_name}-"}
dep_package=${dep_name}-${dep_version}
dep_dirname=php-${dep_version}
dep_archive_name=${dep_dirname}.tar.gz
Expand Down
2 changes: 0 additions & 2 deletions support/build/php-5.5.33
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: libraries/libmcrypt, libraries/gettext

VERSION=5.5.33

source $(dirname $0)/php
2 changes: 0 additions & 2 deletions support/build/php-5.6.19
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: libraries/libmcrypt, libraries/gettext

VERSION=5.6.19

source $(dirname $0)/php
2 changes: 0 additions & 2 deletions support/build/php-7.0.4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
# Build Path: /app/.heroku/php/
# Build Deps: libraries/libmcrypt, libraries/gettext

VERSION=7.0.4

source $(dirname $0)/php

0 comments on commit 6252f22

Please sign in to comment.