Author: jsc
Date: Tue Apr 22 09:29:27 2014
New Revision: 1589052
URL: http://svn.apache.org/r1589052
Log:
#124701# merge from trunk, bring moz bootstrap back to find profiles
Added:
openoffice/branches/AOO410/main/extensions/source/mozbootstrap/
- copied from r1589050,
openoffice/trunk/main/extensions/source/mozbootstrap/
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/extensions/prj/build.lst
openoffice/branches/AOO410/main/extensions/prj/d.lst
openoffice/branches/AOO410/main/postprocess/packcomponents/makefile.mk
openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/AOO410/main/scp2/source/ooo/module_hidden_ooo.scp
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1589050
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1589050
Modified: openoffice/branches/AOO410/main/extensions/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/extensions/prj/build.lst?rev=1589052&r1=1589051&r2=1589052&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/extensions/prj/build.lst (original)
+++ openoffice/branches/AOO410/main/extensions/prj/build.lst Tue Apr 22
09:29:27 2014
@@ -22,6 +22,7 @@ ex extensions\source\config\ldap
ex extensions\source\update\feed nmake - all ex_updchkfeed
ex_inc NULL
ex extensions\source\update\check nmake - all ex_updchk
ex_inc NULL
ex extensions\source\update\ui nmake - all ex_updchkui
ex_inc NULL
+ex extensions\source\mozbootstrap nmake - all
ex_mozbootstrap ex_inc NULL
ex extensions\util nmake - all ex_util
ex_preload ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib
ex_oooimprovecore NULL
# Fails at the moment
Modified: openoffice/branches/AOO410/main/extensions/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/extensions/prj/d.lst?rev=1589052&r1=1589051&r2=1589052&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/extensions/prj/d.lst (original)
+++ openoffice/branches/AOO410/main/extensions/prj/d.lst Tue Apr 22 09:29:27
2014
@@ -12,6 +12,7 @@ mkdir: %_DEST%\bin%_EXT%\so
..\%__SRC%\lib\ldapbe2.uno.so %_DEST%\lib%_EXT%\ldapbe2.uno.so
..\%__SRC%\lib\updchk.uno.so %_DEST%\lib%_EXT%\updchk.uno.so
..\%__SRC%\lib\updatefeed.uno.so %_DEST%\lib%_EXT%\updatefeed.uno.so
+..\%__SRC%\lib\mozbootstrap.uno.so %_DEST%\lib%_EXT%\mozbootstrap.uno.so
..\%__SRC%\bin\oleautobridge2.uno.dll
%_DEST%\bin%_EXT%\odf4ms\oleautobridge.uno.dll
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
@@ -50,3 +51,4 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
..\%__SRC%\misc\updchk.component %_DEST%\xml%_EXT%\updchk.component
..\%__SRC%\misc\updchk.uno.component %_DEST%\xml%_EXT%\updchk.uno.component
..\%__SRC%\misc\xmx.component %_DEST%\xml%_EXT%\xmx.component
+..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
Modified: openoffice/branches/AOO410/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/postprocess/packcomponents/makefile.mk?rev=1589052&r1=1589051&r2=1589052&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/postprocess/packcomponents/makefile.mk
(original)
+++ openoffice/branches/AOO410/main/postprocess/packcomponents/makefile.mk Tue
Apr 22 09:29:27 2014
@@ -211,6 +211,10 @@ my_components += component/vcl/vcl.unx
my_components += updchk.uno
.END
+.IF "$(OS)" != "WNT" && "$(OS)" != "OS2"
+my_components += mozbootstrap
+.END
+
.IF "$(ENABLE_OOOIMPROVEMENT)" != ""
my_components += oooimprovement
.END
Modified: openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp?rev=1589052&r1=1589051&r2=1589052&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp
(original)
+++ openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp Tue
Apr 22 09:29:27 2014
@@ -553,6 +553,15 @@ End
#endif
+#if !defined WNT && !defined OS2
+File gid_File_Lib_Mozbootstrap
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = SPECIAL_COMPONENT_LIB_NAME(mozbootstrap.uno);
+ End
+#endif
+
#if defined UNX && ! defined MACOSX
File gid_File_Lib_Desktopbe
Modified: openoffice/branches/AOO410/main/scp2/source/ooo/module_hidden_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1589052&r1=1589051&r2=1589052&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/scp2/source/ooo/module_hidden_ooo.scp
(original)
+++ openoffice/branches/AOO410/main/scp2/source/ooo/module_hidden_ooo.scp Tue
Apr 22 09:29:27 2014
@@ -373,6 +373,9 @@ Module gid_Module_Root_Files_5
gid_File_Lib_XSec_XMLSecurity,
gid_File_Lib_XSec_Framework,
gid_File_Lib_XSec_XmlSec,
+#if !defined WNT && ! defined OS2
+ gid_File_Lib_Mozbootstrap,
+#endif
gid_File_Lib_Xstor,
gid_File_CanvasFactory,
gid_File_SimpleCanvas,
