wucket/Z-Sharp
1
0
Fork 0
mirror of https://github.com/sam-astro/Z-Sharp.git synced 2025-12-11 16:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from sam-astro/dev

Browse Source 
Probably final dev from me
This commit is contained in:
sam-astro 2022-05-30 17:19:45 -04:00 committed by GitHub
commit 0d2e0faa56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 307 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
ZSharp/Main.cpp
View File

@ -5,7 +5,7 @@
//bool DEVELOPER_MESSAGES = true; //bool DEVELOPER_MESSAGES = true;
#define DEVELOPER_MESSAGES false #define DEVELOPER_MESSAGES false
#define EXAMPLE_PROJECT false #define EXAMPLE_PROJECT false
#define NAMEVERSION "ZSharp v2.1.1-alpha" #define NAMEVERSION "ZSharp v2.1.2-alpha"
#if defined(__unix__) #if defined(__unix__)
#define UNIX true #define UNIX true
@ -78,12 +78,12 @@ boost::any GetVariableValue(const string& varName, const unordered_map<string, b
// Check if there is a variable with the specified name // Check if there is a variable with the specified name
bool IsVar(const string& varName, const unordered_map<string, boost::any>& variableValues) bool IsVar(const string& varName, const unordered_map<string, boost::any>& variableValues)
{ {
if(split(varName, '.')[0] == "ZS") if (split(varName, '.')[0] == "ZS")
return false; return false;
if (variableValues.find(split(varName, '.')[0]) != variableValues.end()) if (variableValues.find(split(varName, '.')[0]) != variableValues.end())
return true; return true;
return false; return false;
} }
@ -163,7 +163,7 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
string insideFunArgs = betweenChars(expression, '(', ')'); string insideFunArgs = betweenChars(expression, '(', ')');
vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')'); vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
#if DEVELOPER_MESSAGES == true #if DEVELOPER_MESSAGES == true
cout << "[" << unWrapVec(argList) << "]" << endl; cout << split(expression, '(')[0] << " [" << unWrapVec(argList) << "]" << endl;
printVarValues(argList, variableValues); printVarValues(argList, variableValues);
#endif #endif
vector<boost::any> funcArgs = VarValues(argList, variableValues); vector<boost::any> funcArgs = VarValues(argList, variableValues);
@ -176,7 +176,7 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
string insideFunArgs = betweenChars(expression, '(', ')'); string insideFunArgs = betweenChars(expression, '(', ')');
vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')'); vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
#if DEVELOPER_MESSAGES == true #if DEVELOPER_MESSAGES == true
cout << split(expression, '(')[0]<< " [" << unWrapVec(argList) << "]" << endl; cout << split(expression, '(')[0] << " [" << unWrapVec(argList) << "]" << endl;
printVarValues(argList, variableValues); printVarValues(argList, variableValues);
#endif #endif
vector<boost::any> funcArgs = VarValues(argList, variableValues); vector<boost::any> funcArgs = VarValues(argList, variableValues);
@ -288,9 +288,9 @@ bool BooleanLogic(const string& valA, const string& comparer, const string& valB
{ {
boost::any valARealValue; boost::any valARealValue;
boost::any valBRealValue; boost::any valBRealValue;
if(valA != "") if (valA != "")
valARealValue = EvalExpression(valA, variableValues); valARealValue = EvalExpression(valA, variableValues);
if(valB != "") if (valB != "")
valBRealValue = EvalExpression(valB, variableValues); valBRealValue = EvalExpression(valB, variableValues);
#if DEVELOPER_MESSAGES == true #if DEVELOPER_MESSAGES == true
InterpreterLog(AnyAsString(valARealValue) + " " + comparer + " " + AnyAsString(valBRealValue) + " : " + AnyAsString(valA) + " " + comparer + " " + AnyAsString(valB) + " : " + to_string(AnyAsString(valARealValue) == AnyAsString(valBRealValue))); InterpreterLog(AnyAsString(valARealValue) + " " + comparer + " " + AnyAsString(valBRealValue) + " : " + AnyAsString(valA) + " " + comparer + " " + AnyAsString(valB) + " : " + to_string(AnyAsString(valARealValue) == AnyAsString(valBRealValue)));
@ -419,22 +419,16 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
// Check if it is function call // Check if it is function call
else if (IsFunction(split(words.at(lineNum).at(0), '(')[0])) else if (IsFunction(split(words.at(lineNum).at(0), '(')[0]))
{ {
// No args provided // start -> FuncCall(0, x, OtherFunc(a))
if (indexInStr(words.at(lineNum).at(0), ')') - indexInStr(words.at(lineNum).at(0), '(')<=1) // changeto -> 0, x, OtherFunc(a)
ExecuteFunction(split(words.at(lineNum).at(0), '(')[0], vector<boost::any>()); string insideFunArgs = betweenChars(unWrapVec(words.at(lineNum)), '(', ')');
else vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
{ // Args provided, parse them first
// start -> FuncCall(0, x, OtherFunc(a))
// changeto -> 0, x, OtherFunc(a)
string insideFunArgs = betweenChars(unWrapVec(words.at(lineNum)), '(', ')');
vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
#if DEVELOPER_MESSAGES == true #if DEVELOPER_MESSAGES == true
cout << unWrapVec(argList) << endl; cout << unWrapVec(argList) << endl;
printVarValues(argList, variableValues); printVarValues(argList, variableValues);
#endif #endif
vector<boost::any> funcArgs = VarValues(argList, variableValues); vector<boost::any> funcArgs = VarValues(argList, variableValues);
ExecuteFunction(split(words.at(lineNum).at(0), '(')[0], funcArgs); ExecuteFunction(split(words.at(lineNum).at(0), '(')[0], funcArgs);
}
return nullType; return nullType;
} }
@ -520,9 +514,9 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
break; break;
} }
} }
// If the statement is already false, don't bother gathering the contents // If the statement is already false, don't bother gathering the contents
if(BooleanLogic(whileParameters.at(0), whileParameters.at(1), whileParameters.at(2), variableValues) == false){ if (BooleanLogic(whileParameters.at(0), whileParameters.at(1), whileParameters.at(2), variableValues) == false) {
lineNum++; lineNum++;
while (lineNum < (int)words.size()) while (lineNum < (int)words.size())
{ {
@ -553,9 +547,9 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
//Iterate through all lines in while loop //Iterate through all lines in while loop
for (int lineNum = 0; lineNum < (int)whileContents.size(); lineNum++) for (int lineNum = 0; lineNum < (int)whileContents.size(); lineNum++)
{ {
if(whileContents.at(lineNum).at(0)== "continue") if (whileContents.at(lineNum).at(0) == "continue")
break; // Stops iterating through lines and return to beginning break; // Stops iterating through lines and return to beginning
if(whileContents.at(lineNum).at(0)== "break") if (whileContents.at(lineNum).at(0) == "break")
return nullType; // Stops iterating through lines and leave while loop return nullType; // Stops iterating through lines and leave while loop
boost::any returnVal = ProcessLine(whileContents, lineNum, variableValues); boost::any returnVal = ProcessLine(whileContents, lineNum, variableValues);
if (!returnVal.empty()) { if (!returnVal.empty()) {
@ -594,7 +588,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
} }
// If the statement is already false, don't bother gathering the contents // If the statement is already false, don't bother gathering the contents
if(BooleanLogic(ifParameters.at(0), ifParameters.at(1), ifParameters.at(2), variableValues) == false){ if (BooleanLogic(ifParameters.at(0), ifParameters.at(1), ifParameters.at(2), variableValues) == false) {
lineNum++; lineNum++;
while (lineNum < (int)words.size()) while (lineNum < (int)words.size())
{ {
@ -605,7 +599,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
} }
return nullType; return nullType;
} }
// Gather the contents // Gather the contents
lineNum++; lineNum++;
while (lineNum < (int)words.size()) while (lineNum < (int)words.size())
@ -624,7 +618,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
//Iterate through all lines in if statement //Iterate through all lines in if statement
for (int l = 0; l < (int)ifContents.size(); l++) for (int l = 0; l < (int)ifContents.size(); l++)
{ {
if(ifContents.at(l).at(0)== "break") if (ifContents.at(l).at(0) == "break")
return breakReOp; // Stops iterating through lines and leave while loop return breakReOp; // Stops iterating through lines and leave while loop
boost::any returnVal = ProcessLine(ifContents, l, variableValues); boost::any returnVal = ProcessLine(ifContents, l, variableValues);
if (!returnVal.empty()) if (!returnVal.empty())
@ -718,8 +712,8 @@ int parseZSharp(string script)
// Split the script by newline, signifying a line ending // Split the script by newline, signifying a line ending
vector<string> beforeProcessLines = split(script, '\n'); vector<string> beforeProcessLines = split(script, '\n');
vector<string> lines; vector<string> lines;
for (int i = 0; i < (int)beforeProcessLines.size(); i++){ // Then split said lines into indiviual words for (int i = 0; i < (int)beforeProcessLines.size(); i++) { // Then split said lines into indiviual words
if(!startsWith(trim(beforeProcessLines.at(i)), "//") && trim(beforeProcessLines.at(i)) != "") if (!startsWith(trim(beforeProcessLines.at(i)), "//") && trim(beforeProcessLines.at(i)) != "")
{ // dont include line if it is a comment or if it is blank { // dont include line if it is a comment or if it is blank
lines.push_back(trim(beforeProcessLines.at(i))); lines.push_back(trim(beforeProcessLines.at(i)));
} }
@ -836,7 +830,7 @@ int parseZSharp(string script)
InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "..."); InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
#endif #endif
} }
// Iterate through all types to see if line inits or // Iterate through all types to see if line inits or
// re-inits a variable then store it with it's value // re-inits a variable then store it with it's value
else if (countInVector(types, trim(words.at(lineNum).at(0))) > 0) else if (countInVector(types, trim(words.at(lineNum).at(0))) > 0)
@ -844,24 +838,24 @@ int parseZSharp(string script)
//cout << words.at(lineNum).at(1) << "=" << unWrapVec(slice(words.at(lineNum), 3, -1)) << "=" << AnyAsString(EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), variableValues)) << endl; //cout << words.at(lineNum).at(1) << "=" << unWrapVec(slice(words.at(lineNum), 3, -1)) << "=" << AnyAsString(EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), variableValues)) << endl;
globalVariableValues[words.at(lineNum).at(1)] = EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), globalVariableValues); globalVariableValues[words.at(lineNum).at(1)] = EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), globalVariableValues);
} }
// else if (words.at(lineNum).at(0) == "int") { // else if (words.at(lineNum).at(0) == "int") {
// globalVariableValues[words.at(lineNum).at(1)] = stoi(words.at(lineNum).at(3)); // globalVariableValues[words.at(lineNum).at(1)] = stoi(words.at(lineNum).at(3));
//#if DEVELOPER_MESSAGES == true //#if DEVELOPER_MESSAGES == true
// InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "..."); // InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
//#endif //#endif
// } // }
// else if (words.at(lineNum).at(0) == "float") { // else if (words.at(lineNum).at(0) == "float") {
// globalVariableValues[words.at(lineNum).at(1)] = stof(words.at(lineNum).at(3)); // globalVariableValues[words.at(lineNum).at(1)] = stof(words.at(lineNum).at(3));
//#if DEVELOPER_MESSAGES == true //#if DEVELOPER_MESSAGES == true
// InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "..."); // InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
//#endif //#endif
// } // }
// else if (words.at(lineNum).at(0) == "bool") { // else if (words.at(lineNum).at(0) == "bool") {
// globalVariableValues[words.at(lineNum).at(1)] = stob(words.at(lineNum).at(3)); // globalVariableValues[words.at(lineNum).at(1)] = stob(words.at(lineNum).at(3));
//#if DEVELOPER_MESSAGES == true //#if DEVELOPER_MESSAGES == true
// InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "..."); // InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
//#endif //#endif
// } // }
else else
LogWarning("unrecognized type \'" + words.at(lineNum).at(0) + "\' on line: " + to_string(lineNum)); LogWarning("unrecognized type \'" + words.at(lineNum).at(0) + "\' on line: " + to_string(lineNum));
} }

