Skip to content

Commit

Permalink
Merge branch 'master' into REL-9_0_DEV
Browse files Browse the repository at this point in the history 
Conflicts:
	ApachePhp/build-osx.sh
	pgmemcache/build-osx.sh
	server/build-osx.sh
	versions.sh
  • Loading branch information
Buildfarm committed Feb 23, 2010
2 parents d1ce16a + 9c29c26 commit 04063e5
Show file tree
Hide file tree
Showing 106 changed files with 3,742 additions and 4,097 deletions.
10 changes: 9 additions & 1 deletion ApachePhp/build-osx.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ EOT
for configFile in ${CONFIG_FILES}
do
if [ -f "${configFile}.h" ]; then
cp ${configFile}.h ${configFile}_${ARCH}.h
#Hack for php 5.2.12
_replace "#define HAVE_ARPA_NAMESER_COMPAT_H 1" "#define HAVE_ARPA_NAMESER_COMPAT_H 0" "main/php_config.h"
mv ${configFile}.h ${configFile}_${ARCH}.h
fi
done
done
Expand Down Expand Up @@ -198,7 +200,13 @@ EOT

echo "Building php"
cd $PG_PATH_OSX/ApachePhp/source/php.osx
#Remove the -L/usr/lib LDFLAG as it links to the system libxml2.
#Hack for php 5.2.12
line=`grep "EXTRA_LDFLAGS =" Makefile | sed -e 's:-L/usr/lib ::g'`
sed -e "s:EXTRA_LDFLAGS = .*:$line:g" Makefile > /tmp/Makefile.tmp
mv /tmp/Makefile.tmp Makefile
CFLAGS="$PG_ARCH_OSX_CFLAGS ${ARCH_FLAGS}" LDFLAGS="-lresolv" make -j2 || _die "Failed to build php"

install_name_tool -change "libpq.5.dylib" "$PG_PGHOME_OSX/lib/libpq.5.dylib" "$PG_PATH_OSX/ApachePhp/source/php.osx/sapi/cli/php"

make install || _die "Failed to install php"
Expand Down
1 change: 1 addition & 0 deletions DevServer/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ _prep_DevServer() {
patch -p0 < ../../../tarballs/pljava-fix.patch
patch -p1 < ../../../tarballs/pljava-fix2.patch
patch -p1 < ../../../tarballs/pljava-fix3.patch
patch -p1 < ../../../tarballs/pljava-fix4.patch

echo "making another source tree for building postgres Docs"
cd $WD/DevServer/source
Expand Down
18 changes: 9 additions & 9 deletions Drupal/installer.xml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@
<actionList>
<runProgram>
<program>${installdir}/Drupal/installer/Drupal/install.sh</program>
<programArguments> "${pghost}" "${pgport}" "${pguser}" "${pgpassword}" "${system_temp_directory}/instscripts" "${pgdatabase}"</programArguments>
<programArguments> "${pghost}" "${pgport}" "${pguser}" "${pgpassword.password}" "${system_temp_directory}/instscripts" "${pgdatabase}"</programArguments>
<workingDirectory>${installdir}/Drupal/installer/Drupal</workingDirectory>
</runProgram>
<!-- Inform user about the database and role creation -->
Expand Down Expand Up @@ -1563,7 +1563,7 @@
<!-- Running the Script to validate the PostgreSQL Server Details -->
<setInstallerVariableFromScriptOutput>
<exec>${system_temp_directory}/${product_fullname}/check-connection.bat</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}\instscripts" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}\instscripts" "${pgdatabase}"</execArgs>
<name>connection</name>
<workingDirectory>${system_temp_directory}/${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
Expand All @@ -1584,7 +1584,7 @@
<!-- Running the Script to validate the PostgreSQL Server Details -->
<setInstallerVariableFromScriptOutput>
<exec>${system_temp_directory}/${product_fullname}/check-connection.bat</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}\instscripts" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}\instscripts" "${pgdatabase}"</execArgs>
<name>connection</name>
<workingDirectory>${system_temp_directory}/${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
Expand All @@ -1611,7 +1611,7 @@
<!-- Running the Script to validate the PostgreSQL Server Details -->
<setInstallerVariableFromScriptOutput>
<exec>${system_temp_directory}/${product_fullname}/check-connection.sh</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}/instscripts" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}/instscripts" "${pgdatabase}"</execArgs>
<name>connection</name>
<workingDirectory>${system_temp_directory}/${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
Expand All @@ -1632,7 +1632,7 @@
<!-- Running the Script to validate the PostgreSQL Server Details -->
<setInstallerVariableFromScriptOutput>
<exec>${system_temp_directory}/${product_fullname}/check-connection.sh</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}/instscripts" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}/instscripts" "${pgdatabase}"</execArgs>
<name>connection</name>
<workingDirectory>${system_temp_directory}/${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
Expand Down Expand Up @@ -1682,7 +1682,7 @@
<setInstallerVariableFromScriptOutput>
<name>dbexist</name>
<exec>${system_temp_directory}\${product_fullname}\check-db.bat</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}\instscripts" "drupal" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}\instscripts" "drupal" "${pgdatabase}"</execArgs>
<workingDirectory>${system_temp_directory}\${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
<showMessageOnError>0</showMessageOnError>
Expand All @@ -1691,7 +1691,7 @@
<setInstallerVariableFromScriptOutput>
<name>userexist</name>
<exec>${system_temp_directory}\${product_fullname}\check-db.bat</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}\instscripts" "drupaluser" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}\instscripts" "drupaluser" "${pgdatabase}"</execArgs>

<workingDirectory>${system_temp_directory}\${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
Expand All @@ -1718,7 +1718,7 @@
<setInstallerVariableFromScriptOutput>
<name>dbexist</name>
<exec>${system_temp_directory}/${product_fullname}/check-db.sh</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}/instscripts" "drupal" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}/instscripts" "drupal" "${pgdatabase}"</execArgs>

<workingDirectory>${system_temp_directory}/${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
Expand All @@ -1728,7 +1728,7 @@
<setInstallerVariableFromScriptOutput>
<name>userexist</name>
<exec>${system_temp_directory}/${product_fullname}/check-db.sh</exec>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword}" "${system_temp_directory}\instscripts" "drupaluser" "${pgdatabase}"</execArgs>
<execArgs>${pghost} ${pgport} ${pguser} "${pgpassword.password}" "${system_temp_directory}\instscripts" "drupaluser" "${pgdatabase}"</execArgs>
<workingDirectory>${system_temp_directory}/${product_fullname}</workingDirectory>
<abortOnError>0</abortOnError>
<showMessageOnError>0</showMessageOnError>
Expand Down
Loading

0 comments on commit 04063e5

Please sign in to comment.