Merge pull request #1051 from Squirrel/only-generate-root-stubs

Only generate execution stubs for the top-level executables
Squirrel · Jun 7, 2017 · eacae0f · eacae0f
2 parents 4dac714 + bceb89f
commit eacae0f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/Squirrel/Utility.cs b/src/Squirrel/Utility.cs
@@ -573,6 +573,16 @@ public static bool FileIsLikelyPEImage(string name)
             return peExtensions.Any(x => ext.Equals(x, StringComparison.OrdinalIgnoreCase));
         }
 
+        public static bool IsFileTopLevelInPackage(string fullName, string pkgPath)
+        {
+            var fn = fullName.ToLowerInvariant();
+            var pkg = pkgPath.ToLowerInvariant();
+            var relativePath = fn.Replace(pkg, "");
+
+            // NB: We want to match things like `/lib/net45/foo.exe` but not `/lib/net45/bar/foo.exe`
+            return relativePath.Split(Path.DirectorySeparatorChar).Length == 4;
+        }
+
         public static void LogIfThrows(this IFullLogger This, LogLevel level, string message, Action block)
         {
             try {

diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -389,6 +389,7 @@ public void Releasify(string package, string targetDir = null, string packagesDi
                     new DirectoryInfo(pkgPath).GetAllFilesRecursively()
                         .Where(x => x.Name.ToLowerInvariant().EndsWith(".exe"))
                         .Where(x => !x.Name.ToLowerInvariant().Contains("squirrel.exe"))
+                        .Where(x => Utility.IsFileTopLevelInPackage(x.FullName, pkgPath))
                         .Where(x => Utility.ExecutableUsesWin32Subsystem(x.FullName))
                         .ForEachAsync(x => createExecutableStubForExe(x.FullName))
                         .Wait();
@@ -405,7 +406,7 @@ public void Releasify(string package, string targetDir = null, string packagesDi
 
                             this.Log().Info("About to sign {0}", x.FullName);
                             await signPEFile(x.FullName, signingOpts);
-                        })
+                        }, 1)
                         .Wait();
                 });
 

diff --git a/test/UtilityTests.cs b/test/UtilityTests.cs
@@ -142,6 +142,18 @@ public void FileIsLikelyPEImageTest(string input, bool result)
             Assert.Equal(result, Utility.FileIsLikelyPEImage(input));
         }
 
+        [Theory]
+        [InlineData("C:\\Users\\bob\\temp\\pkgPath\\lib\\net45\\foo.exe", "C:\\Users\\bob\\temp\\pkgPath", true)]
+        [InlineData("C:\\Users\\bob\\temp\\pkgPath\\lib\\net45\\node_modules\\foo.exe", "C:\\Users\\bob\\temp\\pkgPath", false)]
+        [InlineData("C:\\Users\\bob\\temp\\pkgPath\\lib\\net45\\node_modules\\foo\\foo.exe", "C:\\Users\\bob\\temp\\pkgPath", false)]
+        [InlineData("foo.png", "C:\\Users\\bob\\temp\\pkgPath", false)]
+        public void IsFileTopLevelInPackageTest(string input, string packagePath, bool result)
+        {
+            Assert.Equal(result, Utility.IsFileTopLevelInPackage(input, packagePath));
+        }
+
+
+
         [Fact]
         public void WeCanFetchAllProcesses()
         {