diff --git a/.codeclimate.yml b/.codeclimate.yml index 0c62d4ed5eb..f6fbf2fe168 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -6,7 +6,6 @@ languages: engines: phpcodesniffer: true exclude_paths: - - 'build/*' - 'dev/*' - 'doc/*' - 'test/*' diff --git a/.github/workflows/doxygen-gh-pages.yml.disabled b/.github/workflows/doxygen-gh-pages.yml.disabled index 33dd47aa6e6..7c91b892378 100644 --- a/.github/workflows/doxygen-gh-pages.yml.disabled +++ b/.github/workflows/doxygen-gh-pages.yml.disabled @@ -8,7 +8,7 @@ on: - develop permissions: contents: write - + jobs: build: runs-on: ubuntu-latest @@ -18,16 +18,16 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: gh-pages - folder: build/html - config_file: build/doxygen/dolibarr-doxygen.doxyfile + folder: dev/build/html + config_file: dev/build/doxygen/dolibarr-doxygen.doxyfile # - name: Deploy # uses: JamesIves/github-pages-deploy-action@v4 # with: # branch: gh-pages -# folder: build/html # The folder the action should deploy. +# folder: dev/build/html # The folder the action should deploy. # target-folder: docs/html2 - + #jobs: # doxygen: # runs-on: ubuntu-latest diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml index 420ca085cad..2d53ce8f49c 100644 --- a/.github/workflows/exakat.yml +++ b/.github/workflows/exakat.yml @@ -22,6 +22,6 @@ jobs: uses: docker://exakat/exakat-ga with: ignore_rules: 'Classes/UseInstanceof,Constants/ConstantStrangeNames,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' - ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/' + ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/dev/,/doc/,/scripts/,/test/' file_extensions: php project_reports: Perfile diff --git a/.github/workflows/github_ci_php71_pgsql.yml.disabled b/.github/workflows/github_ci_php71_pgsql.yml.disabled index d324d1c1481..b2997a041b6 100644 --- a/.github/workflows/github_ci_php71_pgsql.yml.disabled +++ b/.github/workflows/github_ci_php71_pgsql.yml.disabled @@ -35,14 +35,14 @@ jobs: --health-timeout 5s --health-retries 5 ports: - - 5432:5432 + - 5432:5432 steps: # git clone dolibarr into GITHUB_WORKSPACE = /home/runner/work/dolibarr/dolibarr - uses: actions/checkout@v3 with: fetch-depth: 1 - + - name: Version PHP run: | php -i | head - @@ -59,7 +59,7 @@ jobs: sudo apt install apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1 sudo update-alternatives --set php /usr/bin/php7.1 php -i | head - - + cd $GITHUB_WORKSPACE ls $GITHUB_WORKSPACE composer -n require --ignore-platform-reqs phpunit/phpunit ^7.5 \ @@ -76,7 +76,7 @@ jobs: sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html - name: Adding path of binaries tools installed by composer to the PATH - run: | + run: | export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH" echo $PATH # We must have a directory bin created by the previous composer call @@ -107,32 +107,32 @@ jobs: psql --version echo "Check pgloader version" pgloader --version - + - name: Create database run: | pwd - echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE + echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE sudo apt-get install -y mysql-client mysql --version | head - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES" - + echo "Drop and create database" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;' mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;' - - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" - echo "Init postgresql database" + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql + + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" + + echo "Init postgresql database" ps fauxww | grep postgres ls /etc/postgresql/14/main/ sudo chmod -R a+rwx /etc/postgresql/14/main/pg_hba.conf - + sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/14/main/pg_hba.conf sudo cat /etc/postgresql/14/main/pg_hba.conf @@ -144,7 +144,7 @@ jobs: sudo mkdir -p /tmp/pgloader sudo chmod -R a+rwx /tmp/pgloader/ - + echo sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis @@ -190,7 +190,7 @@ jobs: echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE cat $INSTALL_FORCED_FILE - + - name: Create document directory run: | echo "Create documents directory and set permissions" @@ -199,9 +199,9 @@ jobs: sudo chmod -R a+rwx /var/www/html/documents sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log sudo chmod a+rwx /var/www/html/documents/dolibarr.log - + - name: Copy app into /var/www - run: | + run: | sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html sudo mv /var/www/html/index.html /var/www/html/index.disabled.html sudo ln -fs /var/www/html /var/www/htdocs @@ -217,7 +217,7 @@ jobs: a2query -s a2query -m ls /etc/apache2/sites-available - #sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf + #sudo cp -f $GITHUB_WORKSPACE/dev/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf #sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf a2ensite 000-default a2enmod php7.1 @@ -245,7 +245,7 @@ jobs: # The wget should return a page with line ' wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1 head -n 200 $GITHUB_WORKSPACE/test.html - + echo Logs are... #sudo cat /tmp/install.log sudo cat /var/log/apache2/access.log @@ -287,7 +287,7 @@ jobs: php upgrade.php 6.0.0 7.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade600700.log php upgrade2.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-2.log php step5.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-3.log - + echo "\dt llx_c_paiement" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' echo "\dt llx_c_payment_term" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' @@ -324,17 +324,17 @@ jobs: php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log - + - name: Result of migration scripts if: always() run: | ls -alrt $GITHUB_WORKSPACE/ - + echo Show content of last file cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)" - name: Enabling new modules - run: | + run: | # Enable modules not enabled into original dump set -e cd /var/www/html/install @@ -361,5 +361,4 @@ jobs: includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php phpunitresult=$? echo "Phpunit return code = $phpunitresult" - set +e - + set +e diff --git a/.github/workflows/github_ci_php81_mysql.yml.disabled b/.github/workflows/github_ci_php81_mysql.yml.disabled index 047fcd63fb5..c303b3125c1 100644 --- a/.github/workflows/github_ci_php81_mysql.yml.disabled +++ b/.github/workflows/github_ci_php81_mysql.yml.disabled @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 1 - + - name: Version PHP run: | php -i | head - @@ -38,14 +38,14 @@ jobs: sudo composer self-update 2.2.18 sudo chmod -R a+rwx /home/runner composer -n config -g vendor-dir htdocs/includes - + sudo add-apt-repository -y ppa:ondrej/php sudo apt-get update sudo apt-get install -y pgloader memcached sudo apt install apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1 sudo update-alternatives --set php /usr/bin/php8.1 php -i | head - - + cd $GITHUB_WORKSPACE ls $GITHUB_WORKSPACE composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \ @@ -56,7 +56,7 @@ jobs: sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html - name: Adding path of binaries tools installed by composer to the PATH - run: | + run: | export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH" echo $PATH # We must have a directory bin created by the previous composer call @@ -87,26 +87,26 @@ jobs: psql --version echo "Check pgloader version" pgloader --version - + - name: Create database run: | pwd - echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE + echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE sudo apt-get install -y mysql-client mysql --version | head - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES" - + echo "Drop and create database" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;' mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;' - - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql + + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" - name: Generate Dolibarr conf file run: | @@ -145,7 +145,7 @@ jobs: echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE cat $INSTALL_FORCED_FILE - + - name: Create document directory run: | echo "Create documents directory and set permissions" @@ -154,9 +154,9 @@ jobs: sudo chmod -R a+rwx /var/www/html/documents sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log sudo chmod a+rwx /var/www/html/documents/dolibarr.log - + - name: Copy app into /var/www - run: | + run: | sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html sudo mv /var/www/html/index.html /var/www/html/index.disabled.html sudo ln -fs /var/www/html /var/www/htdocs @@ -172,7 +172,7 @@ jobs: a2query -s a2query -m ls /etc/apache2/sites-available - #sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf + #sudo cp -f $GITHUB_WORKSPACE/dev/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf #sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf a2ensite 000-default a2enmod php8.1 @@ -200,7 +200,7 @@ jobs: # The wget should return a page with line ' wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1 head -n 200 $GITHUB_WORKSPACE/test.html - + echo Logs are... #sudo cat /tmp/install.log sudo cat /var/log/apache2/access.log @@ -274,17 +274,17 @@ jobs: php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log - + - name: Result of migration scripts if: always() run: | ls -alrt $GITHUB_WORKSPACE/ - + echo Show content of last file cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)" - name: Enabling new modules - run: | + run: | # Enable modules not enabled into original dump set -e cd /var/www/html/install @@ -311,7 +311,7 @@ jobs: includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php phpunitresult=$? echo "Phpunit return code = $phpunitresult" - set +e + set +e - name: Code quality check - Lint if: github.event_name == 'push' @@ -325,10 +325,9 @@ jobs: - name: Code quality check - phpcs if: github.event_name == 'push' run: | - htdocs/includes/bin/phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; + htdocs/includes/bin/phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; - name: Code quality check - var-dump-check if: github.event_name == 'push' run: | htdocs/includes/bin/var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php . - diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 844ad46af3c..ddc3c6ccc4e 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -67,7 +67,7 @@ jobs: - name: Run PHPStan id: phpstan run: | - phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings + phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings # continue-on-error: true # Save cache @@ -90,4 +90,4 @@ jobs: # id: phpstan-baseline # if: ${{ success() }} # run: | - # phpstan -vv analyse --memory-limit 7G -a build/phpstan/bootstrap_action.php --generate-baseline build/phpstan/phpstan-baseline.neon + # phpstan -vv analyse --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php --generate-baseline dev/build/phpstan/phpstan-baseline.neon diff --git a/.github/workflows/phpstan_baseline.yml b/.github/workflows/phpstan_baseline.yml index 9503c25de77..9cea77150dd 100644 --- a/.github/workflows/phpstan_baseline.yml +++ b/.github/workflows/phpstan_baseline.yml @@ -60,8 +60,8 @@ jobs: github_token: ${{ env.GH_TOKEN }} phpstan_path: phpstan configuration_path: phpstan.neon.dist - phpstan_additional_arguments: --memory-limit 7G -a build/phpstan/bootstrap_action.php - baseline_path: build/phpstan/phpstan-baseline.neon + phpstan_additional_arguments: --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php + baseline_path: dev/build/phpstan/phpstan-baseline.neon commit_name: Dolibot commit_email: dolibarr-bot@users.noreply.github.com commit_message: PHPStan > Update baseline diff --git a/.gitignore b/.gitignore index 0a6e4cf6655..434764e4f06 100644 --- a/.gitignore +++ b/.gitignore @@ -47,8 +47,8 @@ htdocs/.well-known/apple-developer-merchantid-domain-association /output/ # Node Modules -build/yarn-error.log -build/node_modules/ +dev/build/yarn-error.log +dev/build/node_modules/ node_modules/ vendor/ @@ -84,8 +84,8 @@ doc/install.lock /INI_PHPUNIT # ignore cache builds -/build/phpstan/phpstan -/build/phpstan/bootstrap_custom.php +/dev/build/phpstan/phpstan +/dev/build/phpstan/bootstrap_custom.php phpstan_custom.neon /.php-cs-fixer.cache /.php_cs.cache diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b74143a4512..2c2226fb84b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -51,8 +51,8 @@ repos: exclude: (?x)^( dev/tools/dolibarr-postgres2mysql.php |test/other/test_serialize.php |test/phpunit/textutf8.txt |test/phpunit/textiso.txt |htdocs/includes/.* - |htdocs/modulebuilder/template/.* |build/debian/dolibarr.postrm |build/debian/dolibarr.postinst - |build/debian/dolibarr.config )$ + |htdocs/modulebuilder/template/.* |dev/build/debian/dolibarr.postrm |dev/build/debian/dolibarr.postinst + |dev/build/debian/dolibarr.config )$ # Fix the first UTF8 byte - id: fix-byte-order-marker # Check that there are no files that have are the same when uppercased (conflict on windows) diff --git a/.travis.yml b/.travis.yml index ad037e8fe31..2609b797d95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -177,7 +177,7 @@ install: fi # Remove non expected files - rm -fr /home/travis/build/Dolibarr/dolibarr/htdocs/includes/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/js + rm -fr /home/travis/dev/build/Dolibarr/dolibarr/htdocs/includes/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/js echo - | @@ -313,7 +313,7 @@ before_script: - | echo "Setting up Apache" sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars - sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf + sudo cp -f dev/build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf sudo cat /etc/apache2/sites-available/000-default.conf sudo service apache2 restart diff --git a/dev/build/README b/dev/build/README index 549937881b3..d1107129de0 100644 --- a/dev/build/README +++ b/dev/build/README @@ -1,6 +1,6 @@ README (English) -Path: /dolibarr/build/README +Path: /dolibarr/dev/build/README ################################################## Building packages diff --git a/dev/build/debian/rules b/dev/build/debian/rules index 5b70362c610..f22c7f1d0a8 100755 --- a/dev/build/debian/rules +++ b/dev/build/debian/rules @@ -81,16 +81,16 @@ override_dh_install: rm -fr test - rm -fr build/aps - rm -fr build/dmg - rm -fr build/doap - rm -fr build/exe - rm -fr build/launchpad - rm -fr build/live - rm -fr build/patch - rm -fr build/perl - rm -fr build/rpm - rm -fr build/zip + rm -fr dev/build/aps + rm -fr dev/build/dmg + rm -fr dev/build/doap + rm -fr dev/build/exe + rm -fr dev/build/launchpad + rm -fr dev/build/live + rm -fr dev/build/patch + rm -fr dev/build/perl + rm -fr dev/build/rpm + rm -fr dev/build/zip # clean from all PHP embedded libraries (we use package dependencies instead) # rm -fr htdocs/includes/geoip diff --git a/dev/build/docker-dev/README.md b/dev/build/docker-dev/README.md index 66358bf2bbe..bb5c82391f1 100644 --- a/dev/build/docker-dev/README.md +++ b/dev/build/docker-dev/README.md @@ -10,7 +10,7 @@ Before build/run, define the variable HOST_USER_ID as following: Go in repository build/docker : - cd build/docker + cd dev/build/docker And then, you can run : diff --git a/dev/build/doxygen/dolibarr-doxygen-build.pl b/dev/build/doxygen/dolibarr-doxygen-build.pl index e8100011666..08deb42d6cd 100755 --- a/dev/build/doxygen/dolibarr-doxygen-build.pl +++ b/dev/build/doxygen/dolibarr-doxygen-build.pl @@ -19,7 +19,7 @@ my $dir = getcwd; print "Current dir is: $dir\n"; #print "Running dir for doxygen must be: $DIR\n"; -if (! -s "build/doxygen/$CONFFILE") +if (! -s "dev/build/doxygen/$CONFFILE") { print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n"; print "\n"; @@ -47,8 +47,8 @@ $version=$MAJOR.".".$MINOR.".".$BUILD; print "Running doxygen for version ".$version.", please wait...\n"; -print "cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n"; -$result=`cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`; +print "cat dev/build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n"; +$result=`cat dev/build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`; print $result; diff --git a/dev/build/doxygen/dolibarr-doxygen.doxyfile b/dev/build/doxygen/dolibarr-doxygen.doxyfile index 66d86a6aa22..fb9a116409c 100644 --- a/dev/build/doxygen/dolibarr-doxygen.doxyfile +++ b/dev/build/doxygen/dolibarr-doxygen.doxyfile @@ -575,7 +575,7 @@ WARN_FORMAT = "$file:$line: $text" # and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = build/html/doxygen_warnings.log +WARN_LOGFILE = dev/build/html/doxygen_warnings.log #--------------------------------------------------------------------------- # configuration options related to the input files @@ -804,14 +804,14 @@ HTML_FILE_EXTENSION = .html # standard header. # Does not work with 1.7.3 -#HTML_HEADER = build/doxygen/doxygen_header.html +#HTML_HEADER = dev/build/doxygen/doxygen_header.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. # Does not work with 1.7.3 -HTML_FOOTER = build/doxygen/doxygen_footer.html +HTML_FOOTER = dev/build/doxygen/doxygen_footer.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to @@ -1655,4 +1655,4 @@ DOT_CLEANUP = YES FULL_SIDEBAR = NO -HTML_EXTRA_STYLESHEET = build/doxygen/doxygen-awesome.css +HTML_EXTRA_STYLESHEET = dev/build/doxygen/doxygen-awesome.css diff --git a/dev/build/exe/doliwamp/doliwamp.iss b/dev/build/exe/doliwamp/doliwamp.iss index a637b7deca1..063c9047bd5 100644 --- a/dev/build/exe/doliwamp/doliwamp.iss +++ b/dev/build/exe/doliwamp/doliwamp.iss @@ -8,7 +8,7 @@ ; package contains only one user called root with no password. ; For this, you can edit the mysql.user table of the source database to keep ; only the root user with no password, stop server and catch -; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory. +; files user.MY* to put them in the Dolibarr dev/build/exe/doliwamp/mysql directory. ; ;---------------------------------------------------------------------------------------- diff --git a/dev/build/generate_filelist_xml.php b/dev/build/generate_filelist_xml.php index c97194efa18..13c07c7da19 100755 --- a/dev/build/generate_filelist_xml.php +++ b/dev/build/generate_filelist_xml.php @@ -18,7 +18,7 @@ */ /** - * \file build/generate_filelist_xml.php + * \file dev/build/generate_filelist_xml.php * \ingroup dev * \brief This script create a xml checksum file */ diff --git a/dev/build/gource/README.md b/dev/build/gource/README.md index 548d01ebccb..8356d788084 100644 --- a/dev/build/gource/README.md +++ b/dev/build/gource/README.md @@ -1,10 +1,10 @@ # Command to run gource on Dolibarr git project. cd ~/git/dolibarr -gource -a 0.5 -c 4 -i 0 --max-files 0 --dir-name-depth 2 --max-file-lag 0.1 --max-user-speed 150 --user-friction 1 --user-scale 3 --file-filter svgs --file-filter _source --file-filter tests --file-show-filter htdocs --date-format "%d %b %Y" -logo doc/images/appicon_64.png --highlight-users --highlight-colour FFFF88 -s 0.5 -1280x720 -r 25 -title 'Dolibarr ERP CRM Genesis' --stop-at-end --filename-time 2 --user-image-dir build/gource/avatars --hide filenames +gource -a 0.5 -c 4 -i 0 --max-files 0 --dir-name-depth 2 --max-file-lag 0.1 --max-user-speed 150 --user-friction 1 --user-scale 3 --file-filter svgs --file-filter _source --file-filter tests --file-show-filter htdocs --date-format "%d %b %Y" -logo doc/images/appicon_64.png --highlight-users --highlight-colour FFFF88 -s 0.5 -1280x720 -r 25 -title 'Dolibarr ERP CRM Genesis' --stop-at-end --filename-time 2 --user-image-dir dev/build/gource/avatars --hide filenames # To build a mp4 video # Change -crf 1 to -crf 50 for max compression (best is 5) cd ~/git/dolibarr -gource -a 0.5 -c 4 -i 0 --max-files 0 --dir-name-depth 2 --max-file-lag 0.1 --max-user-speed 150 --user-friction 1 --user-scale 3 --file-filter svgs --file-filter _source --file-filter tests --file-show-filter htdocs --date-format "%d %b %Y" -logo doc/images/appicon_64.png --highlight-users --highlight-colour FFFF88 -s 0.4 -1280x720 -r 25 -title 'Dolibarr ERP CRM Genesis' --stop-at-end --filename-time 2 --user-image-dir build/gource/avatars --hide filenames -o - | ffmpeg -y -r 25 -f image2pipe -vcodec ppm -i - -vcodec libx264 -preset slow -pix_fmt yuv420p -crf 5 -threads 0 -bf 0 dolibarr_genesis.mp4 +gource -a 0.5 -c 4 -i 0 --max-files 0 --dir-name-depth 2 --max-file-lag 0.1 --max-user-speed 150 --user-friction 1 --user-scale 3 --file-filter svgs --file-filter _source --file-filter tests --file-show-filter htdocs --date-format "%d %b %Y" -logo doc/images/appicon_64.png --highlight-users --highlight-colour FFFF88 -s 0.4 -1280x720 -r 25 -title 'Dolibarr ERP CRM Genesis' --stop-at-end --filename-time 2 --user-image-dir dev/build/gource/avatars --hide filenames -o - | ffmpeg -y -r 25 -f image2pipe -vcodec ppm -i - -vcodec libx264 -preset slow -pix_fmt yuv420p -crf 5 -threads 0 -bf 0 dolibarr_genesis.mp4 diff --git a/dev/build/launchpad/README b/dev/build/launchpad/README index a787bf3f9ad..7350c805a5a 100644 --- a/dev/build/launchpad/README +++ b/dev/build/launchpad/README @@ -31,7 +31,7 @@ DEBEMAIL="" - Create a Bazaar directory mkdir bzr -If you want to build/test package locally: +If you want to build or test package locally: - Create a file ~/.pbuilderrc with content COMPONENTS="main universe multiverse restricted" - Create chroot ubuntu env diff --git a/dev/build/makepack-dolibarr.pl b/dev/build/makepack-dolibarr.pl index 442466b128c..0e0f9412596 100755 --- a/dev/build/makepack-dolibarr.pl +++ b/dev/build/makepack-dolibarr.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl #---------------------------------------------------------------------------- -# \file build/makepack-dolibarr.pl +# \file dev/build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) # \author (c)2004-2023 Laurent Destailleur # @@ -410,8 +410,8 @@ if ($nboftargetok) { exit; } - print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filelist_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n"; - $ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`; + print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/dev/build/generate_filelist_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n"; + $ret=`php $SOURCE/dev/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`; print $ret."\n"; # Copy to final dir $NEWDESTI=$DESTI; @@ -468,8 +468,8 @@ if ($nboftargetok) { print "Copy $SOURCE into $BUILDROOT/$PROJECT\n"; $ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`; - #print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n"; - #$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`; + #print "Copy $SOURCE/dev/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/dev/build/debian/apache/.htaccess\n"; + #$ret=`cp -pr "$SOURCE/dev/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/dev/build/debian/apache/.htaccess"`; } print "Clean $BUILDROOT\n"; $ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`; @@ -492,22 +492,22 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`; $ret=`rm -f $BUILDROOT/$PROJECT/README-*.md`; - $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/Doli*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.xz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.xz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.xz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`; - $ret=`rm -fr $BUILDROOT/$PROJECT/build/phpstan/phpstan`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/build/html`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/Doli*-*`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr_*.deb`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr_*.dsc`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr_*.tar.gz`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr_*.tar.xz`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.deb`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.rpm`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.tar`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.tar.gz`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.tar.xz`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.tgz`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.xz`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.zip`; + $ret=`rm -f $BUILDROOT/$PROJECT/dev/build/doxygen/doxygen_warnings.log`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/build/phpstan/phpstan`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/cache.manifest`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; @@ -702,11 +702,11 @@ if ($nboftargetok) { $cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\""; $ret=`$cmd`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/dev/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`; # We can't remove it with exclude file, we need it for some tarball packages print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n"; - $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ"; + $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/dev/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ"; print "$cmd\n"; $ret=`$cmd`; @@ -734,7 +734,7 @@ if ($nboftargetok) { $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\""; $ret=`$cmd`; - $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/dev/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`; # We can't remove it with exclude file, we need it for some tarball packages print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n"; @@ -771,7 +771,7 @@ if ($nboftargetok) { $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\""; $ret=`$cmd`; - $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/dev/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`; # We can't remove it with exclude file, we need it for some tarball packages print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n"; @@ -779,7 +779,7 @@ if ($nboftargetok) { print "Go to directory $BUILDROOT\n"; $olddir=getcwd(); chdir("$BUILDROOT"); - $cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*"; + $cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/dev\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*"; print $cmd."\n"; $ret= `$cmd`; chdir("$olddir"); @@ -829,7 +829,7 @@ if ($nboftargetok) { # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; - $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; + $ret=`tar --exclude-from "$SOURCE/dev/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n"; $cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz"; @@ -846,8 +846,8 @@ if ($nboftargetok) { $datestring = $lang->time2str("%a %b %e %Y", time); $changelogstring="* ".$datestring." Laurent Destailleur (eldy) $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n"; - print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n"; - open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error"; + print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/dev/build/rpm/${BUILDFICSRC}\n"; + open (SPECFROM,"<$SOURCE/dev/build/rpm/${BUILDFICSRC}") || die "Error"; open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error"; while () { $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/; @@ -860,7 +860,7 @@ if ($nboftargetok) { close SPECTO; print "Copy patch file to $RPMDIR/SOURCES\n"; - $ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`; + $ret=`cp "$SOURCE/dev/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`; $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`; print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n"; @@ -917,40 +917,40 @@ if ($nboftargetok) { print "Remove other files\n"; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/README-FR.md`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/pad/README`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/tgz/README`; - #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/changelog`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/compat`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/control*`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/copyright`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/rules`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/watch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/dmg`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/pad/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/tgz/README`; + #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/debian`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/debian/po`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/debian/source`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/changelog`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/compat`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/control*`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/copyright`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.config`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.desktop`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.docs`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.install`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.lintian-overrides`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.postrm`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.postinst`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.templates`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/dolibarr.templates.futur`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/rules`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/README.Debian`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/README.howto`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/dev/build/debian/watch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/launchpad`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/perl`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/rpm`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/dev/build/zip`; # Removed duplicate license files $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/LICENSE.md`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md`; @@ -978,10 +978,10 @@ if ($nboftargetok) { # Prepare source package (init debian dir) print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; - print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; + print "Copy $SOURCE/dev/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; # Add files for dpkg-source (changelog) - #$ret=`cp -f "$SOURCE/build/debian/changelog" "$BUILDROOT/$PROJECT.tmp/debian"`; - open (SPECFROM,"<$SOURCE/build/debian/changelog") || die "Error"; + #$ret=`cp -f "$SOURCE/dev/build/debian/changelog" "$BUILDROOT/$PROJECT.tmp/debian"`; + open (SPECFROM,"<$SOURCE/dev/build/debian/changelog") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/debian/changelog") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -990,28 +990,28 @@ if ($nboftargetok) { close SPECFROM; close SPECTO; # Add files for dpkg-source - $ret=`cp -f "$SOURCE/build/debian/compat" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/control" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/copyright" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.docs" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.install" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/rules" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/watch" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/patches" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/po" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/source" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -fr "$SOURCE/build/debian/apache" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; - $ret=`cp -f "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; - $ret=`cp -fr "$SOURCE/build/debian/lighttpd" "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`; - # Add files also required to build binary package - $ret=`cp -f "$SOURCE/build/debian/dolibarr.config" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.templates" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/install.forced.php.install" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/compat" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/control" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/copyright" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.docs" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.install" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/rules" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/watch" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/dev/build/debian/patches" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/dev/build/debian/po" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/dev/build/debian/source" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -fr "$SOURCE/dev/build/debian/apache" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; + $ret=`cp -f "$SOURCE/dev/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`; + $ret=`cp -fr "$SOURCE/dev/build/debian/lighttpd" "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`; + # Add files also required to dev/build binary package + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.config" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/dolibarr.templates" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/dev/build/debian/install.forced.php.install" "$BUILDROOT/$PROJECT.tmp/debian"`; # Set owners and permissions #print "Set owners on files/dir\n"; @@ -1055,7 +1055,7 @@ if ($nboftargetok) { # We need a tarball to be able to build "quilt" debian package (not required for native but we need patch so it is not a native) print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n"; - $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build"; + $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/dev/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build"; print $cmd."\n"; $ret=`$cmd`; @@ -1105,11 +1105,11 @@ if ($nboftargetok) { $SOURCEBACK=$SOURCE; $SOURCEBACK =~ s/\//\\/g; - print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; + print "Prepare file \"$SOURCEBACK\\dev\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" from \"$SOURCEBACK\\dev\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; - #$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`; - open(IN, '<' . $SOURCE."/build/exe/doliwamp/doliwamp.iss") or die $!; - open(OUT, '>' . "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss") or die $!; + #$ret=`cat "$SOURCE/dev/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`; + open(IN, '<' . $SOURCE."/dev/build/exe/doliwamp/doliwamp.iss") or die $!; + open(OUT, '>' . "$SOURCE/dev/build/exe/doliwamp/doliwamp.tmp.iss") or die $!; while() { $_ =~ s/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g; @@ -1118,30 +1118,30 @@ if ($nboftargetok) { close(IN); close(OUT); - print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" on OS $OS\n"; + print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\dev\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" on OS $OS\n"; if ($OS eq 'windows') { - $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\""; + $cmd= "ISCC.exe \"$SOURCEBACK\\dev\\build\\exe\\doliwamp\\doliwamp.tmp.iss\""; } else { - #$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\""; + #$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\dev\\build\\exe\\doliwamp\\doliwamp.tmp.iss\""; } print "$cmd\n"; $ret= `$cmd`; print "ret=$ret\n"; # Move to final dir - print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; - rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); - print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; + print "Move \"$SOURCE\\dev\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; + rename("$SOURCE/dev/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); + print "Move $SOURCE/dev/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; use File::Copy; - #$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; - $ret=move("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe", "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); + #$ret=`mv "$SOURCE/dev/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; + $ret=move("$SOURCE/dev/build/$FILENAMEEXEDOLIWAMP.exe", "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); - print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n"; - #$ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`; - $ret=unlink("$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"); + print "Remove tmp file $SOURCE/dev/build/exe/doliwamp/doliwamp.tmp.iss\n"; + #$ret=`rm "$SOURCE/dev/build/exe/doliwamp/doliwamp.tmp.iss"`; + $ret=unlink("$SOURCE/dev/build/exe/doliwamp/doliwamp.tmp.iss"); next; } diff --git a/dev/build/makepack-dolibarrmodule.pl b/dev/build/makepack-dolibarrmodule.pl index 5f51582a65b..bc0022a67fc 100755 --- a/dev/build/makepack-dolibarrmodule.pl +++ b/dev/build/makepack-dolibarrmodule.pl @@ -285,10 +285,10 @@ foreach my $PROJECT (@PROJECTLIST) { @timearray=localtime(time()); $fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1]; - open(VF,">$BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt"); + open(VF,">$BUILDROOT/$PROJECTLC/dev/build/version-".$PROJECTLC.".txt"); - print "Create version file $BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECTLC/build"`; + print "Create version file $BUILDROOT/$PROJECTLC/dev/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECTLC/dev/build"`; print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n"; print VF "Build : ".$fulldate."\n"; close VF; @@ -299,7 +299,7 @@ foreach my $PROJECT (@PROJECTLIST) { $ret=`rm -fr $BUILDROOT/$PROJECTLC/.project`; $ret=`rm -fr $BUILDROOT/$PROJECTLC/.settings`; $ret=`rm -fr $BUILDROOT/$PROJECTLC/index.php`; - $ret=`rm -fr $BUILDROOT/$PROJECTLC/build/html`; + $ret=`rm -fr $BUILDROOT/$PROJECTLC/dev/build/html`; $ret=`rm -fr $BUILDROOT/$PROJECTLC/documents`; $ret=`rm -fr $BUILDROOT/$PROJECTLC/document`; $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.mysql`; diff --git a/dev/build/makepack-dolibarrtheme.pl b/dev/build/makepack-dolibarrtheme.pl index 6aeb32a5fcb..7a6c31fb0f8 100755 --- a/dev/build/makepack-dolibarrtheme.pl +++ b/dev/build/makepack-dolibarrtheme.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl #----------------------------------------------------------------------------- -# \file build/makepack-dolibarrtheme.pl +# \file dev/build/makepack-dolibarrtheme.pl # \brief Script to build a theme Package for Dolibarr # \author (c)2005-2009 Laurent Destailleur #----------------------------------------------------------------------------- diff --git a/dev/build/makepack-howto.txt b/dev/build/makepack-howto.txt index 674d6e2fd01..aed7f0685fd 100644 --- a/dev/build/makepack-howto.txt +++ b/dev/build/makepack-howto.txt @@ -15,11 +15,11 @@ Prerequisites to build autoexe DoliWamp package from Linux (solution seems broke For example by running isetup-5.5.8.exe (https://www.jrsoftware.org) https://files.jrsoftware.org/is/5/ > Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB For example by running wampserver3.2.6_x64.exe (https://www.wampserver.com). - See file build/exe/doliwamp.iss to know the doliwamp version currently setup. + See file dev/build/exe/doliwamp.iss to know the doliwamp version currently setup. > Add path to ISCC into PATH windows var: Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH > To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommended), - open file build/exe/doliwamp.iss and click on button "Compile". + open file dev/build/exe/doliwamp.iss and click on button "Compile". The .exe file will be build into directory build. diff --git a/dev/build/patch/buildpatch.sh b/dev/build/patch/buildpatch.sh index a2c5787e853..8f672c0b395 100755 --- a/dev/build/patch/buildpatch.sh +++ b/dev/build/patch/buildpatch.sh @@ -1,6 +1,6 @@ #!/bin/bash #---------------------------------------------------------------------------- -# \file build/patch/buildpatch.sh +# \file dev/build/patch/buildpatch.sh # \brief Create patch files # \author (c)2009-2011 Laurent Destailleur #---------------------------------------------------------------------------- diff --git a/dev/build/phpstan/README b/dev/build/phpstan/README index 7f207283b61..e5f743fa1ec 100644 --- a/dev/build/phpstan/README +++ b/dev/build/phpstan/README @@ -7,7 +7,7 @@ Config File is: ./phpstan.neon = Installation = -cd ./build/phpstan +cd ./dev/build/phpstan mkdir phpstan cd phpstan composer require --dev phpstan/phpstan @@ -17,8 +17,8 @@ composer require --dev phpstan/phpstan In dolibarr/ mv htdocs/custom /tmp/ -php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class -php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/ +php dev/build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a dev/build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class +php dev/build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a dev/build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/ mv /tmp/custom htdocs Build HTML report from Cron: diff --git a/dev/build/rpm/dolibarr_fedora.spec b/dev/build/rpm/dolibarr_fedora.spec index f17cf690160..77860e9d744 100644 --- a/dev/build/rpm/dolibarr_fedora.spec +++ b/dev/build/rpm/dolibarr_fedora.spec @@ -84,23 +84,23 @@ cui hai bisogno ed essere facile da usare. %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf -%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr -%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php +%{__install} -m 644 dev/build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php +%{__install} -m 644 dev/build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf +%{__install} -m 644 dev/build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr +%{__install} -m 644 dev/build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop -%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications dev/build/rpm/%{name}.desktop +%{__install} -m 644 dev/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts -%{__cp} -pr build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__cp} -pr build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__cp} -pr dev/build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__cp} -pr dev/build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__cp} -pr htdocs $RPM_BUILD_ROOT%{_datadir}/%{name} %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name} %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source @@ -146,13 +146,13 @@ done >>%{name}.lang %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/dev/build -%dir %_datadir/dolibarr/build/rpm -%_datadir/dolibarr/build/rpm/* +%dir %_datadir/dolibarr/dev/build/rpm +%_datadir/dolibarr/dev/build/rpm/* -%dir %_datadir/dolibarr/build/tgz -%_datadir/dolibarr/build/tgz/* +%dir %_datadir/dolibarr/dev/build/tgz +%_datadir/dolibarr/dev/build/tgz/* %dir %_datadir/dolibarr/htdocs %_datadir/dolibarr/htdocs/accountancy diff --git a/dev/build/rpm/dolibarr_generic.spec b/dev/build/rpm/dolibarr_generic.spec index b0ac7d65e80..2c3da4a4817 100644 --- a/dev/build/rpm/dolibarr_generic.spec +++ b/dev/build/rpm/dolibarr_generic.spec @@ -133,19 +133,19 @@ cui hai bisogno ed essere facile da usare. %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} %endif -%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf -%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr +%{__install} -m 644 dev/build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php +%{__install} -m 644 dev/build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf +%{__install} -m 644 dev/build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} -%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php +%{__install} -m 644 dev/build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php %else %if 0%{?mdkversion} -%{__install} -m 644 build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php +%{__install} -m 644 dev/build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php %else %if 0%{?suse_version} -%{__install} -m 644 build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php +%{__install} -m 644 dev/build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php %else -%{__install} -m 644 build/rpm/install.forced.php.generic $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php +%{__install} -m 644 dev/build/rpm/install.forced.php.generic $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php %endif %endif %endif @@ -153,18 +153,18 @@ cui hai bisogno ed essere facile da usare. %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +%{__install} -m 644 dev/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version} -#Commented as it fails with error: /usr/bin/install: cannot stat build/rpm/dolibarr.desktop: No such file or directory -#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop --vendor="" +#Commented as it fails with error: /usr/bin/install: cannot stat dev/build/rpm/dolibarr.desktop: No such file or directory +#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications dev/build/rpm/%{name}.desktop --vendor="" %endif -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts -%{__cp} -pr build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__cp} -pr build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__cp} -pr dev/build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__cp} -pr dev/build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__cp} -pr htdocs $RPM_BUILD_ROOT%{_datadir}/%{name} %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name} %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source @@ -227,13 +227,13 @@ done >>%{name}.lang %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/dev/build -%dir %_datadir/dolibarr/build/rpm -%_datadir/dolibarr/build/rpm/* +%dir %_datadir/dolibarr/dev/build/rpm +%_datadir/dolibarr/dev/build/rpm/* -%dir %_datadir/dolibarr/build/tgz -%_datadir/dolibarr/build/tgz/* +%dir %_datadir/dolibarr/dev/build/tgz +%_datadir/dolibarr/dev/build/tgz/* %dir %_datadir/dolibarr/htdocs %_datadir/dolibarr/htdocs/accountancy @@ -413,7 +413,7 @@ then superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') fi echo Mysql superuser found to use is $superuserlogin - %{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} /usr/share/dolibarr/dev/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig %{__chmod} -R 660 $installconfig fi %endif diff --git a/dev/build/rpm/dolibarr_mandriva.spec b/dev/build/rpm/dolibarr_mandriva.spec index e1d70e7de93..543a91bfff1 100644 --- a/dev/build/rpm/dolibarr_mandriva.spec +++ b/dev/build/rpm/dolibarr_mandriva.spec @@ -83,23 +83,23 @@ cui hai bisogno ed essere facile da usare. %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf -%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr -%{__install} -m 644 build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php +%{__install} -m 644 dev/build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php +%{__install} -m 644 dev/build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf +%{__install} -m 644 dev/build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr +%{__install} -m 644 dev/build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop -%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications dev/build/rpm/%{name}.desktop +%{__install} -m 644 dev/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts -%{__cp} -pr build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__cp} -pr build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__cp} -pr dev/build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__cp} -pr dev/build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__cp} -pr htdocs $RPM_BUILD_ROOT%{_datadir}/%{name} %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name} %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source @@ -144,13 +144,13 @@ done >>%{name}.lang %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/dev/build -%dir %_datadir/dolibarr/build/rpm -%_datadir/dolibarr/build/rpm/* +%dir %_datadir/dolibarr/dev/build/rpm +%_datadir/dolibarr/dev/build/rpm/* -%dir %_datadir/dolibarr/build/tgz -%_datadir/dolibarr/build/tgz/* +%dir %_datadir/dolibarr/dev/build/tgz +%_datadir/dolibarr/dev/build/tgz/* %dir %_datadir/dolibarr/htdocs %_datadir/dolibarr/htdocs/accountancy diff --git a/dev/build/rpm/dolibarr_opensuse.spec b/dev/build/rpm/dolibarr_opensuse.spec index 7a8e42664e5..9af35bca1d2 100644 --- a/dev/build/rpm/dolibarr_opensuse.spec +++ b/dev/build/rpm/dolibarr_opensuse.spec @@ -83,23 +83,23 @@ cui hai bisogno ed essere facile da usare. %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf -%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr -%{__install} -m 644 build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php +%{__install} -m 644 dev/build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php +%{__install} -m 644 dev/build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf +%{__install} -m 644 dev/build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr +%{__install} -m 644 dev/build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop -%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications dev/build/rpm/%{name}.desktop +%{__install} -m 644 dev/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts -%{__cp} -pr build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm -%{__cp} -pr build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz +%{__cp} -pr dev/build/rpm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/rpm +%{__cp} -pr dev/build/tgz/* $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz %{__cp} -pr htdocs $RPM_BUILD_ROOT%{_datadir}/%{name} %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name} %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source @@ -154,13 +154,13 @@ done >>%{name}.lang %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/dev/build -%dir %_datadir/dolibarr/build/rpm -%_datadir/dolibarr/build/rpm/* +%dir %_datadir/dolibarr/dev/build/rpm +%_datadir/dolibarr/dev/build/rpm/* -%dir %_datadir/dolibarr/build/tgz -%_datadir/dolibarr/build/tgz/* +%dir %_datadir/dolibarr/dev/build/tgz +%_datadir/dolibarr/dev/build/tgz/* %dir %_datadir/dolibarr/htdocs %_datadir/dolibarr/htdocs/accountancy diff --git a/dev/build/tgz/tar_exclude.txt b/dev/build/tgz/tar_exclude.txt index 4a69b4e87dc..c5173fe955d 100644 --- a/dev/build/tgz/tar_exclude.txt +++ b/dev/build/tgz/tar_exclude.txt @@ -4,8 +4,8 @@ .gitignore .scrutinizer.yml Thumbs.db -build/exe -build/html +dev/build/exe +dev/build/html dev/examples/zapier dev/initdemo dev/initdata diff --git a/dev/build/zip/zip_exclude.txt b/dev/build/zip/zip_exclude.txt index 88bd22826ff..11a17d808d8 100644 --- a/dev/build/zip/zip_exclude.txt +++ b/dev/build/zip/zip_exclude.txt @@ -1,8 +1,8 @@ *~ *.#* Thumbs.db -*/build/exe -*/build/html +*/dev/build/exe +*/dev/build/html */dev/dbmodel/* */dev/fpdf/* */dev/initdemo/* diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index 50b107f5fcc..25ccaa38c40 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -7,7 +7,7 @@ - /build/(html|aps)/ + /dev/build/(html|aps)/ /dev/tools/test/namespacemig/ /dev/tools/phan/stubs/ diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php index 825257dadbe..2e7e1b2b39a 100755 --- a/dev/tools/apstats.php +++ b/dev/tools/apstats.php @@ -149,7 +149,7 @@ $phpstanversion = $output_arrtd[0]; $output_arrtd = array(); if ($dirphpstan != 'disabled') { - $commandcheck = ($dirphpstan ? $dirphpstan.'/' : '').'phpstan --level='.$PHPSTANLEVEL.' -v analyze -a build/phpstan/bootstrap.php --memory-limit 8G --error-format=github -c ~/preview.dolibarr.org/dolibarr/dev/tools/phpstan/phpstan_v1_apstats.neon'; + $commandcheck = ($dirphpstan ? $dirphpstan.'/' : '').'phpstan --level='.$PHPSTANLEVEL.' -v analyze -a dev/build/phpstan/bootstrap.php --memory-limit 8G --error-format=github -c ~/preview.dolibarr.org/dolibarr/dev/tools/phpstan/phpstan_v1_apstats.neon'; print 'Execute PHPStan to get the technical debt: '.$commandcheck."\n"; $resexectd = 0; exec($commandcheck, $output_arrtd, $resexectd); diff --git a/htdocs/core/doxygen.php b/htdocs/core/doxygen.php index 0d86ec3438f..b0f7f3a8af7 100644 --- a/htdocs/core/doxygen.php +++ b/htdocs/core/doxygen.php @@ -23,7 +23,7 @@ * \mainpage Dolibarr documentation of source code * * This is source documentation for Dolibarr ERP/CRM.
- * This documentation can be built or updated running the script build/doxygen/dolibarr-doxygen-build.pl or from Eclipse with Doxygen plugin.
+ * This documentation can be built or updated running the script dev/build/doxygen/dolibarr-doxygen-build.pl or from Eclipse with Doxygen plugin.
*
* Dolibarr official web site: www.dolibarr.org
*
diff --git a/phpstan.neon.dist b/phpstan.neon.dist index a21273cea08..075cc668cca 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,5 +1,5 @@ includes: - - build/phpstan/phpstan-baseline.neon + - dev/build/phpstan/phpstan-baseline.neon parameters: tmpDir: ./.github/tmp parallel: diff --git a/pyproject.toml b/pyproject.toml index a14e7614a89..419d1d6d5f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" # `codespell` can be run as a standalone program from the CLI # with the appropriate default options. -skip = "*/.*/*,*/langs/*,*/build/exe/*,**.log,*.pdf,*.PDF,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*dev/trans*/ignore_translation_keys.lst,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*dev/tools/phan/stubs/*,*/documents,phpstan.*" +skip = "*/.*/*,*/langs/*,*/dev/build/exe/*,**.log,*.pdf,*.PDF,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*dev/trans*/ignore_translation_keys.lst,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*dev/tools/phan/stubs/*,*/documents,phpstan.*" check-hidden = true quiet-level=2 diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index 7fa17448216..ff3afdbf7ec 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -36,7 +36,6 @@ ../../htdocs/core/modules/fichinter/modules_fichinter.php - ../../build/ ../../dev/ ../../doc/ ../../test/