Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pen 6296 Apply patch for win64.mak file #87

Draft
wants to merge 3 commits into
base: REL-15
Choose a base branch
from
Draft

Pen 6296 Apply patch for win64.mak file #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
287dd51
PEN-6296 Bump pgJDBC and psqlODBC new versions and generate Mac&windo…
shahidullah-khan Sep 12, 2023
399723d
PEN-6296 Revert NPGSQL version to 3.2.6.
shahidullah-khan Sep 12, 2023
b8d80d9
PEN-6296 Apply patch for win64.mak file
shahidullah-khan Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 64 additions & 64 deletions pgJDBC/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ then
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
source $WD/pgJDBC/build-linux.sh
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
source $WD/pgJDBC/build-linux-x64.sh
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
source $WD/pgJDBC/build-linux-ppc64.sh
fi
#if [ $PG_ARCH_LINUX = 1 ];
#then
# source $WD/pgJDBC/build-linux.sh
#fi
#
## Linux x64
#if [ $PG_ARCH_LINUX_X64 = 1 ];
#then
# source $WD/pgJDBC/build-linux-x64.sh
#fi
#
## Linux ppc64
#if [ $PG_ARCH_LINUX_PPC64 = 1 ];
#then
# source $WD/pgJDBC/build-linux-ppc64.sh
#fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
Expand Down Expand Up @@ -67,22 +67,22 @@ _prep_pgJDBC() {
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_prep_pgJDBC_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_prep_pgJDBC_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
_prep_pgJDBC_linux_ppc64
fi
#if [ $PG_ARCH_LINUX = 1 ];
#then
# _prep_pgJDBC_linux
#fi

## Linux x64
#if [ $PG_ARCH_LINUX_X64 = 1 ];
#then
# _prep_pgJDBC_linux_x64
#fi

## Linux ppc64
#if [ $PG_ARCH_LINUX_PPC64 = 1 ];
#then
# _prep_pgJDBC_linux_ppc64
#fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
Expand All @@ -105,22 +105,22 @@ _build_pgJDBC() {
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_build_pgJDBC_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_build_pgJDBC_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
_build_pgJDBC_linux_ppc64
fi
#if [ $PG_ARCH_LINUX = 1 ];
#then
# _build_pgJDBC_linux
#fi

## Linux x64
#if [ $PG_ARCH_LINUX_X64 = 1 ];
#then
# _build_pgJDBC_linux_x64
#fi

## Linux ppc64
#if [ $PG_ARCH_LINUX_PPC64 = 1 ];
#then
# _build_pgJDBC_linux_ppc64
#fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
Expand Down Expand Up @@ -157,22 +157,22 @@ _postprocess_pgJDBC() {
fi

# Linux
if [ $PG_ARCH_LINUX = 1 ];
then
_postprocess_pgJDBC_linux
fi

# Linux x64
if [ $PG_ARCH_LINUX_X64 = 1 ];
then
_postprocess_pgJDBC_linux_x64
fi

# Linux ppc64
if [ $PG_ARCH_LINUX_PPC64 = 1 ];
then
_postprocess_pgJDBC_linux_ppc64
fi
#if [ $PG_ARCH_LINUX = 1 ];
#then
# _postprocess_pgJDBC_linux
#fi

## Linux x64
#if [ $PG_ARCH_LINUX_X64 = 1 ];
#then
# _postprocess_pgJDBC_linux_x64
#fi
#
## Linux ppc64
#if [ $PG_ARCH_LINUX_PPC64 = 1 ];
#then
# _postprocess_pgJDBC_linux_ppc64
#fi

# Windows
if [ $PG_ARCH_WINDOWS = 1 ];
Expand Down
6 changes: 3 additions & 3 deletions psqlODBC/build-osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ _build_psqlODBC_osx() {
cd $PG_PATH_OSX/psqlODBC/source/psqlODBC.osx

CONFIG_FILES="config"
ARCHS="i386 x86_64"
ARCHS="x86_64"
ARCH_FLAGS=""
for ARCH in \${ARCHS}
do
echo "Configuring psqlODBC sources for \${ARCH}"
CFLAGS="$PG_ARCH_OSX_CFLAGS -arch \${ARCH}" LDFLAGS="-lssl" PATH="$PG_PGHOME_OSX/bin:$PATH" sh -x ./configure --disable-dependency-tracking --with-iodbc --with-libpq=$PG_PGHOME_OSX --prefix="$PG_STAGING" || _die "Could not configuring psqlODBC sources for intel"
CFLAGS="-I$IODBC_HOME_OSX/include $PG_ARCH_OSX_CFLAGS -arch \${ARCH}" LD_LIBRARY_PATH=/opt/local/Current/lib LDFLAGS="-L/opt/local/Current/lib -lssl" PATH="$PG_PGHOME_OSX/bin:$PATH" sh -x ./configure --disable-dependency-tracking --with-iodbc=$IODBC_HOME_OSX/bin --with-libpq=$PG_PGHOME_OSX --prefix="$PG_STAGING" || _die "Could not configuring psqlODBC sources for intel"
ARCH_FLAGS="\${ARCH_FLAGS} -arch \${ARCH}"
for configFile in \${CONFIG_FILES}
do
Expand All @@ -109,7 +109,7 @@ _build_psqlODBC_osx() {
done

echo "Configuring psqlODBC sources for Universal"
CFLAGS="$PG_ARCH_OSX_CFLAGS \${ARCH_FLAGS}" LDFLAGS="-lssl" PATH="$PG_PGHOME_OSX/bin:$PATH" ./configure --disable-dependency-tracking --with-iodbc --with-libpq=$PG_PGHOME_OSX --prefix="$PG_STAGING" || _die "Could not configuring psqlODBC sources for Universal"
CFLAGS="-I$IODBC_HOME_OSX/include $PG_ARCH_OSX_CFLAGS \${ARCH_FLAGS}" LD_LIBRARY_PATH=/opt/local/Current/lib LDFLAGS="-L/opt/local/Current/lib -lssl" PATH="$PG_PGHOME_OSX/bin:$PATH" ./configure --disable-dependency-tracking --with-iodbc=$IODBC_HOME_OSX/bin --with-libpq=$PG_PGHOME_OSX --prefix="$PG_STAGING" || _die "Could not configuring psqlODBC sources for Universal"

# Create a replacement config.h's that will pull in the appropriate architecture-specific one:
for configFile in \${CONFIG_FILES}
Expand Down
7 changes: 4 additions & 3 deletions psqlODBC/build-windows-x64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ _prep_psqlODBC_windows_x64() {
cp -R psqlodbc-$PG_VERSION_PSQLODBC/* psqlODBC.windows-x64 || _die "Failed to copy the source code (source/psqlODBC-$PG_VERSION_PSQLODBC)"
cd psqlODBC.windows-x64
#patch -p1 < $WD/tarballs/psqlodbc-win64.patch
patch -p1 < $WD/tarballs/psqlodbc-win64-mak.patch
cd ..

echo "Archieving psqlODBC sources"
Expand Down Expand Up @@ -70,7 +71,7 @@ _build_psqlODBC_windows_x64() {

cat <<EOT > "build-psqlODBC.bat"

CALL "$PG_VSINSTALLDIR_WINDOWS_X64\VC\vcvarsall.bat" amd64
CALL "$PG_VSINSTALLDIR_WINDOWS_X64\Professional\VC\Auxiliary\Build\vcvarsall.bat" amd64

@SET OPENSSL_PATH=$PG_PGBUILD_WINDOWS_X64
@SET PG_HOME_PATH=$PG_PATH_WINDOWS_X64\output
Expand Down Expand Up @@ -135,8 +136,8 @@ _postprocess_psqlODBC_windows_x64() {
PG_BUILD_PSQLODBC=$(expr $PG_BUILD_PSQLODBC + $SKIPBUILD)

scp $PG_SSH_WINDOWS_X64:$PG_PATH_WINDOWS_X64/output/lib/libpq.dll $WD/psqlODBC/staging/windows-x64/bin || _die "Failed to copy the dependent dll"
scp $PG_SSH_WINDOWS_X64:$PG_PGBUILD_OPENSSL_WINDOWS_X64/bin/libssl-1_1-x64.dll $WD/psqlODBC/staging/windows-x64/bin || _die "Failed to copy the dependent dll"
scp $PG_SSH_WINDOWS_X64:$PG_PGBUILD_OPENSSL_WINDOWS_X64/bin/libcrypto-1_1-x64.dll $WD/psqlODBC/staging/windows-x64/bin || _die "Failed to copy the dependent dll"
scp $PG_SSH_WINDOWS_X64:$PG_PGBUILD_OPENSSL_WINDOWS_X64/bin/libssl-3-x64.dll $WD/psqlODBC/staging/windows-x64/bin || _die "Failed to copy the dependent dll"
scp $PG_SSH_WINDOWS_X64:$PG_PGBUILD_OPENSSL_WINDOWS_X64/bin/libcrypto-3-x64.dll $WD/psqlODBC/staging/windows-x64/bin || _die "Failed to copy the dependent dll"
scp $PG_SSH_WINDOWS_X64:$PG_PGBUILD_WINDOWS_X64/bin/libintl-8.dll $WD/psqlODBC/staging/windows-x64/bin || _die "Failed to copy the dll (libintl.dll)"
scp $PG_SSH_WINDOWS_X64:$PG_PGBUILD_WINDOWS_X64/bin/libiconv-2.dll $WD/psqlODBC/staging/windows-x64/bin || _die "Failed to copy the dll (libiconv-2.dll)"

Expand Down
Loading