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

[PPS-54-v13] - Fix warnings that installbuilder throws during installer build #35

Draft
wants to merge 4 commits into
base: REL-13
Choose a base branch
from
Draft

[PPS-54-v13] - Fix warnings that installbuilder throws during installer build #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce1e6e5
[PPS-54] - Fixing some warnings that installbuilder throws during ins…
Semab-Tariq Nov 30, 2021
5a3f022
[PPS-54] - Removing unsupported platforms code
Semab-Tariq Nov 30, 2021
a7b0eee
[PPS-54] - Removing unsupported platforms and cleaning the script files
Semab-Tariq Nov 30, 2021
c36f587
[PPS-54] Restructure the code to fix some build time warnings by inst…
Semab-Tariq Dec 1, 2021
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
83 changes: 0 additions & 83 deletions server/commandlinetools.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,51 +39,6 @@
</compareText>
</ruleList>
</folder>
<!-- LINUX_X64: Program files -->
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfileslinux-x64</name>
<platforms>linux-x64</platforms>
<distributionFileList>
<distributionDirectory>
<origin>staging/linux-x64/commandlinetools/lib</origin>
</distributionDirectory>
<distributionDirectory>
<origin>staging/linux-x64/commandlinetools/bin</origin>
</distributionDirectory>
<distributionDirectory>
<origin>staging/linux-x64/commandlinetools/share</origin>
</distributionDirectory>
<distributionDirectory>
<origin>staging/linux-x64/commandlinetools/installer</origin>
</distributionDirectory>
<distributionDirectory>
<origin>staging/linux-x64/commandlinetools/scripts</origin>
</distributionDirectory>
<distributionFile>
<origin>staging/linux-x64/commandlinetools/commandlinetools_3rd_party_licenses.txt</origin>
</distributionFile>
</distributionFileList>
</folder>
<!-- LINUX_PPC64: Program files -->
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfileslinux-ppc64</name>
<platforms>linux-ppc</platforms>
<distributionFileList>
<distributionDirectory>
<origin>staging/linux-ppc64/pgAdmin 4</origin>
</distributionDirectory>
<distributionFile>
<origin>../resources/license.txt</origin>
</distributionFile>
<distributionFile>
<origin>staging/linux-ppc64/server_3rd_party_licenses.txt</origin>
</distributionFile>
</distributionFileList>
</folder>
<!-- MAC: Program files -->
<folder>
<description>Program Files</description>
Expand Down Expand Up @@ -135,42 +90,6 @@
</distributionFile>
</distributionFileList>
</folder>
<!-- SOLARIS_X64: Program files -->
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfilessolaris-x64</name>
<platforms>solaris-intel</platforms>
<distributionFileList>
<distributionDirectory>
<origin>staging/solaris-x64/pgAdmin 4</origin>
</distributionDirectory>
<distributionFile>
<origin>../resources/license.txt</origin>
</distributionFile>
<distributionFile>
<origin>staging/solaris-x64/server_3rd_party_licenses.txt</origin>
</distributionFile>
</distributionFileList>
</folder>
<!-- SOLARIS_SPARC: Program files -->
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfilessolaris-sparc</name>
<platforms>solaris-sparc</platforms>
<distributionFileList>
<distributionDirectory>
<origin>staging/solaris-sparc/pgAdmin 4</origin>
</distributionDirectory>
<distributionFile>
<origin>../resources/license.txt</origin>
</distributionFile>
<distributionFile>
<origin>staging/solaris-sparc/server_3rd_party_licenses.txt</origin>
</distributionFile>
</distributionFileList>
</folder>
</folderList>
<!-- WIN: Start Menu -->
<startMenuShortcutList>
Expand Down Expand Up @@ -233,8 +152,6 @@
<type>regexp</type>
<substitutionList>
<substitution pattern="Cflags:.*include" value="Cflags: -I${installdir}/include"/>
</substitutionList>
<substitutionList>
<substitution pattern="Libs:.*lib" value="Libs: -L${installdir}/lib"/>
</substitutionList>
<ruleList>
Expand Down
109 changes: 16 additions & 93 deletions server/installer.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,6 @@ EOF
</initializationActionList>


<readyToInstallActionList/>

<installationAbortedActionList>
<deleteFile path="${system_temp_directory}/postgresql_installer_${random_number}" abortOnError="0" showMessageOnError="0">
<ruleList>
Expand Down Expand Up @@ -1267,21 +1265,6 @@ EOF
<isFalse value="${extract_mode}"/>
</ruleList>
</unpackFile>
<unpackFile>
<component>default</component>
<destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
<folder>defaultlinux-x64</folder>
<origin>prerun_checks.sh</origin>
<customErrorMessage>${msg(error.writing.temp)}</customErrorMessage>
<ruleList>
<compareText>
<logic>equals</logic>
<text>${platform_name}</text>
<value>linux-x64</value>
</compareText>
<isFalse value="${extract_mode}"/>
</ruleList>
</unpackFile>
<unpackFile>
<component>default</component>
<destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
Expand All @@ -1297,34 +1280,6 @@ EOF
<isFalse value="${extract_mode}"/>
</ruleList>
</unpackFile>
<unpackFile>
<component>default</component>
<destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
<folder>programfilessolaris-x64</folder>
<origin>server/installer/prerun_checks.sh</origin>
<ruleList>
<compareText>
<logic>equals</logic>
<text>${platform_name}</text>
<value>solaris-intel</value>
</compareText>
<isFalse value="${extract_mode}"/>
</ruleList>
</unpackFile>
<unpackFile>
<component>default</component>
<destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
<folder>programfilessolaris-sparc</folder>
<origin>server/installer/prerun_checks.sh</origin>
<ruleList>
<compareText>
<logic>equals</logic>
<text>${platform_name}</text>
<value>solaris-sparc</value>
</compareText>
<isFalse value="${extract_mode}"/>
</ruleList>
</unpackFile>

