Skip to content

Commit

Permalink
PHP in os-specific subdir
Browse files Browse the repository at this point in the history
  • Loading branch information
lstoll committed Oct 4, 2011
1 parent 6225067 commit c83c951
Show file tree
Hide file tree
Showing 429 changed files with 3,394 additions and 3,393 deletions.
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: cd public ; ../sw/bin/php -S 0.0.0.0:$PORT
web: cd public ; ../sw/linux/bin/php -S 0.0.0.0:$PORT
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# PHP on Heroku
4 changes: 2 additions & 2 deletions provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ sudo apt-get -y install build-essential libxml2-dev libpq-dev
wget http://snaps.php.net/php5.4-latest.tar.bz2
tar -jxvf php5.4-latest.tar.bz2
cd php5.4*
./configure --with-pgsql --prefix=/app/sw
./configure --with-pgsql --prefix=/app/sw/linux
make
make install
make install
1 change: 0 additions & 1 deletion sw/bin/phar

This file was deleted.

2 changes: 0 additions & 2 deletions sw/etc/pear.conf

This file was deleted.

11 changes: 0 additions & 11 deletions sw/lib/php/.registry/structures_graph.reg

This file was deleted.

10 changes: 5 additions & 5 deletions sw/bin/pear → sw/linux/bin/pear
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
PHP="$PHP_PEAR_PHP_BIN"
else
if test "/app/sw/bin/php" = '@'php_bin'@'; then
if test "/app/sw/linux/bin/php" = '@'php_bin'@'; then
PHP=php
else
PHP="/app/sw/bin/php"
PHP="/app/sw/linux/bin/php"
fi
fi

Expand All @@ -16,12 +16,12 @@ if test "x$PHP_PEAR_INSTALL_DIR" != "x"; then
INCDIR=$PHP_PEAR_INSTALL_DIR
INCARG="-d include_path=$PHP_PEAR_INSTALL_DIR"
else
if test "/app/sw/lib/php" = '@'php_dir'@'; then
if test "/app/sw/linux/lib/php" = '@'php_dir'@'; then
INCDIR=`dirname $0`
INCARG=""
else
INCDIR="/app/sw/lib/php"
INCARG="-d include_path=/app/sw/lib/php"
INCDIR="/app/sw/linux/lib/php"
INCARG="-d include_path=/app/sw/linux/lib/php"
fi
fi

Expand Down
10 changes: 5 additions & 5 deletions sw/bin/peardev → sw/linux/bin/peardev
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
PHP="$PHP_PEAR_PHP_BIN"
else
if test "/app/sw/bin/php" = '@'php_bin'@'; then
if test "/app/sw/linux/bin/php" = '@'php_bin'@'; then
PHP=php
else
PHP="/app/sw/bin/php"
PHP="/app/sw/linux/bin/php"
fi
fi

Expand All @@ -16,12 +16,12 @@ if test "x$PHP_PEAR_INSTALL_DIR" != "x"; then
INCDIR=$PHP_PEAR_INSTALL_DIR
INCARG="-d include_path=$PHP_PEAR_INSTALL_DIR"
else
if test "/app/sw/lib/php" = '@'php_dir'@'; then
if test "/app/sw/linux/lib/php" = '@'php_dir'@'; then
INCDIR=`dirname $0`
INCARG=""
else
INCDIR="/app/sw/lib/php"
INCARG="-d include_path=/app/sw/lib/php"
INCDIR="/app/sw/linux/lib/php"
INCARG="-d include_path=/app/sw/linux/lib/php"
fi
fi

Expand Down
10 changes: 5 additions & 5 deletions sw/bin/pecl → sw/linux/bin/pecl
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
PHP="$PHP_PEAR_PHP_BIN"
else
if test "/app/sw/bin/php" = '@'php_bin'@'; then
if test "/app/sw/linux/bin/php" = '@'php_bin'@'; then
PHP=php
else
PHP="/app/sw/bin/php"
PHP="/app/sw/linux/bin/php"
fi
fi

