simplification scripts version packagée + séparation init (max-dev.sh) (fcd63197) · Commits · pdn-certic / MaX

.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

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="
		}
		}
		}

tools/build.sh

+6 −9

Original line number	Diff line number	Diff line
		#!/bin/bash
		#build max release ' zip

		BASEX_URL=https://files.basex.org/releases/10.4/BaseX104.zip
		SAXON_HE_URL="https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/10.8/Saxon-HE-10.8.jar"
		FOP_URL="https://files.basex.org/modules/org/basex/modules/fop/FOP.jar"
		BASEX_URL=https://files.basex.org/releases/10.7/BaseX107.zip
		DIRECTORY=$(cd `dirname $0` && pwd)
		echo "Working directory = "$DIRECTORY

		@@ -43,7 +41,6 @@ done
		cp $DIRECTORY/../tools/max.sh $MAX_WEBAPP_DIR/tools
		cp -r $DIRECTORY/../tools/xq $MAX_WEBAPP_DIR/tools
		cp $DIRECTORY/../tools/*.xml $MAX_WEBAPP_DIR/tools
		cp $DIRECTORY/../tools/about.frag_tmpl.html $MAX_WEBAPP_DIR/tools
		cp $DIRECTORY/../CHANGELOG $MAX_WEBAPP_DIR/

		#removes equations & pager plugins
		@@ -87,10 +84,10 @@ mv basex $RELEASE_DIR
		cd $RELEASE_DIR/basex/webapp
		ln -s ../../max max

		#fetch saxon & fop jars in basex lib dir
		cd ../lib/custom
		curl --silent -k -O $SAXON_HE_URL
		curl --silent -k -O $FOP_URL
		#copy saxon & fop jars in basex lib dir
		cd $DIRECTORY
		cp basex/lib/custom/Saxon-HE-10.8.jar $RELEASE_DIR/basex/custom/
		cp basex/lib/custom/FOP.jar $RELEASE_DIR/basex/custom/

		#create zip release
		cd $DIRECTORY
		@@ -99,4 +96,4 @@ zip -r --symlinks $RELEASE_DIR.zip $RELEASE_DIR
		mkdir dist
		mv $RELEASE_DIR.zip $RELEASE_DIR dist

		echo "RELEASE BUILT DONE in dist/"$RELEASE_DIR.zip
		No newline at end of file
		echo "RELEASE BUILD SUCCESSFULLY in dist/"$RELEASE_DIR.zip
		No newline at end of file

tools/max-dev.sh

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		#!/bin/bash
		DIRECTORY=$(cd "$(dirname "$0")" && pwd)

		if [[ -f ${DIRECTORY}'/../package.json' ]]
		then
		dependency_test npm
		cd "${DIRECTORY}/.." \|\| return
		npm install
		echo " -> Adds nodes_modules/.ignore file"
		touch "${DIRECTORY}/../node_modules/.ignore"
		echo -e "\n -> disabling all plugins (.ignore file)"
		for i in "${MAX_PLUGINS_DIR}"/*
		do
		if [[ -d "$i" ]]; then
		touch "${i}/.ignore" \|\| abort
		fi
		done

		echo -e "\n${GREEN} * MaX initialization is finished :) * ${NC}\n"
		fi
		No newline at end of file

tools/max.sh

+9 −78

Original line number	Diff line number	Diff line
		@@ -75,9 +75,8 @@ MAX_TEI_DEMO_VERSION="max-tei-demo-$MAX_TEI_DEMO_VERSION_NUMBER"
		MAX_EAD_DEMO_VERSION="max-ead-demo-$MAX_EAD_DEMO_VERSION_NUMBER"
		TEI_DEMO_RELEASE_URL="$TEI_DEMO_URL/-/archive/$MAX_TEI_DEMO_VERSION_NUMBER/$MAX_TEI_DEMO_VERSION.zip"
		EAD_DEMO_RELEASE_URL="$EAD_DEMO_URL/-/archive/$MAX_EAD_DEMO_VERSION_NUMBER/$MAX_EAD_DEMO_VERSION.zip"
		SAXON_HE_URL="https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/10.8/Saxon-HE-10.8.jar"
		FOP_URL="https://files.basex.org/modules/org/basex/modules/fop/FOP.jar"

		#SAXON_HE_URL="https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/10.8/Saxon-HE-10.8.jar"
		#FOP_URL="https://files.basex.org/modules/org/basex/modules/fop/FOP.jar"
		DEFAULT_EAD_PLUGINS=(side_toc ead_basket)

		dependency_test(){
		@@ -91,26 +90,6 @@ dependency_test(){
		fi
		}

		install_jar_in_libs(){
		jar_url=$1
		jar_name=$(basename "$jar_url")
		basex_libs=$(which $BASEX_BIN)
		d=$(dirname "$basex_libs")/../lib/custom
		if [[ ! -f $d/$jar_name ]]
		then
		echo -e "\tDownloading jar $jar_url"
		curl --silent -k -O "$jar_url"
		ret_code=$?
		if [[ $ret_code -gt 0 ]]
		then
		echo -e "${RED}Cannot install jar ${jar_url}${NC}"
		exit 1
		else
		mv "$jar_name" "$d" \|\| abort
		fi
		fi
		echo -e "\t${jar_name}: ${GREEN}ok${NC}"
		}

		echo "---------------------------"
		echo " MaX - Utilities - $MAX_VERSION"
		@@ -126,32 +105,15 @@ fi
		echo
		echo -e "Let's check and set BaseX binaries..."
		echo
		if [[ -n ${BASEX_PATH} ]]
		then
		echo "\$BASEX_PATH environment variable is set to ${BASEX_PATH}"
		BASEX_CLIENT_BIN="${BASEX_PATH}/bin/basexclient"
		BASEX_BIN="${BASEX_PATH}/bin/basex"
		else
		if [[ -f ${DIRECTORY}/../VERSION ]]

		if [[ -d ${DIRECTORY}/../basex ]]
		then
		RELEASE_DIRECTORY=$(cd "$(dirname "$0")/../.." && pwd)
		BASEX_CLIENT_BIN="${RELEASE_DIRECTORY}/basex/bin/basexclient"
		BASEX_BIN="${RELEASE_DIRECTORY}/basex/bin/basex"
		BASEX_CLIENT_BIN="${DIRECTORY}/../basex/bin/basexclient"
		BASEX_BIN="${DIRECTORY}/../basex/bin/basex"
		echo "BaseX OK"
		else
		echo ${DIRECTORY}/../VERSION
		a=$(command -v basexclient)
		b=$(command -v basex)
		if [[ -z $a ]] && [[ -z $b ]]
		then
		display_usage
		echo "Please install BaseX or set \$BASEX_PATH environment variable"
		exit 1
		else
		BASEX_CLIENT_BIN=$a
		BASEX_BIN=$b
		fi
		fi
		echo 'BaseX is missing'
		abort
		fi

		echo
		@@ -160,13 +122,6 @@ echo -e "\tBASEX_CLIENT_BIN = $BASEX_CLIENT_BIN"
		echo -e "\tBASEX_BIN = $BASEX_BIN"
		echo

		#checks if fop & saxon he jar are in basex libs
		echo
		echo "Checks BaseX libs..."
		install_jar_in_libs $SAXON_HE_URL
		install_jar_in_libs $FOP_URL
		echo

		list_plugins(){
		echo
		echo -e ' --- MaX plugins --- '
		@@ -401,36 +356,12 @@ new_edition_build(){
		include_project_config "$1"
		}


		init_dev_max(){
		if [[ -f ${DIRECTORY}'/../package.json' ]]
		then
		dependency_test npm
		cd "${DIRECTORY}/.." \|\| return
		npm install
		echo " -> Adds nodes_modules/.ignore file"
		touch "${DIRECTORY}/../node_modules/.ignore"
		echo -e "\n -> disabling all plugins (.ignore file)"
		for i in "${MAX_PLUGINS_DIR}"/*
		do
		if [[ -d "$i" ]]; then
		# plug=$(basename "$i");
		# echo "$plug"
		touch "${i}/.ignore" \|\| abort
		fi
		done

		echo -e "\n${GREEN} * MaX initialization is finished :) * ${NC}\n"
		fi
		}

		set -- "${args[@]}"
		while [[ "$#" -gt 0 ]]; do
		case $1 in
		-p) shift ;; # already done
		-b) shift ;; # already done
		-n) deploy_new_edition;exit 0;;
		-i) init_dev_max;exit 0;;
		--d-tei) install_demo "$TEI_DEMO_RELEASE_URL" "$MAX_TEI_DEMO_VERSION" max_tei_demo;exit 0;;
		--d-ead) install_demo "$EAD_DEMO_RELEASE_URL" "$MAX_EAD_DEMO_VERSION" max_ead_demo;exit 0;;
		--list-plugins) list_plugins;exit 0;;