r13789 mono - /trunk/netsurf/atari/scripts/mkpkg.sh
by netsurf＠semichrome.net
Author: mono
Date: Wed Apr 4 16:21:33 2012
New Revision: 13789
URL: http://source.netsurf-browser.org?rev=13789&view=rev
Log:
This version was used to build release package of netsurf 2.9
Modified:
trunk/netsurf/atari/scripts/mkpkg.sh
Modified: trunk/netsurf/atari/scripts/mkpkg.sh
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/scripts/mkpkg.sh?re...
==============================================================================
--- trunk/netsurf/atari/scripts/mkpkg.sh (original)
+++ trunk/netsurf/atari/scripts/mkpkg.sh Wed Apr 4 16:21:33 2012
@@ -28,8 +28,8 @@
#
# config variable, set default values
-src="/f/netsurf/netsurf/"
-dst=$src"atari/nspkg/"
+src="/usr/src/netsurf-2.9/release/netsurf/2.9/"
+dst="/tmp/nspkg/"
shortfs=0
inc_short_fonts=0
font_src="/usr/share/fonts/truetype/ttf-dejavu/"
@@ -97,9 +97,10 @@
mkdir $dst"res"
mkdir $dst"res/icons"
mkdir $dst"res/fonts"
-touch $dst"cookies"
+touch $dst"res/cookies"
cp $src"atari/doc" $dst -R
cp $src"ns.prg" $dst
+cp $src"ChangeLog" $dst
chmod +x $dst"ns.prg"
m68k-atari-mint-strip $dst"ns.prg"
m68k-atari-mint-stack -S 256k $dst"ns.prg"
@@ -163,7 +164,7 @@
font_size:130
font_min_size:120
-# 2.5 MB Cache as default:
+# 20 MB Cache as default:
memory_cache_size:2048512
# this actually hides advertisements, it still generates network traffic:
@@ -183,19 +184,23 @@
minimum_gif_delay:50
animate_images:1
+foreground_images:1
+background_images:1
+
+
# path configuration
ca_bundle:./res/cabundle
ca_path:./res/certs
cookie_file:./res/cookies
url_file:./res/url.db
tree_icons_path:./res/icons
-downloads_directory:./download
-hotlist_path:./res/hotlist
+downloads_path:./download
+hotlist_file:./res/hotlist
# enable reflow for interactive content and during fetch:
incremental_reflow:1
# reformat time during fetch:
-min_reflow_period:500
+min_reflow_period:2500
core_select_menu:1
max_fetchers:3
max_fetchers_per_host:2
@@ -215,6 +220,8 @@
# enable loosening for printed content:
#enable_loosening:1
# configure disc cache ( currently not implemented )
+#option_disc_cache_age:28
+#configure urldb (url search):
#expire_url:28
#hover_urls:1
" > $dst"Choices"
10 years, 12 months
r13788 mono - /trunk/netsurf/atari/scripts/make.sh
by netsurf＠semichrome.net
Author: mono
Date: Wed Apr 4 16:16:40 2012
New Revision: 13788
URL: http://source.netsurf-browser.org?rev=13788&view=rev
Log:
Added script to invoke make process for different architecture.
Added:
trunk/netsurf/atari/scripts/make.sh (with props)
Added: trunk/netsurf/atari/scripts/make.sh
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/scripts/make.sh?rev...
==============================================================================
--- trunk/netsurf/atari/scripts/make.sh (added)
+++ trunk/netsurf/atari/scripts/make.sh Wed Apr 4 16:16:40 2012
@@ -1,0 +1,88 @@
+#!/bin/sh
+arch="68000"
+#arch="68020-60"
+#arch="5475"
+prefix="/usr/m68k-atari-mint/"
+libdir=$prefix"lib/"
+outfile="ns.prg"
+release="0"
+
+while [ "$1" != "" ] # When there are arguments...
+do # Process the next one
+ case $1 # Look at $1
+ in
+ -arch)
+ shift
+ arch=$1
+ shift
+ ;;
+
+ -prefix)
+ shift
+ prefix=$1
+ shift
+ ;;
+
+ -release)
+ release="1"
+ shift
+ ;;
+
+ *)
+ echo "Unknown commandline option"
+ exit;;
+ esac
+done
+
+libdir=$prefix"lib/"
+
+
+if [ "$arch" = "68000" ]
+then
+echo "Default m68000 build."
+else
+libdir="$libdir/m$arch/"
+fi
+
+if [ "$arch" = "68020-60" ]
+then
+outfile="ns020.prg"
+fi
+
+if [ "$arch" = "5475" ]
+then
+outfile="nscf.prg"
+fi
+
+
+echo "compiling: " $outfile
+echo
+
+
+
+pkgconfdir="$libdir"pkgconfig
+export PKG_CONFIG_PATH=$pkgconfdir
+export PKG_CONFIG_LIBDIR=$pkgconfdir
+
+#env
+
+echo "ibdir: $libdir"
+echo "pkgconfdir: $pkgconfdir"
+echo "arch: $arch"
+
+
+echo PKG_CONFIG_PATH="$pkgconfdir" PKG_CONFIG_LIBDIR="$pkgconfdir" AS="m68k-atari-mint-as" CC="m68k-atari-mint-gcc" LD="m68k-atari-mint-ld" AR="m68k-atari-mint-ar" RANLIB="m68k-atari-mint-ranlib" make TARGET="atari"
+PKG_CONFIG_PATH="$pkgconfdir" PKG_CONFIG_LIBDIR="$pkgconfdir" AS="m68k-atari-mint-as" CC="m68k-atari-mint-gcc" LD="m68k-atari-mint-ld" AR="m68k-atari-mint-ar" RANLIB="m68k-atari-mint-ranlib" make TARGET="atari"
+if [ "$arch" != "68000" ]
+then
+mv ns.prg $outfile
+fi
+
+
+if [ "$release" = "1" ]
+then
+echo Stripping $outfile ...
+m68k-atari-mint-strip $outfile
+fi
+
+
Propchange: trunk/netsurf/atari/scripts/make.sh
------------------------------------------------------------------------------
svn:executable = *
10 years, 12 months
r13787 mono - /trunk/netsurf/atari/scripts/makelibs.sh
by netsurf＠semichrome.net
Author: mono
Date: Wed Apr 4 16:12:58 2012
New Revision: 13787
URL: http://source.netsurf-browser.org?rev=13787&view=rev
Log:
Added script to compile all the libraries needed (build optimized for netsurf).
Added:
trunk/netsurf/atari/scripts/makelibs.sh (with props)
Added: trunk/netsurf/atari/scripts/makelibs.sh
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/scripts/makelibs.sh...
==============================================================================
--- trunk/netsurf/atari/scripts/makelibs.sh (added)
+++ trunk/netsurf/atari/scripts/makelibs.sh Wed Apr 4 16:12:58 2012
@@ -1,0 +1,625 @@
+#!/bin/sh
+
+#todo: cflib, libcurl -> ensure ssl support, force ssl support
+
+#example usage:
+#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68000 -cross -nsonly -clean -src ./
+#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68020 -cross -arch 68020 -nsonly -clean -src ./
+#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m68020-60 -cross -arch 68020-60 -nsonly -clean -src ./
+#./makelibs.sh -prefix /usr -dest /media/EXT3_DATA/nslibs/m5475 -cross -arch 5475 -clean
+
+# option description:
+#
+#-buildroot - this option tells the script where it is located, only needen when the script isn|t located in cwd.
+#-arch - specifiy architecture type (format: 68000, 68020, 5475 etc...)
+#-src - tell the tool where the sources for the ns libs are located
+#-prefix - what prefix to use ( -prefix local )
+#-dest - where to install result files, this should NOT point to /usr or something like that!!! Its a temporary folder.
+#-optflags
+#-with-nsfb - compile with libnsfb
+#-cross - set up some cross-compiler vars
+#-clean - clean source dirs before building
+#-nsonly - only build netsurf libs
+#-dry - only set environment variables, echo them and then exit the script
+#-release - compile from release svn tree
+
+buildroot=`pwd`"/"
+libopensslpkg="openssl-0.9.8r"
+libpngpkg="libpng-1.5.10"
+libzlibpkg="zlib-1.2.5"
+libldgpkg="ldg-dev-2.33"
+libiconvpkg="libiconv-1.13.1"
+libcurlpkg="curl-7.25.0"
+libfreetypepkg="freetype-2.4.9"
+libhermespkg="Hermes-1.3.3"
+libjpegpkg="jpeg-8b"
+libxmlpkg="libxml2-2.7.8"
+libparserutils_version=0.1.1
+libwapcaplet_version=0.1.1
+hubbub_version=0.1.2
+libnsgif_version=0.0.3
+libnsbmp_version=0.0.3
+libnsfb_version=0.0.2
+libcss_version=0.1.2
+arch="68000"
+archdir=""
+debugmode="1"
+profileflags=""
+optflags="-O2"
+withnsfb="1"
+prefix="/usr"
+userfs=$buildroot"userfs"
+patchdir=$buildroot"patches/"
+builddir=$buildroot"build/"
+rpmdir=$buildroot"packages/"
+nssrctree=$buildroot
+compiler="gcc"
+cross="0"
+cleanup="echo no cleaning"
+ssltarget="m68k-mint"
+dry="0"
+nsonly="0"
+release="0"
+
+if [ "$CC" != "" ]
+then
+ compiler=$CC
+fi
+
+while [ "$1" != "" ] # When there are arguments...
+do # Process the next one
+ case $1 # Look at $1
+ in
+ -dummy)
+ dummy="1"
+ shift
+ ;;
+
+ -p)
+ profileflags="-pg"
+ shift
+ ;;
+
+ -buildroot)
+ shift
+ buildroot=$1
+ userfs=$buildroot"userfs"
+ patchdir=$buildroot"patches/"
+ builddir=$buildroot"build/"
+ rpmdir=$buildroot"packages/"
+ nssrctree=$buildroot"src/"
+ shift
+ ;;
+
+ -arch)
+ shift
+ arch=$1
+ shift
+ ;;
+
+ -src)
+ shift
+ nssrctree=$1
+ shift
+ ;;
+
+ -prefix)
+ shift
+ prefix=$1
+ shift
+ ;;
+
+ -release)
+ release="1"
+ shift
+ ;;
+
+ -dest)
+ shift
+ userfs=$1
+ shift
+ ;;
+
+ -optflags)
+ shift
+ optflags=$1
+ shift
+ ;;
+
+ -with-nsfb)
+ withnsfb="1"
+ shift
+ ;;
+
+ -cross )
+ cross="1"
+ shift
+ ;;
+
+ -nsonly )
+ nsonly="1"
+ shift
+ ;;
+
+ -clean )
+ cleanup="make clean && make distclean"
+ shift
+ ;;
+
+ -dry )
+ dry="1"
+ shift
+ ;;
+
+ *) echo "Option [$1] not one of [-buildroot,-arch,-src,-prefix,-dest,-optflags,-with-nsfb]";
+ exit;;
+ esac
+done
+
+
+if [ -d "$buildroot" ]
+then
+ echo "Buildroot: $buildroot"
+else
+ echo "Invalid buildroot directory ("$buildroot") !"
+ echo "This script must know where it is located!"
+ echo "Either use buildroot option or start from directory where the script is located."
+ exit 0
+fi
+
+if [ "$release" = "0" ]
+then
+libparserutils_version=""
+libwapcaplet_version=""
+hubbub_version=""
+libnsgif_version=""
+libnsbmp_version=""
+libnsfb_version=""
+libcss_version=""
+fi
+
+if [ "$nssrctree" = "./" ]
+then
+ nssrctree=`pwd`
+fi
+
+
+
+#testarch:
+archok=0
+if [ "$arch" = "68000" ]
+then
+ archok=1
+fi
+if [ "$arch" = "68020" ]
+then
+ archok=1
+fi
+if [ "$arch" = "68020-60" ]
+then
+ archok=1
+ openssltarget="m680x0-mint"
+fi
+if [ "$arch" = "5475" ]
+then
+ archok=1
+ openssltarget="cf-mint"
+fi
+
+if [ "$archok" = "0" ]
+then
+ echo "Invalid arch:"$arch" valid: 68000,68020,68020-69,5475"
+ exit 0
+fi
+
+if [ "$cross" = "1" ]
+then
+ echo "enabling cross compiler mode"
+ export CC="m68k-atari-mint-gcc"
+ export LD="m68k-atari-mint-ld"
+ export AR="m68k-atari-mint-ar"
+ export RANLIB="m68k-atari-mint-ranlib"
+ export CPP="m68k-atari-mint-cpp"
+ compiler="m68k-atari-mint-gcc"
+fi
+
+
+# handle arch specific settings here.
+
+if [ "$arch" = "68000" ]
+then
+ archlibdir=$userfs$prefix"/lib"
+ archdir=""
+else
+ archlibdir=$userfs$prefix"/lib/m"$arch
+ archdir="m"$arch
+fi
+
+if [ "$arch" = "5475" ]
+then
+ machineflag="cpu="$arch
+else
+ machineflag=$arch
+fi
+
+
+echo "machine: " $machineflag
+incdir="-I$userfs$prefix/include"
+CFLAGS_ORG="-m$machineflag $optflags $profileflags $incdir"
+LDLAGS_ORG="-m$machineflag $profileflags"
+CFLAGS="$CFLAGS_ORG"
+LDFLAGS="$LDFLAGS_ORG"
+export CFLAGS_ORG
+export LDLAGS_ORG
+export CFLAGS
+export LDFLAGS
+
+echo "Build root: "$buildroot
+echo "Netsurf sources: "$nssrctree
+echo "Build directory: "$builddir
+echo "Patches: "$patchdir
+echo "Libdir: "$archlibdir
+echo "Dest: "$userfs
+echo "Prefix: "$prefix
+echo "Compiler: "$compiler
+echo "CFLAGS: "$CFLAGS
+echo "PKG_CONFIG_PATH=$archlibdir/pkgconfig"
+echo "PKG_CONFIG_LIBDIR=$archlibdir/pkgconfig"
+echo "PKG_CONFIG_SYSROOT_DIR=$userfs"
+echo "Dry: " $dry
+
+
+#echo "Installing RPMs:"
+#rpm -i $rpmdir""$opensslpkg
+
+#cd $buildroot
+#exit 0
+
+
+# configure flags for curl, this actually saves 30kb in the lib and about 100k in the final executable
+#./configure --disable-debug --enable-optimize --disable-ldap --disable-ldaps --disable-rtsp --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-manual -- disable-sspi --target="m"$arch
+
+# freetype configured for winfnt, truetype, raster (not smooth)
+# saves around 160kb in the lib.
+
+if [ "$dry" = "1" ]
+then
+echo "export CFLAGS=$CFLAGS"
+echo "export PKG_CONFIG_PATH=$archlibdir/pkgconfig"
+echo "export PKG_CONFIG_LIBDIR=$archlibdir/pkgconfig"
+echo "export PKG_CONFIG_SYSROOT_DIR=$userfs"
+exit 0
+fi
+
+echo "creating staging directory"
+mkdir "$userfs"
+mkdir "$userfs$prefix"
+mkdir "$userfs$prefix/include"
+mkdir "$archlibdir"
+mkdir "$archlibdir/pkgconfig"
+
+
+export PKG_CONFIG_PATH="$archlibdir/pkgconfig"
+export PKG_CONFIG_LIBDIR="$archlibdir/pkgconfig"
+export PKG_CONFIG_SYSROOT_DIR="$userfs"
+
+echo "Building Libraries..."
+cd $nssrctree
+
+#start test
+if [ "$nsonly" = "0" ]
+then
+
+echo "compiling Hermes..."
+cd $libhermespkg
+$cleanup
+./configure --disable-x86asm --disable-debug --host="m68k-atari-mint" --prefix="$userfs$prefix"
+make install
+cd ..
+
+echo "compiling iconv..."
+cd $libiconvpkg
+$cleanup
+./configure --enable-static \
+ --host="m68k-atari-mint"\
+ --prefix="$prefix"\
+ --exec-prefix="$prefix"\
+ --enable-extra-encodings\
+ lt_cv_sys_max_cmd_len=65536
+make install DESTDIR=$destdir PREFIX=$prefix
+cd ..
+
+
+cd $libzlibpkg
+$cleanup
+if [ "$cross" = "1" ]
+then
+ ./configure --prefix=$prefix --static
+else
+ ./configure --prefix=$prefix --static
+fi
+make
+# there is an error within make instal, copy headers manually.
+install -m644 zlib.h "$userfs$prefix/include/zlib.h"
+install -m644 zconf.h "$userfs$prefix/include/zconf.h"
+install -m644 zutil.h "$userfs$prefix/include/zutil.h"
+make install DESTDIR=$userfs PREFIX="$prefix"
+cd ..
+
+pwd
+cd $libfreetypepkg
+$cleanup
+if [ "$cross" = "1" ]
+then
+./configure --prefix="$prefix" \
+ --host="m68k-atari-mint" \
+ CFLAGS="$CFLAGS_ORG"
+make
+make install DESTDIR=$userfs
+else
+./configure --prefix="$userfs$prefix" --host="m68k-atari-mint" --target="m$arch" CFLAGS="$CFLAGS_ORG"
+make
+make install DESTDIR=$userfs
+fi
+
+cd ..
+
+cd $libxmlpkg
+$cleanup
+if [ "$cross" = "1" ]
+then
+./configure --prefix="$prefix" \
+ --host="m68k-atari-mint" \
+ --without-python \
+ --without-threads \
+ --enable-ipv6=no \
+ --without-debug \
+ --without-http \
+ --without-ftp \
+ --without-legacy \
+ --without-docbook \
+ --without-catalog \
+ --without-regexps \
+ --without-schemas \
+ --without-schematron \
+ --without-sax1 \
+ --without-xpath \
+ --without-modules \
+ --without-c14n \
+ --without-pattern \
+ --without-push \
+ --with-iconv="$archlibdir" \
+ --with-zlib="$archlibdir"
+make
+make install DESTDIR="$userfs"
+else
+echo "no cross"
+fi
+cd ..
+
+cd $libopensslpkg
+$cleanup
+if [ "$cross" = "1" ]
+then
+./Configure $openssltarget --prefix="$prefix" --install-prefix="$userfs"
+else
+./Configure $openssltarget --prefix="$prefix" --install-prefix="$userfs"
+fi
+make
+make rehash
+make install
+cd ..
+
+# FIXME: build c-ares here, if you want to
+
+cd $libcurlpkg
+$cleanup
+/configure\
+ --prefix="$prefix" \
+ --libdir=$prefix"/lib/$archdir"\
+ --host="m68k-atari-mint"\
+ --program-suffix=".ttp"\
+ --with-random="/dev/urandom"\
+ --enable-static\
+ --enable-optimize\
+ --enable-warnings\
+ --enable-http\
+ --enable-gopher\
+ --enable-nonblocking\
+ --enable-cookies\
+ --disable-libtool-lock\
+ --disable-verbose\
+ --disable-shared\
+ --disable-dependency-tracking\
+ --disable-manual\
+ --disable-curldebug\
+ --disable-debug\
+ --disable-ipv6\
+ --disable-largefile\
+ --disable-thread\
+ --disable-threaded-resolver\
+ --disable-telnet\
+ --disable-tftp\
+ --disable-dict\
+ --disable-pop3\
+ --disable-imap\
+ --disable-smtp\
+ --disable-ldaps\
+ --disable-ldap\
+ --disable-rtsp\
+ --disable-sspi\
+ --disable-rtsp\
+ --without-polarssl\
+ --without-cyassl\
+ --without-nss\
+ --without-libssh2\
+ --without-librtmp\
+ --without-libidn\
+ --without-gnutls
+# --with-ares="/usr/m68k-atari-mint/lib/"$archdir\
+# --enable-ares
+
+make CFLAGS="$CFLAGS_ORG"
+make install DESTDIR="$userfs"
+cd ..
+
+cd $libjpegpkg
+./configure --enable-static --prefix="$userfs$prefix" --host="m68k-atari-mint"
+make install
+cd ..
+
+cd $libpngpkg
+$cleanup
+if [ "$cross" = "1" ]
+then
+ ./configure --prefix=$prefix --host=m68k-atari-mint
+else
+ ./configure --prefix=$prefix
+fi
+
+make
+make install DESTDIR="$userfs"
+cd ..
+
+# we only need header files of ldg...
+#cd $libldgpkg
+#cp ./include/ldg.h "$userfs$prefix/include"
+#cd ..
+
+cd windom
+cd src
+rm ../lib/gcc/libwindom.a
+$cleanup
+export M68K_ATARI_MINT_CFLAGS="$CFLAGS"
+echo $M68K_ATARI_MINT_CFLAGS
+echo "dest:" $userfs$prefix
+if [ "$cross" = "1" ]
+then
+make cross
+cp ../lib/gcc/libwindom.a "$userfs$prefix/lib"
+cp ../include/* "$userfs$prefix/include/" -R
+else
+make -f gcc.mak
+cp ./lib/gcc/libwindom.a "$userfs$prefix/lib"
+cp ./include/* "$userfs$prefix/include/" -R
+fi
+cd ../..
+
+fi # END OF TEST
+
+# set TARGET, so that make clean and build use the same directory.
+export TARGET="freemint"
+
+echo "compiling libparserutils..."
+cd libparserutils/$libparserutils_version
+export CFLAGS="$CFLAGS_ORG -DWITH_ICONV_FILTER"
+$cleanup
+if [ "$cross" = "1" ]
+then
+ make TARGET="freemint"
+ make install DESTDIR="$userfs" PREFIX="$prefix" TARGET="freemint"
+else
+# make install DESTDIR="$userfs" PREFIX="$prefix"
+ make install DESTDIR="$archlibdir" PREFIX="$prefix"
+fi
+cd $nssrctree
+export CFLAGS="$CFLAGS_ORG"
+
+
+echo "compiling libwapcaplet..."
+cd libwapcaplet/$libwapcaplet_version || exit 1
+$cleanup
+if [ "$cross" = "1" ]
+then
+ make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
+ #make install DESTDIR="$userfs/$archdir" TARGET="freemint"
+ #PREFIX=$prefix TARGET="freemint"
+else
+ make install DESTDIR=$userfs PREFIX=$prefix
+ #make install DESTDIR="$archlibdir" PREFIX=$prefix
+fi
+cd $nssrctree
+
+cd libcss/$libcss_version
+$cleanup
+if [ "$cross" = "1" ]
+then
+ make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
+# make install DESTDIR="$archlibdir" TARGET="freemint"
+#PREFIX=$prefix TARGET="freemint"
+else
+ make install DESTDIR=$userfs PREFIX=$prefix
+# make install DESTDIR="$archlibdir" PREFIX=$prefix
+fi
+cd $nssrctree
+
+echo "compiling hubbub..."
+pwd
+cd hubbub/$hubbub_version || exit 1
+$cleanup
+if [ "$cross" = "1" ]
+then
+ make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
+else
+ make install DESTDIR=$userfs PREFIX=$prefix
+fi
+cd $nssrctree
+
+
+echo "compiling libnsgif..."
+cd libnsgif/$libnsgif_version || exit 1
+$cleanup
+if [ "$cross" = "1" ]
+then
+ make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
+else
+ make install DESTDIR=$userfs PREFIX=$prefix
+fi
+cd $nssrctree
+
+echo "compiling libnsbmp..."
+cd libnsbmp/$libnsbmp_version || exit 1
+$cleanup
+if [ "$cross" = "1" ]
+then
+ make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
+else
+ make install DESTDIR=$userfs PREFIX=$prefix
+fi
+cd $nssrctree
+
+
+if [ "$withnsfb" = "1" ]
+then
+ echo "compiling libnsfb..."
+ cd libnsfb/$libnsfb_version || exit 1
+ $cleanup
+ if [ "$cross" = "1" ]
+ then
+ make install DESTDIR=$userfs PREFIX=$prefix TARGET="freemint"
+ else
+ make install DESTDIR=$userfs PREFIX=$prefix
+ fi
+ cd $nssrctree
+else
+ echo "libnsfb skipped"
+fi
+
+
+if [ "$arch" = "68000" ]
+then
+ echo "No library relocation needed!"
+else
+ echo "Relocation Libraries to :"
+ echo $archlibdir
+ srclibdir=$userfs$prefix"/lib/"
+ srcpkgdir=$userfs$prefix"/lib/pkgconfig"
+ mkdir $archlibdir
+ rm $archlib/*.a
+ mv $srclibdir*.a $archlibdir/ -v
+ mv $srcpkgdir $archlibdir -v
+fi
+
+echo "please add symlink to libxml2/libxml within /usr/m68k-atari-mint/include"
+echo "please add symlink to freetype2/freetype within /usr/m68k-atari-mint/include"
+exit 0
Propchange: trunk/netsurf/atari/scripts/makelibs.sh
------------------------------------------------------------------------------
svn:executable = *
10 years, 12 months
r13786 chris_y - /trunk/netsurf/amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Mon Apr 2 13:05:09 2012
New Revision: 13786
URL: http://source.netsurf-browser.org?rev=13786&view=rev
Log:
Move status basr left one pixel
Modified:
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13786&r1=...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Mon Apr 2 13:05:09 2012
@@ -2976,7 +2976,7 @@
NULL,
"gaugeiclass",
IA_Top, 2 - (scrn->RastPort.TxHeight),
- IA_Left, -3,
+ IA_Left, -4,
IA_Height, 4 + scrn->RastPort.TxHeight,
IA_InBorder, TRUE,
IA_Label, NULL,
10 years, 12 months
r13785 jmb - in /trunk/libdom: include/dom/core/string.h src/core/string.c
by netsurf＠semichrome.net
Author: jmb
Date: Sun Apr 1 04:14:13 2012
New Revision: 13785
URL: http://source.netsurf-browser.org?rev=13785&view=rev
Log:
Force dom_string to have maximal alignment requirements.
Make it clear that dom_string_internal extends it
Modified:
trunk/libdom/include/dom/core/string.h
trunk/libdom/src/core/string.c
Modified: trunk/libdom/include/dom/core/string.h
URL: http://source.netsurf-browser.org/trunk/libdom/include/dom/core/string.h?...
==============================================================================
--- trunk/libdom/include/dom/core/string.h (original)
+++ trunk/libdom/include/dom/core/string.h Sun Apr 1 04:14:13 2012
@@ -15,10 +15,10 @@
#include <dom/functypes.h>
#include <dom/core/exceptions.h>
-
-typedef struct dom_string {
+typedef struct dom_string dom_string;
+struct dom_string {
uint32_t refcnt;
-} dom_string;
+} _ALIGNED;
/* Claim a reference on a DOM string */
Modified: trunk/libdom/src/core/string.c
URL: http://source.netsurf-browser.org/trunk/libdom/src/core/string.c?rev=1378...
==============================================================================
--- trunk/libdom/src/core/string.c (original)
+++ trunk/libdom/src/core/string.c Sun Apr 1 04:14:13 2012
@@ -32,8 +32,8 @@
* Strings are reference counted so destruction is performed correctly.
*/
typedef struct dom_string_internal {
- uint32_t refcnt;
-
+ dom_string base;
+
union {
struct {
uint8_t *ptr; /**< Pointer to string data */
@@ -49,7 +49,7 @@
* Empty string, for comparisons against NULL
*/
static const dom_string_internal empty_string = {
- 0,
+ { 0 },
{ { (uint8_t *) "", 0 } },
DOM_STRING_CDATA
};
@@ -58,7 +58,7 @@
{
dom_string_internal *istr = (dom_string_internal *)str;
if (str != NULL) {
- assert(str->refcnt == 0);
+ assert(istr->base.refcnt == 0);
switch (istr->type) {
case DOM_STRING_INTERNED:
if (istr->data.intern != NULL) {
@@ -113,7 +113,7 @@
ret->data.cdata.len = len;
- ret->refcnt = 1;
+ ret->base.refcnt = 1;
ret->type = DOM_STRING_CDATA;
@@ -156,7 +156,7 @@
return DOM_NO_MEM_ERR;
}
- ret->refcnt = 1;
+ ret->base.refcnt = 1;
ret->type = DOM_STRING_INTERNED;
@@ -578,7 +578,7 @@
concat->data.cdata.len = s1len + s2len;
- concat->refcnt = 1;
+ concat->base.refcnt = 1;
concat->type = DOM_STRING_CDATA;
@@ -720,7 +720,7 @@
res->data.cdata.len = tlen + slen;
- res->refcnt = 1;
+ res->base.refcnt = 1;
res->type = DOM_STRING_CDATA;
@@ -819,7 +819,7 @@
res->data.cdata.len = tlen + slen - (b2 - b1);
- res->refcnt = 1;
+ res->base.refcnt = 1;
res->type = DOM_STRING_CDATA;
11 years