From 249fa1df0b03a9215d0250964045649b59dc25af Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 8 Jul 2016 11:58:21 +0300 Subject: [PATCH] build scripts redesign: temporary restored version*.nsi files because they are used in old NSIS scripts --- build/conf/nsis/version.eap.nsi | 13 +++++++++++++ build/conf/nsis/version.nsi | 13 +++++++++++++ .../build/impl/WinExeInstallerBuilder.groovy | 4 +++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 build/conf/nsis/version.eap.nsi create mode 100644 build/conf/nsis/version.nsi diff --git a/build/conf/nsis/version.eap.nsi b/build/conf/nsis/version.eap.nsi new file mode 100644 index 000000000000..bea430c6acf2 --- /dev/null +++ b/build/conf/nsis/version.eap.nsi @@ -0,0 +1,13 @@ +!define MUI_VERSION_MAJOR "__VERSION_MAJOR__" +!define MUI_VERSION_MINOR "__VERSION_MINOR__" + +!define VER_BUILD __BUILD_NUMBER__ + +!define MIN_UPGRADE_BUILD __MIN_UPGRADE_BUILD__ +!define MAX_UPGRADE_BUILD __MAX_UPGRADE_BUILD__ +!define UPGRADE_VERSION __UPGRADE_VERSION__ + +!define PRODUCT_WITH_VER "${MUI_PRODUCT} ${VER_BUILD}" +!define PRODUCT_FULL_NAME_WITH_VER "${PRODUCT_FULL_NAME} ${VER_BUILD}" +!define PRODUCT_PATHS_SELECTOR "__PRODUCT_PATHS_SELECTOR__" +!define PRODUCT_SETTINGS_DIR ".${PRODUCT_PATHS_SELECTOR}" diff --git a/build/conf/nsis/version.nsi b/build/conf/nsis/version.nsi new file mode 100644 index 000000000000..152bef1ff438 --- /dev/null +++ b/build/conf/nsis/version.nsi @@ -0,0 +1,13 @@ +!define MUI_VERSION_MAJOR "__VERSION_MAJOR__" +!define MUI_VERSION_MINOR "__VERSION_MINOR__" + +!define VER_BUILD __BUILD_NUMBER__ + +!define MIN_UPGRADE_BUILD __MIN_UPGRADE_BUILD__ +!define MAX_UPGRADE_BUILD __MAX_UPGRADE_BUILD__ +!define UPGRADE_VERSION __UPGRADE_VERSION__ + +!define PRODUCT_WITH_VER "${MUI_PRODUCT} ${MUI_VERSION_MAJOR}.${MUI_VERSION_MINOR}" +!define PRODUCT_FULL_NAME_WITH_VER "${PRODUCT_FULL_NAME} ${MUI_VERSION_MAJOR}.${MUI_VERSION_MINOR}" +!define PRODUCT_PATHS_SELECTOR "__PRODUCT_PATHS_SELECTOR__" +!define PRODUCT_SETTINGS_DIR ".${PRODUCT_PATHS_SELECTOR}" \ No newline at end of file diff --git a/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy index 95f0c1643148..eb090aaf54cc 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy @@ -55,7 +55,9 @@ class WinExeInstallerBuilder { } ant.copy(todir: "$box/nsiconf") { - fileset(dir: "$communityHome/build/conf/nsis") + fileset(dir: "$communityHome/build/conf/nsis") { + exclude(name: "version*") + } } if (SystemInfoRt.isLinux) { File ideaNsiPath = new File(box, "nsiconf/idea.nsi")