diff --git a/docs/source/dev/compiling_and_installing/index.rst b/docs/source/dev/compiling_and_installing/index.rst index d37894e6a5f77813a85787229f5220ad5aa7c9f0..3cd5f625e3158a4565c84f70714b2b22df868489 100644 --- a/docs/source/dev/compiling_and_installing/index.rst +++ b/docs/source/dev/compiling_and_installing/index.rst @@ -8,7 +8,7 @@ This section covers compiling the different components of Ring. .. toctree:: :maxdepth: 1 - ring-project + jami-project daemon lrc gnome_client diff --git a/docs/source/dev/compiling_and_installing/ring-project.rst b/docs/source/dev/compiling_and_installing/jami-project.rst similarity index 100% rename from docs/source/dev/compiling_and_installing/ring-project.rst rename to docs/source/dev/compiling_and_installing/jami-project.rst diff --git a/docs/source/dev/releasing.rst b/docs/source/dev/releasing.rst index 6ae044726f5cddd2851503aa41349f6f0ea68114..c4ba1c998dab8d745b06ea89b2cb78306a50a1eb 100644 --- a/docs/source/dev/releasing.rst +++ b/docs/source/dev/releasing.rst @@ -10,7 +10,7 @@ Jami is released in the form of a tarball. They are hosted here: - https://dl.jami.net/ring-release/tarballs/ -Tarballs are generated from the integration branch of the `ring-project <https://github.com/savoirfairelinux/ring-project>`_ repository with a job on our `Jenkins server <https://test.savoirfairelinux.com/>`_. They include a copy of all contrib libraries configured in ``daemon/contrib/src``. If you are a Savoir-faire Linux employee, you may trigger the job from `this page <https://test.savoirfairelinux.com/job/ring-release/>`_. +Tarballs are generated from the integration branch of the `jami-project <https://github.com/savoirfairelinux/jami-project>`_ repository with a job on our `Jenkins server <https://jenkins.jami.net/>`_. They include a copy of all contrib libraries configured in ``daemon/contrib/src``. If you are a Savoir-faire Linux employee, you may trigger the job from `this page <https://jenkins.jami.net/job/packaging-gnu-linux/>`_. Naming scheme ------------- @@ -19,7 +19,7 @@ Tarballs respect the following naming scheme ``ring_<date>_<number_of_commits>.< - **date** is the current date, for example 20160422 - **number_of_commits** represents the number of commits that day - - **commit_id** is the commit id of the last ring-project commit + - **commit_id** is the commit id of the last jami-project commit Packaging diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec index 38d356fd274dcd0703f81bf25d783324ba1876c6..1e92ae2aa59477c0a35fcfb2f609ca52f0432aee 100644 --- a/packaging/rules/rpm/jami-daemon.spec +++ b/packaging/rules/rpm/jami-daemon.spec @@ -58,12 +58,12 @@ universal communication which respects the freedoms and privacy of its users. %prep -%setup -n ring-project +%setup -n jami-project %build # Configure the Jami bundled libraries (ffmpeg & pjproject). mkdir -p daemon/contrib/native -cd %{_builddir}/ring-project/daemon/contrib/native && \ +cd %{_builddir}/jami-project/daemon/contrib/native && \ ../bootstrap \ --no-checksums \ --disable-ogg \ @@ -81,20 +81,20 @@ cd %{_builddir}/ring-project/daemon/contrib/native && \ make %{_smp_mflags} V=1 .ffmpeg # Configure the daemon. -cd %{_builddir}/ring-project/daemon && \ +cd %{_builddir}/jami-project/daemon && \ ./autogen.sh && \ ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} # Build the daemon. -make -C %{_builddir}/ring-project/daemon %{_smp_mflags} V=1 -pod2man %{_builddir}/ring-project/daemon/man/jamid.pod \ - > %{_builddir}/ring-project/daemon/jamid.1 +make -C %{_builddir}/jami-project/daemon %{_smp_mflags} V=1 +pod2man %{_builddir}/jami-project/daemon/man/jamid.pod \ + > %{_builddir}/jami-project/daemon/jamid.1 %install DESTDIR=%{buildroot} make -C daemon install -cp %{_builddir}/ring-project/daemon/jamid.1 \ +cp %{_builddir}/jami-project/daemon/jamid.1 \ %{buildroot}/%{_mandir}/man1/jamid.1 rm -rfv %{buildroot}/%{_libdir}/*.a rm -rfv %{buildroot}/%{_libdir}/*.la diff --git a/packaging/rules/rpm/jami-gnome.spec b/packaging/rules/rpm/jami-gnome.spec index e7258468730c9d710c82a8fc583c4832a44cf296..b186a6600ea9cfcbd3f9b7db2993f01a3fa3ad3c 100644 --- a/packaging/rules/rpm/jami-gnome.spec +++ b/packaging/rules/rpm/jami-gnome.spec @@ -38,10 +38,10 @@ This package contains the GNOME desktop client of Jami. Jami is a free software for universal communication which respects freedoms and privacy of its users. -%prep %setup -n ring-project +%prep %setup -n jami-project %build -cd %{_builddir}/ring-project/client-gnome && \ +cd %{_builddir}/jami-project/client-gnome && \ mkdir build && cd build && \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ @@ -49,11 +49,11 @@ cd %{_builddir}/ring-project/client-gnome && \ -DGSETTINGS_LOCALCOMPILE=OFF \ .. -make -C %{_builddir}/ring-project/client-gnome/build \ +make -C %{_builddir}/jami-project/client-gnome/build \ LDFLAGS="-lpthread" %{_smp_mflags} V=1 %install -DESTDIR=%{buildroot} make -C %{_builddir}/ring-project/client-gnome/build install +DESTDIR=%{buildroot} make -C %{_builddir}/jami-project/client-gnome/build install # Only keep /bin/jami-gnome for the GNOME client. rm -rfv %{buildroot}/%{_bindir}/jami diff --git a/packaging/rules/rpm/jami-libclient.spec b/packaging/rules/rpm/jami-libclient.spec index 5997e96b4aa6f3b045b9dfbedc36e8161d221489..3ba7979450d6909fc8cb30c1e1bb56b52b44383b 100644 --- a/packaging/rules/rpm/jami-libclient.spec +++ b/packaging/rules/rpm/jami-libclient.spec @@ -29,21 +29,21 @@ universal communication which respects freedoms and privacy of its users. %prep -%setup -n ring-project +%setup -n jami-project %build # Qt-related variables -cd %{_builddir}/ring-project/lrc && \ +cd %{_builddir}/jami-project/lrc && \ mkdir build && cd build && \ - cmake -DRING_BUILD_DIR=%{_builddir}/ring-project/daemon/src \ + cmake -DRING_BUILD_DIR=%{_builddir}/jami-project/daemon/src \ -DENABLE_LIBWRAP=true \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ -DCMAKE_BUILD_TYPE=Release \ .. -make -C %{_builddir}/ring-project/lrc/build %{_smp_mflags} V=1 +make -C %{_builddir}/jami-project/lrc/build %{_smp_mflags} V=1 %install DESTDIR=%{buildroot} make -C lrc/build install diff --git a/packaging/rules/rpm/jami-qt.spec b/packaging/rules/rpm/jami-qt.spec index 795a4f9cc66989e0bd24af246bd7e70805d41e0f..c46ade17058b38561312c0a96738e01495bdd1ac 100644 --- a/packaging/rules/rpm/jami-qt.spec +++ b/packaging/rules/rpm/jami-qt.spec @@ -35,22 +35,22 @@ software for universal communication which respects freedoms and privacy of its users. %prep -%setup -n ring-project +%setup -n jami-project %build # Qt-related variables -cd %{_builddir}/ring-project/client-qt && \ +cd %{_builddir}/jami-project/client-qt && \ mkdir build && cd build && \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ -DCMAKE_BUILD_TYPE=Release \ .. -make -C %{_builddir}/ring-project/client-qt/build %{_smp_mflags} V=1 +make -C %{_builddir}/jami-project/client-qt/build %{_smp_mflags} V=1 %install -DESTDIR=%{buildroot} make -C %{_builddir}/ring-project/client-qt/build install +DESTDIR=%{buildroot} make -C %{_builddir}/jami-project/client-qt/build install %files %defattr(-,root,root,-) diff --git a/scripts/build-package-debian.sh b/scripts/build-package-debian.sh index c9ae0b63a52343c97b3bbf1ef09023648f678179..23f90f4813e0747d49adaf82cd725a8ca58a1929 100755 --- a/scripts/build-package-debian.sh +++ b/scripts/build-package-debian.sh @@ -82,7 +82,7 @@ ${QT_MAJOR}.${QT_MINOR}/${qt_version}/single cd "libqt-jami-${qt_version}" # Extract the debian folder - tar xf "/src/$RELEASE_TARBALL_FILENAME" ring-project/packaging/rules/debian-qt \ + tar xf "/src/$RELEASE_TARBALL_FILENAME" jami-project/packaging/rules/debian-qt \ --strip-components=3 && mv debian-qt debian # Create the changelog file. diff --git a/scripts/build-package-rpm.sh b/scripts/build-package-rpm.sh index b64387eb5096c9ef169173e28f2495ebcd0d8cdc..f46e4877f46f86e9def804e912b039c16a295881 100755 --- a/scripts/build-package-rpm.sh +++ b/scripts/build-package-rpm.sh @@ -24,9 +24,9 @@ set -e # Import the spec file. -mkdir -p /opt/ring-project -cd /opt/ring-project -tar xf "/src/$RELEASE_TARBALL_FILENAME" ring-project/packaging/rules/rpm \ +mkdir -p /opt/jami-project +cd /opt/jami-project +tar xf "/src/$RELEASE_TARBALL_FILENAME" jami-project/packaging/rules/rpm \ --strip-components=3 && mv rpm/* . && rmdir rpm rm jami-libqt.spec @@ -71,7 +71,7 @@ if [ ! -f "${RPM_PATH}" ]; then mkdir /opt/qt-jami-build cd /opt/qt-jami-build tar xf "/src/$RELEASE_TARBALL_FILENAME" \ - ring-project/packaging/rules/rpm/jami-libqt.spec \ + jami-project/packaging/rules/rpm/jami-libqt.spec \ --strip-components=4 # Fetch and cache the tarball, if not already available. @@ -115,7 +115,7 @@ if [ ! -f "${RPM_PATH}" ]; then fi rpm --install "${RPM_PATH}" cp "${RPM_PATH}" /opt/output -cd /opt/ring-project +cd /opt/jami-project # Set the version and associated comment. sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" ./*.spec diff --git a/scripts/build-package-snap.sh b/scripts/build-package-snap.sh index c7035560605432d1e15ea958162d83410677f275..90fb3415b92ebd545f8786e44568d89b07171536 100755 --- a/scripts/build-package-snap.sh +++ b/scripts/build-package-snap.sh @@ -24,7 +24,7 @@ set -e tar xf "/src/$RELEASE_TARBALL_FILENAME" -C /opt -cd /opt/ring-project/packaging/rules/snap/${SNAP_PKG_NAME}/ +cd /opt/jami-project/packaging/rules/snap/${SNAP_PKG_NAME}/ # set the version and tarball filename sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" snapcraft.yaml