Skip to content

Commit

Permalink
Removing extra exit statements from build.sh for all active components:
Browse files Browse the repository at this point in the history 
- ApacheHTTPD
- Npgsql
- PostGIS
- Slony
- UpdateMonitor
- hdfs_fdw
- languagepack
- pgAgent
- pgJDBC
- pgbouncer
- pgmemcache
- psqlODBC
- server
- sqlprotect
  • Loading branch information
@talha-edb
talha-edb committed Jul 19, 2017
1 parent d8e2a83 commit 0e39797
Show file tree
Hide file tree
Showing 14 changed files with 252 additions and 252 deletions.
40 changes: 20 additions & 20 deletions ApacheHTTPD/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,27 @@ _prep_ApacheHTTPD() {
rm -rf mod_wsgi-$PG_VERSION_WSGI || _die "Couldn't remove the existing mod_wsgi-$PG_VERSION_WSGI source directory (source/mod_wsgi-$PG_VERSION_WSGI)"
fi

extract_file ../../tarballs/mod_wsgi-$PG_VERSION_WSGI || exit 1
extract_file ../../tarballs/mod_wsgi-$PG_VERSION_WSGI

echo "Unpacking apache source..."
if [ $PG_ARCH_WINDOWS = 1 ];
then
if [ -e apache.windows ]; then
rm -rf apache.windows || _die "Couldn't remove the existing apache.windows source directory (source/apache.windows)"
fi
extract_file ../../tarballs/httpd-$PG_VERSION_APACHE-win32-src || exit 1
extract_file ../../tarballs/zlib-$PG_TARBALL_ZLIB || exit 1
extract_file ../../tarballs/openssl-$PG_TARBALL_OPENSSL || exit 1
extract_file ../../tarballs/pcre-836-win32-binaries || exit 1
mv pcre-836-win32-binaries httpd-$PG_VERSION_APACHE/srclib/pcre || exit 1
extract_file ../../tarballs/httpd-$PG_VERSION_APACHE-win32-src
extract_file ../../tarballs/zlib-$PG_TARBALL_ZLIB
extract_file ../../tarballs/openssl-$PG_TARBALL_OPENSSL
extract_file ../../tarballs/pcre-836-win32-binaries
mv pcre-836-win32-binaries httpd-$PG_VERSION_APACHE/srclib/pcre
mv httpd-$PG_VERSION_APACHE apache.windows || _die "Couldn't move httpd-$PG_VERSION_APACHE as apache.windows"

fi

if [[ $PG_ARCH_LINUX = 1 || $PG_ARCH_LINUX_X64 = 1 || $PG_ARCH_OSX = 1 ]];
then
extract_file ../../tarballs/httpd-$PG_VERSION_APACHE || exit 1
extract_file ../../tarballs/httpd-$PG_VERSION_APACHE-deps || exit 1
extract_file ../../tarballs/httpd-$PG_VERSION_APACHE
extract_file ../../tarballs/httpd-$PG_VERSION_APACHE-deps
fi

# Per-platform prep
Expand All @@ -84,25 +84,25 @@ _prep_ApacheHTTPD() {
# Mac OS X
if [ $PG_ARCH_OSX = 1 ];
then
_prep_ApacheHTTPD_osx || exit 1
_prep_ApacheHTTPD_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_prep_ApacheHTTPD_linux || exit 1
_prep_ApacheHTTPD_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_prep_ApacheHTTPD_linux_x64 || exit 1
_prep_ApacheHTTPD_linux_x64
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
_prep_ApacheHTTPD_windows || exit 1
_prep_ApacheHTTPD_windows
fi

}
Expand All @@ -116,25 +116,25 @@ _build_ApacheHTTPD() {
# Mac OSX
if [ $PG_ARCH_OSX = 1 ];
then
_build_ApacheHTTPD_osx || exit 1
_build_ApacheHTTPD_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_build_ApacheHTTPD_linux || exit 1
_build_ApacheHTTPD_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_build_ApacheHTTPD_linux_x64 || exit 1
_build_ApacheHTTPD_linux_x64
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
_build_ApacheHTTPD_windows || exit 1
_build_ApacheHTTPD_windows
fi
}

Expand Down Expand Up @@ -162,24 +162,24 @@ _postprocess_ApacheHTTPD() {
# Mac OSX
if [ $PG_ARCH_OSX = 1 ];
then
_postprocess_ApacheHTTPD_osx || exit 1
_postprocess_ApacheHTTPD_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_postprocess_ApacheHTTPD_linux || exit 1
_postprocess_ApacheHTTPD_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_postprocess_ApacheHTTPD_linux_x64 || exit 1
_postprocess_ApacheHTTPD_linux_x64
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
_postprocess_ApacheHTTPD_windows || exit 1
_postprocess_ApacheHTTPD_windows
fi
}
32 changes: 16 additions & 16 deletions Npgsql/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ _prep_Npgsql() {
echo "Unpacking Npgsql source..."

cd $WD/Npgsql/source/
extract_file ../../../tarballs/npgsql-"${PG_VERSION_NPGSQL}" || exit 1
extract_file ../../../tarballs/npgsql-"${PG_VERSION_NPGSQL}"

#Commenting patch as new version 3.0.5 is already present in the source code.
#Npgsql-3.0.4 patch against VS 2013.
Expand All @@ -63,31 +63,31 @@ _prep_Npgsql() {
# Mac OS X
if [ $PG_ARCH_OSX = 1 ];
then
_prep_Npgsql_osx || exit 1
_prep_Npgsql_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_prep_Npgsql_linux || exit 1
_prep_Npgsql_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_prep_Npgsql_linux_x64 || exit 1
_prep_Npgsql_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
_prep_Npgsql_linux_ppc64 || exit 1
_prep_Npgsql_linux_ppc64
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
_prep_Npgsql_windows || exit 1
_prep_Npgsql_windows
fi

}
Expand All @@ -101,31 +101,31 @@ _build_Npgsql() {
# Mac OSX
if [ $PG_ARCH_OSX = 1 ];
then
_build_Npgsql_osx || exit 1
_build_Npgsql_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_build_Npgsql_linux || exit 1
_build_Npgsql_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_build_Npgsql_linux_x64 || exit 1
_build_Npgsql_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
_build_Npgsql_linux_ppc64 || exit 1
_build_Npgsql_linux_ppc64
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
_build_Npgsql_windows || exit 1
_build_Npgsql_windows
fi
}

Expand All @@ -152,30 +152,30 @@ _postprocess_Npgsql() {
# Mac OSX
if [ $PG_ARCH_OSX = 1 ];
then
_postprocess_Npgsql_osx || exit 1
_postprocess_Npgsql_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_postprocess_Npgsql_linux || exit 1
_postprocess_Npgsql_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_postprocess_Npgsql_linux_x64 || exit 1
_postprocess_Npgsql_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
_postprocess_Npgsql_linux_ppc64 || exit 1
_postprocess_Npgsql_linux_ppc64
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
_postprocess_Npgsql_windows || exit 1
_postprocess_Npgsql_windows
fi
}
36 changes: 18 additions & 18 deletions PostGIS/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ _prep_PostGIS() {
fi

echo "Unpacking postgis source..."
extract_file ../../tarballs/postgis-$PG_VERSION_POSTGIS || exit 1
extract_file ../../tarballs/postgis-$PG_VERSION_POSTGIS

echo "Extracting the postgis-java source..."
extract_file ../../tarballs/postgis-java-$PG_VERSION_POSTGIS_JAVA || exit 1
extract_file ../../tarballs/postgis-java-$PG_VERSION_POSTGIS_JAVA
mv postgis-java-$PG_VERSION_POSTGIS_JAVA postgis-$PG_VERSION_POSTGIS/java/

echo "Applying patches..."
Expand All @@ -71,7 +71,7 @@ _prep_PostGIS() {
cd $WD/PostGIS/source

echo "Extracting the postgresql jar file..."
extract_file ../../tarballs/pgJDBC-$PG_VERSION_PGJDBC || exit 1
extract_file ../../tarballs/pgJDBC-$PG_VERSION_PGJDBC
mv pgJDBC-$PG_VERSION_PGJDBC/*.jar .

# Per-platform prep
Expand All @@ -80,32 +80,32 @@ _prep_PostGIS() {
# Mac OS X
if [ $PG_ARCH_OSX = 1 ];
then
_prep_PostGIS_osx || exit 1
_prep_PostGIS_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_prep_PostGIS_linux || exit 1
_prep_PostGIS_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_prep_PostGIS_linux_x64 || exit 1
_prep_PostGIS_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
#_prep_PostGIS_linux_ppc64 || exit 1
#_prep_PostGIS_linux_ppc64
echo "Linux-PPC64 build pre-process is not part of build framework yet."
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
#_prep_PostGIS_windows || exit 1
#_prep_PostGIS_windows
echo "PostGIS:Disabled for now:windows"
fi

Expand All @@ -120,32 +120,32 @@ _build_PostGIS() {
# Mac OSX
if [ $PG_ARCH_OSX = 1 ];
then
_build_PostGIS_osx || exit 1
_build_PostGIS_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_build_PostGIS_linux || exit 1
_build_PostGIS_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_build_PostGIS_linux_x64 || exit 1
_build_PostGIS_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
#_build_PostGIS_linux_ppc64 || exit 1
#_build_PostGIS_linux_ppc64
echo "Linux-PPC64 build process is not part of build framework yet."
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
#_build_PostGIS_windows || exit 1
#_build_PostGIS_windows
echo "PostGIS:Disabled for now:windows"
fi
}
Expand Down Expand Up @@ -184,31 +184,31 @@ _postprocess_PostGIS() {
# Mac OSX
if [ $PG_ARCH_OSX = 1 ];
then
_postprocess_PostGIS_osx || exit 1
_postprocess_PostGIS_osx
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_postprocess_PostGIS_linux || exit 1
_postprocess_PostGIS_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_postprocess_PostGIS_linux_x64 || exit 1
_postprocess_PostGIS_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
_postprocess_PostGIS_linux_ppc64 || exit 1
_postprocess_PostGIS_linux_ppc64
fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
then
#_postprocess_PostGIS_windows || exit 1
#_postprocess_PostGIS_windows
echo "PostGIS:Disabled for now:windows"
fi
}
Expand Down
Loading

0 comments on commit 0e39797

Please sign in to comment.