summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBrody Kenrick <user.fake@server.userfake>2013-12-05 06:56:54 (GMT)
committerMarius Kintel <marius@kintel.net>2013-12-08 23:35:35 (GMT)
commit3abf64249fd667f0b7f558ecfbbf35cfe9916a5d (patch)
treea5e3aa4699cf5b9d27693f8ab5411acdacc2fdb0 /scripts
parent7075d8d9c4dde62798022bdfe02c5d57e997ba43 (diff)
Unicode support for strings
Add suport for using unicode strings in .scad files. Support iterating across them/accessing them via [] and searching. -------- Add GLIB (to build for test and normal build -- both with installed and built locally development files). Add support for unicode chars to length and search builtin functions and [] for strings. Added unicode testing functions. Ad GLIB to library info page.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/check-dependencies.sh17
-rwxr-xr-xscripts/uni-build-dependencies.sh1
-rwxr-xr-xscripts/uni-get-dependencies.sh15
3 files changed, 25 insertions, 8 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
index b63c677..e587198 100755
--- a/scripts/check-dependencies.sh
+++ b/scripts/check-dependencies.sh
@@ -66,6 +66,21 @@ cgal_sysver()
cgal_sysver_result=`grep "define *CGAL_VERSION *[0-9.]*" $cgalpath | awk '{print $3}'`
}
+glib2_sysver()
+{
+ #Get architecture triplet - e.g. x86_64-linux-gnu
+ glib2archtriplet=`gcc -dumpmachine 2>/dev/null`
+ if [ -z "$VAR" ]; then
+ glib2archtriplet=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`
+ fi
+ glib2path=$1/lib/$glib2archtriplet/glib-2.0/include/glibconfig.h
+ if [ ! -e $glib2path ]; then return; fi
+ glib2major=`grep "define *GLIB_MAJOR_VERSION *[0-9.]*" $glib2path | awk '{print $3}'`
+ glib2minor=`grep "define *GLIB_MINOR_VERSION *[0-9.]*" $glib2path | awk '{print $3}'`
+ glib2micro=`grep "define *GLIB_MICRO_VERSION *[0-9.]*" $glib2path | awk '{print $3}'`
+ glib2_sysver_result="${glib2major}.${glib2minor}.${glib2micro}"
+}
+
boost_sysver()
{
boostpath=$1/include/boost/version.hpp
@@ -530,7 +545,7 @@ checkargs()
main()
{
- deps="qt4 cgal gmp mpfr boost opencsg glew eigen gcc bison flex make"
+ deps="qt4 cgal gmp mpfr boost opencsg glew eigen glib2 gcc bison flex make"
#deps="$deps curl git" # not technically necessary for build
#deps="$deps python cmake imagemagick" # only needed for tests
#deps="cgal"
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index e652c47..8d912c3 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -603,5 +603,6 @@ build_boost 1.53.0
build_cgal 4.0.2
build_glew 1.9.0
build_opencsg 1.3.2
+build_glib2 2.38.2
echo "OpenSCAD dependencies built and installed to " $BASEDIR
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh
index a0306ef..d2408c0 100755
--- a/scripts/uni-get-dependencies.sh
+++ b/scripts/uni-get-dependencies.sh
@@ -8,7 +8,7 @@ get_fedora_deps()
{
sudo yum install qt-devel bison flex eigen3-devel python-paramiko \
boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc gcc-c++ pkgconfig \
- opencsg-devel git libXmu-devel curl imagemagick ImageMagick make \
+ opencsg-devel git libXmu-devel curl imagemagick ImageMagick glib2-devel make \
xorg-x11-server-Xvfb
}
@@ -21,7 +21,7 @@ get_altlinux_deps()
{
for i in boost-devel boost-filesystem-devel gcc4.5 gcc4.5-c++ boost-program_options-devel \
boost-thread-devel boost-system-devel boost-regex-devel eigen3 libmpfr libgmp libgmp_cxx-devel qt4-devel libcgal-devel git-core \
- libglew-devel flex bison curl imagemagick; do sudo apt-get install $i; done
+ libglew-devel flex bison curl imagemagick glib2-devel; do sudo apt-get install $i; done
}
get_freebsd_deps()
@@ -29,20 +29,21 @@ get_freebsd_deps()
pkg_add -r bison boost-libs cmake git bash eigen3 flex gmake gmp mpfr \
xorg libGLU libXmu libXi xorg-vfbserver glew \
qt4-corelib qt4-gui qt4-moc qt4-opengl qt4-qmake qt4-rcc qt4-uic \
- opencsg cgal curl imagemagick
+ opencsg cgal curl imagemagick glib2-devel
}
get_netbsd_deps()
{
sudo pkgin install bison boost cmake git bash eigen flex gmake gmp mpfr \
qt4 glew cgal opencsg modular-xorg python27 py27-paramiko curl \
- imagemagick ImageMagick
+ imagemagick ImageMagick glib2-devel
}
get_opensuse_deps()
{
sudo zypper install libeigen3-devel mpfr-devel gmp-devel boost-devel \
- libqt4-devel glew-devel cmake git bison flex cgal-devel opencsg-devel curl
+ libqt4-devel glew-devel cmake git bison flex cgal-devel opencsg-devel curl \
+ glib2-devel
}
get_mageia_deps()
@@ -50,7 +51,7 @@ get_mageia_deps()
sudo urpmi ctags
sudo urpmi task-c-devel task-c++-devel libqt4-devel libgmp-devel \
libmpfr-devel libboost-devel eigen3-devel libglew-devel bison flex \
- cmake imagemagick python curl git x11-server-xvfb
+ cmake imagemagick glib2-devel python curl git x11-server-xvfb
}
get_debian_deps()
@@ -59,7 +60,7 @@ get_debian_deps()
libxmu-dev cmake bison flex git-core libboost-all-dev \
libXi-dev libmpfr-dev libboost-dev libglew-dev \
libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev \
- python-paramiko curl imagemagick; do
+ python-paramiko curl imagemagick libglib2.0-dev; do
sudo apt-get -y install $pkg;
done
}
contact: Jan Huwald // Impressum