Commit 36149f55 authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

merge easy-start branch

parents 6a892150 ef2de52e

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ 
.DS_Store

/plugins/**/.ignore

tools/dist

basex
 
 No newline at end of file

CHANGELOG

+5 −0
Original line number Diff line number Diff line 
# Changelog



## [1.1.0-rc4] - 16/10/2023



* Mise en place d'un Makefile utilisateur



## [1.1.0-rc3] - 20/04/2023



* TEI to PDF: prise en charge du cas document complet (en plus des fragments)

* Sommaire : toc.xsl surchargeable dans max/<mon_projet>/ui/xsl/core/toc.xsl

Makefile

0 → 100644
+65 −0
Original line number Diff line number Diff line 
TOOLS_DIR=tools/

HTTP_PORT=1234

install-basex: ## BaseX: Téléchargement, installation et définition du mot de passe admin

	@if [ -d 'basex' ]; then\

		echo 'BaseX install OK.';\

	else\

		curl https://files.basex.org/releases/10.7/BaseX107.zip --output BaseX107.zip;\

		unzip BaseX107.zip;\

		curl https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/10.8/Saxon-HE-10.8.jar --output Saxon-HE-10.8.jar ;\

		curl https://files.basex.org/modules/org/basex/modules/fop/FOP.jar --output FOP.jar ;\

		mv Saxon-HE-10.8.jar basex/lib/custom/;\

		mv FOP.jar basex/lib/custom/;\

		rm BaseX107.zip;\

		./$(TOOLS_DIR)max.sh;\

    fi



install: install-basex ##  installation de MaX

	./$(TOOLS_DIR)max-dev.sh

	mkdir basex/webapp/MaX

	ln -s ../../../configuration basex/webapp/MaX/

	ln -s ../../../editions basex/webapp/MaX/

	ln -s ../../../ui basex/webapp/MaX/

	ln -s ../../../plugins basex/webapp/MaX/

	ln -s ../../../max.xq basex/webapp/MaX/

	ln -s ../../../rxq basex/webapp/MaX/

	ln -s ../../../package.json basex/webapp/MaX/

	@echo "Install done !"



package:  ## packaging de la version à distribuer

	cd $(TOOLS_DIR) && ./build.sh

	@echo "Package ok"



#### end of dev targets

stop:  ## arrêt basex de dev

	./basex/bin/basexhttpstop || true



run:  stop ## lancement du serveur basex

	@if [ ! $(HTTP_PORT)  ]; then\

		./basex/bin/basexhttp -S;\

	else\

		./basex/bin/basexhttp -h$(HTTP_PORT) &\

	fi



install-tei-demo: run ##  installation de l'édition de démo TEI

	sleep 2

	$(TOOLS_DIR)max.sh --d-tei

	@echo "done"



enable-plugin: ## Activation d'un plugin : make enable-plugin [plugin-name] [edition-name]

	cd $(TOOLS_DIR) && ./max.sh --$(MAKECMDGOALS)



disable-plugin: ## Désactivation d'un plugin : make disable-plugin [plugin-name] [edition-name]

	cd $(TOOLS_DIR) && ./max.sh --$(MAKECMDGOALS)



list-plugins: ## Affichage de la liste des plugins

	cd $(TOOLS_DIR) && ./max.sh --$(MAKECMDGOALS)



package-edition:  ## packaging d'un max avec ses sources

	cd $(TOOLS_DIR) && ./build.sh

	@echo "Package ok"



help: ## afficher l'aide

	@echo "\nChoisissez une commande. Les choix sont:\n"

	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[0;36m%-12s\033[m %s\n", $$1, $$2}'

	@echo ""

package-lock.json

+3 −68
Original line number Diff line number Diff line 
{

  "name": "MaX",

  "version": "1.0.0",

  "lockfileVersion": 2,

  "version": "1.1.0-rc3",

  "lockfileVersion": 3,

  "requires": true,

  "packages": {

    "": {

      "name": "MaX",

      "version": "1.0.0",

      "version": "1.1.0-rc3",

      "license": "CECILL",

      "dependencies": {

        "babel-polyfill": "^6.26.0",
@@ -97,70 +97,5 @@ 
      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",

      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="

    }

  },

  "dependencies": {

    "@popperjs/core": {

      "version": "2.11.4",

      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz",

      "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==",

      "peer": true

    },

    "babel-polyfill": {

      "version": "6.26.0",

      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",

      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",

      "requires": {

        "babel-runtime": "^6.26.0",

        "core-js": "^2.5.0",

        "regenerator-runtime": "^0.10.5"

      }

    },

    "babel-runtime": {

      "version": "6.26.0",

      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",

      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",

      "requires": {

        "core-js": "^2.4.0",

        "regenerator-runtime": "^0.11.0"

      },

      "dependencies": {

        "regenerator-runtime": {

          "version": "0.11.1",

          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",

          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="

        }

      }

    },

    "bootstrap": {

      "version": "5.1.3",

      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",

      "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",

      "requires": {}

    },

    "core-js": {

      "version": "2.6.11",

      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",

      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="

    },

    "mathjax": {

      "version": "3.2.0",

      "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-3.2.0.tgz",

      "integrity": "sha512-PL+rdYRK4Wxif+SQ94zP/L0sv6/oW/1WdQiIx0Jvn9FZaU5W9E6nlIv8liYAXBNPL2Fw/i+o/mZ1212eSzn0Cw=="

    },

    "openseadragon": {

      "version": "3.0.0",

      "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-3.0.0.tgz",

      "integrity": "sha512-IIl90uMZ8mi+W4IWJ0W6/xyz2SCcHeEMT6U5dcAN7UYJYAXWLYbmu3diWzoz4KE0JvMXbXC5wjRoACdTVrgaog=="

    },

    "popper.js": {

      "version": "1.16.1",

      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",

      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="

    },

    "regenerator-runtime": {

      "version": "0.10.5",

      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",

      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="

    }

  }

}

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "MaX",

  "version": "1.1.0-rc3",

  "version": "1.1.0-rc4",

  "description": "Moteur d'Affichage XML / XML renderer engine",

  "repository": "git@git.unicaen.fr:pdn-certic/MaX.git",

  "contributors": [