Spitfire/Builder
Spitfire/Builder
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fixed '--skip-patch-update' flag

Browse source
This commit is contained in:
partisan 2024-12-13 14:31:28 +01:00
parent e99e7bf437
commit 504fc59573
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
main.go
View file

@ -186,6 +186,23 @@ func BuildProcess() {
spitfire.RunProject(sourcePath)
}
fmt.Println("Spitfire build completed successfully.")
} else if buildFlag {
if prePatch {
if err := spitfire.ApplyPatches(sourcePath, patchesRepo, "pre-compile-patches", filepath.Join(sourcePath, "patcher"), skipPatchUpdate); err != nil {
log.Fatalf("Error during patch application: %v", err)
}
}
spitfire.Configure(sourcePath)
spitfire.Build(sourcePath)
if postPatch {
if err := spitfire.ApplyPatches(buildDir, patchesRepo, "post-compile-patches", filepath.Join(sourcePath, "patcher"), skipPatchUpdate); err != nil {
log.Fatalf("Error during patch application: %v", err)
}
}
if run {
spitfire.RunProject(sourcePath)
}
fmt.Println("Spitfire build completed successfully.")
} else if clean {
spitfire.CleanBuild(sourcePath)
fmt.Println("Cleaned Firefox build.")
@ -205,18 +222,9 @@ func BuildProcess() {
log.Fatalf("Error during patch application: %v", err)
}
}
} else if buildFlag {
spitfire.Configure(sourcePath)
spitfire.Build(sourcePath)
if postPatch {
if err := spitfire.ApplyPatches(buildDir, patchesRepo, "post-compile-patches", filepath.Join(sourcePath, "patcher"), skipPatchUpdate); err != nil {
log.Fatalf("Error during patch application: %v", err)
}
}
if run {
spitfire.RunProject(sourcePath)
}
fmt.Println("Spitfire build completed successfully.")
} else if run {
spitfire.RunProject(sourcePath)
}

2
spitfire/patch.go
View file

@ -29,7 +29,7 @@ func ApplyPatches(sourcePath string, patchesRepo string, patchesPath string, pat
}
fmt.Println("Patches repository cloned successfully.")
} else {
if skipUpdateRepo {
if !skipUpdateRepo {
// If the directory exists, fetch and pull the latest changes
fmt.Println("Patches directory already exists. Fetching latest changes.")
cmdFetch := exec.Command("git", "fetch", "--all")