librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'better_versions' into 'master'

Browse source 
make versioning more consistent

See merge request librewolf-community/browser/bsys5!6
This commit is contained in:
stanzabird 2022-05-05 20:10:16 +00:00
commit b5cbf1e6bd
6 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -3,6 +3,7 @@
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
help : help :
@echo "Use: make [help]" @echo "Use: make [help]"

20
assets/linux.artifacts.mk
View file

@ -7,22 +7,23 @@
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 infile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
# #
# Debian based: # Debian based:
# #
librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb : $(infile) librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile)
mkdir -p work mkdir -p work
(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)
ifeq ($(use_docker),false) ifeq ($(use_docker),false)
(cd work && bash linux.build-deb.sh $(version) $(release)) (cd work && bash linux.build-deb.sh $(full_version))
else else
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "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 $(full_version)"
endif endif
cp -v work/librewolf.deb $@ cp -v work/librewolf.deb $@
sha256sum $@ > $@.sha256sum sha256sum $@ > $@.sha256sum
@ -30,18 +31,19 @@ endif
artifacts-deb : $(infile) $(infile).sha256sum artifacts-deb : $(infile) $(infile).sha256sum
sha256sum -c $(infile).sha256sum sha256sum -c $(infile).sha256sum
${MAKE} -f assets/linux.artifacts.mk distro=$(distro) librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb ${MAKE} -f assets/linux.artifacts.mk distro=$(distro) librewolf-$(full_version).en-US.$(distro).x86_64.deb
# #
# RPM Based: # RPM Based:
# #
librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile) librewolf-$(full_version).$(fc).x86_64.rpm : $(infile)
mkdir -p work mkdir -p work
(cd work && tar xf ../$<) (cd work && tar xf ../$<)
cp -v assets/linux.build-rpm.sh work cp -v assets/linux.build-rpm.sh work
cp -v version work cp -v version work
cp -v release work cp -v release work
cp -v source_release work
cp -v assets/linux.librewolf.spec work/librewolf.spec cp -v assets/linux.librewolf.spec work/librewolf.spec
cp -v assets/linux.librewolf.desktop.in work/librewolf/start-librewolf.desktop.in cp -v assets/linux.librewolf.desktop.in work/librewolf/start-librewolf.desktop.in
cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico
@ -50,10 +52,10 @@ librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile)
rm -f work/librewolf/precomplete rm -f work/librewolf/precomplete
rm -f work/librewolf/removed-files rm -f work/librewolf/removed-files
ifeq ($(use_docker),false) ifeq ($(use_docker),false)
(cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \ (cp -r work / && cd work && bash linux.build-rpm.sh $(fc))
cp -v /work/$@ $@ cp -v /work/$@ $@
else else
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "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 $(fc)"
cp -v work/$@ $@ cp -v work/$@ $@
endif endif
sha256sum $@ > $@.sha256sum sha256sum $@ > $@.sha256sum
@ -61,5 +63,5 @@ endif
artifacts-rpm : $(infile) $(infile).sha256sum artifacts-rpm : $(infile) $(infile).sha256sum
sha256sum -c $(infile).sha256sum sha256sum -c $(infile).sha256sum
${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(version)-$(release).$(fc).x86_64.rpm ${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm

2
assets/linux.build-deb.sh
View file

@ -20,7 +20,7 @@ Priority: optional
Provides: gnome-www-browser, www-browser, x-www-browser Provides: gnome-www-browser, www-browser, x-www-browser
Section: web Section: web
EOF EOF
echo "Version: $1-$2" >>control echo "Version: $1" >>control
cd .. cd ..
mkdir -p usr/share/librewolf mkdir -p usr/share/librewolf

19
assets/linux.build-rpm.sh
View file

@ -8,10 +8,17 @@ mkdir /artifacts
version=$(cat /work/version) version=$(cat /work/version)
release=$(cat /work/release) release=$(cat /work/release)
source_release=$(cat /work/source_release)
full_release="$source_release$(if [ $release -gt 1 ]; then echo ".$release"; fi)"
full_version="$version-$source_release$(if [ $release -gt 1 ]; then echo "-$release"; fi)"
fc=$1
echo '---' echo '---'
echo "--- LibreWolf version file is: $version" echo "--- LibreWolf version file is: $version"
echo "--- LibreWolf release is: $release" echo "--- LibreWolf bsys5 release is: $release"
echo "--- LibreWolf source release is: $source_release"
echo "--- LibreWolf fedora release is: $full_release"
echo "--- LibreWolf full version is: $full_version"
echo '---' echo '---'
echo '--- Contents of /artifacts folder:' echo '--- Contents of /artifacts folder:'
ls -la /artifacts ls -la /artifacts
@ -20,18 +27,14 @@ echo '--- Contents of /WORK folder:'
ls -la /WORK ls -la /WORK
echo '---' echo '---'
rm -rf rpmbuild rm -rf rpmbuild
mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
sed "s/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec sed "s/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec
sed "s/__RELEASE__/$release/g" < /work/tmp.spec > rpmbuild/SPECS/librewolf.spec sed "s/__RELEASE__/$full_release/g" </work/tmp.spec >rpmbuild/SPECS/librewolf.spec
# copy in the librewolf assets # copy in the librewolf assets
cp -rv /work/librewolf rpmbuild/SOURCES cp -rv /work/librewolf rpmbuild/SOURCES
cd rpmbuild/SOURCES cd rpmbuild/SOURCES
mkdir -p librewolf-$version/usr/share/librewolf mkdir -p librewolf-$version/usr/share/librewolf
@ -49,7 +52,6 @@ mkdir -p librewolf-$version/usr/share/icons
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/librewolf.png cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/librewolf.png
sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/start-librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/start-librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop
tar cvfz lw.tar.gz librewolf-$version tar cvfz lw.tar.gz librewolf-$version
# todo perhaps: rm -rf librwolf-$version # todo perhaps: rm -rf librwolf-$version
@ -66,6 +68,5 @@ echo '---'
rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec
echo '--- [debug] Copying output files to /artifacts' echo '--- [debug] Copying output files to /artifacts'
#Wrote: /root/rpmbuild/RPMS/x86_64/librewolf-94.0.2-1.fc35.x86_64.rpm #Wrote: /root/rpmbuild/RPMS/x86_64/librewolf-94.0.2-1.fc35.x86_64.rpm
cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /work cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /work/librewolf-$full_version.$fc.x86_64.rpm

3
assets/linux.mk
View file

@ -7,8 +7,9 @@
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
docker : docker :
docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile

11
assets/macos.mk
View file

@ -6,22 +6,25 @@
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
source_release:=$(shell cat source_release) source_release:=$(shell cat source_release)
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
outfile=librewolf-$(version)-$(release).en-US.mac.$(arch).dmg outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
docker : docker :
docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile
build : $(outfile) $(outfile).sha256sum build : $(outfile) $(outfile).sha256sum
$(outfile) $(outfile).sha256sum : $(outfile) :
${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
ifeq ($(use_docker),false) ifeq ($(use_docker),false)
(cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && ./mach package) (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package)
else else
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./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"
endif 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)
$(outfile).sha256sum : $(outfile)
sha256sum $(outfile) > $(outfile).sha256sum sha256sum $(outfile) > $(outfile).sha256sum
cat $(outfile).sha256sum cat $(outfile).sha256sum