summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure2
-rw-r--r--core/opie-login/opie-login.pro17
-rw-r--r--noncore/settings/backup/backup.pro18
-rw-r--r--noncore/settings/sshkeys/sshkeys.pro17
-rw-r--r--noncore/settings/usermanager/usermanager.pro18
5 files changed, 71 insertions, 1 deletions
diff --git a/configure b/configure
index 0445aa4..b7cb702 100755
--- a/configure
+++ b/configure
@@ -95,210 +95,210 @@ then
if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ]
then
TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG
PLATFORM=linux-$PLATFORM-g++
else
echo
echo ' The specified platform/compiler not supported: ' $TARGET
echo
exit 2
fi
fi
# Next, emit a usage message if something failed.
if [ "$HELP" = "yes" ]; then
cat <<EOF
Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...]
The defaults (*) are usually acceptable. Here is a short explanation of
each option:
* -release ........... Compile and link Qt with debugging turned off.
-debug ............. Compile and link Qt with debugging turned on.
* -shared ............ Create and use a shared Qt library (libqt.so)
-static ............ Create and use a static Qt library (libqt.a)
-qt3 ............... Configure for use with Qt 3.x
-platform target ... The platform you are building on ($PLATFORM)
EOF
exit 0;
fi
CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"`
if [ -f library/custom-$CUSTOM.h ]
then
rm -f library/custom.h
ln -s custom-$CUSTOM.h library/custom.h
fi
mkdir -p include/qpe
( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
mkdir -p include/qtopia
( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; )
mkdir -p include/qtopia/private
( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; )
mkdir -p include/opie
( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
( cd include/opie && ln -s ../../libsql/*.h .; )
( cd include/opie && ln -s ../../libopie/pim/*.h .; )
( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
ln -sf ../../libopie/$generatedHeader $generatedHeader; done )
echo Creating makefiles...
# Set version for library directly
# Version 1.5.0 right now for compat.
sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v
mv library/library.pro-v library/library.pro
if [ "$QT3" = yes ]
then
VCONFIG="CONFIG+=qt3"
else
VCONFIG="CONFIG+=qt2"
fi
if [ -f $TMAKEPATH/tmake.conf ]
then
# You have tmake. We'll regenerate the file for you...
echo "Makefiles will be regenerated."
fi
H=`pwd`
if [ -z "$TOMAKE" ]
then
TOMAKE=`make showcomponents`
fi
for a in $TOMAKE ; do
N=$a/Makefile
M=$a/Makefile.in
O=$a/Makefile.add
f=`basename $a`
if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ]
then
( cd $a;
TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
-t $H/qt/tmake/propagate.t $f.pro |
sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
)
echo -n "."
# echo Building $N..
appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"`
translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
if [ -n "$translation" -a -n "$appname" ]
then
if [ "$appname" != "$translation" ]
then
echo
echo "Warning: translation and appname disagree in $a/$f.pro"
fi
fi
fi
cat > $N <<EOF
#############################################################################
# Automatically generated from $M
# Build options from $1
#############################################################################
EOF
SED=
PLATFORM_CFLAGS=
if [ "$f" = "embeddedkonsole" ]
then
case $PLATFORM in
*x86*|*generic*|*ipaq*|*oz*|*sharp*)
SED="$SED /^LIBS.*=/s/\$/ -lutil/;"
PLATFORM_CFLAGS="-DHAVE_OPENPTY"
;; *)
SED=
esac
elif [ "$f" = "libmpeg3" ]
then
# Patch our Makefile.in file with the platform specifics for the libmpeg3 library
# Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code)
SED='s/\$(CC)/\$(CXX)/;'
case $PLATFORM
in
# For x86 turn on using floating point, compile mmx and css code
*x86*)
# "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486"
PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS"
SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;"
# For generic turn on using floating point
;; *generic*)
PLATFORM_CFLAGS=""
# For the ipaq use fixed point maths, don't compile the mmx or css code
;; *ipaq*|*oz*|*sharp*)
PLATFORM_CFLAGS="-DUSE_FIXED_POINT"
;; *)
# For 'other platforms', turn off optimizations and use fixed point
PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT"
esac
elif [ "$f" = "libmad" ]
then
# Patch our Makefile.in file with the platform specifics for the libmad library
case $PLATFORM
in
# For x86 use intel optimizations
*x86*)
PLATFORM_CFLAGS="-DFPM_INTEL"
# For the ipaq use ARM asm optimizations
;; *ipaq*|*oz*|*sharp*)
PLATFORM_CFLAGS="-DFPM_ARM"
SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
# For generic platforms use the C 64-bit implementation
;; *generic*)
PLATFORM_CFLAGS="-DFPM_64BIT"
# For 'other platforms' use the ARM code
;; *)
PLATFORM_CFLAGS="-DFPM_ARM"
SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
esac
fi
SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;"
PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS";
if [ -n "$PLATFORM_CFLAGS" ]
then
# Append the addition c-flags we have defined
SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;"
SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;"
fi
cat $TARGET >> $N
if [ -n "$SED" ]
then
sed -e "$SED" $M >> $N
else
cat $M >> $N
fi
cat >> $N <<EOF
lupdate:
- lupdate $f.pro
+ lupdate -noobsolete $f.pro
lrelease:
lrelease $f.pro
EOF
if [ -f "$O" ]
then
cat >> $N $O
fi
done
MAKE=make
echo
echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)."
echo "To reconfigure, run $MAKE clean and configure."
echo
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index 45b9a7a..7d8ecb1 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,27 +1,44 @@
TEMPLATE = app
CONFIG = qt warn_on debug usepam
HEADERS = loginwindowimpl.h \
loginapplication.h \
../launcher/inputmethods.h \
../apps/calibrate/calibrate.h
SOURCES = loginwindowimpl.cpp \
loginapplication.cpp \
../launcher/inputmethods.cpp \
../apps/calibrate/calibrate.cpp \
main.cpp
INTERFACES = loginwindow.ui
INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
LIBS += -lqpe -lopie
usepam:LIBS += -lpam
usepam:DEFINES += USEPAM
DESTDIR = $(OPIEDIR)/bin
TARGET = opie-login
+TRANSLATIONS = ../../i18n/de/opie-login.ts \
+· ../../i18n/en/opie-login.ts \
+· ../../i18n/es/opie-login.ts \
+· ../../i18n/fr/opie-login.ts \
+· ../../i18n/hu/opie-login.ts \
+· ../../i18n/ja/opie-login.ts \
+· ../../i18n/ko/opie-login.ts \
+· ../../i18n/no/opie-login.ts \
+· ../../i18n/pl/opie-login.ts \
+· ../../i18n/pt/opie-login.ts \
+· ../../i18n/pt_BR/opie-login.ts \
+· ../../i18n/sl/opie-login.ts \
+· ../../i18n/zh_CN/opie-login.ts \
+· ../../i18n/zh_TW/opie-login.ts \
+· ../../i18n/it/opie-login.ts \
+· ../../i18n/da/opie-login.ts
+
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index 8259195..064d6e4 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,11 +1,29 @@
TEMPLATE = app
#CONFIG = qt warn_on debug
CONFIG = qt warn_on release
HEADERS = backuprestore.h
SOURCES = main.cpp backuprestore.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = backuprestorebase.ui
TARGET = backup
DESTDIR = $(OPIEDIR)/bin
+
+TRANSLATIONS = ../../../i18n/de/backup.ts \
+· ../../../i18n/en/backup.ts \
+· ../../../i18n/es/backup.ts \
+· ../../../i18n/fr/backup.ts \
+· ../../../i18n/hu/backup.ts \
+· ../../../i18n/ja/backup.ts \
+· ../../../i18n/ko/backup.ts \
+· ../../../i18n/no/backup.ts \
+· ../../../i18n/pl/backup.ts \
+· ../../../i18n/pt/backup.ts \
+· ../../../i18n/pt_BR/backup.ts \
+· ../../../i18n/sl/backup.ts \
+· ../../../i18n/zh_CN/backup.ts \
+· ../../../i18n/zh_TW/backup.ts \
+ · ../../../i18n/it/backup.ts \
+ · ../../../i18n/da/backup.ts
+
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index 33155e3..af2cc60 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -1,11 +1,28 @@
TEMPLATE = app
CONFIG += qt warn_on release
HEADERS = sshkeys.h
SOURCES = main.cpp sshkeys.cpp
TARGET = sshkeys
INTERFACES = sshkeysbase.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie
DESTDIR = $(OPIEDIR)/bin
+TRANSLATIONS = ../../../i18n/de/sshkeys.ts \
+· ../../../i18n/en/sshkeys.ts \
+· ../../../i18n/es/sshkeys.ts \
+· ../../../i18n/fr/sshkeys.ts \
+· ../../../i18n/hu/sshkeys.ts \
+· ../../../i18n/ja/sshkeys.ts \
+· ../../../i18n/ko/sshkeys.ts \
+· ../../../i18n/no/sshkeys.ts \
+· ../../../i18n/pl/sshkeys.ts \
+· ../../../i18n/pt/sshkeys.ts \
+· ../../../i18n/pt_BR/sshkeys.ts \
+· ../../../i18n/sl/sshkeys.ts \
+· ../../../i18n/zh_CN/sshkeys.ts \
+· ../../../i18n/zh_TW/sshkeys.ts \
+ ../../../i18n/it/sshkeys.ts \
+ ../../../i18n/da/sshkeys.ts
+
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 2f3212f..06bb4a8 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,10 +1,28 @@
TEMPLATE = app
#CONFIG = qt warn_on debug
CONFIG = qt warn_on release
HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h
SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.h main.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie -lcrypt
TARGET = usermanager
DESTDIR = $(OPIEDIR)/bin
+
+TRANSLATIONS = ../../../i18n/de/usermanager.ts \
+· ../../../i18n/en/usermanager.ts \
+· ../../../i18n/es/usermanager.ts \
+· ../../../i18n/fr/usermanager.ts \
+· ../../../i18n/hu/usermanager.ts \
+· ../../../i18n/ja/usermanager.ts \
+· ../../../i18n/ko/usermanager.ts \
+· ../../../i18n/no/usermanager.ts \
+· ../../../i18n/pl/usermanager.ts \
+· ../../../i18n/pt/usermanager.ts \
+· ../../../i18n/pt_BR/usermanager.ts \
+· ../../../i18n/sl/usermanager.ts \
+· ../../../i18n/zh_CN/usermanager.ts \
+· ../../../i18n/zh_TW/usermanager.ts \
+ · ../../../i18n/it/usermanager.ts \
+ ../../../i18n/da/usermanager.ts
+