diff --git a/.gitignore b/.gitignore index 99eb9bf..80b08fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/librewolf-*-*.source.tar.gz +/librewolf-* /typescript /work diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk index a8392c3..773935d 100644 --- a/assets/linux.artifacts.mk +++ b/assets/linux.artifacts.mk @@ -8,11 +8,6 @@ version:=$(shell cat version) release:=$(shell cat 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 # @@ -24,11 +19,11 @@ librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb : $(infile) (cd work && tar xf ../$<) 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) - if [ $(use_docker) = true ]; then \ - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(version) $(release)" ; \ - else \ - (cd work && bash linux.build-deb.sh $(version) $(release)) ; \ - fi +ifeq ($(use_docker),false) + (cd work && bash linux.build-deb.sh $(version) $(release)) +else + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "bash linux.build-deb.sh $(version) $(release)" +endif cp -v work/librewolf.deb $@ sha256sum $@ > $@.sha256sum cat $@.sha256sum @@ -54,13 +49,13 @@ librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile) rm -f work/librewolf/pingsender rm -f work/librewolf/precomplete rm -f work/librewolf/removed-files - if [ $(use_docker) = true ]; then \ - 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/$@ $@ ; \ - else \ - (cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \ - cp -v /work/$@ $@ ; \ - fi +ifeq ($(use_docker),false) + (cp -r work / && cd work && bash linux.build-rpm.sh $(version) $(release)) ; \ + cp -v /work/$@ $@ +else + 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/$@ $@ +endif sha256sum $@ > $@.sha256sum cat $@.sha256sum diff --git a/assets/linux.mk b/assets/linux.mk index 550c39b..4d8ba4c 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -8,11 +8,6 @@ version:=$(shell cat version) release:=$(shell cat 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 docker : @@ -20,13 +15,15 @@ docker : build : $(outfile) $(outfile).sha256sum -$(outfile) $(outfile).sha256sum : +$(outfile) : ${MAKE} work - if [ $(use_docker) = true ]; then \ - 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" ; \ - else \ - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ - fi +ifeq ($(use_docker),false) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) +else + 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" +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) + +$(outfile).sha256sum : $(outfile) sha256sum $(outfile) > $(outfile).sha256sum cat $(outfile).sha256sum diff --git a/assets/macos.mk b/assets/macos.mk index ea6858e..200047a 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -7,11 +7,6 @@ version:=$(shell cat version) release:=$(shell cat 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 docker : @@ -22,11 +17,11 @@ build : $(outfile) $(outfile).sha256sum $(outfile) $(outfile).sha256sum : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig - if [ $(use_docker) = true ]; then \ - 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" ; \ - else \ - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ - fi +ifeq ($(use_docker),false) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) +else + 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 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 cat $(outfile).sha256sum