[ivette] new distribution scripts

# Conflicts:
#	Makefile

Makefile

@@ -2486,6 +2486,8 @@ sinclude ivette/Makefile.distrib
 
 DISTRIB_TESTS += $(wildcard $(PLUGIN_DIST_TESTS_LIST))
 
+include ivette/Makefile.distrib
+sinclude ivette/Makefile.plugins
 
 SPECIFIED_OPEN_SOURCE:=$(OPEN_SOURCE)
 OPEN_SOURCE  ?= no

ivette/.gitignore

@@ -14,5 +14,6 @@ yarn-error.log
 /doc/html
 /src/renderer/loader.ts
 /src/dome/doc/guides/icons.md
+/Makefile.plugins
 
 # --------------------------------------------------------------------------

ivette/Makefile

@@ -83,37 +83,10 @@ $(LOADER): $(PACKAGES) ./configure.js ./Makefile
 # --- Frama-C Source Distrib
 # --------------------------------------------------------------------------
 
-.PHONY: update-distrib-files update-distrib-plugins
-
-SRC_DISTRIB=Makefile.distrib
-SRC_HEADERS=headers/header_spec.txt
+.PHONY: update-distrib-files
 
 update-distrib-files:
-	@echo "Generating $(SRC_DISTRIB)"
-	@rm -f $(SRC_DISTRIB)
-	@rm -f $(SRC_HEADERS)
-	@for f in `git ls-files .` ;\
-	 do \
-	   echo "DISTRIB_FILES += ivette/$$f" >> $(SRC_DISTRIB) ;\
-	   headers/register.sh "$$f" >> $(SRC_HEADERS) ; \
-	 done
-	@chmod a-w $(SRC_DISTRIB)
-	@chmod a-w $(SRC_HEADERS)
-
-update-distrib-plugins: update-distrib-files
-	@chmod a+w $(SRC_DISTRIB)
-	@chmod a+w $(SRC_HEADERS)
-	@for repo in `find . -type d -name ".git"` ;\
-	 do \
-	   echo "Distributing $$repo" ;\
-	   for f in `git -C $$repo ls-files .` ;\
-	   do \
-	     echo "DISTRIB_FILES += ivette/$$f" >> $(SRC_DISTRIB) ;\
-	     headers/register.sh "$$f" >> $(SRC_HEADERS) ; \
-	   done \
-	 done
-	@chmod a-w $(SRC_DISTRIB)
-	@chmod a-w $(SRC_HEADERS)
+	./distrib.sh
 
 # --------------------------------------------------------------------------
 # --- Frama-C API

ivette/Makefile.distrib

@@ -7,15 +7,13 @@ DISTRIB_FILES += ivette/.gitignore
 DISTRIB_FILES += ivette/CONTRIBUTING.md
 DISTRIB_FILES += ivette/INSTALL.md
 DISTRIB_FILES += ivette/Makefile
-DISTRIB_FILES += ivette/Makefile.distrib
 DISTRIB_FILES += ivette/README.md
 DISTRIB_FILES += ivette/configure.js
+DISTRIB_FILES += ivette/distrib.sh
 DISTRIB_FILES += ivette/doc/pandoc/href.lua
 DISTRIB_FILES += ivette/doc/pandoc/index.json
 DISTRIB_FILES += ivette/doc/pandoc/template.html
 DISTRIB_FILES += ivette/electron-webpack.json
-DISTRIB_FILES += ivette/headers/header_spec.txt
-DISTRIB_FILES += ivette/headers/register.sh
 DISTRIB_FILES += ivette/package.json
 DISTRIB_FILES += ivette/src/dome/.gitignore
 DISTRIB_FILES += ivette/src/dome/CONTRIBUTING.md

ivette/distrib.sh

+#!/bin/sh -e
+# --------------------------------------------------------------------------
+# ---  Generate Files for Ivette Distribution
+# --------------------------------------------------------------------------
+
+Distribute() {
+    repo=$1
+    Distrib=$repo/Makefile.distrib
+    Headers=$repo/headers/header_spec.txt
+    rm -f $Distrib
+    rm -f $Headers
+    mkdir -p $1/headers
+    if [ "$repo" == "." ]
+    then
+        src=ivette
+    else
+        src=ivette/$repo
+    fi
+    echo "Distributing $src"
+    for f in $(git -C $repo ls-files .)
+    do
+        case $f in
+            Makefile.distrib | headers/* )
+            ;;
+            *)
+                echo "DISTRIB_FILES += $src/$f" >> $Distrib
+                case $f in
+                    *.sh | *.json | */dome/doc/* | configure.js | .* | webpack*.js )
+                        echo "$f: .ignore" >> $Headers
+                        ;;
+                    *Make* | *.js* | *.ts* | *.ml*)
+                        echo "$f: CEA_LGPL" >> $Headers
+                        ;;
+                    *)
+                        echo "$f: .ignore" >> $Headers
+                        ;;
+                esac
+        esac
+    done
+    chmod a-w $Distrib
+    chmod a-w $Headers
+    if [ "$repo" != "." ]
+    then
+        echo "include ivette/$Distrib" >> Makefile.plugins
+    fi
+}
+
+Distribute .
+rm -f Makefile.plugins
+for rgit in $(find src -type d -name ".git")
+do
+    Distribute $(dirname $rgit)
+done
+chmod -f a-w Makefile.plugins

ivette/headers/header_spec.txt

@@ -7,15 +7,13 @@
 CONTRIBUTING.md: .ignore
 INSTALL.md: .ignore
 Makefile: CEA_LGPL
-Makefile.distrib: .ignore
 README.md: .ignore
 configure.js: .ignore
+distrib.sh: .ignore
 doc/pandoc/href.lua: .ignore
 doc/pandoc/index.json: .ignore
 doc/pandoc/template.html: .ignore
 electron-webpack.json: .ignore
-headers/header_spec.txt: .ignore
-headers/register.sh: .ignore
 package.json: .ignore
 src/dome/.gitignore: .ignore
 src/dome/CONTRIBUTING.md: .ignore

ivette/headers/register.sh

-#!/bin/sh
-case "$1" in
-    Makefile.distrib | *.json | src/dome/doc/* | */.eslintrc.js )
-        echo "$1: .ignore"
-        ;;
-    *Make* | src/*/*.js* | src/*/*.ts* | src/*/*.ml*)
-        echo "$1: CEA_LGPL"
-        ;;
-    *)
-        echo "$1: .ignore"
-        ;;
-esac