18
ZSharp/ZSharpInstallerMakerInnoSetup.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Z-Sharp" #define MyAppName "Z-Sharp"
#define MyAppVersion "2.1.1-alpha" #define MyAppVersion "2.1.2-alpha"
#define MyAppPublisher "AstroSam" #define MyAppPublisher "AstroSam"
#define MyAppURL "https://github.com/sam-astro/Z-Sharp" #define MyAppURL "https://github.com/sam-astro/Z-Sharp"
#define MyAppExeName "ZSharp.exe" #define MyAppExeName "ZSharp.exe"
@ -25,6 +25,7 @@ DefaultDirName={autopf}\ZSharp
DisableDirPage=yes DisableDirPage=yes
ChangesAssociations=yes ChangesAssociations=yes
DisableProgramGroupPage=yes DisableProgramGroupPage=yes
ChangesEnvironment=true
LicenseFile=D:\Code\Z-Sharp\LICENSE LicenseFile=D:\Code\Z-Sharp\LICENSE
; Uncomment the following line to run in non administrative install mode (install for current user only.) ; Uncomment the following line to run in non administrative install mode (install for current user only.)
;PrivilegesRequired=lowest ;PrivilegesRequired=lowest
@ -36,6 +37,21 @@ Compression=lzma
SolidCompression=yes SolidCompression=yes
WizardStyle=modern WizardStyle=modern
[Tasks]
Name: modifypath; Description: Add application directory to your environmental path (This allows you to easily use from command line); Flags: unchecked
[Code]
const
ModPathName = 'modifypath';
ModPathType = 'system';
function ModPathDir(): TArrayOfString;
begin
setArrayLength(Result, 1)
Result[0] := ExpandConstant('{app}');
end;
#include "modpath.iss"
[Languages] [Languages]
Name: "english"; MessagesFile: "compiler:Default.isl" Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.isl" Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.isl"

