[Gpsbabel-code] gui builds, linux
Brought to you by:
robertl
Menu
▾
▴
[Gpsbabel-code] gui builds, linux
|
From: tsteven4 <tst...@gm...> - 2012-09-09 23:18:03
|
Index: configure
===================================================================
--- configure (revision 4199)
+++ configure (working copy)
@@ -4985,8 +4985,10 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty"
+ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty"
+ac_config_files="$ac_config_files gui/makelinuxdist.sh"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -5544,13 +5546,13 @@
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"gbversion.h") CONFIG_FILES="$CONFIG_FILES gbversion.h" ;;
"gui/setup.iss") CONFIG_FILES="$CONFIG_FILES gui/setup.iss" ;;
- "gui/makelinuxdist.sh") CONFIG_FILES="$CONFIG_FILES gui/makelinuxdist.sh" ;;
"xmldoc/makedoc") CONFIG_FILES="$CONFIG_FILES xmldoc/makedoc" ;;
"tools/mkcapabilities") CONFIG_FILES="$CONFIG_FILES tools/mkcapabilities" ;;
"win32/gpsbabel.rc") CONFIG_FILES="$CONFIG_FILES win32/gpsbabel.rc" ;;
"jeeps/Makefile") CONFIG_FILES="$CONFIG_FILES jeeps/Makefile" ;;
"shapelib/Makefile") CONFIG_FILES="$CONFIG_FILES shapelib/Makefile" ;;
"zlib/empty") CONFIG_FILES="$CONFIG_FILES zlib/empty" ;;
+ "gui/makelinuxdist.sh") CONFIG_FILES="$CONFIG_FILES gui/makelinuxdist.sh" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -6099,6 +6101,11 @@
esac
+
+ case $ac_file$ac_mode in
+ "gui/makelinuxdist.sh":F) chmod +x gui/makelinuxdist.sh ;;
+
+ esac
done # for ac_tag
Index: tools/mac-localize
===================================================================
--- tools/mac-localize (revision 4199)
+++ tools/mac-localize (working copy)
@@ -2,7 +2,8 @@
# the application menu and system buttons. See description at
# http://doc.qt.nokia.com/4.6/mac-differences.html#translating-the-application-menu-and-native-dialogs
-QTDIR="/Developer/Applications/Qt/Qt Creator.app/Contents/Resources/translations"
+QTDIR=`qmake -query QT_INSTALL_TRANSLATIONS`
+
LANGDIR=objects/GPSBabelFE.app/Contents/MacOS/translations
Index: configure.in
===================================================================
--- configure.in (revision 4199)
+++ configure.in (working copy)
@@ -429,6 +429,7 @@
else
AC_MSG_RESULT(no)
fi
-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
+AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
AC_OUTPUT
Index: Makefile.in
===================================================================
--- Makefile.in (revision 4199)
+++ Makefile.in (working copy)
@@ -136,6 +136,7 @@
clean:
rm -f $(OBJS) gpsbabel gpsbabel.exe
+ [ -f gui/Makefile ] && $(MAKE) -C gui clean
configure: configure.in
autoconf
@@ -348,13 +349,17 @@
tar cvzf gpsbabel-osx.tgz usr/bin/gpsbabel
curl -u anonymous:anonymous --upload-file gpsbabel-osx.tgz ftp://upload.sf.net/incoming/
+gui: gpsbabel
+ cd gui ; qmake && make
+ cd gui ; lupdate app.pro
+ cd gui ; lrelease app.pro
-mac-gui: gpsbabel
+linux-gui: gui
+ cd gui; ./makelinuxdist.sh
+
+mac-gui: gui
# file gpsbabel | grep '2 architectures' || exit 1
# file gui/objects/GPSBabelFE.app/Contents/MacOS/GPSBabelFE | grep '2 architectures' || exit 1
- cd gui ; qmake && make
- cd gui ; lupdate app.pro
- cd gui ; lrelease app.pro
mkdir -p gui/objects/GPSBabelFE.app/Contents/MacOS/translations
cp gui/*.qm gui/objects/gpsbabelFE.app/Contents/MacOS/translations
cp gpsbabel gui/objects/GPSBabelFE.app/Contents/MacOS
Index: gui/makelinuxdist.sh.in
===================================================================
--- gui/makelinuxdist.sh.in (revision 4199)
+++ gui/makelinuxdist.sh.in (working copy)
@@ -1,7 +1,7 @@
#!/bin/sh
set -e -v
-QTLIBDIR=/usr/lib
-QTSHDIR=/usr/share/qt4
+QT_INSTALL_PLUGINS=`qmake -query QT_INSTALL_PLUGINS`
+QT_INSTALL_TRANSLATIONS=`qmake -query QT_INSTALL_TRANSLATIONS`
DISTNAME=GPSBabel@PACKAGE_VERSION@@PACKAGE_RELEASE@
DISTDIR=$DISTNAME
@@ -11,38 +11,21 @@
mkdir $DISTDIR/translations
mkdir $DISTDIR/help
-cp `ldd objects/gpsbabelfe-bin | grep libQtCore |awk '{print $3}'` $DISTDIR
-cp `ldd objects/gpsbabelfe-bin | grep libQtGui |awk '{print $3}'` $DISTDIR
-cp `ldd objects/gpsbabelfe-bin | grep libQtWebKit |awk '{print $3}'` $DISTDIR
-cp `ldd objects/gpsbabelfe-bin | grep libQtXml |awk '{print $3}'` $DISTDIR
-cp `ldd objects/gpsbabelfe-bin | grep libQtNetwork |awk '{print $3}'` $DISTDIR
-cp `ldd objects/gpsbabelfe-bin | grep libQtDBus |awk '{print $3}'` $DISTDIR
-cp `ldd objects/gpsbabelfe-bin | grep libphonon |awk '{print $3}'` $DISTDIR
-cp `ldd objects/gpsbabelfe-bin | grep libaudio |awk '{print $3}'` $DISTDIR
+QT_LIBS=`ldd objects/gpsbabelfe-bin | grep libQt | awk '{print $3}'`
+for lib in $QT_LIBS
+do
+ cp $lib $DISTDIR
+done
+#cp `ldd objects/gpsbabelfe-bin | grep libphonon |awk '{print $3}'` $DISTDIR
+#cp `ldd objects/gpsbabelfe-bin | grep libaudio |awk '{print $3}'` $DISTDIR
-cp -r $QTSHDIR/plugins/imageformats $DISTDIR/plugins
-cp $QTSHDIR/translations/qt_*.qm $DISTDIR/translations/
+cp -r $QT_INSTALL_PLUGINS/imageformats $DISTDIR/plugins
+cp -r $QT_INSTALL_PLUGINS/codecs $DISTDIR/plugins
+cp $QT_INSTALL_TRANSLATIONS/qt_*.qm $DISTDIR/translations/
-# Generate the compiled translations
-TSFILES="gpsbabel_de.ts
-gpsbabel_es.ts
-gpsbabel_fr.ts
-gpsbabel_hu.ts
-gpsbabel_it.ts
-gpsbabelfe_de.ts
-gpsbabelfe_es.ts
-gpsbabelfe_fr.ts
-gpsbabelfe_hu.ts
-gpsbabelfe_it.ts"
+# copy the compiled translations
+cp *.qm $DISTDIR/translations
-#
-lrelease $TSFILES
-QMFILES=`echo $TSFILES | sed -e 's/\.ts/.qm/g'`
-cp $TSFILES $DISTDIR/translations
-#
-# Only Spanish and German are moderately OK.
-cp gpsbabel_es.ts gpsbabelfe_es.ts gpsbabel_de.ts gpsbabelfe_de.ts $DISTDIR/translations
-
# Now our gui
cp gmapbase.html $DISTDIR/
cp gpsbabelfe $DISTDIR/
@@ -51,19 +34,14 @@
cp qt.conf $DISTDIR/
cp ../gpsbabel $DISTDIR/
#
-# Help needs to be donea
-cp ../../babelweb/htmldoc-development/* $DISTDIR/help/
+cp -r help/*.html $DISTDIR/help
-cp COPYING $DISTDIR/
+cp ../COPYING $DISTDIR/
#cp AUTHORS $DISTDIR/
-#cp README.contrib $DISTDIR/
-#cp README.gui $DISTDIR/
+cp ../README* $DISTDIR/
rm -f $DISTDIR.tar $DISTDIR.tar.bz2
tar cvf $DISTDIR.tar $DISTDIR
bzip2 $DISTDIR.tar
-# cleanup needed
-echo $QMFILES
-rm -f $QMFILES
|