xavi
/
bsys5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some Improvements

This commit is contained in:
Malte Jürgens 2022-04-19 06:59:17 +00:00 committed by stanzabird
parent c99f6db415
commit 82d97de545
4 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
/librewolf-*-*.source.tar.gz /librewolf-*
/typescript /typescript
/work /work

29
assets/linux.artifacts.mk
View File

@ -8,11 +8,6 @@ version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
#use_docker=true
ifeq ($(use_docker),)
use_docker:=true
endif
infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
# #
@ -24,11 +19,11 @@ librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb : $(infile)
(cd work && tar xf ../$<) (cd work && tar xf ../$<)
cp -v assets/linux.build-deb.sh work/ cp -v assets/linux.build-deb.sh work/
(cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop) (cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop)
if [ $(use_docker) = true ]; then \ ifeq ($(use_docker),false)
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(version) $(release)" ; \ (cd work && bash linux.build-deb.sh $(version) $(release))
else \ else
(cd work && bash linux.build-deb.sh $(version) $(release)) ; \ docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(version) $(release)"
fi endif
cp -v work/librewolf.deb $@ cp -v work/librewolf.deb $@
sha256sum $@ > $@.sha256sum sha256sum $@ > $@.sha256sum
cat $@.sha256sum cat $@.sha256sum
@ -54,13 +49,13 @@ librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile)
rm -f work/librewolf/pingsender rm -f work/librewolf/pingsender
rm -f work/librewolf/precomplete rm -f work/librewolf/precomplete
rm -f work/librewolf/removed-files rm -f work/librewolf/removed-files
if [ $(use_docker) = true ]; then \ ifeq ($(use_docker),false)
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(version) $(release)" ; \ (cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \
cp -v work/$@ $@ ; \ cp -v /work/$@ $@
else \ else
(cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \ docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-rpm.sh $(version) $(release)" ; \
cp -v /work/$@ $@ ; \ cp -v work/$@ $@
fi endif
sha256sum $@ > $@.sha256sum sha256sum $@ > $@.sha256sum
cat $@.sha256sum cat $@.sha256sum

19
assets/linux.mk
View File

@ -8,11 +8,6 @@ version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
#use_docker=true
ifeq ($(use_docker),)
use_docker:=true
endif
outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
docker : docker :
@ -20,13 +15,15 @@ docker :
build : $(outfile) $(outfile).sha256sum build : $(outfile) $(outfile).sha256sum
$(outfile) $(outfile).sha256sum : $(outfile) :
${MAKE} work ${MAKE} work
if [ $(use_docker) = true ]; then \ ifeq ($(use_docker),false)
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" ; \ (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package)
else \ else
(cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package"
fi endif
cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile) cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile)
$(outfile).sha256sum : $(outfile)
sha256sum $(outfile) > $(outfile).sha256sum sha256sum $(outfile) > $(outfile).sha256sum
cat $(outfile).sha256sum cat $(outfile).sha256sum

15
assets/macos.mk
View File

@ -7,11 +7,6 @@ version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
#use_docker=true
ifeq ($(use_docker),)
use_docker:=true
endif
outfile=librewolf-$(version)-$(release).en-US.mac.$(arch).dmg outfile=librewolf-$(version)-$(release).en-US.mac.$(arch).dmg
docker : docker :
@ -22,11 +17,11 @@ build : $(outfile) $(outfile).sha256sum
$(outfile) $(outfile).sha256sum : $(outfile) $(outfile).sha256sum :
${MAKE} work ${MAKE} work
sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig
if [ $(use_docker) = true ]; then \ ifeq ($(use_docker),false)
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" ; \ (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package)
else \ else
(cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package"
fi endif
cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)
sha256sum $(outfile) > $(outfile).sha256sum sha256sum $(outfile) > $(outfile).sha256sum
cat $(outfile).sha256sum cat $(outfile).sha256sum