removed obsoleted install-over from ApplicationInfo.xml files and build scripts.

This commit is contained in:
Vladimir.Orlov
2016-04-05 17:42:48 +03:00
parent d81fe6158e
commit 5e81fde2d8
6 changed files with 1 additions and 18 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,21 +24,11 @@ class ApplicationInfoProperties {
final String majorVersion
final String minorVersion
final boolean isEAP
final InstallOverProperties installOver
ApplicationInfoProperties(String appInfoXmlPath) {
def root = new XmlParser().parse(new File(appInfoXmlPath))
majorVersion = root.version.first().@major
minorVersion = root.version.first().@minor
isEAP = Boolean.parseBoolean(root.version.first().@eap)
def installOverTag = root."install-over".first()
installOver = new InstallOverProperties(minBuild: installOverTag.@minbuild, maxBuild: installOverTag.@maxbuild, version: installOverTag.@version)
}
}
@Immutable
class InstallOverProperties {
final String minBuild
final String maxBuild
final String version
}

View File

@@ -71,9 +71,6 @@ def nsis_installer(pathsToInclude, stringsFile, pathsFile, outNamePrefix, includ
replacefilter(token: "__BUILD_NUMBER__", value: buildNumber)
replacefilter(token: "__VERSION_MAJOR__", value: p("component.version.major"))
replacefilter(token: "__VERSION_MINOR__", value: p("component.version.minor"))
replacefilter(token: "__MIN_UPGRADE_BUILD__", value: p("component.install-over.minbuild"))
replacefilter(token: "__MAX_UPGRADE_BUILD__", value: p("component.install-over.maxbuild"))
replacefilter(token: "__UPGRADE_VERSION__", value: p("component.install-over.version"))
replacefilter(token: "__PRODUCT_PATHS_SELECTOR__", value: system_selector)
}

View File

@@ -2,7 +2,6 @@
<version codename="Community Edition 2016.2" major="2016" minor="2" eap="true"/>
<company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<install-over minbuild="129.1" maxbuild="139.9999" version="14"/>
<logo url="/idea_community_logo.png" textcolor="444444" progressColor="f87206" progressX="0" progressY="271" progressHeight="3" licenseOffsetY="30" />
<about url="/idea_community_about.png" foreground="444444" copyrightForeground="7A858F" linkColor="9b5121" logoX="300" logoY="265" logoW="75" logoH="30"/>
<icon size32="/icon_CE.png" size16="/icon_CEsmall.png" size128="/icon_CE_128.png" ico="idea_CE.ico"/>

View File

@@ -2,7 +2,6 @@
<version codename="Community Edition" major="10" minor="0" eap="true" update-channel="IDEA10EAP"/>
<company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<install-over minbuild="0" maxbuild="0" version="9.0"/>
<logo url="/idea_community_logo.png" textcolor="FFFFFF"/>
<about url="/idea_community_about.png"/>
<icon size32="/icon_CE.png" size16="/icon_CEsmall.png" size12="/toolwindows/toolWindowProject.png" ico="idea_CE.ico"/>

View File

@@ -8,7 +8,6 @@
<icon size32="/PyCharmEdu32.png" size16="/PyCharmEdu16.png" ico="PyCharmEdu.ico"/>
<package code="__PACKAGE_CODE__"/>
<names product="PyCharm" fullname="PyCharm Edu" script="charm"/>
<install-over minbuild="0" maxbuild="0" version="2.x"/>
<welcome-screen logo-url="/PyCharmEduWelcomeScreen.png"/>

View File

@@ -8,7 +8,6 @@
<icon size32="/PyCharmCore32.png" size16="/PyCharmCore16.png" ico="PyCharmCore.ico"/>
<package code="__PACKAGE_CODE__"/>
<names product="PyCharm" fullname="PyCharm Community Edition" script="charm"/>
<install-over minbuild="0" maxbuild="0" version="4.x"/>
<welcome-screen logo-url="/PyCharmCoreWelcomeScreen.png"/>