<actionGroup>
<actionList>
Expand Down Expand Up @@ -2085,28 +2040,6 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
</compareText>
</ruleList>
</folder>
<!-- LINUX-X64: files for default component -->
<folder>
<description>Program Files</description>
<destination>${installdir}/installer/server</destination>
<name>defaultlinux-x64</name>
<platforms>linux-x64</platforms>
<distributionFileList>
<distributionDirectory>
<origin>staging/linux-x64/server/installer/prerun_checks.sh</origin>
</distributionDirectory>
<distributionDirectory>
<origin>staging/linux-x64/server/scripts</origin>
</distributionDirectory>
</distributionFileList>
<ruleList>
<compareText>
<logic>contains</logic>
<text>${platform_name}</text>
<value>linux-x64</value>
</compareText>
</ruleList>
</folder>
<!-- MacOSX: files for default component -->
<folder>
<description>Program Files</description>
Expand Down Expand Up @@ -2148,7 +2081,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
<folder>
<description>Program Files</description>
<destination>${installdir}/installer</destination>
<name>defaultwindows-x64</name>
<name>defaultwindows64</name>
<platforms>windows</platforms>
<distributionFileList>
<distributionDirectory>
Expand Down Expand Up @@ -2278,15 +2211,6 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
<cliOptionName>prefix</cliOptionName>
<width>30</width>
<mustBeWritable>yes</mustBeWritable>
<ruleList>
<stringTest>
<text>${iBaseDirectory}</text>
<type>empty</type>
</stringTest>
</ruleList>
<postShowPageActionList>
<wow64FsRedirection action="disable" />
</postShowPageActionList>

<validationActionList>
<validateInstallDir installdir="${installdir}">
Expand All @@ -2297,6 +2221,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
</validationActionList>

<postShowPageActionList>
<wow64FsRedirection action="disable" />
<actionGroup>
<actionList>
<actionGroup>
Expand Down Expand Up @@ -2352,6 +2277,10 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
</postShowPageActionList>
<ruleList>
<isTrue value="${component(server).selected}"/>
<stringTest>
<text>${iBaseDirectory}</text>
<type>empty</type>
</stringTest>
</ruleList>
</directoryParameter>

Expand Down Expand Up @@ -2397,23 +2326,14 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
<cliOptionName>datadir</cliOptionName>
<width>30</width>
<mustBeWritable>yes</mustBeWritable>
<ruleList>
<stringTest>
<text>${iDataDirectory}</text>
<type>empty</type>
</stringTest>
<isFalse value="${extract_mode}"/>
</ruleList>
<postShowPageActionList>
<wow64FsRedirection action="disable" />
</postShowPageActionList>

<!-- Check the directory selected. If it's a valid data directory, change to upgrade mode -->

<!-- Note that this validation occurs in a postShowPageActionList due -->
<!-- to some odd behaviour in InstallBuilder in the way <allowEmptyValue> -->
<!-- interacts with default values, on the advice of tech support -->
<postShowPageActionList>
<wow64FsRedirection action="disable" />
<!-- !WIN: Always check if the data directory path looks valid and is writeable -->
<actionGroup>
<!-- We need this because this isn't a validateActionList> -->
Expand Down Expand Up @@ -2734,9 +2654,8 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
</compareText>
</ruleList>
</actionGroup>
</actionList>
<!-- Switch to upgrade mode -->
<actionList>

<!-- Switch to upgrade mode -->
<setInstallerVariable>
<name>IsUpgrade</name>
<value>1</value>
Expand All @@ -2756,7 +2675,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
<pattern>^.*port\s*=\s*([\d]+)\s+.*$</pattern>
<substitution>\1</substitution>
</setInstallerVariableFromRegEx>
</actionList>
</actionList>

<!-- We only check the data directory if it exists and isn't empty -->
<ruleList>
Expand Down Expand Up @@ -2803,6 +2722,11 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
</actionGroup>
</postShowPageActionList>
<ruleList>
<stringTest>
<text>${iDataDirectory}</text>
<type>empty</type>
</stringTest>
<isFalse value="${extract_mode}"/>
<isTrue value="${component(server).selected}"/>
</ruleList>
</directoryParameter>
Expand Down Expand Up @@ -3300,8 +3224,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
<isTrue value="${component(server).selected}"/>
</ruleList>
</parameterGroup>
</parameterList>
<parameterList>

<infoParameter>
<name>preinstallsummary</name>
<title>${msg(preinstall.summary)}</title>
Expand Down
Loading