Commit 505031b7 authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

nettoyage scripts, variable HTTP_PORT Mkaefile de dev

parent 8e83a52e

Makefile

+34 −9
Original line number Diff line number Diff line 
install-basex:

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\
@@ -9,12 +11,11 @@ install-basex: 
		mv Saxon-HE-10.8.jar basex/lib/custom/;\

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

		rm BaseX107.zip;\

		echo "======== Saisissez un mot de passe d'administration pour BaseX ========";\

		./basex/bin/basex -c PASSWORD;\

		./$(TOOLS_DIR)max.sh;\

    fi



install: install-basex ##  installation de MaX

	./tools/max-dev.sh

	./$(TOOLS_DIR)max-dev.sh

	mkdir basex/webapp/MaX

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

	ln -s ../../../editions basex/webapp/MaX/
@@ -23,20 +24,44 @@ install: install-basex ## installation de 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 de dev

	./basex/bin/basexhttp -h1234 &

run:  stop ## lancement du serveur basex

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

		./basex/bin/basexhttp -S;\

	else\

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

	fi

#	@echo 'RUN'

#	@if [ ! $(HTTP_PORT) ] then ./basex/bin/basexhttp -h$(HTTP_PORT) & else sh ./basex/bin/basexhttp &;fi

#	@if [ $(MAX_ENV) -eq 'DEV' ]; then\

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

#	else\

#  		./basex/bin/basexhttp;\

#  	fi





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

	sleep 2

	./tools/max.sh --d-tei

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

	@echo "done"



package:  ## packaging de la version à distribuer

	cd tools && ./build.sh

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)



help: ## afficher l'aide

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

tools/build.sh

+5 −0
Original line number Diff line number Diff line
@@ -89,6 +89,11 @@ 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/



# generate Makefile from dev one

echo 'TOOLS_DIR=max/tools/' > Makefile

awk 'f;/#### end of dev targets/{f=1}' $DIRECTORY/../Makefile >> Makefile

mv Makefile $RELEASE_DIR



#create zip release

cd $DIRECTORY

zip -r --symlinks $RELEASE_DIR.zip $RELEASE_DIR

tools/max-dev.sh

100644 → 100755
+28 −17
Original line number Diff line number Diff line 
#!/bin/bash

DIRECTORY=$(cd "$(dirname "$0")" && pwd)



dependency_test(){

  result=$(command -v "$1")

  if [[ -z $result ]]

  then

      echo "Dependency $1 is not satisfied - please install it first"

      exit 1

  else

      echo "Dependency $1 is satisfied"

  fi

}



if [[ -f ${DIRECTORY}'/../package.json' ]]

then

  dependency_test npm

tools/max.sh

+25 −13
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ display_usage(){ 
    echo -e "\t-v: Display MaX version."

    echo -e "\t-p: Specify BaseX port to use for db feed. Default one is $PORT."

    echo -e "\t-b: Specify custom BaseX home. Common BaseX will be used by default if presents."

    echo -e "\t-i: Max initialization."

    echo -e "\t-n: Deploy new edition with its XML sources."

    echo -e "\t--d-tei: Deploy the TEI demo edition project."

    echo -e "\t--d-ead: Deploy the EAD demo edition project."
@@ -79,18 +78,6 @@ EAD_DEMO_RELEASE_URL="$EAD_DEMO_URL/-/archive/$MAX_EAD_DEMO_VERSION_NUMBER/$MAX_ 
#FOP_URL="https://files.basex.org/modules/org/basex/modules/fop/FOP.jar"

DEFAULT_EAD_PLUGINS=(side_toc ead_basket)



dependency_test(){

  result=$(command -v "$1")

  if [[ -z $result ]]

  then

      echo "Dependency $1 is not satisfied - please install it first"

      exit 1

  else

      echo "Dependency $1 is satisfied"

  fi

}





echo "---------------------------"

echo "  MaX - Utilities - $MAX_VERSION"

echo "---------------------------"
@@ -110,6 +97,15 @@ if [[ -d ${DIRECTORY}/../basex ]] 
then

  BASEX_CLIENT_BIN="${DIRECTORY}/../basex/bin/basexclient"

  BASEX_BIN="${DIRECTORY}/../basex/bin/basex"

  BASEX_HTTP="${DIRECTORY}/../basex/bin/basexhttp"

  BASEX_HTTPSTOP="${DIRECTORY}/../basex/bin/basexhttpstop"

  echo "BaseX OK"

elif [[ -d ${DIRECTORY}/../../basex ]]

then

  BASEX_CLIENT_BIN="${DIRECTORY}/../../basex/bin/basexclient"

  BASEX_BIN="${DIRECTORY}/../../basex/bin/basex"

  BASEX_HTTP="${DIRECTORY}/../../basex/bin/basexhttp"

  BASEX_HTTPSTOP="${DIRECTORY}/../../basex/bin/basexhttpstop"

  echo "BaseX OK"

else

  echo 'BaseX is missing'
@@ -122,6 +118,17 @@ echo -e "\tBASEX_CLIENT_BIN = $BASEX_CLIENT_BIN" 
echo -e "\tBASEX_BIN = $BASEX_BIN"

echo



#set password admin password if not already defined

if [[ ! -f ${DIRECTORY}/../basex/data/users.xml ]] && [[ ! -f ${DIRECTORY}/../../basex/data/users.xml ]]

then

  $BASEX_HTTPSTOP || true

  $BASEX_HTTP -S

  echo 'Please define a BaseX admin password'

  $BASEX_BIN -c'PASSWORD'

  $BASEX_HTTPSTOP

fi





list_plugins(){

  echo

  echo -e ' --- MaX plugins --- '
@@ -195,6 +202,9 @@ disable_plugin(){ 


#adds xml datas to a new db

db_project_feed(){

   # basex must be running

   $BASEX_HTTPSTOP || true

   $BASEX_HTTP -S

   echo "CREATE DATABASE $1" > feed.txt

   echo "ADD $2" >> feed.txt

   echo "Please type your BaseX login/password :"
@@ -204,10 +214,12 @@ db_project_feed(){ 
   if [[ $ret -gt 0 ]]

    then echo "Cannot insert data in DB. Is your BaseX running on port $PORT ?"

    rm feed.txt

    $BASEX_HTTPSTOP

    return 1

   else

    echo "INFO: The $1 DB was successfully created."

    rm feed.txt

    $BASEX_HTTPSTOP

    return 0

   fi

}