mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Install.sh improvements:
* Replace RegEx-Gnu by RegEx-Spencer 3.8, because GtkHTML is linked against that * Update fontconfig, use expat-2.0.0.zip from ftp.gnome.org, drop inst_expat * Use $GNOME_WIN32_URL/dependencies for other packages too * Build guile with -avoid-version git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15213 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler
parent
f643a37cc8
commit
eed0933fdf
@ -52,8 +52,9 @@ MINGW_DIR=$GLOBAL_DIR\\mingw
|
||||
UNZIP_URL="$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
|
||||
UNZIP_DIR=$GLOBAL_DIR\\unzip
|
||||
|
||||
REGEX_BIN_URL="$SF_MIRROR/gnuwin32/regex-0.12-bin.zip"
|
||||
REGEX_LIB_URL="$SF_MIRROR/gnuwin32/regex-0.12-lib.zip"
|
||||
# do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
|
||||
REGEX_BIN_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-bin.zip"
|
||||
REGEX_LIB_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-lib.zip"
|
||||
REGEX_DIR=$GLOBAL_DIR\\regex
|
||||
|
||||
READLINE_BIN_URL="$SF_MIRROR/gnuwin32/readline-5.0-bin.zip"
|
||||
@ -84,24 +85,23 @@ PEXPORTS_DIR=$GLOBAL_DIR\\pexports
|
||||
LIBXML2_URL="http://www.zlatkovic.com/pub/libxml/libxml2-2.6.27.win32.zip"
|
||||
LIBXML2_DIR=$GLOBAL_DIR\\gnome #avoid XML_FLAGS
|
||||
|
||||
EXPAT_URL="ftp://ftp.jclark.com/pub/xml/expat.zip"
|
||||
EXPAT_DIR=$GLOBAL_DIR\\gnome #avoid EXPAT_FLAGS
|
||||
|
||||
GNOME_WIN32_URL="$GNOME_MIRROR/binaries/win32"
|
||||
GETTEXT_URL="$GTK_MIRROR/glib/2.12/win32/dependencies/gettext-0.14.5.zip"
|
||||
GETTEXT_DEV_URL="$GTK_MIRROR/glib/2.12/win32/dependencies/gettext-dev-0.14.5.zip"
|
||||
LIBICONV_URL="$GTK_MIRROR/glib/2.12/win32/dependencies/libiconv-1.9.1.bin.woe32.zip"
|
||||
GNOME_WIN32_DEPS_URL="$GNOME_WIN32_URL/dependencies"
|
||||
GETTEXT_URL="$GNOME_WIN32_DEPS_URL/gettext-0.14.5.zip"
|
||||
GETTEXT_DEV_URL="$GNOME_WIN32_DEPS_URL/gettext-dev-0.14.5.zip"
|
||||
LIBICONV_URL="$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
|
||||
GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.4.zip"
|
||||
GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.4.zip"
|
||||
LIBJPEG_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/libjpeg-6b-4.zip"
|
||||
LIBJPEG_URL="$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
|
||||
LIBPNG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
|
||||
ZLIB_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
|
||||
PKG_CONFIG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/pkg-config-0.20.zip"
|
||||
CAIRO_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/cairo-1.2.4.zip"
|
||||
CAIRO_DEV_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/cairo-dev-1.2.4.zip"
|
||||
FONTCONFIG_URL="$GTK_MIRROR/gtk/v2.8/win32/dependencies/fontconfig-2.2.2-20040412.zip"
|
||||
FONTCONFIG_DEV_URL="$GTK_MIRROR/gtk/v2.8/win32/dependencies/fontconfig-dev-2.2.2-20040412.zip"
|
||||
FREETYPE_URL="$GTK_MIRROR/gtk/v2.8/win32/dependencies/freetype-2.1.10.zip"
|
||||
PKG_CONFIG_URL="$GNOME_WIN32_DEPS_URL/pkg-config-0.20.zip"
|
||||
CAIRO_URL="$GNOME_WIN32_DEPS_URL/cairo-1.2.6.zip"
|
||||
CAIRO_DEV_URL="$GNOME_WIN32_DEPS_URL/cairo-dev-1.2.6.zip"
|
||||
EXPAT_URL="$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
|
||||
FONTCONFIG_URL="$GNOME_WIN32_DEPS_URL/fontconfig-2.3.2-tml-20060825.zip"
|
||||
FONTCONFIG_DEV_URL="$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.3.2-tml-20060825.zip"
|
||||
FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.1.10.zip"
|
||||
FREETYPE_DEV_URL="$SF_MIRROR/gnuwin32/freetype-2.1.10-lib.zip"
|
||||
ATK_URL="$GNOME_WIN32_URL/atk/1.12/atk-1.12.3.zip"
|
||||
ATK_DEV_URL="$GNOME_WIN32_URL/atk/1.12/atk-dev-1.12.3.zip"
|
||||
@ -116,8 +116,8 @@ ORBIT2_URL="$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.2.zip"
|
||||
ORBIT2_DEV_URL="$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.2.zip"
|
||||
GAIL_URL="$GNOME_WIN32_URL/gail/1.9/gail-1.9.3.zip"
|
||||
GAIL_DEV_URL="$GNOME_WIN32_URL/gail/1.9/gail-dev-1.9.3.zip"
|
||||
POPT_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/popt-1.10.2-tml-20050828.zip"
|
||||
POPT_DEV_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/popt-dev-1.10.2-tml-20050828.zip"
|
||||
POPT_URL="$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
|
||||
POPT_DEV_URL="$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
|
||||
GCONF_URL="$GNOME_WIN32_URL/GConf/2.14/GConf-2.14.0.zip"
|
||||
GCONF_DEV_URL="$GNOME_WIN32_URL/GConf/2.14/GConf-dev-2.14.0.zip"
|
||||
LIBBONOBO_URL="$GNOME_WIN32_URL/libbonobo/2.16/libbonobo-2.16.0.zip"
|
||||
@ -142,10 +142,10 @@ GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.0.zip"
|
||||
GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.0.zip"
|
||||
GNOME_DIR=$GLOBAL_DIR\\gnome
|
||||
|
||||
SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.29.zip"
|
||||
SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.31.zip"
|
||||
SWIG_DIR=$GLOBAL_DIR\\swig
|
||||
|
||||
LIBGSF_URL="$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.2.tar.bz2"
|
||||
LIBGSF_URL="$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.3.tar.bz2"
|
||||
LIBGSF_DIR=$GLOBAL_DIR\\libgsf
|
||||
|
||||
# do not update this if you are unwilling to hack gnc-html-graph-gog.c
|
||||
@ -153,12 +153,14 @@ GOFFICE_URL="$GNOME_MIRROR/sources/goffice/0.3/goffice-0.3.0.tar.bz2"
|
||||
GOFFICE_DIR=$GLOBAL_DIR\\goffice
|
||||
GOFFICE_PATCH=`pwd`/goffice-0.3.0-patch.diff
|
||||
|
||||
GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.0.2.tar.bz2"
|
||||
GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
|
||||
GLADE_DIR=$GLOBAL_DIR\\glade
|
||||
|
||||
SVN_URL="http://subversion.tigris.org/files/documents/15/34093/svn-1.4.0-setup.exe"
|
||||
SVN_URL="http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
|
||||
SVN_DIR=$GLOBAL_DIR\\svn
|
||||
|
||||
DIST_DIR=$GLOBAL_DIR\\dist
|
||||
|
||||
# There is no reason to ever need to comment these out!
|
||||
# * commented out glade, as it is not needed to run gnucash
|
||||
if test x$cross_compile != xyes ; then
|
||||
@ -180,7 +182,6 @@ if test x$cross_compile != xyes ; then
|
||||
fi
|
||||
add_step inst_pexports
|
||||
add_step inst_libxml2
|
||||
add_step inst_expat
|
||||
add_step inst_gnome
|
||||
add_step inst_swig
|
||||
add_step inst_libgsf
|
||||
|
||||
@ -102,6 +102,15 @@ function prepare() {
|
||||
if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh | wc -l)" -eq 0 ]; then
|
||||
rm -f ${_REPOS_UDIR}/install-sh
|
||||
fi
|
||||
# Partially remove RegEx-GNU if installed
|
||||
_REGEX_UDIR=`unix_path $REGEX_DIR`
|
||||
if [ -f ${_REGEX_UDIR}/contrib/regex-0.12-GnuWin32.README ]; then
|
||||
qpushd ${_REGEX_UDIR}
|
||||
rm -f bin/*regex*.dll
|
||||
rm -f contrib/regex*
|
||||
rm -f lib/*regex*
|
||||
qpopd
|
||||
fi
|
||||
|
||||
mkdir -p $TMP_DIR
|
||||
mkdir -p $DOWNLOAD_DIR
|
||||
@ -216,7 +225,7 @@ function inst_unzip() {
|
||||
function inst_regex() {
|
||||
setup RegEx
|
||||
_REGEX_UDIR=`unix_path $REGEX_DIR`
|
||||
add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
|
||||
add_to_env -I$_REGEX_UDIR/include/rxspencer REGEX_CPPFLAGS
|
||||
add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
|
||||
add_to_env $_REGEX_UDIR/bin PATH
|
||||
if quiet ${LD} $REGEX_LDFLAGS -lregex -o $TMP_UDIR/ofile
|
||||
@ -374,14 +383,9 @@ function inst_guile() {
|
||||
cp Makefile Makefile.bak
|
||||
cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile
|
||||
qpopd
|
||||
make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex -no-undefined"
|
||||
make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex -no-undefined -avoid-version"
|
||||
make install
|
||||
qpopd
|
||||
qpushd $GUILE_DIR/bin
|
||||
mv libguilereadline-v-12-12.dll libguilereadline-v-12.dll
|
||||
mv libguile-srfi-srfi-4-v-1-1.dll libguile-srfi-srfi-4-v-1.dll
|
||||
mv libguile-srfi-srfi-13-14-v-1-1.dll libguile-srfi-srfi-13-14-v-1.dll
|
||||
qpopd
|
||||
_GUILE_MAJOR=`echo $_GUILE_UDIR/share/guile/1.* | sed 's,.*/,,'`
|
||||
_SLIB_DIR=$GUILE_DIR\\share\\guile\\$_GUILE_MAJOR
|
||||
mkdir -p $_SLIB_DIR
|
||||
@ -467,7 +471,7 @@ includedir=\${prefix}/include
|
||||
|
||||
Name: libXML
|
||||
Version: $_LIBXML2_VERSION
|
||||
Description: libXML library version2.
|
||||
Description: libXML library version 2.
|
||||
Requires:
|
||||
Libs: -L\${libdir} -lxml2 -lz
|
||||
Cflags: -I\${includedir}
|
||||
@ -477,23 +481,6 @@ EOF
|
||||
quiet ${LD} -L$_LIBXML2_UDIR/lib -lxml2 -o $TMP_UDIR/ofile || die "libxml2 not installed correctly"
|
||||
}
|
||||
|
||||
function inst_expat() {
|
||||
setup Expat
|
||||
_EXPAT_UDIR=`unix_path $EXPAT_DIR`
|
||||
add_to_env $_EXPAT_UDIR/bin PATH
|
||||
if quiet which xmlwf && test -f $_EXPAT_UDIR/bin/xmlwf.exe
|
||||
then
|
||||
echo "expat already installed. skipping."
|
||||
else
|
||||
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $EXPAT_DIR
|
||||
qpushd $EXPAT_DIR
|
||||
cp -r expat/* .
|
||||
rm -rf expat
|
||||
qpopd
|
||||
fi
|
||||
quiet which xmlwf || die "expat not installed correctly"
|
||||
}
|
||||
|
||||
function inst_gnome() {
|
||||
setup Gnome platform
|
||||
_GNOME_UDIR=`unix_path $GNOME_DIR`
|
||||
@ -521,6 +508,7 @@ function inst_gnome() {
|
||||
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
|
||||
@ -570,7 +558,6 @@ function inst_gnome() {
|
||||
mv libz.dll.a ../lib
|
||||
qpopd
|
||||
fi
|
||||
[ -f bin/libintl-2.dll ] || cp bin/intl.dll bin/libintl-2.dll
|
||||
# work around a bug in msys bash, adding 0x01 smilies
|
||||
cat > bin/pkg-config-msys.sh <<EOF
|
||||
#!/bin/sh
|
||||
@ -625,6 +612,7 @@ function inst_swig() {
|
||||
qpushd $SWIG_DIR
|
||||
mv swigwin-* mydir
|
||||
mv mydir/* .
|
||||
mv mydir/.[A-Za-z]* . # hidden files
|
||||
rmdir mydir
|
||||
rm INSTALL # bites with /bin/install
|
||||
qpopd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user