diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rwxr-xr-x | download | 17 | ||||
| -rw-r--r-- | external/prj/d.lst | 2 | ||||
| -rwxr-xr-x | external/rebase/README_rebase.exe | 1 |
5 files changed, 32 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index a192ab727f48..97f6ec6ca4fb 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -481,6 +481,7 @@ export PYTHON_LIBS=@PYTHON_LIBS@ export RANLIB=@RANLIB@ export REDLAND_CFLAGS=@REDLAND_CFLAGS@ export REDLAND_LIBS=@REDLAND_LIBS@ +export REBASE=@REBASE@ export RHINO_JAR=@RHINO_JAR@ export RHINO_TARBALL=@RHINO_TARBALL@ export RPM=@RPM@ diff --git a/configure.in b/configure.in index 074f16c7dd19..2d3115f04313 100644 --- a/configure.in +++ b/configure.in @@ -9119,6 +9119,17 @@ AC_SUBST(WINDOWS_SDK_HOME) AC_SUBST(WINDOWS_SDK_VERSION) dnl ========================================= +dnl Check for Micorosft rebase.exe +dnl ========================================= +if test "$build_os" = "cygwin"; then + AC_PATH_PROG([REBASE], [rebase]) + if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a "$WINDOWS_SDK_VERSION" = "80"; then + REBASE=download + AC_SUBST(REBASE) + fi +fi + +dnl ========================================= dnl Check for uuidgen dnl ========================================= if test "$_os" = "WINNT" -a "$cross_compiling" != "yes"; then @@ -183,6 +183,11 @@ if [ "$COM" = "MSC" ]; then downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1" fi +if [ "$REBASE" = "download" ]; then + downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "cab1.cab" "15331cc5cb4a03e7a44aaa303e34bf5b" + downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "WinSDKTools_x86.msi" "d1f44ddc2ba6bbda79407e951e44303b" +fi + if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then # these sources are from a tarball, so get the other source tarballs . $start_dir/sources.ver @@ -223,6 +228,18 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll fi 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 + rebase_exe_path=Pfiles/*/Windows/v7.1/Bin/ReBase.Exe + sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$rebase_exe_path | sed "s/ .*//"` + if [ "$sum" = "5892a62147b7be59f0553ae3634e9dfa" ]; then + cp $TARFILE_LOCATION/tmp/$rebase_exe_path ./external/rebase/rebase.exe + fi + fi + fi + if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe ]; then gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB958911-x86-ENU.exe diff --git a/external/prj/d.lst b/external/prj/d.lst index 7fa38d391cc1..6d15049aa3a3 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -28,6 +28,8 @@ mkdir: %_DEST%\inc\external\wine ..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll +..\rebase\rebase.exe %_DEST%\bin\rebase.exe + ..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll ..\msvcp80\msvcm80*.dll %_DEST%\bin diff --git a/external/rebase/README_rebase.exe b/external/rebase/README_rebase.exe new file mode 100755 index 000000000000..87248931e24e --- /dev/null +++ b/external/rebase/README_rebase.exe @@ -0,0 +1 @@ +Put rebase.exe in this directory for Windows builds. |