Expand All @@ -16,12 +16,12 @@ if test "x$PHP_PEAR_INSTALL_DIR" != "x"; then
INCDIR=$PHP_PEAR_INSTALL_DIR
INCARG="-d include_path=$PHP_PEAR_INSTALL_DIR"
else
if test "/app/sw/lib/php" = '@'php_dir'@'; then
if test "/app/sw/linux/lib/php" = '@'php_dir'@'; then
INCDIR=`dirname $0`
INCARG=""
else
INCDIR="/app/sw/lib/php"
INCARG="-d include_path=/app/sw/lib/php"
INCDIR="/app/sw/linux/lib/php"
INCARG="-d include_path=/app/sw/linux/lib/php"
fi
fi

Expand Down
1 change: 1 addition & 0 deletions sw/linux/bin/phar
Binary file renamed sw/bin/phar.phar → sw/linux/bin/phar.phar
Binary file not shown.
Binary file renamed sw/bin/php → sw/linux/bin/php
Binary file not shown.
Binary file renamed sw/bin/php-cgi → sw/linux/bin/php-cgi
Binary file not shown.
8 changes: 4 additions & 4 deletions sw/bin/php-config → sw/linux/bin/php-config
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#! /bin/sh

SED="/bin/sed"
prefix="/app/sw"
datarootdir="/app/sw/php"
prefix="/app/sw/linux"
datarootdir="/app/sw/linux/php"
exec_prefix="${prefix}"
version="5.4.0beta1-dev"
vernum="50400"
include_dir="${prefix}/include/php"
includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
ldflags=""
libs="-lcrypt -lcrypt -lpq -lrt -lrt -lm -ldl -lnsl -lxml2 -lxml2 -lxml2 -lcrypt -lxml2 -lxml2 -lxml2 -lcrypt "
extension_dir='/app/sw/lib/php/extensions/no-debug-non-zts-20100525'
extension_dir='/app/sw/linux/lib/php/extensions/no-debug-non-zts-20100525'
man_dir=`eval echo ${datarootdir}/man`
program_prefix=""
program_suffix=""
exe_extension=""
php_cli_binary=NONE
php_cgi_binary=NONE
configure_options=" '--with-pgsql' '--prefix=/app/sw'"
configure_options=" '--with-pgsql' '--prefix=/app/sw/linux'"
php_sapis=" cli cgi"

# Set php_cli_binary and php_cgi_binary if available
Expand Down
6 changes: 3 additions & 3 deletions sw/bin/phpize → sw/linux/bin/phpize
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh

# Variable declaration
prefix='/app/sw'
datarootdir='/app/sw/php'
prefix='/app/sw/linux'
datarootdir='/app/sw/linux/php'
exec_prefix="`eval echo ${prefix}`"
phpdir="`eval echo ${exec_prefix}/lib/php`/build"
includedir="`eval echo ${prefix}/include`/php"
Expand Down Expand Up @@ -152,7 +152,7 @@ phpize_copy_files()
phpize_replace_prefix()
{
$SED \
-e "s#/app/sw#$prefix#" \
-e "s#/app/sw/linux#$prefix#" \
< "$phpdir/phpize.m4" > configure.in
}

Expand Down
2 changes: 2 additions & 0 deletions sw/linux/etc/pear.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#PEAR_Config 0.9
a:31:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:21:"/app/sw/linux/lib/php";s:7:"ext_dir";s:58:"/app/sw/linux/lib/php/extensions/no-debug-non-zts-20100525";s:7:"doc_dir";s:25:"/app/sw/linux/lib/php/doc";s:7:"bin_dir";s:17:"/app/sw/linux/bin";s:8:"data_dir";s:26:"/app/sw/linux/lib/php/data";s:7:"cfg_dir";s:25:"/app/sw/linux/lib/php/cfg";s:7:"www_dir";s:28:"/app/sw/linux/lib/php/htdocs";s:8:"test_dir";s:26:"/app/sw/linux/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:21:"/app/sw/linux/bin/php";s:10:"php_prefix";s:0:"";s:10:"php_suffix";s:0:"";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:12:"/usr/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:26:"/app/sw/linux/etc/pearkeys";}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c83c951

Please sign in to comment.