diff --git a/cesetup/cesetup.coedit b/cesetup/cesetup.coedit index d0caf6ec..3118f9dd 100644 --- a/cesetup/cesetup.coedit +++ b/cesetup/cesetup.coedit @@ -7,7 +7,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2alpha4.win32.setup.exe' + pathsOptions.outputFilename = 'output\coedit.2rc1.win32.setup.exe' pathsOptions.importStringPaths.Strings = ( 'win32\' ) @@ -33,7 +33,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2alpha4.linux32.setup' + pathsOptions.outputFilename = 'output\coedit.2rc1.linux32.setup' pathsOptions.importStringPaths.Strings = ( 'nux32\' ) @@ -55,7 +55,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2alpha4.linux64.setup' + pathsOptions.outputFilename = 'output\coedit.2rc1.linux64.setup' pathsOptions.importStringPaths.Strings = ( 'nux64\' ) @@ -78,7 +78,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output\coedit.2alpha4.win32.setup' + pathsOptions.outputFilename = 'output\coedit.2rc1.win32.setup' pathsOptions.importStringPaths.Strings = ( 'win32\' ) diff --git a/cesetup/cesetup.d b/cesetup/cesetup.d index 84c8498b..8db552ac 100644 --- a/cesetup/cesetup.d +++ b/cesetup/cesetup.d @@ -7,7 +7,7 @@ version(X86) version(linux) version = nux32; version(X86_64) version(linux) version = nux64; version(X86) version(Windows)version = win32; -version(win32) enum exeExt = ".exe"; +version(Windows) enum exeExt = ".exe"; else enum exeExt = ""; alias ImpType = immutable ubyte[]; @@ -84,7 +84,7 @@ version(linux) immutable bool asSu; static this() { - version(win32) + version(Windows) { exePath = environment.get("PROGRAMFILES") ~ r"\Coedit\"; datPath = environment.get("APPDATA") ~ r"\Coedit\"; @@ -146,11 +146,11 @@ void main(string[] args) return; } - if (!uninstall) Formater.justify!'C'("Coedit 2 alpha 4 - setup"); + if (!uninstall) Formater.justify!'C'("Coedit 2 rc1 - setup"); else Formater.justify!'C'("Coedit uninstaller"); Formater.separate; - version(win32) Formater.justify!'L'("the setup program must be run as admin"); + version(Windows) Formater.justify!'L'("the setup program must be run as admin"); else { if(!asSu) Formater.justify!'L'("Coedit will be accessible to the current user"); @@ -236,7 +236,7 @@ void main(string[] args) failures += !done; } // remove $PF folder - version(win32) + version(Windows) { try rmdir(exePath); catch(FileException e) failures++; @@ -313,14 +313,11 @@ bool tryRemove(string fname) /// adds menu entry, shortcut, etc void postInstall() { - version(Win32) + version(Windows) { import std.conv: to; import std.random: uniform; - // shortcut prior to v 1 upd 2 was actually an url. - tryRemove(shortCutPath ~ "Coedit.url"); - string target = exePath ~ "coedit.exe"; string vbsName; do vbsName = environment.get("TEMP") ~ r"\cesh" ~ uniform(0,int.max).to!string ~ ".vbs"; @@ -361,10 +358,8 @@ void postInstall() /// removes menu entry shortcuts, etc void postUninstall() { - version(Win32) + version(Windows) { - // shortcut prior to v 1 upd 2 was actually an url. - tryRemove(shortCutPath ~ "Coedit.url"); tryRemove(shortCutPath ~ "Coedit.lnk"); } else version(linux) diff --git a/cesetup/version.txt b/cesetup/version.txt index cf3dd854..6540c70e 100644 --- a/cesetup/version.txt +++ b/cesetup/version.txt @@ -1 +1 @@ -2alpha4 \ No newline at end of file +2rc1 diff --git a/src/ce_infos.lfm b/src/ce_infos.lfm index 1f3338de..a6ff64db 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 - alpha 4' + Caption = 'Coedit 2 - rc1' Font.Height = -16 Font.Style = [fsBold] Layout = tlCenter