mirror of https://github.com/vitalif/openscad
Fix library references and translation scripts on MacOS.
parent
d620c8f40b
commit
ee4b2ffef5
|
@ -12,6 +12,7 @@ include(glew.pri)
|
||||||
include(eigen.pri)
|
include(eigen.pri)
|
||||||
include(boost.pri)
|
include(boost.pri)
|
||||||
include(glib-2.0.pri)
|
include(glib-2.0.pri)
|
||||||
|
include(gettext.pri)
|
||||||
include(sparkle.pri)
|
include(sparkle.pri)
|
||||||
include(harfbuzz.pri)
|
include(harfbuzz.pri)
|
||||||
include(freetype.pri)
|
include(freetype.pri)
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
# Detect gettext, then use this priority list to determine
|
||||||
|
# which library to use:
|
||||||
|
#
|
||||||
|
# Priority
|
||||||
|
# 1. GETTEXT_INCLUDEPATH / GETTEXT_LIBPATH (qmake parameter, not checked it given on commandline)
|
||||||
|
# 2. OPENSCAD_LIBRARIES (environment variable)
|
||||||
|
# 3. system's standard include paths from pkg-config
|
||||||
|
|
||||||
|
gettext {
|
||||||
|
|
||||||
|
# read environment variables
|
||||||
|
OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
|
||||||
|
GETTEXT_DIR = $$(GETTEXTDIR)
|
||||||
|
|
||||||
|
macx: {
|
||||||
|
isEmpty(GETTEXT_INCLUDEPATH) {
|
||||||
|
!isEmpty(OPENSCAD_LIBRARIES_DIR) {
|
||||||
|
GETTEXT_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include
|
||||||
|
GETTEXT_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
|
||||||
|
}
|
||||||
|
}
|
||||||
|
GETTEXT_CXXFLAGS=-I$$GETTEXT_INCLUDEPATH
|
||||||
|
GETTEXT_LIBS=-L$$GETTEXT_LIBPATH -lintl -liconv
|
||||||
|
}
|
||||||
|
|
||||||
|
QMAKE_CXXFLAGS += $$GETTEXT_CXXFLAGS
|
||||||
|
LIBS += $$GETTEXT_LIBS
|
||||||
|
}
|
|
@ -182,6 +182,7 @@ CONFIG += glib-2.0
|
||||||
CONFIG += harfbuzz
|
CONFIG += harfbuzz
|
||||||
CONFIG += freetype
|
CONFIG += freetype
|
||||||
CONFIG += fontconfig
|
CONFIG += fontconfig
|
||||||
|
CONFIG += gettext
|
||||||
|
|
||||||
#Uncomment the following line to enable the QScintilla editor
|
#Uncomment the following line to enable the QScintilla editor
|
||||||
CONFIG += scintilla
|
CONFIG += scintilla
|
||||||
|
|
|
@ -15,21 +15,21 @@ updatepot()
|
||||||
OPTS=$OPTS' --default-domain=openscad'
|
OPTS=$OPTS' --default-domain=openscad'
|
||||||
OPTS=$OPTS' --keyword=_'
|
OPTS=$OPTS' --keyword=_'
|
||||||
OPTS=$OPTS' --files-from=./po/POTFILES.in'
|
OPTS=$OPTS' --files-from=./po/POTFILES.in'
|
||||||
cmd='xgettext '$OPTS' -o ./po/openscad.pot'
|
cmd="${GETTEXT_PATH}xgettext "$OPTS' -o ./po/openscad.pot'
|
||||||
echo $cmd
|
echo $cmd
|
||||||
$cmd
|
$cmd
|
||||||
if [ ! $? = 0 ]; then
|
if [ ! $? = 0 ]; then
|
||||||
echo error running xgettext
|
echo error running xgettext
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
sed -i s/"CHARSET"/"UTF-8"/g ./po/openscad.pot
|
sed -e s/"CHARSET"/"UTF-8"/g ./po/openscad.pot > ./po/openscad.pot.new && mv ./po/openscad.pot.new ./po/openscad.pot
|
||||||
}
|
}
|
||||||
|
|
||||||
updatepo()
|
updatepo()
|
||||||
{
|
{
|
||||||
for LANGCODE in `cat ./po/LINGUAS | grep -v "#"`; do
|
for LANGCODE in `cat ./po/LINGUAS | grep -v "#"`; do
|
||||||
OPTS='--update --backup=t'
|
OPTS='--update --backup=t'
|
||||||
cmd='msgmerge '$OPTS' ./po/'$LANGCODE'.po ./po/openscad.pot'
|
cmd="$GETTEXT_PATH"'msgmerge '$OPTS' ./po/'$LANGCODE'.po ./po/openscad.pot'
|
||||||
echo $cmd
|
echo $cmd
|
||||||
$cmd
|
$cmd
|
||||||
if [ ! $? = 0 ]; then
|
if [ ! $? = 0 ]; then
|
||||||
|
@ -44,7 +44,7 @@ updatemo()
|
||||||
for LANGCODE in `cat po/LINGUAS | grep -v "#"`; do
|
for LANGCODE in `cat po/LINGUAS | grep -v "#"`; do
|
||||||
mkdir -p ./po/$LANGCODE/LC_MESSAGES
|
mkdir -p ./po/$LANGCODE/LC_MESSAGES
|
||||||
OPTS='-c -v'
|
OPTS='-c -v'
|
||||||
cmd='msgfmt '$OPTS' -o ./po/'$LANGCODE'/LC_MESSAGES/openscad.mo ./po/'$LANGCODE'.po'
|
cmd="$GETTEXT_PATH"'msgfmt '$OPTS' -o ./po/'$LANGCODE'/LC_MESSAGES/openscad.mo ./po/'$LANGCODE'.po'
|
||||||
echo $cmd
|
echo $cmd
|
||||||
$cmd
|
$cmd
|
||||||
if [ ! $? = 0 ]; then
|
if [ ! $? = 0 ]; then
|
||||||
|
@ -54,6 +54,11 @@ updatemo()
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GETTEXT_PATH=""
|
||||||
|
if [ "x$OPENSCAD_LIBRARIES" != x ]; then
|
||||||
|
GETTEXT_PATH="$OPENSCAD_LIBRARIES/bin/"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "x$1" = xupdatemo ]; then
|
if [ "x$1" = xupdatemo ]; then
|
||||||
updatemo
|
updatemo
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue