Skip to content

Commit 54c9305

Browse files
committed
Fixed Windows installer so installation folder not added to PATH multiple times.
Also, updated installer readme.txt and fix typo in licensing.
1 parent f6f7775 commit 54c9305

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

installer/readme.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ Documentation files ("doc" folder)
2424

2525
INSTALLING THE PROGRAM
2626

27-
Please uninstall any prior versions. After running the installer program, all the program files will be located in the indicated folder. The Path environment variable will be modified to include the directory containing grcompiler.exe.
27+
Please uninstall any prior versions (see below). After running the installer program, all the program files will be located in the indicated folder. The PATH environment variable will be modified to include the directory containing grcompiler.exe.
2828

2929
If you choose to put the gdlpp.exe file in a different folder from GrCompiler.exe, you need to set the GDLPP environment variable to indicate where this utility is, for instance: "c:\graphite_extras\gdlpp.exe". Note that the variable must include the name of the program as well as well as the path. Also, the actual env var must be set without using quote marks.
3030

3131
The GDLPP_PREFS environment variable is used to indicate where the Graphite compiler will find #included files. The value consists of "-I" followed by the path or paths to files of interest, for instance, "-Ic:\graphite" (without quotes marks in actual use). At the very least, you will want to be able to #include "stddef.gdh", which is the standard include file that contains all the standard GDL abbreviations. If it is located in a different folder than the GDL source code and font file, you will need to put its path in the GDLPP_PREFS environment variable. The installer will initialize GDLPP_PREFS to point to the directory containing this file, which will be in the same directory as grcompiler.exe.
3232

33-
NOTE: GDLPP_PREFS must not contain directory names with spaces. If there are spaces in your path, you will need to use 8-character directory names. So if, for instance, your "stddef.gdh" file is located in C:\Program Files\Graphite Compiler, GDLPP_PREFS should be set to "-IC:\Progra~1\Graphi~1" (without quotes). If the compiler is having trouble finding the stddef.gdh file (ie, standard definitions are not recognized), check your GDLPP_PREFS environment variable and change it to use short names if necessary.
33+
NOTE: GDLPP_PREFS must not contain directory names with spaces. If there are spaces in your path, you will need to use 8-character directory names. So if, for instance, your "stddef.gdh" file is located in "C:\Program Files\Graphite Compiler", GDLPP_PREFS should likely be set to "-IC:\Progra~1\Graphi~1" (without quotes). If the compiler is having trouble finding the stddef.gdh file (ie, standard definitions are not recognized), check your GDLPP_PREFS environment variable and change it to use short names if necessary. (Alternatively, you can install the compiler into a folder with no spaces in its path or copy the "stddef.gdh" to the same folder as the GDL source code or specify the path to it in the #include directive.)
3434

3535

3636
RUNNING THE COMPILER
@@ -77,4 +77,4 @@ The file "allcaps.gdl" is a very simple program that you can try to compile whic
7777

7878
UNINSTALLING THE PROGRAM
7979

80-
To uninstall, run "unins000.exe".
80+
To uninstall, run "unins000.exe". You may also want to remove the installation folder from the PATH.

installer/windows/grcompiler.iss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Name: "{group}\Compiler Debug Files Doc"; Filename: "{app}\doc\CompilerDebugFile
5656
Name: "{commondesktop}\Graphite Compiler"; Filename: "{app}\GrCompiler.exe"; Tasks: desktopicon
5757

5858
[Registry]
59-
Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; ValueName: "GDLPP_PREFS"; ValueData: "-I{code:GetShortName|{app}}"
60-
Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; Check: NeedsAddPath('{app}')
59+
Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; ValueName: "GDLPP_PREFS"; ValueData: "-I{code:GetShortName|{app}}"; Flags: uninsdeletevalue
60+
Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; Check: NeedsAddPath(ExpandConstant('{app}'))
6161

6262

6363
[Messages]
@@ -78,7 +78,8 @@ begin
7878
end;
7979
end;
8080
81-
// This check does not seem to be working (as of 2/28/2012):
81+
// Check if install directory should be added to the PATH
82+
// see https://stackoverflow.com/questions/3304463/how-do-i-modify-the-path-environment-variable-when-running-an-inno-setup-install
8283
function NeedsAddPath(NewDir: string): boolean;
8384
var
8485
OrigPath: string;

license/LICENSING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Graphite Compiler Licensing
22
============================
3-
Copyright 1999-2021, SIL International (http://ww.sil.org).
3+
Copyright 1999-2021, SIL International (http://www.sil.org).
44

55
This program is free software; you can redistribute it and/or modify
66
it under the terms of either:

0 commit comments

Comments
 (0)