Mercurial > hg > orthanc

changeset 6277:519b1e2af1a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pystache is not needed to build the code model
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 12 Aug 2025 07:38:01 +0200
parents f81ff223f618
children 05049a4d6782
files OrthancServer/Resources/CodeModel/Dockerfile OrthancServer/Resources/CodeModel/GenerateCodeModel.py OrthancServer/Resources/CodeModel/README.txt OrthancServer/Resources/CodeModel/docker-compile.sh OrthancServer/Resources/CodeModel/docker-run.sh
diffstat 5 files changed, 46 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Resources/CodeModel/Dockerfile	Mon Aug 11 19:10:37 2025 +0200
+++ b/OrthancServer/Resources/CodeModel/Dockerfile	Tue Aug 12 07:38:01 2025 +0200
@@ -24,5 +24,5 @@
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt update && \
-    apt install -y python3 python3-clang-14 python3-pystache && \
+    apt install -y python3 python3-clang-14 && \
     apt clean
--- a/OrthancServer/Resources/CodeModel/GenerateCodeModel.py	Mon Aug 11 19:10:37 2025 +0200
+++ b/OrthancServer/Resources/CodeModel/GenerateCodeModel.py	Tue Aug 12 07:38:01 2025 +0200
@@ -26,7 +26,6 @@
 import json
 import os
 import pprint
-import pystache
 import re
 import sys
 
--- a/OrthancServer/Resources/CodeModel/README.txt	Mon Aug 11 19:10:37 2025 +0200
+++ b/OrthancServer/Resources/CodeModel/README.txt	Tue Aug 12 07:38:01 2025 +0200
@@ -18,7 +18,7 @@
 
 Executing with default parameters:
 
-$ sudo apt install python3-clang-14 python3-pystache
+$ sudo apt install python3-clang-14
 $ python3 ./GenerateCodeModel.py
 
 
@@ -33,4 +33,4 @@
 Generation using Docker
 =======================
 
-$ ./docker-compile.sh
+$ ./docker-run.sh
--- a/OrthancServer/Resources/CodeModel/docker-compile.sh	Mon Aug 11 19:10:37 2025 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Orthanc - A Lightweight, RESTful DICOM Store
-# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
-# Department, University Hospital of Liege, Belgium
-# Copyright (C) 2017-2023 Osimis S.A., Belgium
-# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium
-# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
-#
-# 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/>.
-
-
-set -ex
-
-if [ -t 1 ]; then
-    # TTY is available => use interactive mode
-    DOCKER_FLAGS='-i'
-fi
-
-ROOT_DIR=`dirname $(readlink -f $0)`/../../..
-
-( cd ${ROOT_DIR}/OrthancServer/Resources/CodeModel/ && \
-    docker build -t orthanc-code-model . )
-
-docker run -t ${DOCKER_FLAGS} --rm \
-    --user $(id -u):$(id -g) \
-    -v ${ROOT_DIR}:/source:ro \
-    -v ${ROOT_DIR}/OrthancServer/Plugins/Include/orthanc/:/target:rw \
-    orthanc-code-model \
-    bash /source/OrthancServer/Resources/CodeModel/docker-internal.sh
-
-ls -lR ${ROOT_DIR}/OrthancServer/Plugins/Include/orthanc/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/Resources/CodeModel/docker-run.sh	Tue Aug 12 07:38:01 2025 +0200
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Orthanc - A Lightweight, RESTful DICOM Store
+# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+# Department, University Hospital of Liege, Belgium
+# Copyright (C) 2017-2023 Osimis S.A., Belgium
+# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium
+# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
+#
+# 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/>.
+
+
+set -ex
+
+if [ -t 1 ]; then
+    # TTY is available => use interactive mode
+    DOCKER_FLAGS='-i'
+fi
+
+ROOT_DIR=`dirname $(readlink -f $0)`/../../..
+
+( cd ${ROOT_DIR}/OrthancServer/Resources/CodeModel/ && \
+    docker build -t orthanc-code-model . )
+
+docker run -t ${DOCKER_FLAGS} --rm \
+    --user $(id -u):$(id -g) \
+    -v ${ROOT_DIR}:/source:ro \
+    -v ${ROOT_DIR}/OrthancServer/Plugins/Include/orthanc/:/target:rw \
+    orthanc-code-model \
+    bash /source/OrthancServer/Resources/CodeModel/docker-internal.sh
+
+ls -lR ${ROOT_DIR}/OrthancServer/Plugins/Include/orthanc/