Rename Makefile.packaging to Makefile.

Rename Makefile.packaging to Makefile, as it's the only one. Makefile.packaging symlinks to it, to preserve backward compatibility for now. Change-Id: I136d01342e9779e9bb7a21b22dd10f54b6ac7064

Rename Makefile.packaging to Makefile.
627d63b9 · Maxim Cournoyer · 350f7a55 · 627d63b9 · 350f7a55 · 627d63b9
Unverified Commit 627d63b9 authored 4 years ago by Maxim Cournoyer
--- a/Makefile
+++ b/Makefile
+# -*- mode: makefile; -*-
+# Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+.DEFAULT_GOAL := package-all
+
+##############################
+## Version number variables ##
+##############################
+# YYYY-MM-DD
+LAST_COMMIT_DATE:=$(shell git log -1 --format=%cd --date=short)
+
+# number of commits that day
+NUMBER_OF_COMMITS:=$(shell git log --format=%cd --date=short | grep -c $(LAST_COMMIT_DATE))
+
+# YYMMDD
+LAST_COMMIT_DATE_SHORT:=$(shell echo $(LAST_COMMIT_DATE) | sed -s 's/-//g')
+
+# last commit id
+COMMIT_ID:=$(shell git rev-parse --short HEAD)
+
+RELEASE_VERSION:=$(LAST_COMMIT_DATE_SHORT).$(NUMBER_OF_COMMITS).$(COMMIT_ID)
+RELEASE_TARBALL_FILENAME:=jami_$(RELEASE_VERSION).tar.gz
+
+# Debian versions
+DEBIAN_VERSION:=$(RELEASE_VERSION)~dfsg1-1
+DEBIAN_DSC_FILENAME:=jami_$(DEBIAN_VERSION).dsc
+DEBIAN_OCI_VERSION:=$(RELEASE_VERSION)~dfsg1-0
+DEBIAN_OCI_DSC_FILENAME:=jami_$(DEBIAN_OCI_VERSION).dsc
+DEBIAN_OCI_PKG_DIR:="packaging/rules/debian-one-click-install"
+
+#####################
+## Other variables ##
+#####################
+TMPDIR := $(shell mktemp -d)
+CURRENT_UID:=$(shell id -u)
+CURRENT_GID:=$(shell id -g)
+
+#############################
+## Release tarball targets ##
+#############################
+.PHONY: release-tarball
+release-tarball: $(RELEASE_TARBALL_FILENAME)
+
+$(RELEASE_TARBALL_FILENAME):
+	# Fetch tarballs
+	mkdir -p daemon/contrib/native
+	cd daemon/contrib/native && \
+	    ../bootstrap && make list && \
+	    make fetch-all -j || make fetch-all || make fetch-all
+	rm -rf daemon/contrib/native
+
+	cd $(TMPDIR) && \
+	    tar -C $(CURDIR)/.. \
+	        --exclude-vcs \
+	        -zcf $(RELEASE_TARBALL_FILENAME) \
+	        $(shell basename $(CURDIR)) && \
+	    mv $(RELEASE_TARBALL_FILENAME) $(CURDIR)
+
+	rm -rf $(CURDIR)/daemon/contrib/tarballs/*
+
+#######################
+## Packaging targets ##
+#######################
+
+.PHONY: package-all
+package-all: package-debian_9 \
+             package-debian_9_i386 \
+             package-debian_9_armhf \
+             package-debian_9_arm64 \
+             package-debian_9_oci \
+             package-debian_9_i386_oci \
+             package-debian_9_armhf_oci \
+             package-debian_9_arm64_oci \
+             package-debian_10 \
+             package-debian_10_i386 \
+             package-debian_10_armhf \
+             package-debian_10_arm64 \
+             package-debian_10_oci \
+             package-debian_10_i386_oci \
+             package-debian_10_armhf_oci \
+             package-debian_10_arm64_oci \
+             package-raspbian_10_armhf \
+             package-ubuntu_18.04 \
+             package-ubuntu_18.04_i386 \
+             package-ubuntu_18.04_oci \
+             package-ubuntu_18.04_i386_oci \
+             package-ubuntu_18.10 \
+             package-ubuntu_18.10_i386 \
+             package-ubuntu_18.10_oci \
+             package-ubuntu_18.10_i386_oci \
+             package-ubuntu_19.10 \
+             package-ubuntu_19.10_i386 \
+             package-ubuntu_19.10_oci \
+             package-ubuntu_19.10_i386_oci \
+             package-ubuntu_20.04 \
+             package-ubuntu_20.04_oci \
+             package-ubuntu_20.10 \
+             package-ubuntu_20.10_oci \
+             package-fedora_31 \
+             package-fedora_31_i386 \
+             package-fedora_32 \
+             package-fedora_32_i386 \
+             package-fedora_33 \
+             package-fedora_33_i386 \
+             package-rhel_8 \
+             package-opensuse-leap_15.1 \
+             package-opensuse-leap_15.2 \
+             package-opensuse-tumbleweed \
+             package-gentoo \
+             package-snap
+
+
+# Append the output of make-packaging-target to this Makefile
+# see Makefile.packaging.distro_targets
+$(shell scripts/make-packaging-target.py --generate-all > Makefile.packaging.distro_targets)
+include Makefile.packaging.distro_targets
+
+docker/Dockerfile_snap: patches/docker-snap-build-scripts.patch
+	if patch -p1 -fR --dry-run < $< >/dev/null 2>&1; then \
+	  echo "Patching $@... skipped (already patched)"; \
+	else \
+	  echo "Patching $@..."; \
+	  patch -p1 -Ns < $< || { echo "Patching $@... failed" >&2 && exit 1; }; \
+	  echo "Patching $@... done"; \
+	fi
+.PHONY: docker/Dockerfile_snap
+
+###################
+## Other targets ##
+###################
+.PHONY: docs
+
+# Build the documentation
+# Note that newly added RST files will likely not display on all documents'
+# navigation bar unless the docs/build folder is manually deleted.
+docs: env
+	env/bin/sphinx-build -b html docs/source docs/build/html
+	env/bin/sphinx-build -b texinfo docs/source docs/build/texinfo
+
+env:
+	virtualenv env
+	env/bin/pip install Sphinx==1.4.1 sphinx-rtd-theme==0.1.9
+
+.PHONY: clean
+clean:
+	rm -rf env
+	rm -rf docs/build
+	rm -f jami_*.tar.gz
+	rm -rf packages
+	rm -f Makefile.packaging.distro_targets
+	rm -f .docker-image-*
+	rm -fr qemu-static
--- a/Makefile.packaging
+++ b/Makefile.packaging
-# -*- mode: makefile; -*-
-# Copyright (C) 2016-2019 Savoir-faire Linux Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-.DEFAULT_GOAL := package-all
-
-##############################
-## Version number variables ##
-##############################
-# YYYY-MM-DD
-LAST_COMMIT_DATE:=$(shell git log -1 --format=%cd --date=short)
-
-# number of commits that day
-NUMBER_OF_COMMITS:=$(shell git log --format=%cd --date=short | grep -c $(LAST_COMMIT_DATE))
-
-# YYMMDD
-LAST_COMMIT_DATE_SHORT:=$(shell echo $(LAST_COMMIT_DATE) | sed -s 's/-//g')
-
-# last commit id
-COMMIT_ID:=$(shell git rev-parse --short HEAD)
-
-RELEASE_VERSION:=$(LAST_COMMIT_DATE_SHORT).$(NUMBER_OF_COMMITS).$(COMMIT_ID)
-RELEASE_TARBALL_FILENAME:=jami_$(RELEASE_VERSION).tar.gz
-
-# Debian versions
-DEBIAN_VERSION:=$(RELEASE_VERSION)~dfsg1-1
-DEBIAN_DSC_FILENAME:=jami_$(DEBIAN_VERSION).dsc
-DEBIAN_OCI_VERSION:=$(RELEASE_VERSION)~dfsg1-0
-DEBIAN_OCI_DSC_FILENAME:=jami_$(DEBIAN_OCI_VERSION).dsc
-DEBIAN_OCI_PKG_DIR:="packaging/rules/debian-one-click-install"
-
-#####################
-## Other variables ##
-#####################
-TMPDIR := $(shell mktemp -d)
-CURRENT_UID:=$(shell id -u)
-CURRENT_GID:=$(shell id -g)
-
-#############################
-## Release tarball targets ##
-#############################
-.PHONY: release-tarball
-release-tarball: $(RELEASE_TARBALL_FILENAME)
-
-$(RELEASE_TARBALL_FILENAME):
-	# Fetch tarballs
-	mkdir -p daemon/contrib/native
-	cd daemon/contrib/native && \
-	    ../bootstrap && make list && \
-	    make fetch-all -j || make fetch-all || make fetch-all
-	rm -rf daemon/contrib/native
-
-	cd $(TMPDIR) && \
-	    tar -C $(CURDIR)/.. \
-	        --exclude-vcs \
-	        -zcf $(RELEASE_TARBALL_FILENAME) \
-	        $(shell basename $(CURDIR)) && \
-	    mv $(RELEASE_TARBALL_FILENAME) $(CURDIR)
-
-	rm -rf $(CURDIR)/daemon/contrib/tarballs/*
-
-#######################
-## Packaging targets ##
-#######################
-
-.PHONY: package-all
-package-all: package-debian_9 \
-             package-debian_9_i386 \
-             package-debian_9_armhf \
-             package-debian_9_arm64 \
-             package-debian_9_oci \
-             package-debian_9_i386_oci \
-             package-debian_9_armhf_oci \
-             package-debian_9_arm64_oci \
-             package-debian_10 \
-             package-debian_10_i386 \
-             package-debian_10_armhf \
-             package-debian_10_arm64 \
-             package-debian_10_oci \
-             package-debian_10_i386_oci \
-             package-debian_10_armhf_oci \
-             package-debian_10_arm64_oci \
-             package-raspbian_10_armhf \
-             package-ubuntu_18.04 \
-             package-ubuntu_18.04_i386 \
-             package-ubuntu_18.04_oci \
-             package-ubuntu_18.04_i386_oci \
-             package-ubuntu_18.10 \
-             package-ubuntu_18.10_i386 \
-             package-ubuntu_18.10_oci \
-             package-ubuntu_18.10_i386_oci \
-             package-ubuntu_19.10 \
-             package-ubuntu_19.10_i386 \
-             package-ubuntu_19.10_oci \
-             package-ubuntu_19.10_i386_oci \
-             package-ubuntu_20.04 \
-             package-ubuntu_20.04_oci \
-             package-ubuntu_20.10 \
-             package-ubuntu_20.10_oci \
-             package-fedora_31 \
-             package-fedora_31_i386 \
-             package-fedora_32 \
-             package-fedora_32_i386 \
-             package-fedora_33 \
-             package-fedora_33_i386 \
-             package-rhel_8 \
-             package-opensuse-leap_15.1 \
-             package-opensuse-leap_15.2 \
-             package-opensuse-tumbleweed \
-             package-gentoo \
-             package-snap
-
-
-# Append the output of make-packaging-target to this Makefile
-# see Makefile.packaging.distro_targets
-$(shell scripts/make-packaging-target.py --generate-all > Makefile.packaging.distro_targets)
-include Makefile.packaging.distro_targets
-
-docker/Dockerfile_snap: patches/docker-snap-build-scripts.patch
-	if patch -p1 -fR --dry-run < $< >/dev/null 2>&1; then \
-	  echo "Patching $@... skipped (already patched)"; \
-	else \
-	  echo "Patching $@..."; \
-	  patch -p1 -Ns < $< || { echo "Patching $@... failed" >&2 && exit 1; }; \
-	  echo "Patching $@... done"; \
-	fi
-.PHONY: docker/Dockerfile_snap
-
-###################
-## Other targets ##
-###################
-.PHONY: docs
-
-# Build the documentation
-# Note that newly added RST files will likely not display on all documents'
-# navigation bar unless the docs/build folder is manually deleted.
-docs: env
-	env/bin/sphinx-build -b html docs/source docs/build/html
-	env/bin/sphinx-build -b texinfo docs/source docs/build/texinfo
-
-env:
-	virtualenv env
-	env/bin/pip install Sphinx==1.4.1 sphinx-rtd-theme==0.1.9
-
-.PHONY: clean
-clean:
-	rm -rf env
-	rm -rf docs/build
-	rm -f jami_*.tar.gz
-	rm -rf packages
-	rm -f Makefile.packaging.distro_targets
-	rm -f .docker-image-*
-	rm -fr qemu-static
--- a/Makefile.packaging
+++ b/Makefile.packaging
+Makefile
\ No newline at end of file