diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.in | 94 | ||||
| -rwxr-xr-x | download | 6 | ||||
| -rw-r--r-- | post_download.in | 135 |
4 files changed, 150 insertions, 86 deletions
diff --git a/.gitignore b/.gitignore index 2f876cbc0f6d..e232a5065151 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ /makefile.mk /set_soenv /visibility.cxx +/post_download # misc /set_soenv.last diff --git a/configure.in b/configure.in index c63df79b1bbd..3f1839d10e02 100644 --- a/configure.in +++ b/configure.in @@ -3402,6 +3402,10 @@ if test "$_os" = "WINNT"; then with_jdk_home=`cygpath -u "$with_jdk_home"` fi fi +if test $_os = "WINNT"; then + WITH_VC_REDIST="TRUE" +fi +AC_SUBST(WITH_VC_REDIST) dnl =================================================================== dnl Checks for java @@ -6261,91 +6265,6 @@ fi AC_SUBST(ZIP_HOME) dnl =================================================================== -dnl Windows builds need dbghelp.dll in external/dbghelp/ -dnl =================================================================== -if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([for dbghelp.dll]) - if test -x ./external/dbghelp/dbghelp.dll; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([dbghelp.dll is missing in external/dbghelp/. -Get it from the Microsoft site and put it into external/dbghelp. -(Note: Microsoft seems to enjoy changing the exact location of this file. You -may have to search Microsoft's website.) Last time it was seen at: -<http://www.microsoft.com/downloads/release.asp?releaseid=30682>.]) - fi -fi - -dnl =================================================================== -dnl Windows builds - use oowintool to copy CRT dlls and manifest -dnl =================================================================== -if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then - if ./oowintool --msvc-copy-dlls ./external/msvcp ; then - : - else - AC_MSG_ERROR([oowintool failed to copy CRT]) - fi -fi - -dnl =================================================================== -dnl Windows builds need gdiplus.dll in external/gdiplus/ -dnl =================================================================== -if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([for gdiplus.dll]) - if test -x ./external/gdiplus/gdiplus.dll; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([gdiplus.dll is missing in external/gdiplus/. -Get it from the Microsoft site and put it into external/gdiplus. -You may have to search Microsoft's website. Last time it was seen at: -<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>.]) - fi -fi - -dnl =================================================================== -dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/ -dnl =================================================================== -if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([for vcredist_x86.exe]) - if test -e ./external/vcredist/vcredist_x86.exe; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([vcredist_x86.exe is missing in external/vcredist/. -Get the version corresponding to your Visual Studio from the Microsoft site -and put it into external/vcredist.]) - fi - AC_MSG_CHECKING([for vcredist_x64.exe]) - if test -e ./external/vcredist/vcredist_x64.exe; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([vcredist_x64.exe is missing in external/vcredist/. -Get the version corresponding to your Visual Studio from the Microsoft site -and put it into external/vcredist.]) - fi - WITH_VC_REDIST="TRUE" -fi -AC_SUBST(WITH_VC_REDIST) - -dnl =================================================================== -dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/ -dnl =================================================================== -if test "$_os" = "WINNT"; then - ./oowintool --msvc-copy-instmsi ./external/msi -fi - -dnl =================================================================== -dnl Windows builds with MSVS 2008/2010 need instmsiw.exe in external/msi -dnl =================================================================== -if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([for instmsiw.exe]) - if test -f ./external/msi/instmsiw.exe; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([instmsiw.exe is missing in external/msi.]) - fi -fi - -dnl =================================================================== dnl Test which vclplugs have to be built. dnl =================================================================== AC_MSG_CHECKING([which VCLplugs shall be built]) @@ -8177,3 +8096,8 @@ else fi echo fi + +dnl Setting up the post_download check script +echo "setting up the post_download check script" +autoconf post_download.in > post_download +chmod +x post_download @@ -30,7 +30,7 @@ if [ ! -d clone ] ; then ./g clone fi if [ -z "$TARFILE_LOCATION" ]; then - . ./*.Set.sh + . ./*[Ee]nv.[Ss]et.sh fi if [ ! -d "$TARFILE_LOCATION" ]; then @@ -156,6 +156,10 @@ done rm $TARFILE_LOCATION/tmp/*-* cd $start_dir +if [ -e post_download ] ; then + ./post_download +fi + if [ ! -z "$failed" ]; then echo echo ERROR: failed on: diff --git a/post_download.in b/post_download.in new file mode 100644 index 000000000000..674d6b10ec78 --- /dev/null +++ b/post_download.in @@ -0,0 +1,135 @@ +AC_INIT([LibreOffice], [3.3],,, [http://documentfoundation.org/]) +AC_PREREQ(2.50) + +echo "********************************************************************" +echo "*" +echo "* Running the post download checks." +echo "*" +echo "********************************************************************" + +dnl =================================================================== +dnl The following is a list of supported systems. +dnl =================================================================== +#defaults unless the os test overrides this: + +case "$build_os" in + solaris*) + _os=SunOS + ;; + linux-gnu*|k*bsd*-gnu*) + _os=Linux + ;; + gnu) + _os=GNU + ;; + cygwin*) # Windows + _os=WINNT + ;; + darwin*) # Mac OS X + _os=Darwin + ;; + os2*) + _os=OS2 + ;; + freebsd*) + _os=FreeBSD + ;; + osf) + _os=OSF1 + ;; + *netbsd*) + _os=NetBSD + ;; + aix*) + _os=AIX + ;; + openbsd*) + _os=OpenBSD + ;; + *) + AC_MSG_ERROR([$_os operating system is not suitable to build LibreOffice!]) + ;; +esac + +dnl =================================================================== +dnl Windows builds need dbghelp.dll in external/dbghelp/ +dnl =================================================================== +if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([for dbghelp.dll]) + if test -x ./external/dbghelp/dbghelp.dll; then + AC_MSG_RESULT([found]) + else + AC_MSG_ERROR([dbghelp.dll is missing in external/dbghelp/. +Get it from the Microsoft site and put it into external/dbghelp. +(Note: Microsoft seems to enjoy changing the exact location of this file. You +may have to search Microsoft's website.) Last time it was seen at: +<http://www.microsoft.com/downloads/release.asp?releaseid=30682>.]) + fi +fi + +dnl =================================================================== +dnl Windows builds - use oowintool to copy CRT dlls and manifest +dnl =================================================================== +if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then + if ./oowintool --msvc-copy-dlls ./external/msvcp ; then + : + else + AC_MSG_ERROR([oowintool failed to copy CRT]) + fi +fi + +dnl =================================================================== +dnl Windows builds need gdiplus.dll in external/gdiplus/ +dnl =================================================================== +if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([for gdiplus.dll]) + if test -x ./external/gdiplus/gdiplus.dll; then + AC_MSG_RESULT([found]) + else + AC_MSG_ERROR([gdiplus.dll is missing in external/gdiplus/. +Get it from the Microsoft site and put it into external/gdiplus. +You may have to search Microsoft's website. Last time it was seen at: +<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>.]) + fi +fi + +dnl =================================================================== +dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/ +dnl =================================================================== +if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([for vcredist_x86.exe]) + if test -e ./external/vcredist/vcredist_x86.exe; then + AC_MSG_RESULT([found]) + else + AC_MSG_ERROR([vcredist_x86.exe is missing in external/vcredist/. +Get the version corresponding to your Visual Studio from the Microsoft site +and put it into external/vcredist.]) + fi + AC_MSG_CHECKING([for vcredist_x64.exe]) + if test -e ./external/vcredist/vcredist_x64.exe; then + AC_MSG_RESULT([found]) + else + AC_MSG_ERROR([vcredist_x64.exe is missing in external/vcredist/. +Get the version corresponding to your Visual Studio from the Microsoft site +and put it into external/vcredist.]) + fi +fi + +dnl =================================================================== +dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/ +dnl =================================================================== +if test "$_os" = "WINNT"; then + ./oowintool --msvc-copy-instmsi ./external/msi +fi + +dnl =================================================================== +dnl Windows builds with MSVS 2008/2010 need instmsiw.exe in external/msi +dnl =================================================================== +if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([for instmsiw.exe]) + if test -f ./external/msi/instmsiw.exe; then + AC_MSG_RESULT([found]) + else + AC_MSG_ERROR([instmsiw.exe is missing in external/msi.]) + fi +fi |