Skip to content

Commit

Permalink
Kn/macos signing (#2432)
Browse files Browse the repository at this point in the history
* chore: migrate from altool to notarytool

* fix litte things in build-common

* add pyenv install in build-osx

* add pyinstaller/electron/signing_logs to gitignore

* chore: migrate from altool to notarytool

* fix little things in build.common

* add pyenv install in build osx

* add pyinatsller electron signing logs to gitignore

* updated build-osx.sh

* fix entitlement

* heavily refactoring the electron app

* polish and improve

* further bugfixing and polishing

* tiny change to improve support of MacOS

* Fix dependency issues

---------

Co-authored-by: Manolis <[email protected]>
  • Loading branch information
k9ert and moneymanolis authored May 1, 2024
1 parent 7970c3d commit e9dc494
Show file tree
Hide file tree
Showing 22 changed files with 932 additions and 803 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pyinstaller/electron/downloadloc.js
pyinstaller/electron/node_modules
pyinstaller/electron/package-lock.json
pyinstaller/electron/dist
pyinstaller/electron/signing_logs
pyinstaller/electron/fonts
pyinstaller/electron/typography.css
pyinstaller/electron/output.css
Expand Down
7 changes: 6 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
"python.testing.pytestEnabled": true,
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}
2 changes: 2 additions & 0 deletions pyinstaller/electron/build/entitlements.mac.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.device.camera</key>
Expand Down
37 changes: 17 additions & 20 deletions pyinstaller/electron/error_logs.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<html>
<link rel="stylesheet" type="text/css" href="./styles.css">
<body style="overflow: auto; height: 100%;">
<div class="card" style="width:90%">
This window shows you the last 700 lines Logs of the specterApp. This also includes
the Logs of specterd which are marked as such. It might give you hints on why specter is not coming up properly.
The best approach is to scroll to the bottom and then search upwards for errors.
You can find the logfile in [yourHomedirectory]/.specter/specterApp.log.
<pre><code id="specterapp-logs"></code></pre>
<br>

</div>
<link rel="stylesheet" type="text/css" href="./output.css" />
<body style="overflow: auto; height: 100%">
<div class="card" style="width: 90%">
This window shows you the last 700 lines Logs of the specterApp. This also includes the Logs of specterd which are
marked as such. It might give you hints on why specter is not coming up properly. The best approach is to scroll to the
bottom and then search upwards for errors. You can find the logfile in [yourHomedirectory]/.specter/specterApp.log.
<pre><code id="specterapp-logs"></code></pre>
<br />
</div>
<script>
const fs = require('fs')
const path = require('path')
const helpers = require('./helpers')
helpers.getSpecterAppLogs( (lines) => {
document.getElementById('specterapp-logs').innerText = lines
})

const fs = require('fs')
const path = require('path')
const helpers = require('./src/helpers')
helpers.getSpecterAppLogs((lines) => {
document.getElementById('specterapp-logs').innerText = lines
})
</script>
</body>
</html>
</body>
</html>
125 changes: 0 additions & 125 deletions pyinstaller/electron/helpers.js

This file was deleted.

Loading

0 comments on commit e9dc494

Please sign in to comment.