diff --git a/.gitignore b/.gitignore index 1c6d5dc..75f8080 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ *.tar.xz !/*.patch !/*.sh +/t diff --git a/build.profile b/build.profile index a5aa5ac..9cb4bb6 100644 --- a/build.profile +++ b/build.profile @@ -1,6 +1,6 @@ -BUILD_TAG=2.14.6 +BUILD_TAG=2.15.3 -BUILD_paperless=paperless-ngx-2.14.6 +BUILD_paperless=paperless-ngx-2.15.3 BUILD_DIR=build BUILD_SRC="${PWD}" @@ -16,22 +16,23 @@ TMPDIR=${TMPDIR:-/tmp/${USER}/${BUILD_TAG}} LOGDIR=${PROJECT}/log # https://sqlite.org -# wget "https://sqlite.org/2025/sqlite-autoconf-3480000.tar.gz" -BUILD_sqlite=sqlite-3.48.0 -BUILD_sqlite_SRCURL="https://beehive.molgen.mpg.de/ab4e0652b6dedb075faf7a2781ba2c20/sqlite-autoconf-3480000.tar.gz" +# wget "https://sqlite.org/2025/sqlite-autoconf-3490200.tar.gz" +BUILD_sqlite=sqlite-3.49.2 +BUILD_sqlite_SRCURL="https://beehive.molgen.mpg.de/46ef8fec4c97ec77ab27659ad27b28b0/sqlite-autoconf-3490200.tar.gz" # https://download.redis.io/releases # community edition ! # wget https://download.redis.io/releases/redis-7.4.1.tar.gz BUILD_redis=redis-7.4.1 BUILD_redis_SRCURL="https://beehive.molgen.mpg.de/360809807c15da120affb356e55c6388/${BUILD_redis}.tar.gz" -# wget "https://www.python.org/ftp/python/3.12.8/Python-3.12.8.tgz" -BUILD_python=Python-3.12.8 -BUILD_python_SRCURL="https://beehive.molgen.mpg.de/304473cf367fa65e450edf4b06b55fcc/${BUILD_python}.tgz" -# wget "https://nodejs.org/download/release/v22.13.1/node-v22.13.1.tar.gz" -BUILD_node=node-22.13.1 -BUILD_node_SRCURL="https://beehive.molgen.mpg.de/cbb3aa553b3c0ee4069902fd477aa19a/${BUILD_node/-/-v}.tar.gz" +# wget "https://www.python.org/ftp/python/3.12.9/Python-3.12.9.tgz" +BUILD_python=Python-3.12.9 +BUILD_python_SRCURL="https://beehive.molgen.mpg.de/ce613c72fa9b32fb4f109762d61b249b/${BUILD_python}.tgz" + +# wget "https://nodejs.org/download/release/v22.15.1/node-v22.15.1.tar.gz" +BUILD_node=node-22.15.1 +BUILD_node_SRCURL="https://beehive.molgen.mpg.de/6ee1e546973a07d9a80767c009399d23/${BUILD_node/-/-v}.tar.gz" # SRCURL="https://ffmpeg.org//releases/${BUILD_ffmpeg}.tar.gz" BUILD_ffmpeg=ffmpeg-7.1 @@ -66,7 +67,7 @@ BUILD_libwebp=libwebp-1.5.0 BUILD_libwebp_SRCURL[0]="https://beehive.molgen.mpg.de/8f659e426eaa2aeec4b36bc9ea43b3f3/${BUILD_libwebp}.tar.gz" # gits -BUILD_imagemagick=imagemagick-7.1.1-43 +BUILD_imagemagick=imagemagick-7.1.1-47 BUILD_imagemagick_SRCURL="https://github.com/ImageMagick/ImageMagick.git" BUILD_pngquant=pngquant-3.0.3-7-gf513d98 diff --git a/paperless-ngx.build.sh b/paperless-ngx.build.sh index c2f7d38..0b9c6a1 100755 --- a/paperless-ngx.build.sh +++ b/paperless-ngx.build.sh @@ -65,21 +65,29 @@ pushd $PREFIX . ${PROJECT}/profile -pipenv requirements > requirements.txt +pip install uv -pip install -r requirements.txt +pipenv install + +# pipenv requirements > requirements.txt +# pip install -r requirements.txt pushd src-ui -npm update npm -g --no-fund -ulimit -n 512 - -set +e -while true; do - npm ci --no-fund - r=$? - [ $r != 232 ] && [ $r != 146 ] && break -done -set -e +npm update -g pnpm +npm install -g corepack@latest +corepack enable +pnpm install + +#npm update npm -g --no-fund +#ulimit -n 512 + +#set +e +#while true; do +# npm ci --no-fund +# r=$? +# [ $r != 232 ] && [ $r != 146 ] && break +#done +#set -e ./node_modules/.bin/ng build --configuration production @@ -87,6 +95,10 @@ popd pushd src +echo "Installing Python requirements" +uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt +uv pip install --system --no-python-downloads --python-preference system --requirements requirements.txt + ./manage.py collectstatic --clear --no-input --link ./manage.py compilemessages diff --git a/sqlite.build.sh b/sqlite.build.sh index e8b351c..d66994f 100755 --- a/sqlite.build.sh +++ b/sqlite.build.sh @@ -20,7 +20,7 @@ mkdir -p ${PREFIX} cat >${PREFIX}/profile <<-EOF PATH=${PREFIX}/bin:\${PATH} -PKG_CONFIG_PATH=${PROJECT}/${BUILD_PKG}/lib/pkgconfig\${PKG_CONFIG_PATH:+:}\${PKG_CONFIG_PATH:-} +PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig\${PKG_CONFIG_PATH:+:}\${PKG_CONFIG_PATH:-} EOF test -e ${BUILD_PKG}${BUILD_EXT} || wget -nv ${SRCURL} -O ${BUILD_PKG}${BUILD_EXT} @@ -29,11 +29,7 @@ test -d ${BUILD_PKG} || mkdir -pv ${BUILD_PKG} && tar -xf ${BUILD_PKG}${BUILD_EX pushd ${BUILD_PKG} local _conf=( - --prefix ${PREFIX} -# --enable-shared - --enable-threadsafe - --enable-readline - --enable-dynamic-extensions + --prefix=${PREFIX} CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1 \ -DSQLITE_ENABLE_COLUMN_METADATA=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \ @@ -43,7 +39,7 @@ local _conf=( ./configure "${_conf[@]}" -make -j $NPROC +make -j ${NPROC} make install popd