diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-08-31 13:30:12 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:18 +0200 |
| commit | 5c1a93df5b3a8d7f31d9bb672d391c888418aa53 (patch) | |
| tree | 207cdab6b4b233b6fdf161f3a04ebb5c58bb7ee1 | |
| parent | 59bf5321fa4c49b0d140700e2c56de7e1b637926 (diff) | |
fix dbghelp.dll download again
Change-Id: I5992023a946301809b9708d9df29dd9cc1500b53
| -rw-r--r-- | configure.in | 8 | ||||
| -rwxr-xr-x | download | 13 | ||||
| -rw-r--r-- | ooo.lst.in | 1 |
3 files changed, 12 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 63103aefab87..83c6f4840fa9 100644 --- a/configure.in +++ b/configure.in @@ -3279,6 +3279,14 @@ MSPDB_PATH="$formatted_path" AC_SUBST(SHOWINCLUDES_PREFIX) # +# dbghelp.dll +# +if test "$_os" == "WINNT"; then + DBGHELP_DLL="13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll" +fi +AC_SUBST(DBGHELP_DLL) + +# # prefix C with ccache if needed # if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then @@ -179,7 +179,6 @@ for i in $filelist ; do done if [ "$COM" = "MSC" ]; then - downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKDebuggingTools/" "dbg_x86.msi" "2bd67a7b00507ad93539e138a4a6a2bf" downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1" fi @@ -220,15 +219,9 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then # This can be run only on Windows itself (Cygwin) TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp` chmod a+w $TARFILE_LOCATION/tmp - if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbg_x86.msi ]; then - msiexec /a `cygpath -d $TARFILE_LOCATION/dbg_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1 - dbghelp_dll_path=PFiles/DbgTools/dbghelp.dll - sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$dbghelp_dll_path | sed "s/ .*//"` - if [ "$sum" = "4003e34416ebd25e4c115d49dc15e1a7" ]; then - cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll - fi - fi - + if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ]; then + cp $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ./external/dbghelp/dbghelp.dll + fi if [ "$REBASE" = "download" ]; then if [ ! -f ./external/rebase/rebase.exe -a -f $TARFILE_LOCATION/WinSDKTools_x86.msi ]; then msiexec /a `cygpath -d $TARFILE_LOCATION/WinSDKTools_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1 diff --git a/ooo.lst.in b/ooo.lst.in index 25b83fc0c4d6..06081e4d429d 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -101,6 +101,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 @ORCUS_TARBALL@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll +@DBGHELP_DLL@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOP_GALLERY_PACK@ @OOOP_TEMPLATES_PACK@ |