This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7696

inno: drop support for Windows 95/98/ME
ClosedPublic

Authored by mharbison72 on Dec 18 2019, 12:49 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG109315c41d5e: inno: drop support for Windows 95/98/ME
rHG4ccd0c9f9e92: inno: drop support for Windows 95/98/ME

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Dec 18 2019, 12:49 AM
pulkit accepted this revision.Dec 18 2019, 12:53 AM
This revision is now accepted and ready to land.Dec 18 2019, 12:53 AM
mharbison72 added a subscriber: indygreg.Dec 18 2019, 12:56 AM

I'm not at all familiar with this installer, though the changes seem straight forward. When I went to build it though, it seems like the Inno installer is currently broke:

\> py -3 contrib\packaging\packaging.py inno --python C:\Python27\python.exe
...
Collecting configparser>=3.5; python_version == "2.7"
ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==. These do not:
    configparser>=3.5; python_version == "2.7" from https://files.pythonhosted.org/packages/7a/2a/95ed0501cf5d8709490b1d3a3f9b5cf340da6c433f896bbe9ce08dbe6785/configparser-4.0.2-py2.py3-none-any.whl#sha256=254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c (from entrypoints==0.3->-r C:\Users\Matt\hg\contrib\packaging\inno\requirements.txt (line 25))

I see that there is a configparser version pinned in linux-requirements-py2.txt, but that's an autogenerated file. I was able to build the Wix installer a couple of weeks ago.

CC: @indygreg

mharbison72 added a commit: rHG4ccd0c9f9e92: inno: drop support for Windows 95/98/ME.Jan 8 2020, 11:50 AM
Closed by commit rHG4ccd0c9f9e92: inno: drop support for Windows 95/98/ME (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/inno/modpath.iss (100 lines)

Diff 19070

contrib/packaging/inno/modpath.iss

regpath := 'Environment'; regpath := 'Environment';
end; end;
// Get array of new directories and act on each individually // Get array of new directories and act on each individually
pathdir := ModPathDir(); pathdir := ModPathDir();
for d := 0 to GetArrayLength(pathdir)-1 do begin for d := 0 to GetArrayLength(pathdir)-1 do begin
updatepath := true; updatepath := true;
// Modify WinNT path
if UsingWinNT() = true then begin
// Get current path, split into an array // Get current path, split into an array
RegQueryStringValue(regroot, regpath, 'Path', oldpath); RegQueryStringValue(regroot, regpath, 'Path', oldpath);
oldpath := oldpath + ';'; oldpath := oldpath + ';';
i := 0; i := 0;
while (Pos(';', oldpath) > 0) do begin while (Pos(';', oldpath) > 0) do begin
SetArrayLength(pathArr, i+1); SetArrayLength(pathArr, i+1);
pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1); pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1);
oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath)); oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath));
i := i + 1; i := i + 1;
// Check if current directory matches app dir // Check if current directory matches app dir
if pathdir[d] = pathArr[i-1] then begin if pathdir[d] = pathArr[i-1] then begin
// if uninstalling, remove dir from path // if uninstalling, remove dir from path
if IsUninstaller() = true then begin if IsUninstaller() = true then begin
continue; continue;
// if installing, flag that dir already exists in path // if installing, flag that dir already exists in path
end else begin end else begin
updatepath := false; updatepath := false;
end; end;
end; end;
// Add current directory to new path // Add current directory to new path
if i = 1 then begin if i = 1 then begin
newpath := pathArr[i-1]; newpath := pathArr[i-1];
end else begin end else begin
newpath := newpath + ';' + pathArr[i-1]; newpath := newpath + ';' + pathArr[i-1];
end; end;
end; end;
// Append app dir to path if not already included // Append app dir to path if not already included
if (IsUninstaller() = false) AND (updatepath = true) then if (IsUninstaller() = false) AND (updatepath = true) then
newpath := newpath + ';' + pathdir[d]; newpath := newpath + ';' + pathdir[d];
// Write new path // Write new path
RegWriteStringValue(regroot, regpath, 'Path', newpath); RegWriteStringValue(regroot, regpath, 'Path', newpath);
// Modify Win9x path
end else begin
// Convert to shortened dirname
pathdir[d] := GetShortName(pathdir[d]);
// If autoexec.bat exists, check if app dir already exists in path
aExecFile := 'C:\AUTOEXEC.BAT';
if FileExists(aExecFile) then begin
LoadStringsFromFile(aExecFile, aExecArr);
for i := 0 to GetArrayLength(aExecArr)-1 do begin
if IsUninstaller() = false then begin
// If app dir already exists while installing, skip add
if (Pos(pathdir[d], aExecArr[i]) > 0) then
updatepath := false;
break;
end else begin
// If app dir exists and = what we originally set, then delete at uninstall
if aExecArr[i] = 'SET PATH=%PATH%;' + pathdir[d] then
aExecArr[i] := '';
end;
end;
end;
// If app dir not found, or autoexec.bat didn't exist, then (create and) append to current path
if (IsUninstaller() = false) AND (updatepath = true) then begin
SaveStringToFile(aExecFile, #13#10 + 'SET PATH=%PATH%;' + pathdir[d], True);
// If uninstalling, write the full autoexec out
end else begin
SaveStringsToFile(aExecFile, aExecArr, False);
end;
end;
end; end;
end; end;
// Split a string into an array using passed delimeter // Split a string into an array using passed delimeter
procedure MPExplode(var Dest: TArrayOfString; Text: String; Separator: String); procedure MPExplode(var Dest: TArrayOfString; Text: String; Separator: String);
var var
i: Integer; i: Integer;
begin begin
ModPath(); ModPath();
end; end;
end; end;
end; end;
end; end;
end; end;
function NeedRestart(): Boolean; function NeedRestart(): Boolean;
var
taskname: String;
begin begin
taskname := ModPathName;
if IsTaskSelected(taskname) and not UsingWinNT() then begin
Result := True;
end else begin
Result := False; Result := False;
end; end;
end;