diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3d877a2 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/nulib-base.iml b/.idea/nulib-base.iml new file mode 100644 index 0000000..c88c3c8 --- /dev/null +++ b/.idea/nulib-base.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml index f6159c8..aced70d 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -1,4 +1,64 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.pman.conf b/.pman.conf index 344e2f7..1686b67 100644 --- a/.pman.conf +++ b/.pman.conf @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -UPSTREAM= +UPSTREAM=dev74 DEVELOP=dev82 FEATURE=wip82/ RELEASE=rel82- diff --git a/CHANGES.md b/CHANGES.md index bea6044..82031dd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1 +1,5 @@ +## Release 0.6.0p82 du 30/05/2025-22:37 + +## Release 0.6.0p74 du 30/05/2025-22:35 + 29/05/2025 Renommer le répertoire de nulib à nulib-base et le package de nulib/php à nulib/base diff --git a/php/support/template-.launcher.php b/php/support/template-.launcher.php index eeb2b41..b1a3879 100644 --- a/php/support/template-.launcher.php +++ b/php/support/template-.launcher.php @@ -9,4 +9,4 @@ const NULIB_APP_app_params = [ "projdir" => __DIR__ . '/..', "appcode" => \app\config\bootstrap::APPCODE, ]; -require __DIR__.'/../vendor/nulib/php/php/src/app/cli/include-launcher.php'; +require __DIR__.'/../vendor/nulib/base/php/src/app/cli/include-launcher.php'; diff --git a/runphp/build b/runphp/build index 3f7c7b6..4e796ad 100755 --- a/runphp/build +++ b/runphp/build @@ -8,7 +8,7 @@ PROJDIR=; COMPOSERDIR=; COMPOSERPHAR=; VENDORDIR=; BUILDENV0=; BUILDENV= BUILD_IMAGES=(php-apache mariadb10); export BUILD_FLAVOUR=; DIST=; IMAGENAME= DISTFILES=(); TEMPLATEFILES=(); VARFILES=() source "$RUNPHP" || exit 1 -source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1 +source "$PROJDIR/$VENDORDIR/nulib/base/load.sh" || exit 1 require: template # recenser les valeur de proxy @@ -149,9 +149,9 @@ function _build() { dockerfiles=( "$MYDIR/Dockerfile.$1.local" "$MYDIR/Dockerfile.$1$BUILD_FLAVOUR" - "$PROJDIR/$VENDORDIR/nulib/php/dockerfiles/Dockerfile.$1$BUILD_FLAVOUR" + "$PROJDIR/$VENDORDIR/nulib/base/dockerfiles/Dockerfile.$1$BUILD_FLAVOUR" "$MYDIR/Dockerfile.$1" - "$PROJDIR/$VENDORDIR/nulib/php/dockerfiles/Dockerfile.$1" + "$PROJDIR/$VENDORDIR/nulib/base/dockerfiles/Dockerfile.$1" ) for dockerfile in "${dockerfiles[@]}"; do [ -f "$dockerfile" ] && break diff --git a/runphp/runphp b/runphp/runphp index e24aba5..07d0e8d 100755 --- a/runphp/runphp +++ b/runphp/runphp @@ -232,7 +232,7 @@ function host_check_projdir() { [ -n "$RUNPHP_STANDALONE" ] && return local install - if [ ! -f "$PROJDIR/$VENDORDIR/nulib/php/load.sh" ]; then + if [ ! -f "$PROJDIR/$VENDORDIR/nulib/base/load.sh" ]; then install=1 elif [ ! -f "$PROJDIR/.composer.lock.runphp" ]; then install=1 diff --git a/runphp/template.sh b/runphp/template.sh index 233c527..87fdd85 100755 --- a/runphp/template.sh +++ b/runphp/template.sh @@ -10,7 +10,7 @@ if [ -z "$_RUNPHP_IN_DOCKER" ]; then exec "$MYDIR/$RUNPHP" "$0" "$@" fi source "$MYDIR/$RUNPHP" || exit 1 -source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1 +source "$PROJDIR/$VENDORDIR/nulib/base/load.sh" || exit 1 args=( "description"