Skip to content

Commit

Permalink
Remove adminpack creation step from installer
Browse files Browse the repository at this point in the history 
as that module is no more supported
  • Loading branch information
@sandeep-edb
sandeep-edb committed May 23, 2024
1 parent 646edba commit 64593d9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 58 deletions.
5 changes: 0 additions & 5 deletions server/build-osx.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,6 @@ _postprocess_server_osx() {
mkdir -p $WD/server/staging_cache/osx/doc || _die "Failed to create the doc directory"
cp $WD/server/source/postgres.osx/contrib/pldebugger/README.pldebugger $WD/server/staging_cache/osx/doc || _die "Failed to copy the debugger README into the staging_cache directory"

# 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"

# 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"
Expand Down
53 changes: 0 additions & 53 deletions server/pgserver.xml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3277,59 +3277,6 @@
</ruleList>
</throwError>

<!-- If this is an installation, load the various database modules -->
<actionGroup>
<actionList>
<logMessage text="Installing the adminpack module in the postgres database..."/>
<!-- Set variable psql_path -->
<setInstallerVariable name="psql_path" value="${installdir}/bin/psql">
<ruleList>
<compareText>
<logic>does_not_equal</logic>
<text>${platform_name}</text>
<value>windows</value>
</compareText>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="psql_path" value="${installdir}\bin\psql.exe">
<ruleList>
<compareText>
<logic>equals</logic>
<text>${platform_name}</text>
<value>windows</value>
</compareText>
</ruleList>
</setInstallerVariable>
<!-- Set Environment variable PGHOST, PGUSER, PGPASSWORD, PGPORT, PGDATABASE
on all the platform & LD_LIBRARY_PATH on linux/linux-x64 -->
<setEnvironmentVariable name="PGHOST" value="localhost"/>
<setEnvironmentVariable name="PGUSER" value="${superaccount}"/>
<setEnvironmentVariable name="PGPASSWORD" value="${superpassword}"/>
<setEnvironmentVariable name="PGPORT" value="${serverport}"/>
<setEnvironmentVariable name="LD_LIBRARY_PATH" value="${installdir}/lib">
<ruleList>
<compareText logic="does_not_equal" text="${platform_name}" value="windows"/>
</ruleList>
</setEnvironmentVariable>
<runProgram>
<abortOnError>0</abortOnError>
<program>${psql_path}</program>
<programArguments>-c "CREATE EXTENSION adminpack" -d postgres</programArguments>
<showMessageOnError>1</showMessageOnError>
<customErrorMessage>${msg(error.could.not.load.modules)}</customErrorMessage>
<workingDirectory>${installdir}/bin</workingDirectory>
</runProgram>
</actionList>
<!-- Only appropriate for installs -->
<ruleList>
<compareValues>
<value1>${IsUpgrade}</value1>
<logic>equals</logic>
<value2>0</value2>
</compareValues>
</ruleList>
</actionGroup>

<!-- Register the message formatting DLL on Windows -->
<registrySet>
<key>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Eventlog\Application\PostgreSQL</key>
Expand Down

0 comments on commit 64593d9

Please sign in to comment.