29
ZSharp/builtin.h
View File

@ -409,29 +409,42 @@ boost::any ZSFunction(const string& name, const vector<boost::any>& args)
} }
else if (name == "ZS.Graphics.Sprite") else if (name == "ZS.Graphics.Sprite")
{ {
if (!fileExists(StringRaw(AnyAsString(args.at(0))))) string path = StringRaw(AnyAsString(args.at(0)));
LogCriticalError("Failed to create 'Sprite' object: \"" + StringRaw(AnyAsString(args.at(0))) + "\""); if (count(path, '/') == 0)
path = "./" + path;
if (!fileExists(path))
LogCriticalError("Failed to create 'Sprite' object: \"" + path + "\"");
Sprite s(StringRaw(AnyAsString(args.at(0))), any_cast<Vec2>(args.at(1)), any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3))); Sprite s(StringRaw(AnyAsString(args.at(0))), any_cast<Vec2>(args.at(1)), any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)));
return s; return s;
} }
else if (name == "ZS.Graphics.DrawPixel")
{
SDL_SetRenderDrawColor(gRenderer, AnyAsInt(args.at(2)), AnyAsInt(args.at(3)), AnyAsInt(args.at(4)), 255);
SDL_RenderDrawPoint(gRenderer, AnyAsInt(args.at(0)), AnyAsInt(args.at(1)));
SDL_SetRenderDrawColor(gRenderer, 0, 0, 0, 0);
}
//DrawPixel(AnyAsInt(args.at(0)), AnyAsInt(args.at(1)), AnyAsInt(args.at(2)), AnyAsInt(args.at(3)), AnyAsInt(args.at(4)));
else if (name == "ZS.Graphics.Draw") else if (name == "ZS.Graphics.Draw")
any_cast<Sprite>(args.at(0)).Draw(); any_cast<Sprite>(args.at(0)).Draw();
else if (name == "ZS.Graphics.Load") else if (name == "ZS.Graphics.Load")
any_cast<Sprite>(args.at(0)).Load(); any_cast<Sprite>(args.at(0)).Load();
else if (name == "ZS.Graphics.Text") else if (name == "ZS.Graphics.Text")
{ {
if (!fileExists(StringRaw(AnyAsString(args.at(1))))) string path = StringRaw(AnyAsString(args.at(1)));
LogCriticalError("Failed to create 'Text' object: \"" + StringRaw(AnyAsString(args.at(1))) + "\""); if (count(path, '/') == 0)
path = "./" + path;
if (!fileExists(path))
LogCriticalError("Failed to create 'Text' object: \"" + path + "\"");
if (args.size() <= 8) if (args.size() <= 8)
{ {
Text t(StringRaw(AnyAsString(args.at(0))), StringRaw(AnyAsString(args.at(1))), any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7)), true); Text t(StringRaw(AnyAsString(args.at(0))), path, any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7)), true);
return t; return t;
} }
else else
{ {
Text t(StringRaw(AnyAsString(args.at(0))), StringRaw(AnyAsString(args.at(1))), any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7)), AnyAsBool(args.at(8))); Text t(StringRaw(AnyAsString(args.at(0))), path, any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7)), AnyAsBool(args.at(8)));
return t; return t;
} }
} }
@ -446,9 +459,9 @@ boost::any ZSFunction(const string& name, const vector<boost::any>& args)
else if (name == "ZS.Input.GetKey") else if (name == "ZS.Input.GetKey")
return KEYS[StringRaw(any_cast<string>(args.at(0)))] == 1; return KEYS[StringRaw(any_cast<string>(args.at(0)))] == 1;
else if (name == "ZS.System.Print") else if (name == "ZS.System.Print")
cout << StringRaw(AnyAsString(args.at(0))) << StringRaw(AnyAsString(args.at(0))).length(); cout << StringRaw(AnyAsString(args.at(0)));
else if (name == "ZS.System.PrintLine") else if (name == "ZS.System.PrintLine")
cout << StringRaw(AnyAsString(args.at(0))) << StringRaw(AnyAsString(args.at(0))).length() << endl; cout << StringRaw(AnyAsString(args.at(0))) << endl;
else if (name == "ZS.System.Vec2") else if (name == "ZS.System.Vec2")
{ {
Vec2 v(AnyAsFloat(args.at(0)), AnyAsFloat(args.at(1))); Vec2 v(AnyAsFloat(args.at(0)), AnyAsFloat(args.at(1)));

6
ZSharp/graphics.h
View File

@ -761,6 +761,12 @@ int cleanupGraphics()
return 0; return 0;
} }
//void DrawPixel(int x, int y, int r, int g, int b) {
// SDL_SetRenderDrawColor(gRenderer, r, g, b, 255);
// SDL_RenderDrawPoint(gRenderer, x, y);
// SDL_SetRenderDrawColor(gRenderer, 0, 0, 0, 0);
//}
int updateLoop() int updateLoop()
{ {

219
ZSharp/modpath.iss Normal file
View File

@ -0,0 +1,219 @@
// ----------------------------------------------------------------------------
//
// Inno Setup Ver: 5.4.2
// Script Version: 1.4.2
// Author: Jared Breland <jbreland@legroom.net>
// Homepage: http://www.legroom.net/software
// License: GNU Lesser General Public License (LGPL), version 3
// http://www.gnu.org/licenses/lgpl.html
//
// Script Function:
// Allow modification of environmental path directly from Inno Setup installers
//
// Instructions:
// Copy modpath.iss to the same directory as your setup script
//
// Add this statement to your [Setup] section
// ChangesEnvironment=true
//
// Add this statement to your [Tasks] section
// You can change the Description or Flags
// You can change the Name, but it must match the ModPathName setting below
// Name: modifypath; Description: &Add application directory to your environmental path; Flags: unchecked
//
// Add the following to the end of your [Code] section
// ModPathName defines the name of the task defined above
// ModPathType defines whether the 'user' or 'system' path will be modified;
// this will default to user if anything other than system is set
// setArrayLength must specify the total number of dirs to be added
// Result[0] contains first directory, Result[1] contains second, etc.
// const
// ModPathName = 'modifypath';
// ModPathType = 'user';
//
// function ModPathDir(): TArrayOfString;
// begin
// setArrayLength(Result, 1);
// Result[0] := ExpandConstant('{app}');
// end;
// #include "modpath.iss"
// ----------------------------------------------------------------------------
procedure ModPath();
var
oldpath: String;
newpath: String;
updatepath: Boolean;
pathArr: TArrayOfString;
aExecFile: String;
aExecArr: TArrayOfString;
i, d: Integer;
pathdir: TArrayOfString;
regroot: Integer;
regpath: String;
begin
// Get constants from main script and adjust behavior accordingly
// ModPathType MUST be 'system' or 'user'; force 'user' if invalid
if ModPathType = 'system' then begin
regroot := HKEY_LOCAL_MACHINE;
regpath := 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
end else begin
regroot := HKEY_CURRENT_USER;
regpath := 'Environment';
end;
// Get array of new directories and act on each individually
pathdir := ModPathDir();
for d := 0 to GetArrayLength(pathdir)-1 do begin
updatepath := true;
// Modify WinNT path
if UsingWinNT() = true then begin
// Get current path, split into an array
RegQueryStringValue(regroot, regpath, 'Path', oldpath);
oldpath := oldpath + ';';
i := 0;
while (Pos(';', oldpath) > 0) do begin
SetArrayLength(pathArr, i+1);
pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1);
oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath));
i := i + 1;
// Check if current directory matches app dir
if pathdir[d] = pathArr[i-1] then begin
// if uninstalling, remove dir from path
if IsUninstaller() = true then begin
continue;
// if installing, flag that dir already exists in path
end else begin
updatepath := false;
end;
end;
// Add current directory to new path
if i = 1 then begin
newpath := pathArr[i-1];
end else begin
newpath := newpath + ';' + pathArr[i-1];
end;
end;
// Append app dir to path if not already included
if (IsUninstaller() = false) AND (updatepath = true) then
newpath := newpath + ';' + pathdir[d];
// Write new path
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;
// Split a string into an array using passed delimeter
procedure MPExplode(var Dest: TArrayOfString; Text: String; Separator: String);
var
i: Integer;
begin
i := 0;
repeat
SetArrayLength(Dest, i+1);
if Pos(Separator,Text) > 0 then begin
Dest[i] := Copy(Text, 1, Pos(Separator, Text)-1);
Text := Copy(Text, Pos(Separator,Text) + Length(Separator), Length(Text));
i := i + 1;
end else begin
Dest[i] := Text;
Text := '';
end;
until Length(Text)=0;
end;
procedure CurStepChanged(CurStep: TSetupStep);
var
taskname: String;
begin
taskname := ModPathName;
if CurStep = ssPostInstall then
if IsTaskSelected(taskname) then
ModPath();
end;
procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
var
aSelectedTasks: TArrayOfString;
i: Integer;
taskname: String;
regpath: String;
regstring: String;
appid: String;
begin
// only run during actual uninstall
if CurUninstallStep = usUninstall then begin
// get list of selected tasks saved in registry at install time
appid := '{#emit SetupSetting("AppId")}';
if appid = '' then appid := '{#emit SetupSetting("AppName")}';
regpath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\'+appid+'_is1');
RegQueryStringValue(HKLM, regpath, 'Inno Setup: Selected Tasks', regstring);
if regstring = '' then RegQueryStringValue(HKCU, regpath, 'Inno Setup: Selected Tasks', regstring);
// check each task; if matches modpath taskname, trigger patch removal
if regstring <> '' then begin
taskname := ModPathName;
MPExplode(aSelectedTasks, regstring, ',');
if GetArrayLength(aSelectedTasks) > 0 then begin
for i := 0 to GetArrayLength(aSelectedTasks)-1 do begin
if comparetext(aSelectedTasks[i], taskname) = 0 then
ModPath();
end;
end;
end;
end;
end;
function NeedRestart(): Boolean;
var
taskname: String;
begin
taskname := ModPathName;
if IsTaskSelected(taskname) and not UsingWinNT() then begin
Result := True;
end else begin
Result := False;
end;
end;