diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index 5d62585234..6d6b669c17 100755 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -246,5 +246,5 @@ qpopd ### Local Variables: *** ### sh-basic-offset: 4 *** -### tab-width: 8 *** +### indent-tabs-mode: nil *** ### End: *** diff --git a/packaging/win32/functions.sh b/packaging/win32/functions.sh index addec170a7..42f79c5796 100644 --- a/packaging/win32/functions.sh +++ b/packaging/win32/functions.sh @@ -112,12 +112,12 @@ function add_to_env() { _SED=`eval echo '"s#.*'"${_SEP}$1${_SEP}"'.*##"'` _TEST=`echo "${_SEP}${_ENV}${_SEP}" | sed "${_SED}"` if [ "$_TEST" ]; then - if [ "$_ENV" ]; then - eval "$2_ADDS"'="'"$1${_SEP}"'$'"$2_ADDS"'"' - else - eval "$2_ADDS"'="'"$1"'"' - fi - eval "$2"'="$'"$2_ADDS"'$'"$2_BASE"'"' + if [ "$_ENV" ]; then + eval "$2_ADDS"'="'"$1${_SEP}"'$'"$2_ADDS"'"' + else + eval "$2_ADDS"'="'"$1"'"' + fi + eval "$2"'="$'"$2_ADDS"'$'"$2_BASE"'"' fi } @@ -144,5 +144,5 @@ function assert_one_dir() { ### Local Variables: *** ### mode: shell-script *** ### sh-basic-offset: 4 *** -### tab-width: 8 *** +### indent-tabs-mode: nil *** ### End: *** diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index fea9f8a320..1f1dfc280a 100755 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -96,8 +96,8 @@ function inst_dtk() { smart_wget $DTK_URL $DOWNLOAD_DIR $LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR" for file in \ - /bin/{aclocal*,auto*,ifnames,libtool*,guile*} \ - /share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool} + /bin/{aclocal*,auto*,ifnames,libtool*,guile*} \ + /share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool} do [ "${file##*.bak}" ] || continue _dst_file=$file.bak @@ -279,44 +279,44 @@ function inst_guile() { qpopd ./configure ${HOST_XCOMPILE} \ --disable-static \ - --disable-elisp \ - --disable-networking \ - --disable-dependency-tracking \ - --disable-libtool-lock \ - --disable-linuxthreads \ - -C --prefix=$_GUILE_WFSDIR \ - ac_cv_func_regcomp_rx=yes \ - CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \ - LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS}" - cp config.status config.status.bak - cat config.status.bak | sed 's# fileblocks[$.A-Za-z]*,#,#' > config.status - ./config.status - qpushd guile-config - cp Makefile Makefile.bak - cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile - qpopd - make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -no-undefined -avoid-version" - make install - qpopd - _SLIB_DIR=$_GUILE_UDIR/share/guile/1.* - unzip $_SLIB_BALL -d $_SLIB_DIR - qpushd $_SLIB_DIR/slib - cp guile.init guile.init.bak + --disable-elisp \ + --disable-networking \ + --disable-dependency-tracking \ + --disable-libtool-lock \ + --disable-linuxthreads \ + -C --prefix=$_GUILE_WFSDIR \ + ac_cv_func_regcomp_rx=yes \ + CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \ + LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS}" + cp config.status config.status.bak + cat config.status.bak | sed 's# fileblocks[$.A-Za-z]*,#,#' > config.status + ./config.status + qpushd guile-config + cp Makefile Makefile.bak + cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile + qpopd + make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -no-undefined -avoid-version" + make install + qpopd + _SLIB_DIR=$_GUILE_UDIR/share/guile/1.* + unzip $_SLIB_BALL -d $_SLIB_DIR + qpushd $_SLIB_DIR/slib + cp guile.init guile.init.bak sed '/lambda.*'"'"'unix/a\ (define software-type (lambda () '"'"'ms-dos))' guile.init.bak > guile.init - qpopd + qpopd guile -c '(use-modules (srfi srfi-39))' && guile -c "(use-modules (ice-9 slib)) (require 'printf)" || die "guile not installed correctly" fi if test x$cross_compile = xyes ; then - qpushd $_GUILE_UDIR/bin - # The cross-compiling guile expects these program names - # for the build-time guile - ln -sf /usr/bin/guile-config mingw32-guile-config - ln -sf /usr/bin/guile mingw32-build-guile - qpopd + qpushd $_GUILE_UDIR/bin + # The cross-compiling guile expects these program names + # for the build-time guile + ln -sf /usr/bin/guile-config mingw32-guile-config + ln -sf /usr/bin/guile mingw32-build-guile + qpopd else - add_to_env "-I $_GUILE_UDIR/share/aclocal" ACLOCAL_FLAGS + add_to_env "-I $_GUILE_UDIR/share/aclocal" ACLOCAL_FLAGS fi } @@ -339,7 +339,7 @@ function inst_openssl() { add_to_env $_OPENSSL_UDIR/bin PATH # Make sure the files of Win32OpenSSL-0_9_8d are really gone! if test -f $_OPENSSL_UDIR/unins000.exe ; then - die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again." + die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again." fi # Make sure the files of openssl-0.9.7c-{bin,lib}.zip are really gone! if [ -f $_OPENSSL_UDIR/lib/libcrypto.dll.a ] ; then @@ -467,59 +467,59 @@ function inst_gnome() { echo "gnome packages installed. skipping." else mkdir -p $_GNOME_UDIR - wget_unpacked $GETTEXT_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GETTEXT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $FONTCONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $ATK_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $ATK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $PANGO_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $PANGO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $POPT_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GCONF_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GCONF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GNOME_VFS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOMEPRINT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint - wget_unpacked $LIBGNOMEPRINTUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint - wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GETTEXT_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GETTEXT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $FONTCONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $ATK_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $ATK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $PANGO_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $PANGO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $POPT_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GCONF_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GCONF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GNOME_VFS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMEPRINT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint + wget_unpacked $LIBGNOMEPRINTUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint + wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR qpushd $GNOME_DIR [ -f bin/zlib1.dll ] || mv zlib1.dll bin if [ ! -f lib/libz.dll.a ]; then @@ -553,14 +553,14 @@ EOF fi if test x$cross_compile = xyes ; then qpushd $_GNOME_UDIR/lib/pkgconfig - perl -pi.bak -e"s!^prefix=.*\$!prefix=$GNOME_DIR!" *.pc - #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc - qpopd - # Latest gnome-dev packages don't ship with *.la files - # anymore. What do we do...? + perl -pi.bak -e"s!^prefix=.*\$!prefix=$GNOME_DIR!" *.pc + #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc + qpopd + # Latest gnome-dev packages don't ship with *.la files + # anymore. What do we do...? #qpushd $_GNOME_UDIR/bin - # for A in *-0.dll; do ln -sf $A `echo $A|sed 's/\(.*\)-0.dll/\1.dll/'`; done - #qpopd + # for A in *-0.dll; do ln -sf $A `echo $A|sed 's/\(.*\)-0.dll/\1.dll/'`; done + #qpopd fi } @@ -608,20 +608,20 @@ function inst_libgsf() { add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_PATH if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 then - echo "libgsf already installed. skipping." + echo "libgsf already installed. skipping." else - wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR - assert_one_dir $TMP_UDIR/libgsf-* - qpushd $TMP_UDIR/libgsf-* - ./configure ${HOST_XCOMPILE} \ - --prefix=$_LIBGSF_UDIR \ + wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR + assert_one_dir $TMP_UDIR/libgsf-* + qpushd $TMP_UDIR/libgsf-* + ./configure ${HOST_XCOMPILE} \ + --prefix=$_LIBGSF_UDIR \ --disable-static \ - --without-python \ - CPPFLAGS="${GNOME_CPPFLAGS}" \ - LDFLAGS="${GNOME_LDFLAGS}" - make - make install - qpopd + --without-python \ + CPPFLAGS="${GNOME_CPPFLAGS}" \ + LDFLAGS="${GNOME_LDFLAGS}" + make + make install + qpopd ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly" fi } @@ -633,27 +633,27 @@ function inst_goffice() { add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH if quiet ${PKG_CONFIG} --exists libgoffice-0.3 then - echo "goffice already installed. skipping." + echo "goffice already installed. skipping." else - rm -rf $TMP_UDIR/goffice-* - wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR - mydir=`pwd` - assert_one_dir $TMP_UDIR/goffice-* - qpushd $TMP_UDIR/goffice-* - [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \ - patch -p1 < $GOFFICE_PATCH - ${LIBTOOLIZE} --force - aclocal ${ACLOCAL_FLAGS} -I . - automake - autoconf - ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \ - CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS}" \ - LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS}" - [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR" - [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl . - make - make install - qpopd + rm -rf $TMP_UDIR/goffice-* + wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR + mydir=`pwd` + assert_one_dir $TMP_UDIR/goffice-* + qpushd $TMP_UDIR/goffice-* + [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \ + patch -p1 < $GOFFICE_PATCH + ${LIBTOOLIZE} --force + aclocal ${ACLOCAL_FLAGS} -I . + automake + autoconf + ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \ + CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS}" \ + LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS}" + [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR" + [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl . + make + make install + qpopd ${PKG_CONFIG} --exists libgoffice-0.3 || die "goffice not installed correctly" fi } @@ -738,24 +738,24 @@ function inst_opensp() { add_to_env ${_OPENSP_UDIR}/bin PATH if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll then - echo "Opensp already installed. Skipping." + echo "Opensp already installed. Skipping." else - wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR - assert_one_dir $TMP_UDIR/OpenSP-* - qpushd $TMP_UDIR/OpenSP-* - [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \ - patch -p0 < $OPENSP_PATCH - automake lib/Makefile - ./configure \ - --prefix=${_OPENSP_UDIR} \ - --disable-doc-build --disable-static - # On many windows machines, none of the programs will - # build, but we only need the library, so ignore the rest. - make all-am - make -C lib - make -i - make -i install - qpopd + wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR + assert_one_dir $TMP_UDIR/OpenSP-* + qpushd $TMP_UDIR/OpenSP-* + [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \ + patch -p0 < $OPENSP_PATCH + automake lib/Makefile + ./configure \ + --prefix=${_OPENSP_UDIR} \ + --disable-doc-build --disable-static + # On many windows machines, none of the programs will + # build, but we only need the library, so ignore the rest. + make all-am + make -C lib + make -i + make -i install + qpopd test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "Opensp not installed correctly" fi } @@ -767,22 +767,22 @@ function inst_libofx() { add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH if quiet ${PKG_CONFIG} --exists libofx then - echo "Libofx already installed. Skipping." + echo "Libofx already installed. Skipping." else - wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR - assert_one_dir $TMP_UDIR/libofx-* - qpushd $TMP_UDIR/libofx-* - [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \ - patch -p1 < $LIBOFX_PATCH - ./configure \ - --prefix=${_LIBOFX_UDIR} \ - --with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \ - --with-opensp-libs=${_OPENSP_UDIR}/lib \ - CPPFLAGS="-DOS_WIN32" \ - --disable-static - make LDFLAGS="${LDFLAGS} -no-undefined" - make install - qpopd + wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR + assert_one_dir $TMP_UDIR/libofx-* + qpushd $TMP_UDIR/libofx-* + [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \ + patch -p1 < $LIBOFX_PATCH + ./configure \ + --prefix=${_LIBOFX_UDIR} \ + --with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \ + --with-opensp-libs=${_OPENSP_UDIR}/lib \ + CPPFLAGS="-DOS_WIN32" \ + --disable-static + make LDFLAGS="${LDFLAGS} -no-undefined" + make install + qpopd quiet ${PKG_CONFIG} --exists libofx || die "Libofx not installed correctly" fi } @@ -795,22 +795,22 @@ function inst_gwenhywfar() { add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS if quiet ${PKG_CONFIG} --exists gwenhywfar then - echo "Gwenhywfar already installed. Skipping." + echo "Gwenhywfar already installed. Skipping." else - wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR - assert_one_dir $TMP_UDIR/gwenhywfar-* - qpushd $TMP_UDIR/gwenhywfar-* - ./configure \ - --with-openssl-includes=$_OPENSSL_UDIR/include \ - ssl_libraries="-L${_OPENSSL_UDIR}/lib" \ - ssl_lib="-leay32 -lssl32" \ - --prefix=$_GWENHYWFAR_UDIR \ - CPPFLAGS="${REGEX_CPPFLAGS}" \ - LDFLAGS="${REGEX_LDFLAGS}" - make - make check - make install - qpopd + wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR + assert_one_dir $TMP_UDIR/gwenhywfar-* + qpushd $TMP_UDIR/gwenhywfar-* + ./configure \ + --with-openssl-includes=$_OPENSSL_UDIR/include \ + ssl_libraries="-L${_OPENSSL_UDIR}/lib" \ + ssl_lib="-leay32 -lssl32" \ + --prefix=$_GWENHYWFAR_UDIR \ + CPPFLAGS="${REGEX_CPPFLAGS}" \ + LDFLAGS="${REGEX_LDFLAGS}" + make + make check + make install + qpopd ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly" fi } @@ -823,17 +823,17 @@ function inst_ktoblzcheck() { add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS if quiet ${PKG_CONFIG} --exists ktoblzcheck then - echo "Ktoblzcheck already installed. Skipping." + echo "Ktoblzcheck already installed. Skipping." else - wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR - assert_one_dir $TMP_UDIR/ktoblzcheck-* - qpushd $TMP_UDIR/ktoblzcheck-* - ./configure \ - --prefix=${_GWENHYWFAR_UDIR} - make - make check - make install - qpopd + wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR + assert_one_dir $TMP_UDIR/ktoblzcheck-* + qpushd $TMP_UDIR/ktoblzcheck-* + ./configure \ + --prefix=${_GWENHYWFAR_UDIR} + make + make check + make install + qpopd ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly" fi } @@ -849,20 +849,20 @@ function inst_qt4() { # This section creates .la files for the Qt-4 DLLs so that # libtool correctly links to the DLLs. if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then - qpushd ${_QTDIR}/lib - for A in lib*.a; do - LIBBASENAME=`basename ${A} .a` - OUTFILE="${LIBBASENAME}.la" - BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" ` - DLLNAME="${BASENAME}.dll" + qpushd ${_QTDIR}/lib + for A in lib*.a; do + LIBBASENAME=`basename ${A} .a` + OUTFILE="${LIBBASENAME}.la" + BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" ` + DLLNAME="${BASENAME}.dll" - # Create la file - echo "# Generated by foo bar libtool" > $OUTFILE - echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE - echo "library_names='${DLLNAME}'" >> $OUTFILE - echo "libdir='${_QTDIR}/bin'" >> $OUTFILE - done - qpopd + # Create la file + echo "# Generated by foo bar libtool" > $OUTFILE + echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE + echo "library_names='${DLLNAME}'" >> $OUTFILE + echo "libdir='${_QTDIR}/bin'" >> $OUTFILE + done + qpopd fi } @@ -874,42 +874,42 @@ function inst_aqbanking() { add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS if quiet ${PKG_CONFIG} --exists aqbanking then - echo "AqBanking already installed. Skipping." + echo "AqBanking already installed. Skipping." else - wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR - assert_one_dir $TMP_UDIR/aqbanking-* - qpushd $TMP_UDIR/aqbanking-* - _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS}" - _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS}" - if test x$AQBANKING_WITH_QT = xyes; then - inst_qt4 - ./configure \ - --with-gwen-dir=${_GWENHYWFAR_UDIR} \ - --with-frontends="cbanking qbanking" \ - --with-backends="aqdtaus aqhbci aqofxconnect" \ - CPPFLAGS="${_AQ_CPPFLAGS}" \ - LDFLAGS="${_AQ_LDFLAGS}" \ - qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \ - qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \ - --prefix=${_AQBANKING_UDIR} - make qt4-port - make clean - else - ./configure \ - --with-gwen-dir=${_GWENHYWFAR_UDIR} \ - --with-frontends="cbanking" \ - --with-backends="aqdtaus aqhbci aqofxconnect" \ - CPPFLAGS="${_AQ_CPPFLAGS}" \ - LDFLAGS="${_AQ_LDFLAGS}" \ - --prefix=${_AQBANKING_UDIR} - fi - make - make install - qpopd - qpushd ${_AQBANKING_UDIR}/bin - exetype aqbanking-tool.exe console - exetype aqhbci-tool.exe console - qpopd + wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR + assert_one_dir $TMP_UDIR/aqbanking-* + qpushd $TMP_UDIR/aqbanking-* + _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS}" + _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS}" + if test x$AQBANKING_WITH_QT = xyes; then + inst_qt4 + ./configure \ + --with-gwen-dir=${_GWENHYWFAR_UDIR} \ + --with-frontends="cbanking qbanking" \ + --with-backends="aqdtaus aqhbci aqofxconnect" \ + CPPFLAGS="${_AQ_CPPFLAGS}" \ + LDFLAGS="${_AQ_LDFLAGS}" \ + qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \ + qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \ + --prefix=${_AQBANKING_UDIR} + make qt4-port + make clean + else + ./configure \ + --with-gwen-dir=${_GWENHYWFAR_UDIR} \ + --with-frontends="cbanking" \ + --with-backends="aqdtaus aqhbci aqofxconnect" \ + CPPFLAGS="${_AQ_CPPFLAGS}" \ + LDFLAGS="${_AQ_LDFLAGS}" \ + --prefix=${_AQBANKING_UDIR} + fi + make + make install + qpopd + qpushd ${_AQBANKING_UDIR}/bin + exetype aqbanking-tool.exe console + exetype aqhbci-tool.exe console + qpopd ${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly" fi } @@ -920,11 +920,11 @@ function svn_up() { # latest revision that should compile, use HEAD or vwxyz SVN_REV="HEAD" if [ -x .svn ]; then - setup "svn update in ${REPOS_DIR}" - svn up -r ${SVN_REV} + setup "svn update in ${REPOS_DIR}" + svn up -r ${SVN_REV} else - setup svn co - svn co -r ${SVN_REV} $REPOS_URL . + setup svn co + svn co -r ${SVN_REV} $REPOS_URL . fi qpopd } @@ -964,8 +964,8 @@ function inst_gnucash() { --prefix=$_INSTALL_WFSDIR \ --enable-debug \ --enable-schemas-install=no \ - ${LIBOFX_OPTIONS} \ - ${AQBANKING_OPTIONS} \ + ${LIBOFX_OPTIONS} \ + ${AQBANKING_OPTIONS} \ --enable-binreloc \ --enable-locale-specific-tax \ CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \ @@ -1082,37 +1082,37 @@ function finish() { setup Finish... _NEW=x for _ENV in $ENV_VARS; do - _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'` - if [ "$_ADDS" ]; then - if [ "$_NEW" ]; then - echo - echo "Environment variables changed, please do the following" - echo - [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d" - _NEW= - fi - _VAL=`eval echo '"$'"${_ENV}_BASE"'"'` - if [ "$_VAL" ]; then - _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\"" - else - _CHANGE="export ${_ENV}=\"${_ADDS}\"" - fi - echo $_CHANGE - echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh" - fi + _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'` + if [ "$_ADDS" ]; then + if [ "$_NEW" ]; then + echo + echo "Environment variables changed, please do the following" + echo + [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d" + _NEW= + fi + _VAL=`eval echo '"$'"${_ENV}_BASE"'"'` + if [ "$_VAL" ]; then + _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\"" + else + _CHANGE="export ${_ENV}=\"${_ADDS}\"" + fi + echo $_CHANGE + echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh" + fi done if test "x$cross_compile" = "xyes" ; then - echo "You might want to create a binary tarball now as follows:" - qpushd $GLOBAL_DIR - echo tar -czf $HOME/gnucash-fullbin.tar.gz --anchored \ - --exclude='*.a' --exclude='*.o' --exclude='*.h' \ - --exclude='*.info' --exclude='*.html' \ - --exclude='*include/*' --exclude='*gtk-doc*' \ - --exclude='bin*' \ - --exclude='mingw32/*' --exclude='*bin/mingw32-*' \ - --exclude='gnucash-trunk*' \ - * - qpopd + echo "You might want to create a binary tarball now as follows:" + qpushd $GLOBAL_DIR + echo tar -czf $HOME/gnucash-fullbin.tar.gz --anchored \ + --exclude='*.a' --exclude='*.o' --exclude='*.h' \ + --exclude='*.info' --exclude='*.html' \ + --exclude='*include/*' --exclude='*gtk-doc*' \ + --exclude='bin*' \ + --exclude='mingw32/*' --exclude='*bin/mingw32-*' \ + --exclude='gnucash-trunk*' \ + * + qpopd fi } @@ -1126,5 +1126,5 @@ qpopd ### Local Variables: *** ### sh-basic-offset: 4 *** -### tab-width: 8 *** +### indent-tabs-mode: nil *** ### End: *** diff --git a/packaging/win32/reset.sh b/packaging/win32/reset.sh index 98bb05e71a..005d83393a 100644 --- a/packaging/win32/reset.sh +++ b/packaging/win32/reset.sh @@ -124,5 +124,5 @@ exit 0 ### Local Variables: *** ### sh-basic-offset: 4 *** -### tab-width: 8 *** +### indent-tabs-mode: nil *** ### End: ***