prepared next rlz

This commit is contained in:
Basile Burg 2016-01-30 04:19:02 +01:00
parent a533057ff5
commit 340b7a3383
4 changed files with 13 additions and 18 deletions

View File

@ -7,7 +7,7 @@ object CurrentProject: TCENativeProject
outputOptions.boundsCheck = offAlways outputOptions.boundsCheck = offAlways
outputOptions.optimizations = True outputOptions.optimizations = True
outputOptions.release = True outputOptions.release = True
pathsOptions.outputFilename = 'output\coedit.2alpha4.win32.setup.exe' pathsOptions.outputFilename = 'output\coedit.2rc1.win32.setup.exe'
pathsOptions.importStringPaths.Strings = ( pathsOptions.importStringPaths.Strings = (
'win32\' 'win32\'
) )
@ -33,7 +33,7 @@ object CurrentProject: TCENativeProject
outputOptions.boundsCheck = offAlways outputOptions.boundsCheck = offAlways
outputOptions.optimizations = True outputOptions.optimizations = True
outputOptions.release = True outputOptions.release = True
pathsOptions.outputFilename = 'output\coedit.2alpha4.linux32.setup' pathsOptions.outputFilename = 'output\coedit.2rc1.linux32.setup'
pathsOptions.importStringPaths.Strings = ( pathsOptions.importStringPaths.Strings = (
'nux32\' 'nux32\'
) )
@ -55,7 +55,7 @@ object CurrentProject: TCENativeProject
outputOptions.boundsCheck = offAlways outputOptions.boundsCheck = offAlways
outputOptions.optimizations = True outputOptions.optimizations = True
outputOptions.release = True outputOptions.release = True
pathsOptions.outputFilename = 'output\coedit.2alpha4.linux64.setup' pathsOptions.outputFilename = 'output\coedit.2rc1.linux64.setup'
pathsOptions.importStringPaths.Strings = ( pathsOptions.importStringPaths.Strings = (
'nux64\' 'nux64\'
) )
@ -78,7 +78,7 @@ object CurrentProject: TCENativeProject
outputOptions.boundsCheck = offAlways outputOptions.boundsCheck = offAlways
outputOptions.optimizations = True outputOptions.optimizations = True
outputOptions.release = True outputOptions.release = True
pathsOptions.outputFilename = 'output\coedit.2alpha4.win32.setup' pathsOptions.outputFilename = 'output\coedit.2rc1.win32.setup'
pathsOptions.importStringPaths.Strings = ( pathsOptions.importStringPaths.Strings = (
'win32\' 'win32\'
) )

View File

@ -7,7 +7,7 @@ version(X86) version(linux) version = nux32;
version(X86_64) version(linux) version = nux64; version(X86_64) version(linux) version = nux64;
version(X86) version(Windows)version = win32; version(X86) version(Windows)version = win32;
version(win32) enum exeExt = ".exe"; version(Windows) enum exeExt = ".exe";
else enum exeExt = ""; else enum exeExt = "";
alias ImpType = immutable ubyte[]; alias ImpType = immutable ubyte[];
@ -84,7 +84,7 @@ version(linux) immutable bool asSu;
static this() static this()
{ {
version(win32) version(Windows)
{ {
exePath = environment.get("PROGRAMFILES") ~ r"\Coedit\"; exePath = environment.get("PROGRAMFILES") ~ r"\Coedit\";
datPath = environment.get("APPDATA") ~ r"\Coedit\"; datPath = environment.get("APPDATA") ~ r"\Coedit\";
@ -146,11 +146,11 @@ void main(string[] args)
return; 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"); else Formater.justify!'C'("Coedit uninstaller");
Formater.separate; 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 else
{ {
if(!asSu) Formater.justify!'L'("Coedit will be accessible to the current user"); if(!asSu) Formater.justify!'L'("Coedit will be accessible to the current user");
@ -236,7 +236,7 @@ void main(string[] args)
failures += !done; failures += !done;
} }
// remove $PF folder // remove $PF folder
version(win32) version(Windows)
{ {
try rmdir(exePath); try rmdir(exePath);
catch(FileException e) failures++; catch(FileException e) failures++;
@ -313,14 +313,11 @@ bool tryRemove(string fname)
/// adds menu entry, shortcut, etc /// adds menu entry, shortcut, etc
void postInstall() void postInstall()
{ {
version(Win32) version(Windows)
{ {
import std.conv: to; import std.conv: to;
import std.random: uniform; 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 target = exePath ~ "coedit.exe";
string vbsName; string vbsName;
do vbsName = environment.get("TEMP") ~ r"\cesh" ~ uniform(0,int.max).to!string ~ ".vbs"; 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 /// removes menu entry shortcuts, etc
void postUninstall() 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"); tryRemove(shortCutPath ~ "Coedit.lnk");
} }
else version(linux) else version(linux)

View File

@ -1 +1 @@
2alpha4 2rc1

View File

@ -36,7 +36,7 @@ inherited CEInfoWidget: TCEInfoWidget
Align = alClient Align = alClient
Alignment = taCenter Alignment = taCenter
AutoSize = False AutoSize = False
Caption = 'Coedit 2 - alpha 4' Caption = 'Coedit 2 - rc1'
Font.Height = -16 Font.Height = -16
Font.Style = [fsBold] Font.Style = [fsBold]
Layout = tlCenter Layout = tlCenter