From 094f8c02076206ad96ec3bbad1af2d387534a002 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 26 Feb 2020 23:19:11 +0100 Subject: [PATCH] Project name has changed from SimGrid to simgrid. Update last bits. Untested. --- .gitignore | 2 +- .gitlab-ci.yml | 8 ++++---- doc/doxygen/inside_release.doc | 6 +++--- docs/source/Installing_SimGrid.rst | 4 ++-- docs/source/conf.py | 2 +- tools/docker/Dockerfile.stable | 4 ++-- tools/docker/Makefile | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index d111acd02d..2003a0bcbc 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ teshsuite/simdag/platforms/simgrid.jed ### Libraries links examples/lua/simgrid.so examples/lua/console/simgrid.so -SimGrid-*.tar.gz +[Ss]im[Gg]rid-*.tar.gz simgrid.jar ### Unit files src/simgrid_units_main.c diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72cab2598f..eacd58d90b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,14 +56,14 @@ release: # Get the foreign architectures - wget https://ci.appveyor.com/api/projects/mquinson/simgrid/artifacts/simgrid.jar -O simgrid-windows.jar - export SGVER=`printf '#include "simgrid/config.h"\n#if SIMGRID_VERSION_PATCH\nSIMGRID_VERSION_MAJOR.SIMGRID_VERSION_MINOR.SIMGRID_VERSION_PATCH\n#else\nSIMGRID_VERSION_MAJOR.SIMGRID_VERSION_MINOR\n#endif'|gcc -E - -Iinclude|tail -1|sed 's/ //g'` - - wget https://ci.inria.fr/simgrid/job/SimGrid/build_mode=Debug,node=osx/lastSuccessfulBuild/artifact/build/SimGrid-${SGVER}/build/simgrid.jar -O simgrid-mac.jar + - wget https://ci.inria.fr/simgrid/job/SimGrid/build_mode=Debug,node=osx/lastSuccessfulBuild/artifact/build/simgrid-${SGVER}/build/simgrid.jar -O simgrid-mac.jar # Open all jar files, and strip them - mkdir content ; cd content - for j in ../simgrid.jar ../simgrid-windows.jar ../simgrid-mac.jar ; do unzip -n $j ; done - strip NATIVE/*/*/*.so - x86_64-linux-gnu-strip NATIVE/*/*/lib*dll - - zip -r ../SimGrid-${SGVER}.jar * + - zip -r ../simgrid-${SGVER}.jar * artifacts: paths: - - SimGrid-*.jar - - SimGrid-*.tar.gz + - simgrid-*.jar + - simgrid-*.tar.gz diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index 7567fd24d3..f3609b57f9 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -45,17 +45,17 @@ Please apply the following checklist before releasing. - Do not merge into 'stable' before appveyor and jenkins are done, or your jarfile will not contain the code you expect for win and mac. -- Download the SimGrid-doc-3.X.Y (artefact of pipeline 'pages' on framagit) +- Download the simgrid-doc-3.X.Y (artefact of pipeline 'pages' on framagit) Download the tgz and jar files (artefacts of the pipeline 'stable' on framagit) - Push the archive files (tar.gz and jar) on gforge - Tag the git repository v3.XX.X and push it to framagit and ghub - Document the tag on framagit and ghub - - Upload the files SimGrid-3.XX.tar.gz, simgrid-3_XX.jar and SimGrid-doc-3_XX.zip + - Upload the files simgrid-3.XX.tar.gz, simgrid-3_XX.jar and simgrid-doc-3_XX.zip - Add a link to the version of the ChangeLog that comes with this tag. - Update the website - emacs org/org-templates/level-0.org to change the release version, the tgz link and the jar link. - jed .gitlab-ci.yml - - Change the link to the SimGrid-doc-3_XX.zip file + - Change the link to the simgrid-doc-3_XX.zip file - Only keep 2 versions so that people don't find older ones in google - Change the link to latest - git commit -a && git push # Check that the pipeline goes well on framagit diff --git a/docs/source/Installing_SimGrid.rst b/docs/source/Installing_SimGrid.rst index c5bf3044df..78e9c9f628 100644 --- a/docs/source/Installing_SimGrid.rst +++ b/docs/source/Installing_SimGrid.rst @@ -134,8 +134,8 @@ Grab the last **stable release** from `FramaGit .. code-block:: shell - tar xf SimGrid-3-XX.tar.gz - cd SimGrid-* + tar xf simgrid-3-XX.tar.gz + cd simgrid-* cmake -DCMAKE_INSTALL_PREFIX=/opt/simgrid . make make install diff --git a/docs/source/conf.py b/docs/source/conf.py index e8de0fb671..0ca9461b26 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -132,7 +132,7 @@ html_static_path = ['_static'] # -- Options for HTMLHelp output --------------------------------------------- # Output file base name for HTML help builder. -htmlhelp_basename = 'SimGrid-doc' +htmlhelp_basename = 'simgrid-doc' # -- Options for GitLab integration ------------------------------------------ diff --git a/tools/docker/Dockerfile.stable b/tools/docker/Dockerfile.stable index 80ee0a8cb8..f8e4e636a9 100644 --- a/tools/docker/Dockerfile.stable +++ b/tools/docker/Dockerfile.stable @@ -9,8 +9,8 @@ RUN echo "DOWNLOAD_URL: ${DLURL}" && \ apt-get --allow-releaseinfo-change update && apt upgrade -y && apt install -y wget && \ mkdir /source && cd /source && \ wget https://framagit.org/${DLURL} && \ - tar xf SimGrid-* && rm SimGrid-*tar.gz && \ - cd SimGrid-* && \ + tar xf simgrid-* && rm simgrid-*tar.gz && \ + cd simgrid-* && \ apt install -y g++ gcc git valgrind gfortran libboost-dev libboost-all-dev cmake dpkg-dev && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/ -Denable_documentation=OFF -Denable_smpi=ON -Denable_compile_optimizations=ON . && \ make -j4 && \ diff --git a/tools/docker/Makefile b/tools/docker/Makefile index 550511587a..dc2faf5a70 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -16,7 +16,7 @@ all: build-deps unstable tuto-s4u tuto-smpi stable: # docker build -f Dockerfile.stable --build-arg DLURL=/simgrid/simgrid/uploads/0365f13697fb26eae8c20fc234c5af0e/SimGrid-3.25.tar.gz -t simgrid/stable:latest -t simgrid/stable:v3.25 . |tee stable.log export last_tag=$$(wget https://framagit.org/simgrid/simgrid/tags 2>/dev/null -O - | grep /simgrid/simgrid/-/tags/v | head -n1 | sed 's/[^>]*>//' | sed 's/<.*//'); \ - export DLURL=$$(wget https://framagit.org/simgrid/simgrid/tags/$${last_tag} 2>/dev/null -O - | grep SimGrid- | perl -pe 's/.*?/dev/null -O - | grep simgrid- | perl -pe 's/.*?