From bc187a06defd7bfa1cbdfb415acaa6029527b25a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 24 Jun 2018 23:59:14 +0200 Subject: [PATCH] doc: further improve the release HOWTO --- doc/doxygen/inside_release.doc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index 7422e9e0e7..b2e933293e 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -53,11 +53,11 @@ cmake . && make dist Get the jarfiles for several OSes on the CI slaves. Use Save under to give a separate name to each of them. -- On Jenkins: Mac OSX, Linux 64 and Linux 32 (without boost-context), FreeBSD -- On AppVeyor: Windows - -For Linux, it is safer to rebuild them in a chroot (to avoid -boost-context and all other optional dependencies): +- Mac OSX, FreeBSD: on Jenkins +- Windows: on AppVeyor +- Linux: it is safer to rebuild them in a chroot (to avoid + boost-context and all other optional dependencies): + \verbatim mkdir /tmp/build-amd64 cp SimGrid-3.*.tar.gz /tmp/build-amd64 @@ -65,11 +65,11 @@ sudo debootstrap --arch amd64 --variant=buildd testing /tmp/build-amd64 http://d sudo chroot /tmp/build-amd64 echo "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0" >> /tmp/fstab mount proc /proc -t proc -apt-get install -y cmake default-jdk libboost-dev python3 +apt-get install -y cmake default-jdk libboost-dev python3 doxygen cd tmp tar xfz ../SimGrid*tar.gz && cd SimGrid-* -cmake . -Denable_documentation=off -Denable_java=ON -make -j4 && ctest -R java +cmake . -Denable_documentation=ON -Denable_java=ON +make -j4 && LC_ALL=C ctest -R java \endverbatim Once all jarfiles are in a separate directory, run the following to @@ -77,7 +77,7 @@ merge them: \verbatim mkdir content ; cd content -for j in ../simgrid-linux64.jar ../*.jar ; do unzip -n $j ; done +for j in ../simgrid-linux64.jar ../simgrid*.jar ; do unzip -n $j ; done # The content of all jar should be the same, but I prefer using the Linux64 version by default # => unpack it first, and unpack the others with -n (never overwrite) -- 2.20.1