svn commit: r1388588 - in /incubator/ooo/trunk/main: configure.in external/msvcp100/ external/msvcp100/README_msvcX100.dll.txt external/prj/d.lst scp2/source/ooo/file_library_ooo.scp

[ar...@apache.org]

Author: arielch
Date: Fri Sep 21 17:54:54 2012
New Revision: 1388588

URL: http://svn.apache.org/viewvc?rev=1388588&view=rev
Log:
#i120979# - Bundle msvcr100.dll to support Java 7

Added:
    incubator/ooo/trunk/main/external/msvcp100/
    incubator/ooo/trunk/main/external/msvcp100/README_msvcX100.dll.txt   (with props)
Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/external/prj/d.lst
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1388588&r1=1388587&r2=1388588&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Sep 21 17:54:54 2012
@@ -6106,6 +6106,22 @@ You may have to search Microsoft's websi
 fi
 
 dnl ===================================================================
+dnl Windows builds need msvcr100.dll in external/msvcp100/
+dnl ===================================================================
+if test "$_os" = "WINNT"; then
+   AC_MSG_CHECKING([for msvcr100.dll])
+   if test -x ./external/msvcp100/msvcr100.dll; then
+      AC_MSG_RESULT([found and executable])
+   else
+      AC_MSG_ERROR([msvcr100.dll is missing in external/msvcp100/.
+Get it from the Microsoft Visual C++ 2010 Redistributable Package (x86),
+from the Microsoft site and put it into external/msvcp100.
+You may have to search Microsoft's website. Last time it was seen at:
+<http://www.microsoft.com/en-us/download/search.aspx?q=Microsoft+Visual+C%2b%2b+2010+Redistributable>.])
+   fi
+fi
+
+dnl ===================================================================
 dnl Test which vclplugs have to be built.
 dnl ===================================================================
 AC_MSG_CHECKING([which VCLplugs shall be built])

Added: incubator/ooo/trunk/main/external/msvcp100/README_msvcX100.dll.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external/msvcp100/README_msvcX100.dll.txt?rev=1388588&view=auto
==============================================================================
--- incubator/ooo/trunk/main/external/msvcp100/README_msvcX100.dll.txt (added)
+++ incubator/ooo/trunk/main/external/msvcp100/README_msvcX100.dll.txt Fri Sep 21 17:54:54 2012
@@ -0,0 +1,2 @@
+Put msvcr100.dll  in this directory.
+Needed to support Java 7 built with VS2010.

Propchange: incubator/ooo/trunk/main/external/msvcp100/README_msvcX100.dll.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ooo/trunk/main/external/msvcp100/README_msvcX100.dll.txt
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/ooo/trunk/main/external/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external/prj/d.lst?rev=1388588&r1=1388587&r2=1388588&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external/prj/d.lst (original)
+++ incubator/ooo/trunk/main/external/prj/d.lst Fri Sep 21 17:54:54 2012
@@ -36,6 +36,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\
 ..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest
 ..\msm90\*.msm %_DEST%\bin%_EXT%
 
+..\msvcp100\msvcr100*.dll %_DEST%\bin%_EXT%
+
 ..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
 
 ..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1388588&r1=1388587&r2=1388588&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Sep 21 17:54:54 2012
@@ -1821,6 +1821,15 @@ File gid_File_Moz_Msvcr80
 End
 #endif
 
+#if defined(WNT)
+File gid_File_Lib_Msvcr100
+    TXT_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = SCP2_URE_DL_NORMAL("msvcr100");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+End
+#endif
+
 #ifndef SYSTEM_REDLAND
 File gid_File_Lib_Raptor
     TXT_FILE_BODY;