Implemented setting to copy Libraries content.

sq · iskiselev · Jul 20, 2016 · Jul 20, 2016 · Jul 20, 2016 · Jul 20, 2016
commit 0473c5fbda9436c124717198a68d0cb33394dedb
diff --git a/Compiler/Configuration.cs b/Compiler/Configuration.cs
@@ -43,6 +43,7 @@ public void MergeInto (SolutionBuildConfiguration result) {
         public bool? ReuseTypeInfoAcrossAssemblies;
         public bool? ProxyWarnings;
         public string OutputDirectory;
+        public string JsLibrariesOutputDirectory;
         public string FileOutputDirectory;
         public string Profile;
         public Dictionary<string, object> ProfileSettings = new Dictionary<string, object>();
@@ -66,6 +67,8 @@ public override void MergeInto (JSIL.Translator.Configuration result) {
                 cc.ReuseTypeInfoAcrossAssemblies = ReuseTypeInfoAcrossAssemblies;
             if (OutputDirectory != null)
                 cc.OutputDirectory = OutputDirectory;
+            if (JsLibrariesOutputDirectory != null)
+                cc.JsLibrariesOutputDirectory = JsLibrariesOutputDirectory;
             if (FileOutputDirectory != null)
                 cc.FileOutputDirectory = FileOutputDirectory;
             if (Profile != null)
@@ -108,6 +111,7 @@ public VariableSet ApplyTo (VariableSet variables) {
             result["CurrentDirectory"] = () => Environment.CurrentDirectory;
             result["ConfigDirectory"] = () => Path;
             result["OutputDirectory"] = () => OutputDirectory;
+            result["JsLibrariesOutputDirectory"] = () => JsLibrariesOutputDirectory;
             result["FileOutputDirectory"] = () => FileOutputDirectory;
             result["Profile"] = () => Profile;
 

diff --git a/Compiler/Extensibility/IProfile.cs b/Compiler/Extensibility/IProfile.cs
@@ -18,7 +18,7 @@ TranslationResultCollection Translate (
             Configuration configuration, string assemblyPath, bool scanForProxies
         );
         void WriteOutputs (
-            VariableSet variables, TranslationResultCollection result, string path, bool quiet
+            VariableSet variables, TranslationResultCollection result, Configuration path, bool quiet
         );
 
         void RegisterPostprocessors (IEnumerable<IEmitterGroupFactory> emitters, Configuration configuration, string assemblyPath, string[] skippedAssemblies);

diff --git a/Compiler/Profiles/Base.cs b/Compiler/Profiles/Base.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using JSIL.Compiler.Extensibility;
 using JSIL.Utilities;
 
@@ -24,15 +25,35 @@ public virtual TranslationResultCollection Translate (
         public virtual void RegisterPostprocessors (IEnumerable<IEmitterGroupFactory> emitters, Configuration configuration, string assemblyPath, string[] skippedAssemblies) {
         }
 
-        public virtual void WriteOutputs (VariableSet variables, TranslationResultCollection result, string path,bool quiet) {
+        public virtual void WriteOutputs (VariableSet variables, TranslationResultCollection result, Configuration configuration, bool quiet) {
             foreach (var translationResult in result.TranslationResults) {
                 if (!quiet)
                 {
                     foreach (var fe in translationResult.OrderedFiles)
                         Console.WriteLine(fe.Filename);
                 }
 
-                translationResult.WriteToDirectory(path);
+                translationResult.WriteToDirectory(configuration.OutputDirectory);
+            }
+
+            var jsilPath = Path.GetDirectoryName(JSIL.Internal.Util.GetPathOfAssembly(Assembly.GetExecutingAssembly()));
+            var searchPath = Path.Combine(jsilPath, "JS Libraries\\JsLibraries\\");
+            if (!string.IsNullOrEmpty(configuration.JsLibrariesOutputDirectory) && Directory.Exists(searchPath))
+            {
+                foreach (var file in Directory.GetFiles(searchPath, "*", SearchOption.AllDirectories)) {
+                    var target = Uri.UnescapeDataString(Path.Combine(configuration.JsLibrariesOutputDirectory, new Uri(searchPath).MakeRelativeUri(new Uri(file)).ToString()))
+                        .Replace('/', Path.DirectorySeparatorChar);
+                    var directory = Path.GetDirectoryName(target);
+                    if (!Directory.Exists(directory))
+                        Directory.CreateDirectory(directory);
+
+                    File.Copy(file, target, true);
+
+                    if (!quiet)
+                    {
+                            Console.WriteLine(target);
+                    }
+                }
             }
         }
 

diff --git a/Compiler/Program.cs b/Compiler/Program.cs
@@ -188,6 +188,9 @@ AssemblyCache assemblyCache
                     {"o=|out=", 
                         "Specifies the output directory for generated javascript and manifests.",
                         (path) => commandLineConfig.OutputDirectory = Path.GetFullPath(path) },
+                    {"outLibraries=",
+                        "Specifies the output directory for JSIL Libraries.",
+                        (path) => commandLineConfig.JsLibrariesOutputDirectory = Path.GetFullPath(path) },
                     {"q|quiet",
                         "Suppresses non-error/non-warning stderr messages.",
                         (_) => commandLineConfig.Quiet = Quiet = true },
@@ -822,20 +825,26 @@ static void InternalMain (string[] arguments) {
                         if (localConfig.OutputDirectory == null)
                             throw new Exception("No output directory was specified!");
 
-                        var outputDir = MapPath(localConfig.OutputDirectory, localVariables, false);
-                        CopiedOutputGatherer.EnsureDirectoryExists(outputDir);
+                        localConfig.OutputDirectory = MapPath(localConfig.OutputDirectory, localVariables, false);
+                        CopiedOutputGatherer.EnsureDirectoryExists(localConfig.OutputDirectory);
 
-                        InformationWriteLine("// Saving output to '{0}'.", ShortenPath(outputDir) + Path.DirectorySeparatorChar);
+                        InformationWriteLine("// Saving output to '{0}'.", ShortenPath(localConfig.OutputDirectory) + Path.DirectorySeparatorChar);
+
+                        if (!string.IsNullOrEmpty(localConfig.JsLibrariesOutputDirectory))
+                        {
+                            localConfig.JsLibrariesOutputDirectory = MapPath(localConfig.JsLibrariesOutputDirectory, localVariables, false);
+                            CopiedOutputGatherer.EnsureDirectoryExists(localConfig.JsLibrariesOutputDirectory);
+                        }
 
                         // Ensures that the log file contains the name of the profile that was actually used.
                         localConfig.Profile = localProfile.GetType().Name;
 
                         if (ignoredMethods.Count > 0)
                             Console.Error.WriteLine("// {0} method(s) were ignored during translation. See the log for a list.", ignoredMethods.Count);
 
-                        EmitLog(outputDir, localConfig, filename, outputs, ignoredMethods);
+                        EmitLog(localConfig.OutputDirectory, localConfig, filename, outputs, ignoredMethods);
 
-                        buildGroup.Profile.WriteOutputs(localVariables, outputs, outputDir, Quiet);
+                        buildGroup.Profile.WriteOutputs(localVariables, outputs, localConfig, Quiet);
 
                         totalFailureCount += translator.Failures.Count;
                     }

diff --git a/JSIL.nuspec b/JSIL.nuspec
@@ -28,5 +28,7 @@
     <file src="bin\Mono.Cecil.Pdb.dll" target="tools" />
     <file src="bin\JSIL.ExpressionInterpreter.dll" target="tools" />
     <file src="bin\JSIL.ExpressionInterpreter.pdb" target="tools" />
+    <file src="bin\JS Libraries\**" target="tools\JS Libraries" />
+    <file src="Libraries\" target="tools\JS Libraries\JsLibraries" />
   </files>
 </package>