Update PG version to 17beta1; Add step to

compile docs as release source tarballs do not bundle it
EnterpriseDB · May 23, 2024 · 646edba · 646edba
1 parent 112fbfd
commit 646edba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/server/build-osx.sh b/server/build-osx.sh
@@ -177,6 +177,10 @@ _build_server_osx() {
     ssh $PG_SSH_OSX "cd $PG_PATH_OSX/server/source/postgres.osx/; PATH=/opt/local/Current_v15/bin:$PATH CFLAGS='$PG_ARCH_OSX_CFLAGS -O2' make -j4" || _die "Failed to build postgres"
     ssh $PG_SSH_OSX "cd $PG_PATH_OSX/server/source/postgres.osx/; make install" || _die "Failed to install postgres"
 
+    echo "Building docs"
+    ssh $PG_SSH_OSX "cd $PG_PATH_OSX/server/source/postgres.osx/doc; CFLAGS='$PG_ARCH_OSX_CFLAGS ' make" || _die "Failed to build the postgres docs"
+    ssh $PG_SSH_OSX "cd $PG_PATH_OSX/server/source/postgres.osx/doc; make install" || _die "Failed to install the postgres docs"
+
     echo "Building contrib modules"
     ssh $PG_SSH_OSX "cd $PG_PATH_OSX/server/source/postgres.osx/contrib; CFLAGS='$PG_ARCH_OSX_CFLAGS ' make" || _die "Failed to build the postgres contrib modules"
     ssh $PG_SSH_OSX "cd $PG_PATH_OSX/server/source/postgres.osx/contrib; make install" || _die "Failed to install the postgres contrib modules"
@@ -392,14 +396,14 @@ _postprocess_server_osx() {
     # Install the PostgreSQL docs
     mkdir -p $WD/server/staging_cache/osx/doc/postgresql/html || _die "Failed to create the doc directory"
     cd $WD/server/staging_cache/osx/doc/postgresql/html || _die "Failed to change to the doc directory"
-    cp -pR $WD/server/source/postgres.osx/doc/src/sgml/html/* . || _die "Failed to copy the PostgreSQL documentation"
+    #cp -pR $WD/server/source/postgres.osx/doc/src/sgml/html/* . || _die "Failed to copy the PostgreSQL documentation"
 
     # Install the PostgreSQL man pages
     mkdir -p $WD/server/staging_cache/osx/share/man || _die "Failed to create the man directory"
-    cd $WD/server/staging_cache/osx/share/man || _die "Failed to change to the man directory"
-    cp -pR $WD/server/source/postgres.osx/doc/src/sgml/man1 man1 || _die "Failed to copy the PostgreSQL man pages (osx)"
-    cp -pR $WD/server/source/postgres.osx/doc/src/sgml/man3 man3 || _die "Failed to copy the PostgreSQL man pages (osx)"
-    cp -pR $WD/server/source/postgres.osx/doc/src/sgml/man7 man7 || _die "Failed to copy the PostgreSQL man pages (osx)"
+    #cd $WD/server/staging_cache/osx/share/man || _die "Failed to change to the man directory"
+    #cp -pR $WD/server/source/postgres.osx/doc/src/sgml/man1 man1 || _die "Failed to copy the PostgreSQL man pages (osx)"
+    #cp -pR $WD/server/source/postgres.osx/doc/src/sgml/man3 man3 || _die "Failed to copy the PostgreSQL man pages (osx)"
+    #cp -pR $WD/server/source/postgres.osx/doc/src/sgml/man7 man7 || _die "Failed to copy the PostgreSQL man pages (osx)"
 
     source $WD/server/staging_cache/osx/versions-osx.sh
     PG_BUILD_SERVER=$(expr $PG_BUILD_SERVER + $SKIPBUILD)

diff --git a/versions.sh b/versions.sh
@@ -2,7 +2,7 @@
 
 # Source tarball versions
 
-PG_TARBALL_POSTGRESQL=16.3
+PG_TARBALL_POSTGRESQL=17beta1
 PG_TARBALL_PGADMIN=8.6
 PG_LP_VERSION=4.3
 
@@ -15,8 +15,8 @@ PG_BUILDNUM_LANGUAGEPACK=1
 # PostgreSQL version. This is split into major version (8.4) and minor version (0.1).
 #                     Minor version is revision.build.
 
-PG_MAJOR_VERSION=16
-PG_MINOR_VERSION=3.1
+PG_MAJOR_VERSION=17
+PG_MINOR_VERSION=0.beta1
 
 # Other package versions
 PG_VERSION_POSTGIS=3.4.2