me/omegafox
1
0
Fork 0
mirror of https://forge.fsky.io/oneflux/omegafox.git synced 2026-02-10 05:02:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separate versioning for private patch revisions

Browse source
This commit is contained in:
daijro 2025-03-15 05:50:35 -05:00
parent 5009f52dff
commit 95cc4489d0
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -52,13 +52,13 @@ fetch:
else \ else \
echo "Fetching private patches..."; \ echo "Fetching private patches..."; \
mkdir -p patches/closedsrc; \ mkdir -p patches/closedsrc; \
if ! aria2c --dry-run "https://camoufox.com/pipeline/rev-$(version)-$(release).7z" 2>/dev/null; then \ if ! aria2c --dry-run "https://camoufox.com/pipeline/rev-$(closedsrc_rev).7z" 2>/dev/null; then \
echo "No private patches found for this version"; \ echo "No private patches found for this version"; \
exit 1; \ exit 1; \
else \ else \
aria2c -o rev-$(version)-$(release).7z "https://camoufox.com/pipeline/rev-$(version)-$(release).7z" && \ aria2c -o rev-$(closedsrc_rev).7z "https://camoufox.com/pipeline/rev-$(closedsrc_rev).7z" && \
7z x -p"$$CAMOUFOX_PASSWD" rev-$(version)-$(release).7z -o./patches/closedsrc && \ 7z x -p"$$CAMOUFOX_PASSWD" rev-$(closedsrc_rev).7z -o./patches/closedsrc && \
rm rev-$(version)-$(release).7z; \ rm rev-$(closedsrc_rev).7z; \
fi; \ fi; \
fi; \ fi; \
fi fi
@ -259,7 +259,7 @@ upload:
@test -f .passwd || { echo "Error: .passwd file not found"; exit 1; } @test -f .passwd || { echo "Error: .passwd file not found"; exit 1; }
@mkdir -p ../camoufox-web/internal @mkdir -p ../camoufox-web/internal
@rm -rf ../camoufox-web/pipeline/rev-$(version)-$(release).7z @rm -rf ../camoufox-web/pipeline/rev-$(closedsrc_rev).7z
7z a "-p$$(cat ./.passwd)" -mhe=on ../camoufox-web/pipeline/rev-$(version)-$(release).7z "./patches/private/*.patch" 7z a "-p$$(cat ./.passwd)" -mhe=on ../camoufox-web/pipeline/rev-$(closedsrc_rev).7z "./patches/private/*.patch"
vcredist_arch := $(shell echo $(arch) | sed 's/x86_64/x64/' | sed 's/i686/x86/') vcredist_arch := $(shell echo $(arch) | sed 's/x86_64/x64/' | sed 's/i686/x86/')

1
upstream.sh
View file

@ -1,2 +1,3 @@
version=135.0.1 version=135.0.1
release=beta.24 release=beta.24
closedsrc_rev=1.0.0