Commit 90ecd8c4 authored by Benito van der Zander's avatar Benito van der Zander

meta

parent 7352d4a6
Some important changes: Some important changes:
--------Xidel 0.9.9 --------
(under development)
- Steps towards XQuery 3.1: ? operator, => operator, map:/array: functions, string constructor
- New functions:
x:request-decode to parse the parameters of a HTTP request
inner-text to get the visible text from a HTML page
matched-text for use in pattern matching (this replaces the text() function. stop using text() in patterns. text() is now deprecated and will be removed)
- --in-place option to override the input file with the output
- <json> element in multipage templates to download JSON data
--------Xidel 0.9.8 -------- --------Xidel 0.9.8 --------
(2018-04-02) (2018-04-02)
- Cookie handling follows RFC 6265 rather than sending all cookies to all servers. - Cookie handling follows RFC 6265 rather than sending all cookies to all servers.
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $DIR/../../../manageUtils.sh source $DIR/../../../manageUtils.sh
set -e
function getVersion(){ function getVersion(){
MINOR_VERSION=`grep -i minorVersion xidelbase.pas | head -1 | grep -oE [0-9]+` MINOR_VERSION=`grep -i minorVersion xidelbase.pas | head -1 | grep -oE [0-9]+`
MAJOR_VERSION=`grep -i majorVersion xidelbase.pas | head -1 | grep -oE [0-9]+` MAJOR_VERSION=`grep -i majorVersion xidelbase.pas | head -1 | grep -oE [0-9]+`
...@@ -26,7 +28,7 @@ sfProject videlibri ...@@ -26,7 +28,7 @@ sfProject videlibri
action=2 action=2
BASE=$HGROOT/programs/internet/xidel BASE=$HGROOT/programs/internet/xidel
exesuffix=
function pushhg(){ function pushhg(){
VIDELIBRIBASE=$HGROOT/programs/internet/VideLibri VIDELIBRIBASE=$HGROOT/programs/internet/VideLibri
...@@ -35,20 +37,34 @@ function pushhg(){ ...@@ -35,20 +37,34 @@ function pushhg(){
syncHg $VIDELIBRIBASE/_hg.filemap $HGROOT $PUBLICHG syncHg $VIDELIBRIBASE/_hg.filemap $HGROOT $PUBLICHG
} }
function compile(){ function lazcompile(){
getVersion getVersion
eval $1 xidel "$2" rm xidel$exesuffix || true
echo > xidelbuilddata.inc lazbuild "$@" xidel.lpi || lazbuild "$@" xidel.lpi || (echo "FAILED!"; exit)
echo > xidelbuilddata.inc
} }
function xidelCompileAndroidArm(){ function release(){
rm xidel if [ $action -lt 2 ]; then exit; fi
#fpc -Tandroid -Parm -MObjFPC -Scghi -CX -Crt -O3 -g -gl -XX -l -vewnhibq -Filib/arm-android -Fu../../../components/pascal/import/synapse -Fu../../../components/pascal/internet -Fu../../../components/pascal/data -Fu../../../components/pascal/system -Fu../../../components/pascal/import/regexpr/source -Fu../../../components/pascal/import/utf8tools -Fu../../../components/pascal/lib/arm-android -Fu~/opt/lazarus/packager/units/arm-android -Fu. -FUlib/arm-android -dUSE_SYNAPSE_WRAPPER -Cg xidel.pas packagesuffix=$1
#we cannot compile dependencies, as they default to Java based internet access instead Synapse case "$exesuffix" in
lazbuild -d --bm=androidarm xidel.lpi || (echo "FAILED!"; exit) .exe)
#arm-linux-androideabi-strip --strip-all xidel package=xidel-$VERSION.$packagesuffix.zip
zip -v $package xidel.exe changelog readme.txt
;;
*)
package=xidel-$VERSION.$packagesuffix.tar.gz
tar -vczf $package xidel readme.txt changelog install.sh
;;
esac
fileUpload $package "$UPLOAD_PATH"
} }
function release-deb(){
if [ $action -lt 2 ]; then exit; fi
fileUpload $(./meta/build.deb.sh | tail -n 1) "$UPLOAD_PATH"
}
case "$1" in case "$1" in
...@@ -60,50 +76,44 @@ web) ...@@ -60,50 +76,44 @@ web)
;; ;;
linux64) linux64)
compile lazCompileLinux64 lazcompile --os=linux --ws=nogui --cpu=x86_64
if [ $action -lt 2 ]; then exit; fi release linux64
tar -vczf xidel-$VERSION.linux64.tar.gz xidel readme.txt changelog install.sh release-deb
fileUpload xidel-$VERSION.linux64.tar.gz "$UPLOAD_PATH"
fileUpload $(./meta/build.deb.sh | tail -n 1) "$UPLOAD_PATH"
;; ;;
linux32) linux32)
compile lazCompileLinux32 xidel lazcompile --os=linux --ws=nogui --cpu=i386
if [ $action -lt 2 ]; then exit; fi release linux32
tar -vczf xidel-$VERSION.linux32.tar.gz xidel readme.txt changelog install.sh release-deb
fileUpload xidel-$VERSION.linux32.tar.gz "$UPLOAD_PATH"
fileUpload $(./meta/build.deb.sh | tail -n 1) "$UPLOAD_PATH"
;; ;;
linuxarm) linuxarm)
compile lazCompileLinuxArm xidel lazcompile --os=linux --ws=nogui --cpu=arm
if [ $action -lt 2 ]; then exit; fi release linuxarm
tar -vczf xidel-$VERSION.linuxarm.tar.gz xidel readme.txt changelog install.sh
fileUpload xidel-$VERSION.linuxarm.tar.gz "$UPLOAD_PATH"
#fileUpload $(./meta/build.deb.sh | tail -n 1) "$UPLOAD_PATH"
;; ;;
win32) win32)
compile lazCompileWin32 --build-mode=win32 exesuffix=.exe
if [ $action -lt 2 ]; then exit; fi lazcompile --os=win32 --ws=win32 --cpu=i386 --build-mode=win32
zip -v xidel-$VERSION.win32.zip xidel.exe changelog readme.txt release win32
fileUpload xidel-$VERSION.win32.zip "$UPLOAD_PATH"
;; ;;
win32synapse|win32openssl) win32synapse|win32openssl)
compile lazCompileWin32 --build-mode=win32synapse exesuffix=.exe
if [ $action -lt 2 ]; then exit; fi lazcompile --os=win32 --ws=win32 --cpu=i386 --build-mode=win32synapse
zip -v xidel-$VERSION-openssl.win32.zip xidel.exe changelog readme.txt release openssl.win32
fileUpload xidel-$VERSION-openssl.win32.zip "$UPLOAD_PATH"
;; ;;
androidarm) androidarm)
compile xidelCompileAndroidArm lazcompile -d --bm=androidarm
if [ $action -lt 2 ]; then exit; fi release androidarm
tar -vczf xidel-$VERSION.androidarm.tar.gz xidel readme.txt changelog install.sh
fileUpload xidel-$VERSION.androidarm.tar.gz "$UPLOAD_PATH"
#fileUpload $(./meta/build.deb.sh | tail -n 1) "$UPLOAD_PATH"
;; ;;
androidarm64)
lazcompile -d --bm=androidarm --cpu=aarch64
release androidarm64
;;
cgi) lazCompileLinux64 xidelcgi cgi) lazCompileLinux64 xidelcgi
webUpload xidelcgi /../cgi-bin webUpload xidelcgi /../cgi-bin
;; ;;
...@@ -114,10 +124,11 @@ release) ...@@ -114,10 +124,11 @@ release)
./manage.sh src ./manage.sh src
./manage.sh linux32 ./manage.sh linux32
./manage.sh linux64 ./manage.sh linux64
./manage.sh linuxarm
./manage.sh win32 ./manage.sh win32
./manage.sh win32synapse ./manage.sh win32synapse
#./manage.sh linuxarm
./manage.sh androidarm ./manage.sh androidarm
./manage.sh androidarm64
./manage.sh mirror ./manage.sh mirror
mv oldxidel xidel mv oldxidel xidel
;; ;;
......
...@@ -41,7 +41,7 @@ var cgimode: boolean = false; ...@@ -41,7 +41,7 @@ var cgimode: boolean = false;
majorVersion: integer = 0; majorVersion: integer = 0;
minorVersion: integer = 9; minorVersion: integer = 9;
buildVersion: integer = 8; buildVersion: integer = 9;
type EXidelException = class(Exception); type EXidelException = class(Exception);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment