feat: win 10 sdk 10.0.17134.0

electron-userland · Jul 17, 2018 · c6398db · c6398db
1 parent 32592f5
commit c6398db
Show file tree

Hide file tree

Showing 19 changed files with 75 additions and 7 deletions.
diff --git a/scripts/appx.js b/scripts/appx.js
@@ -2,8 +2,8 @@ const path = require("path")
 const BluebirdPromise = require("bluebird-lst")
 const copy = BluebirdPromise.promisify(require("fs").copyFile)
 
-const windowsKitsDir = "/Volumes/C/Program Files (x86)/Windows Kits/10"
-const sourceDir = path.join(windowsKitsDir, "bin/10.0.15063.0")
+const windowsKitsDir = "/Volumes/[C] MSEdge - Win10.hidden/Program Files (x86)/Windows Kits/10"
+const sourceDir = path.join(windowsKitsDir, "bin/10.0.17134.0")
 const destination = path.join(__dirname, "../winCodeSign/windows-10")
 
 // noinspection SpellCheckingInspection
@@ -15,7 +15,8 @@ const files = [
   "Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest",
   "Microsoft.Windows.Build.Appx.OpcServices.dll.manifest",
   "opcservices.dll",
-  "signtool.exe"
+  "signtool.exe",
+  "pvk2pfx.exe"
 ]
 
 function copyFiles(files, sourceDir, archWin, archNode) {
@@ -25,9 +26,6 @@ function copyFiles(files, sourceDir, archWin, archNode) {
 BluebirdPromise.all([
   copyFiles(files, sourceDir, "x86", "ia32"),
   copyFiles(files, sourceDir, "x64", "x64"),
-  // pvk2pfx not in the 10.0.15063.0 for unknown reason
-  copyFiles(["pvk2pfx.exe",], path.join(windowsKitsDir, "bin"), "x86", "ia32"),
-  copyFiles(["pvk2pfx.exe",], path.join(windowsKitsDir, "bin"), "x64", "x64"),
 ])
   .catch(error => {
     process.exitCode = 1

diff --git a/winCodeSign/darwin/osslsigncode b/winCodeSign/darwin/osslsigncode
diff --git a/winCodeSign/darwin/readme.md b/winCodeSign/darwin/readme.md
@@ -3,4 +3,50 @@ Not 1.7.1 but latest [master](https://github.com/develar/osslsigncode) is used b
 
 Notes:
 
-* osslsigncode requires openssl 1.0, so, we bundle openssl 1.0 lib.
+* osslsigncode requires openssl 1.0, so, we bundle openssl 1.0 lib.
+
+Change `/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/osslsigncode.rb` to:
+
+```ruby
+class Osslsigncode < Formula
+  desc "Authenticode signing of PE(EXE/SYS/DLL/etc), CAB and MSI files"
+  homepage "https://sourceforge.net/projects/osslsigncode/"
+  url "https://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz"
+  sha256 "f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9"
+
+  bottle do
+    cellar :any
+    sha256 "4e079298b889a8ff8b629bc97323852b7f9e342de55ab74e601c995e6ad585f1" => :high_sierra
+    sha256 "898333a70f9700c159c8a29b7452c210f61004b23f39b0637131f7257f9250ec" => :sierra
+    sha256 "ed69f3ff0b8144a10a66cbe0a1986717a5564415768530110ae66749777f3490" => :el_capitan
+    sha256 "5f3799537630936f8d7954e9ec28f191fff6e1713f6b209aa94b2b665e5eaf88" => :yosemite
+    sha256 "59da5261972c8d26f0238c6ea42f5b247489d41e7ce6525c703675a22e260cfa" => :mavericks
+    sha256 "49a6dd76e78c82062041e5025ed1e7d71f1c53b51ef0e314a5e6938a07b6e49d" => :mountain_lion
+  end
+
+  head do
+    url "https://github.com/develar/osslsigncode.git"
+    depends_on "automake" => :build
+  end
+
+  depends_on "pkg-config" => :build
+  depends_on "autoconf" => :build
+  depends_on "openssl"
+  depends_on "libgsf"
+
+  def install
+    system "autoreconf", "-ivf" if build.head?
+    system "./configure", "--prefix=#{prefix}"
+    system "make", "install"
+  end
+
+  test do
+    # Requires Windows PE executable as input, so we're just showing the version
+    assert_match "osslsigncode", shell_output("#{bin}/osslsigncode --version", 255)
+  end
+end
+```
+
+and `brew install libgsf && brew uninstall --force osslsigncode && brew install osslsigncode --HEAD`
+
+`cp /usr/local/bin/osslsigncode ~/Documents/electron-builder-binaries/winCodeSign/darwin/osslsigncode`
diff --git a/winCodeSign/windows-10/ia32/Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest b/winCodeSign/windows-10/ia32/Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest
@@ -23,6 +23,18 @@
         clsid="{48DE828C-730C-49AF-AE84-759C609911EE}"
         threadingModel="Both"
         description="AppxNoValidationFactory class"/>
+    <comClass
+        clsid="{F004F2CA-AEBC-4B0D-BF58-E516D5BCC0AB}"
+        threadingModel="Both"
+        description="AppxPackageEditor class"/>
+    <comClass
+        clsid="{7F00FA1E-9820-47B1-9C4F-8701F1432177}"
+        threadingModel="Both"
+        description="AppxPackagingLayoutReader class"/>
+    <comClass
+        clsid="{0CF07551-EEF2-420C-B5AB-7E4FEB2249CF}"
+        threadingModel="Both"
+        description="AppxFactoryInternal class"/>
   </file>
 
   <dependency>

diff --git a/winCodeSign/windows-10/ia32/appxpackaging.dll b/winCodeSign/windows-10/ia32/appxpackaging.dll
diff --git a/winCodeSign/windows-10/ia32/makeappx.exe b/winCodeSign/windows-10/ia32/makeappx.exe
diff --git a/winCodeSign/windows-10/ia32/makecert.exe b/winCodeSign/windows-10/ia32/makecert.exe
diff --git a/winCodeSign/windows-10/ia32/makepri.exe b/winCodeSign/windows-10/ia32/makepri.exe
diff --git a/winCodeSign/windows-10/ia32/opcservices.dll b/winCodeSign/windows-10/ia32/opcservices.dll
diff --git a/winCodeSign/windows-10/ia32/pvk2pfx.exe b/winCodeSign/windows-10/ia32/pvk2pfx.exe
diff --git a/winCodeSign/windows-10/ia32/signtool.exe b/winCodeSign/windows-10/ia32/signtool.exe
diff --git a/winCodeSign/windows-10/x64/Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest b/winCodeSign/windows-10/x64/Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest
@@ -23,6 +23,18 @@
         clsid="{48DE828C-730C-49AF-AE84-759C609911EE}"
         threadingModel="Both"
         description="AppxNoValidationFactory class"/>
+    <comClass
+        clsid="{F004F2CA-AEBC-4B0D-BF58-E516D5BCC0AB}"
+        threadingModel="Both"
+        description="AppxPackageEditor class"/>
+    <comClass
+        clsid="{7F00FA1E-9820-47B1-9C4F-8701F1432177}"
+        threadingModel="Both"
+        description="AppxPackagingLayoutReader class"/>
+    <comClass
+        clsid="{0CF07551-EEF2-420C-B5AB-7E4FEB2249CF}"
+        threadingModel="Both"
+        description="AppxFactoryInternal class"/>
   </file>
 
   <dependency>

diff --git a/winCodeSign/windows-10/x64/appxpackaging.dll b/winCodeSign/windows-10/x64/appxpackaging.dll
diff --git a/winCodeSign/windows-10/x64/makeappx.exe b/winCodeSign/windows-10/x64/makeappx.exe
diff --git a/winCodeSign/windows-10/x64/makecert.exe b/winCodeSign/windows-10/x64/makecert.exe
diff --git a/winCodeSign/windows-10/x64/makepri.exe b/winCodeSign/windows-10/x64/makepri.exe
diff --git a/winCodeSign/windows-10/x64/opcservices.dll b/winCodeSign/windows-10/x64/opcservices.dll
diff --git a/winCodeSign/windows-10/x64/pvk2pfx.exe b/winCodeSign/windows-10/x64/pvk2pfx.exe
diff --git a/winCodeSign/windows-10/x64/signtool.exe b/winCodeSign/windows-10/x64/signtool.exe