2
0
Martijn Laan 11 жил өмнө
parent
commit
c37a599bd0
3 өөрчлөгдсөн 13 нэмэгдсэн , 18 устгасан
  1. 10 14
      Projects/ISCC.dpr
  2. 2 3
      README.md
  3. 1 1
      setup.iss

+ 10 - 14
Projects/ISCC.dpr

@@ -31,18 +31,13 @@ type
     LineText: String;
     Next: PScriptLine;
   end;
-  
+
   TOptionID = 0..25;
 
   TOptions = packed set of TOptionID;
 
-  PIsppParserOptions = ^TIsppParserOptions;
-  TIsppParserOptions = packed record
-    Options: TOptions;
-  end;
-
   TIsppOptions = packed record
-    ParserOptions: TIsppParserOptions;
+    ParserOptions: TOptions;
     Options: TOptions;
     VerboseLevel: Byte;
     InlineStart: string[7];
@@ -143,14 +138,14 @@ begin
   with Opt do
   begin
     SetOption(Options, 'C', True);
-    SetOption(ParserOptions.Options, 'B', True);
-    SetOption(ParserOptions.Options, 'P', True);
+    SetOption(ParserOptions, 'B', True);
+    SetOption(ParserOptions, 'P', True);
     VerboseLevel := 0;
     InlineStart := '{#';
     InlineEnd := '}';
 
     PopulateOptions(Options, '$');
-    PopulateOptions(ParserOptions.Options, 'p');
+    PopulateOptions(ParserOptions, 'p');
   end;
 
   Definitions := 'ISPPCC_INVOKED';
@@ -159,9 +154,8 @@ end;
 
 procedure IsppOptionsToString(var S: String; Opt: TIsppOptions; Definitions, IncludePath: String);
 begin
-  with Opt do
-  begin
-    AppendOption(S, 'ISPP:ParserOptions', ConvertOptionsToString(ParserOptions.Options));
+  with Opt do begin
+    AppendOption(S, 'ISPP:ParserOptions', ConvertOptionsToString(ParserOptions));
     AppendOption(S, 'ISPP:Options', ConvertOptionsToString(Options));
     AppendOption(S, 'ISPP:VerboseLevel', IntToStr(VerboseLevel));
     AppendOption(S, 'ISPP:InlineStart', String(InlineStart));
@@ -408,11 +402,13 @@ procedure ProcessCommandLine;
       WriteStdErr('  /{#<string>        Emulate #pragma inlinestart <string>');
       WriteStdErr('  /}<string>         Emulate #pragma inlineend <string>');
       WriteStdErr('  /V<number>         Emulate #pragma verboselevel <number>');
+    end;
+    WriteStdErr('  /?                 Show this help screen');
+    if IsppMode then begin
       WriteStdErr('');
       WriteStdErr('Example: iscc /$c- /Pu+ "/DLic=Trial Lic.txt" /IC:\INC;D:\INC scriptfile.iss');
       WriteStdErr('');
     end;
-    WriteStdErr('  /?                 Show this help screen');
   end;
 
 var

+ 2 - 3
README.md

@@ -154,8 +154,7 @@ under Delphi 3 (3.02 to be exact). The rest of the projects are compiled
 under Delphi 2.01.
 
 **ISCC** - This is the command-line front-end to the compiler. Like
-Compil32, it depends on ISCmplr.dll to do the actual compiling. If
-ispp.dll exist, extra preprocessor related parameters would be supported.
+Compil32, it depends on ISCmplr.dll to do the actual compiling.
 
 **ISCmplr** - This is a DLL which is loaded by Compil32 and ISCC to compile
 scripts. The actual compiler code is in Compile.pas. See CompInt.pas for the
@@ -181,7 +180,7 @@ How do the projects link together?
   clauses of the projects and units if you aren't sure if a project uses a
   particular unit.
 
-- ISPP use various copies of other Inno Setup files. To synch these
+- ISPP uses various copies of other Inno Setup files. To synch these
   run synch-isfiles.bat.
 
 5. Source code tips

+ 1 - 1
setup.iss

@@ -95,7 +95,7 @@ Source: "license.txt"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "ishelp\Staging\ISetup.chm"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\Compil32.exe"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\isscint.dll"; DestDir: "{app}"; Flags: ignoreversion touch
-Source: "files\ISCC.exe"; DestDir: "{app}"; Flags: ignoreversion touch;
+Source: "files\ISCC.exe"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\ISCmplr.dll"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\Setup.e32"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\SetupLdr.e32"; DestDir: "{app}"; Flags: ignoreversion touch