allow to force installing a clangd and qtcreator files
Add new targets to the Makefile: - forceclangd - allow to force installing a .clangd file - forceclangdall - force installing .clangd file in this project and in libriaries: pikotools, morm, ezc and tito - forceqtcreator - force installing qtcreator files - forceqtcreatorall - force installing qtcreator files in this project and in libraries Existing files will be overwritten. while here: - update the c++ standard to c++23
This commit is contained in:
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
CompileFlags:
|
CompileFlags:
|
||||||
Add: [-pthread, -std=c++20, -I%%%CURRENT_DIR%%%/winixd, -I%%%GLOBAL_WORKING_DIR%%%/pikotools/src, -I%%%GLOBAL_WORKING_DIR%%%/ezc/src, -I%%%GLOBAL_WORKING_DIR%%%/morm/src, -I%%%GLOBAL_WORKING_DIR%%%/tito/src, -I/usr/include, -I/usr/local/include, -I/usr/local/include/postgresql, -DPT_HAS_MORM_LIBRARY, -DEZC_HAS_MORM_LIBRARY, -DMORM_HAS_EZC_LIBRARY]
|
Add: [-pthread, -std=c++23, -I%%%CURRENT_DIR%%%/winixd, -I%%%GLOBAL_WORKING_DIR%%%/pikotools/src, -I%%%GLOBAL_WORKING_DIR%%%/ezc/src, -I%%%GLOBAL_WORKING_DIR%%%/morm/src, -I%%%GLOBAL_WORKING_DIR%%%/tito/src, -I/usr/include, -I/usr/local/include, -I/usr/local/include/postgresql, -DPT_HAS_MORM_LIBRARY, -DEZC_HAS_MORM_LIBRARY, -DMORM_HAS_EZC_LIBRARY]
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
-std=c20
|
-std=c23
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
-std=c++20
|
-std=c++23
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ GLOBAL_WORKING_DIR=$(realpath ${CURRENT_DIR}/..)
|
|||||||
|
|
||||||
# ----------
|
# ----------
|
||||||
|
|
||||||
|
has_force_arg=0
|
||||||
|
|
||||||
|
if [ $# -eq 1 ] ; then
|
||||||
|
if [ $1 == 'force' ] ; then
|
||||||
|
has_force_arg=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# make sure the current directory is correct
|
# make sure the current directory is correct
|
||||||
if [ ! -d ${CURRENT_DIR}/.templates ] ; then
|
if [ ! -d ${CURRENT_DIR}/.templates ] ; then
|
||||||
echo "this script should be called by make: make clangd (one level up)"
|
echo "this script should be called by make: make clangd (one level up)"
|
||||||
@@ -17,7 +25,7 @@ GLOBAL_WORKING_DIR_FOR_SED=$(echo ${GLOBAL_WORKING_DIR} | sed 's/\//\\\//g')
|
|||||||
|
|
||||||
|
|
||||||
if [ -f "${CURRENT_DIR}/.templates/.clangd" ] ; then
|
if [ -f "${CURRENT_DIR}/.templates/.clangd" ] ; then
|
||||||
if [ ! -f "${CURRENT_DIR}/.clangd" ] ; then
|
if [ $has_force_arg -eq 1 -o ! -f "${CURRENT_DIR}/.clangd" ] ; then
|
||||||
cat "${CURRENT_DIR}/.templates/.clangd" | \
|
cat "${CURRENT_DIR}/.templates/.clangd" | \
|
||||||
sed -e "s/%%%CURRENT_DIR%%%/${CURRENT_DIR_FOR_SED}/g" \
|
sed -e "s/%%%CURRENT_DIR%%%/${CURRENT_DIR_FOR_SED}/g" \
|
||||||
-e "s/%%%GLOBAL_WORKING_DIR%%%/${GLOBAL_WORKING_DIR_FOR_SED}/g" > \
|
-e "s/%%%GLOBAL_WORKING_DIR%%%/${GLOBAL_WORKING_DIR_FOR_SED}/g" > \
|
||||||
|
|||||||
@@ -6,6 +6,14 @@ QTCREATOR_DIR=${CURRENT_DIR}/.qtcreator
|
|||||||
|
|
||||||
# ----------
|
# ----------
|
||||||
|
|
||||||
|
has_force_arg=0
|
||||||
|
|
||||||
|
if [ $# -eq 1 ] ; then
|
||||||
|
if [ $1 == 'force' ] ; then
|
||||||
|
has_force_arg=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# make sure the current directory is correct
|
# make sure the current directory is correct
|
||||||
if [ ! -d ${CURRENT_DIR}/.templates ] ; then
|
if [ ! -d ${CURRENT_DIR}/.templates ] ; then
|
||||||
echo "this script should be called by make: make qtcreator (one level up)"
|
echo "this script should be called by make: make qtcreator (one level up)"
|
||||||
@@ -48,6 +56,10 @@ GLOBAL_WORKING_DIR_FOR_SED=$(echo ${GLOBAL_WORKING_DIR} | sed 's/\//\\\//g')
|
|||||||
|
|
||||||
was_qtcreator_dir=0
|
was_qtcreator_dir=0
|
||||||
|
|
||||||
|
if [ $has_force_arg -eq 1 ] ; then
|
||||||
|
rm -rf "${QTCREATOR_DIR}"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -d "${QTCREATOR_DIR}" ] ; then
|
if [ -d "${QTCREATOR_DIR}" ] ; then
|
||||||
was_qtcreator_dir=1
|
was_qtcreator_dir=1
|
||||||
else
|
else
|
||||||
@@ -76,7 +88,7 @@ if [ -d "${QTCREATOR_DIR}" ] ; then
|
|||||||
|
|
||||||
if [ $was_qtcreator_dir -eq 0 ] ; then
|
if [ $was_qtcreator_dir -eq 0 ] ; then
|
||||||
echo "QTCreator files generated to ${QTCREATOR_DIR} directory"
|
echo "QTCreator files generated to ${QTCREATOR_DIR} directory"
|
||||||
echo "select an 'open project...' option and find a ${QTCREATOR_DIR}/*.creator file"
|
echo "In QTCreator select an 'open project...' option and find a ${QTCREATOR_DIR}/*.creator file"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -40,6 +40,10 @@ clangd: FORCE
|
|||||||
@.templates/install_clangd.sh
|
@.templates/install_clangd.sh
|
||||||
|
|
||||||
|
|
||||||
|
forceclangd: FORCE
|
||||||
|
@.templates/install_clangd.sh force
|
||||||
|
|
||||||
|
|
||||||
clangdall: clangd
|
clangdall: clangd
|
||||||
@$(MAKE) -C ../pikotools clangd
|
@$(MAKE) -C ../pikotools clangd
|
||||||
@$(MAKE) -C ../morm clangd
|
@$(MAKE) -C ../morm clangd
|
||||||
@@ -47,10 +51,21 @@ clangdall: clangd
|
|||||||
@$(MAKE) -C ../tito clangd
|
@$(MAKE) -C ../tito clangd
|
||||||
|
|
||||||
|
|
||||||
|
forceclangdall: forceclangd
|
||||||
|
@$(MAKE) -C ../pikotools forceclangd
|
||||||
|
@$(MAKE) -C ../morm forceclangd
|
||||||
|
@$(MAKE) -C ../ezc forceclangd
|
||||||
|
@$(MAKE) -C ../tito forceclangd
|
||||||
|
|
||||||
|
|
||||||
qtcreator: clangd
|
qtcreator: clangd
|
||||||
@.templates/install_qtcreator.sh
|
@.templates/install_qtcreator.sh
|
||||||
|
|
||||||
|
|
||||||
|
forceqtcreator: forceclangd
|
||||||
|
@.templates/install_qtcreator.sh force
|
||||||
|
|
||||||
|
|
||||||
qtcreatorall: qtcreator
|
qtcreatorall: qtcreator
|
||||||
@$(MAKE) -C ../pikotools qtcreator
|
@$(MAKE) -C ../pikotools qtcreator
|
||||||
@$(MAKE) -C ../morm qtcreator
|
@$(MAKE) -C ../morm qtcreator
|
||||||
@@ -58,5 +73,12 @@ qtcreatorall: qtcreator
|
|||||||
@$(MAKE) -C ../tito qtcreator
|
@$(MAKE) -C ../tito qtcreator
|
||||||
|
|
||||||
|
|
||||||
|
forceqtcreatorall: forceqtcreator
|
||||||
|
@$(MAKE) -C ../pikotools forceqtcreator
|
||||||
|
@$(MAKE) -C ../morm forceqtcreator
|
||||||
|
@$(MAKE) -C ../ezc forceqtcreator
|
||||||
|
@$(MAKE) -C ../tito forceqtcreator
|
||||||
|
|
||||||
|
|
||||||
FORCE:
|
FORCE:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user