Issue oleg-shilo#203: precompiler/context["CompilerOptions"] doesn't appear to work

Author: oleg-shilo

Source/Precompiler.cs

@@ -15,16 +15,6 @@ namespace csscript
     /// </summary>
     internal class PrecompilationContext
     {
-        ///// <summary>
-        ///// Full path of the script being passed for pre-compilation.
-        ///// </summary>
-        //public string ScriptFileName;
-        ///// <summary>
-        ///// Flag, which indicates if the script passed for pre-compilation is an entry script (primary script).
-        ///// <para>This field can be used to determine the pre-compilation algorithm based on the entry script. For example
-        ///// generating the <c>static Main()</c> wrapper for classless scripts should be done only for an entry script but not for other included/imported script. </para>
-        ///// </summary>
-        //public bool IsPrimaryScript = true;
         /// <summary>
         /// Collection of the referenced assemblies to be added to the process script referenced assemblies.
         /// <para>You may want to add new items to the referenced assemblies because of the pre-compilation logic (e.g. some code using assemblies not referenced by the primary script
@@ -51,6 +41,11 @@ internal class PrecompilationContext
         /// </summary>
         public List<string> NewSearchDirs = new List<string>();
 
+        /// <summary>
+        /// Additional compiler options to be passed to the script compiler
+        /// </summary>
+        public string NewCompilerOptions;
+
         /// <summary>
         /// Collection of the process assembly and script probing directories.
         /// </summary>

Source/Utils.cs

@@ -1414,6 +1414,7 @@ internal static PrecompilationContext Precompile(string scriptFile, string[] fil
             contextData["NewSearchDirs"] = context.NewSearchDirs;
             contextData["NewReferences"] = context.NewReferences;
             contextData["NewIncludes"] = context.NewIncludes;
+            contextData["NewCompilerOptions"] = "";
             contextData["SearchDirs"] = context.SearchDirs;
             contextData["ConsoleEncoding"] = options.consoleEncoding;
             contextData["CompilerOptions"] = options.compilerOptions;
@@ -1470,6 +1471,7 @@ internal static PrecompilationContext Precompile(string scriptFile, string[] fil
                 }
             }
 
+            context.NewCompilerOptions = (string)contextData["NewCompilerOptions"];
             options.searchDirs = options.searchDirs.ConcatWith(context.NewSearchDirs);
 
             foreach (string asm in context.NewReferences)

Source/cscscript/CSScriptLibrary.xml

@@ -1734,8 +1734,11 @@ string Compile(string scriptFileName)
                 context.NewDependencies.AddRange(context.NewIncludes);
             }
 
+            Utils.AddCompilerOptions(compilerParams, context.NewCompilerOptions);
+
             string[] additionalDependencies = context.NewDependencies.ToArray();
 
+            compilerParams.ReferencedAssemblies.AddRange(context.NewReferences.ToArray());
             AddReferencedAssemblies(compilerParams, scriptFileName, parser);
 
             //add resources referenced from code
@@ -1823,8 +1826,6 @@ string Compile(string scriptFileName)
             if (!Directory.Exists(outDir))
                 Directory.CreateDirectory(outDir);
 
-            //compilerParams.ReferencedAssemblies.Add(this.GetType().Assembly.Location);
-
             CompilerResults results;
             if (generateExe)
             {