Commit 9ce89d68 authored by Piotr Wendykier's avatar Piotr Wendykier

Used installer variables instead of parameters.

parent 5fbee449
......@@ -15,7 +15,7 @@
<distributionFileList>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>${project.parameter(jreConfiguration).parameter(jrepath).value}/${project.parameter(jreConfiguration).parameter(jreversion).value}-windows-x64/java-windows/*</origin>
<origin>${jrepath}/${jreversion}-windows-x64/java-windows/*</origin>
</distributionFile>
</distributionFileList>
<ruleList>
......@@ -30,7 +30,7 @@
<distributionFileList>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>${project.parameter(jreConfiguration).parameter(jrepath).value}/${project.parameter(jreConfiguration).parameter(jreversion).value}-linux-x64/java-linux-x64/*</origin>
<origin>${jrepath}/${jreversion}-linux-x64/java-linux-x64/*</origin>
</distributionFile>
</distributionFileList>
<ruleList>
......@@ -45,7 +45,7 @@
<distributionFileList>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>${project.parameter(jreConfiguration).parameter(jrepath).value}/${project.parameter(jreConfiguration).parameter(jreversion).value}-osx/java-osx/*</origin>
<origin>${jrepath}/${jreversion}-osx/java-osx/*</origin>
</distributionFile>
</distributionFileList>
<ruleList>
......
......@@ -113,6 +113,14 @@
<value>VisNow.jar</value>
</setInstallerVariable>
</initializationActionList>
<preBuildActionList>
<actionGroup>
<actionList>
<setInstallerVariable name="jrepath" value="/usr/share/jenkins/jars"/>
<setInstallerVariable name="jreversion" value="jre1.8.0_171"/>
</actionList>
</actionGroup>
</preBuildActionList>
<postInstallationActionList>
<actionGroup>
<actionList>
......@@ -210,13 +218,6 @@
</actionGroup>
</finalPageActionList>
<parameterList>
<parameterGroup>
<name>jreConfiguration</name>
<parameterList>
<stringParameter name="jrepath" description="Path to JRE" value="../jre" ask="0"/>
<stringParameter name="jreversion" description="Version of JRE" value="jre1.8.0_161" ask="0"/>
</parameterList>
</parameterGroup>
<directoryParameter>
<name>installdir</name>
<description>Installer.Parameter.installdir.description</description>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment