diff --git a/cesetup/cesetup.coedit b/cesetup/cesetup.coedit index 224aef9a..bfbb13d7 100644 --- a/cesetup/cesetup.coedit +++ b/cesetup/cesetup.coedit @@ -7,9 +7,10 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2gold.win32.setup.exe' + pathsOptions.outputFilename = 'output/coedit.2update1.win32.setup' pathsOptions.importStringPaths.Strings = ( - 'win32\' + 'win32/' + '' ) preBuildProcess.executable = 'cmd' preBuildProcess.workingDirectory = '' @@ -33,9 +34,10 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2gold.linux32.setup' + pathsOptions.outputFilename = 'output/coedit.2update1.linux32.setup' pathsOptions.importStringPaths.Strings = ( - 'nux32\' + 'nux32/' + '' ) preBuildProcess.executable = 'sh' preBuildProcess.options = [poUsePipes, poStderrToOutPut] @@ -55,9 +57,10 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2gold.linux64.setup' + pathsOptions.outputFilename = 'output/coedit.2update1.linux64.setup' pathsOptions.importStringPaths.Strings = ( - 'nux64\' + 'nux64/' + '' ) preBuildProcess.executable = 'sh' preBuildProcess.options = [poUsePipes, poStderrToOutPut] @@ -70,21 +73,9 @@ object CurrentProject: TCENativeProject 'setupzip-nux-noarch.sh' '' ) - end - item - name = 'devel-win32' - messagesOptions.tlsInformations = True - outputOptions.inlining = True - outputOptions.boundsCheck = offAlways - outputOptions.optimizations = True - outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2gold.win32.setup' - pathsOptions.importStringPaths.Strings = ( - 'win32\' - ) end> Sources.Strings = ( 'cesetup.d' ) - ConfigurationIndex = 0 + ConfigurationIndex = 2 end diff --git a/cesetup/cesetup.d b/cesetup/cesetup.d index e6d33a88..c3fb8817 100644 --- a/cesetup/cesetup.d +++ b/cesetup/cesetup.d @@ -146,7 +146,7 @@ void main(string[] args) return; } - if (!uninstall) Formater.justify!'C'("Coedit 2 gold - setup"); + if (!uninstall) Formater.justify!'C'(format("Coedit %s - setup", splitVer)); else Formater.justify!'C'("Coedit uninstaller"); Formater.separate; @@ -368,3 +368,11 @@ void postUninstall() } } +/// splits the version identifier used in filenames +string splitVer() +{ + import std.regex: matchAll, regex; + return matchAll(import("version.txt"), regex("\\d+|\\D+")) + .join.join(" ").stripRight; +} + diff --git a/cesetup/version.txt b/cesetup/version.txt index c4620b95..0062fe17 100644 --- a/cesetup/version.txt +++ b/cesetup/version.txt @@ -1 +1 @@ -2gold +2update1 diff --git a/src/ce_infos.lfm b/src/ce_infos.lfm index 184228e7..80401bb7 100644 --- a/src/ce_infos.lfm +++ b/src/ce_infos.lfm @@ -36,7 +36,7 @@ inherited CEInfoWidget: TCEInfoWidget Align = alClient Alignment = taCenter AutoSize = False - Caption = 'Coedit 2' + Caption = 'Coedit 2 - update 1' Font.Height = -16 Font.Style = [fsBold] Layout = tlCenter