eburk/EpochSilicon
1
0
Fork 0
Code Issues 3 Pull Requests Packages Releases 7 Activity

change pathing

Browse Source
This commit is contained in:
Evan Burkey
2025-07-25 21:47:46 -07:00
parent a07958563a
commit 7397fae6f4
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -77,7 +77,7 @@ This appears to be a problem with using a built-in version of `rosettax87`. In o
1. Install Xcode command line tools by opening a terminal and typing `xcode-select --install` and following the prompts 1. Install Xcode command line tools by opening a terminal and typing `xcode-select --install` and following the prompts
2. Setup [Homebrew](https://brew.sh/) if you don't have it already 2. Setup [Homebrew](https://brew.sh/) if you don't have it already
3. Install Cmake by opening a terminal and enter `brew install cmake` 3. Install Cmake by opening a terminal and enter `brew install cmake`. Cmake must be installed through Homebrew
3. Run EpochSilicon and click the `Troubleshooting` button 3. Run EpochSilicon and click the `Troubleshooting` button
4. Find the line that says `Build Rosettax87 locally` and click the `Build` button, following the prompts 4. Find the line that says `Build Rosettax87 locally` and click the `Build` button, following the prompts

9
pkg/patching/patching.go
View File

@@ -21,6 +21,11 @@ import (
"fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/dialog"
) )
const (
CmakePath = "/opt/homebrew/bin/cmake"
ClangPath = "/usr/bin/clang"
)
func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) { func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
log.Debug("Patch Epoch clicked") log.Debug("Patch Epoch clicked")
if paths.EpochPath == "" { if paths.EpochPath == "" {
@@ -486,14 +491,14 @@ func BuildRosetta() (string, string, error) {
return "", "", fmt.Errorf("failed to clone repository: %v", err) return "", "", fmt.Errorf("failed to clone repository: %v", err)
} }
cmd := exec.Command("cmake", "-B", "build") cmd := exec.Command(CmakePath, "-B", "build")
cmd.Dir = clonedDir cmd.Dir = clonedDir
err = cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
return "", "", fmt.Errorf("failed to create build files: %v", err) return "", "", fmt.Errorf("failed to create build files: %v", err)
} }
cmd = exec.Command("cmake", "--build", "build") cmd = exec.Command(CmakePath, "--build", "build")
cmd.Dir = clonedDir cmd.Dir = clonedDir
err = cmd.Run() err = cmd.Run()
if err != nil { if err != nil {

8
pkg/ui/popup.go
View File

@@ -208,14 +208,14 @@ func showTroubleshootingPopup() {
dialog.NewConfirm("Build rosettax87", msg, func(confirm bool) { dialog.NewConfirm("Build rosettax87", msg, func(confirm bool) {
if confirm { if confirm {
// Check for dependencies // Check for dependencies
if err := exec.Command("clang", "--version").Run(); err != nil { if err := exec.Command(patching.ClangPath, "--version").Run(); err != nil {
m := fmt.Errorf("xcode command line tools are not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again") m := fmt.Errorf("xcode command line tools are not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again. Error: %v", err)
log.Error(m.Error()) log.Error(m.Error())
dialog.ShowError(m, currentWindow) dialog.ShowError(m, currentWindow)
return return
} }
if err := exec.Command("cmake", "--version").Run(); err != nil { if err := exec.Command(patching.CmakePath, "--version").Run(); err != nil {
m := fmt.Errorf("Cmake is not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again") m := fmt.Errorf("Cmake is not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again. Error: %v", err)
log.Error(m.Error()) log.Error(m.Error())
dialog.ShowError(m, currentWindow) dialog.ShowError(m, currentWindow)
return return