You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2012/03/08 18:22:17 UTC
svn commit: r1298475 - in /incubator/ooo/trunk/main: configure.in
external/prj/d.lst scp2/source/ooo/makefile.mk
scp2/source/ooo/vc_redist.scp set_soenv.in
Author: jsc
Date: Thu Mar 8 17:22:16 2012
New Revision: 1298475
URL: http://svn.apache.org/viewvc?rev=1298475&view=rev
Log:
119004: pack vc redistributavles under Windows only
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/external/prj/d.lst
incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
incubator/ooo/trunk/main/scp2/source/ooo/vc_redist.scp
incubator/ooo/trunk/main/set_soenv.in
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1298475&r1=1298474&r2=1298475&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Mar 8 17:22:16 2012
@@ -5767,6 +5767,32 @@ may have to search Microsoft's website.)
fi
dnl ===================================================================
+dnl Windows builds need vcredist_x*.exe in external/vcredist/
+dnl ===================================================================
+WITH_VC_REDIST=""
+
+if test "$_os" = "WINNT"; then
+ AC_MSG_CHECKING([for vcredist_x86.exe])
+ if test -x ./external/vcredist/vcredist_x86.exe; then
+ AC_MSG_RESULT([found and executable])
+ else
+ AC_MSG_ERROR([ vcredist_x86.exe is missing in external/vcredist/.
+Get it from the Microsoft site and put it into external/vcredist. You can try
+to download it from http://www.microsoft.com/download/en/search.aspx?q=redistributable%20package.])
+ fi
+ AC_MSG_CHECKING([for vcredist_x64.exe])
+ if test -x ./external/vcredist/vcredist_x64.exe; then
+ AC_MSG_RESULT([found and executable])
+ else
+ AC_MSG_ERROR([ vcredist_x64.exe is missing in external/vcredist/.
+Get it from the Microsoft site and put it into external/vcredist. You can try
+to download it from http://www.microsoft.com/download/en/search.aspx?q=redistributable%20package.])
+ fi
+ WITH_VC_REDIST=YES
+ AC_SUBST(WITH_VC_REDIST)
+fi
+
+dnl ===================================================================
dnl Windows builds - use oowintool to copy CRT dlls and manifest
dnl ===================================================================
if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
Modified: incubator/ooo/trunk/main/external/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external/prj/d.lst?rev=1298475&r1=1298474&r2=1298475&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external/prj/d.lst (original)
+++ incubator/ooo/trunk/main/external/prj/d.lst Thu Mar 8 17:22:16 2012
@@ -38,6 +38,9 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\
..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
+..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe
+..\vcredist\vcredist_x64.exe %_DEST%\bin%_EXT%\vcredist_x64.exe
+
..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll
..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll
Modified: incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk?rev=1298475&r1=1298474&r2=1298475&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Thu Mar 8 17:22:16 2012
@@ -271,7 +271,7 @@ SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
SCPDEFS+=-DENABLE_SVCTAGS
.ENDIF
-.IF "$(WITH_VC_REDIST)" == "TRUE"
+.IF "$(WITH_VC_REDIST)" == "YES"
SCPDEFS+=-DWITH_VC_REDIST
.ENDIF
Modified: incubator/ooo/trunk/main/scp2/source/ooo/vc_redist.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/vc_redist.scp?rev=1298475&r1=1298474&r2=1298475&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/vc_redist.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/vc_redist.scp Thu Mar 8 17:22:16 2012
@@ -26,21 +26,13 @@
#if defined(WITH_VC_REDIST)
ScpAction scp_Copy_vcredist_x86
- #if defined(BUILD_SPECIAL)
- Copy = "vcredist_x86_9.0.30729.4148.exe";
- #else
Copy = "vcredist_x86.exe";
- #endif
Name = "vcredist_x86.exe";
Subdir = "redist";
End
ScpAction scp_Copy_vcredist_x64
- #if defined(BUILD_SPECIAL)
- Copy = "vcredist_x64_9.0.30729.4148.exe";
- #else
Copy = "vcredist_x64.exe";
- #endif
Name = "vcredist_x64.exe";
Subdir = "redist";
End
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1298475&r1=1298474&r2=1298475&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Thu Mar 8 17:22:16 2012
@@ -2046,6 +2046,7 @@ if ( $platform =~ m/cygwin/ )
ToFile( "LS", $WIN_LS, "e" );
ToFile( "GNUCOPY", $WIN_GNUCOPY, "e" );
ToFile( "TOUCH", $WIN_TOUCH, "e" );
+ ToFile( "WITH_VC_REDIST", "@WITH_VC_REDIST@", "e" );
}
if ( $platform =~ m/os2/ )
{