From b28a2ad5fd0ca94db2f305168426ee97b0792e01 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 1 Jul 2009 12:16:08 +0000 Subject: [PATCH 01/30] #i10000# to 'honor' the lost path variable ... --- solenv/bin/localize | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 solenv/bin/localize diff --git a/solenv/bin/localize b/solenv/bin/localize new file mode 100755 index 000000000000..74a75ecc3aee --- /dev/null +++ b/solenv/bin/localize @@ -0,0 +1,20 @@ +#!/bin/sh +if [ x${SOLARENV}x = xx ]; then + echo No environment found, please use 'setsolar' +exit 1 +fi + +# localize.pl calls localize_sl in solver bin directory which depends on dynamic +# libraries in solver lib directory but has no correct RPATH (or equivalent): +if [ "${OS?}" = MACOSX ]; then + export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} +else + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} +fi + +if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx ]; then + exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@" +else + exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@" +fi + From 6cf5d5f6796a4bf8fad35592f4b9f827e8e769ad Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 2 Jul 2009 09:05:03 +0000 Subject: [PATCH 02/30] CWS-TOOLING: integrate CWS odfmetadata2 2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx: + add "include ustrbuf.hxx" to work around warning caused by solaris declaring a global "long l ;" 2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp: + fix MinGW build 2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk: + disable parsers that do not build on MinGW (thanks for patch by tono) 2009-05-15 17:31:07 +0200 mst r271957 : fix typos 2009-05-15 17:28:57 +0200 mst r271956 : #i101965# - offapi/com/sun/star/text/TextPortion: + add missing properties: SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField + fix read-only status of properties: Bookmark, IsStart, IsCollapsed - offapi/type_reference/{typelibrary_history.txt,types.rdb}: + update reference types.rdb 2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx}, sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx}, sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx, sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx, sw/source/ui/fldui/fldref.cxx: + fix warning ... the hard way + also fix signature of SwDoc::SetCurFtn 2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx: + make some members const 2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx: + make some members const 2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx}, sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}: + fix rebase merge error + rename SwHstryBookmark to SwHistoryBookmark + clean up SwUndoBookmark 2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx: + fix annoying assertion 2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47) 2009-05-04 12:37:01 +0200 mst r271444 : trivial 2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx: + trivial change 2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx: + introduce some predicates for the various hints, and use them 2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx, sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx}, sw/source/core/undo/{unattr.cxx,unins.cxx}: + clean up unattr.cxx: remove/fix casts, prefix members, use auto_ptr, etc. 2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx}, sw/source/core/doc/docfmt.cxx, sw/source/core/txtnode/{thints.cxx,txtedt.cxx}, sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx, unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}: + clean up SwHistory, SwRegHistory and SwHistoryHint etc.: remove/fix casts, prefix members, remove wrong const annotations, use auto_ptr, remove unused members, etc. 2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx, sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx, txtfrm.cxx,txtdrop.cxx,frmform.cxx}, sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx}, sw/source/core/edit/acorrect.cxx, sw/source/core/doc/{docedt.cxx,docfmt.cxx}, sw/source/filter/html/swhtml.cxx: + clean up SwHintsArray and its subclasses: remove/fix casts, prefix members 2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx, sw/source/core/undo/rolbck.cxx: + remove JP_NEWCORE dead code 2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx: + silence unxlngi warning (debug=t) 2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx, sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx: + trivial cleanups 2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx, sfx2/source/doc/objserv.cxx: + fix bug: replaying a macro with a DocumentInfoItem removes all user-defined properties 2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx: + add missing SolarMutex guards 2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx: + never free rdf_world because that would call libxm2 xmlCleanupParser (and, to add insult to injury, other libxml2 functions later...) 2009-03-06 19:02:44 +0100 mst r269041 : argh! undo... 2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931# - sw/source/ui/uno/unomod.cxx: + SwXViewSettings::_getSingleValue returns uninitialized memory for the ZoomType property if the value is PAGE_WIDTH_EXACT 2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx, sw/source/core/unocore/unoportenum.cxx: + fix some more wntmsci12 warnings... 2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx: + work around spurious warning on unxsoli4 debug=t 2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx: + back to c-style casts, they also compile on wntmsci12... 2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx, comphelper/source/processfactory/processfactory.cxx: + revert change of return type of comphelper_getProcessComponentContext to Reference: does not build on wntmsci12 2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}: + fix initialization 2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk: + fix CLASSPATH so complex tests run (fix by sb) 2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx, sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}: + SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr + move SwParaSelection into unoparagraph.cxx, as it is only used there + bugfix: replace SwUnoCrsrs on stack with SwCursors 2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx, sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx, sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx: + clean up SwPaM: prefix members + new constructor SwPosition(SwCntntNode&, xub_StrLen) + fix several broken SwPosition and SwPaM constructors + SwPam::DeleteMark now actually resets the unused position to default 2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx: + fix annoying warning (gcc 4) 2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java: + rename module from FieldMaster to fieldmaster 2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst, sfx2/source/doc/{Metadatable.cxx,makefile.mk}, sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx}, sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx}, sw/source/core/undo/{untbl.cxx,unins.cxx}, sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx: + move Metadatable implementation from sw to sfx2 2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx, sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}: + CreateUndo now returns an opaque MetadatableUndo object 2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx, sw/source/core/text/{itratr.cxx,porlay.cxx}, sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}: + clean up SwTxtNode: fix casts, prefix members + factor out inline function SwTxtNode::TryDeleteSwpHints() 2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx: + fix borken header guard 2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx: + fix use of compiler specific macro 2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx, txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx}, sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx, txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx}, sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx, sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx: + clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members + SwTxtINetFmt: remove unused member bColor - sw/source/core/text/txtfld.cxx: + move SwTxtFld methods to atrfld.cxx 2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx: + don't privately inherit BaseMutex, ScModelObj wants to access it 2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}: + arrrgh!!! someone thought it would be a good idea to have 2 different versions of boost in external! and they're NOT compatible!!! insert an ugly fragile hack that maybe works with both... 2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx. sfx2/source/doc/DocumentMetadataAccess.cxx: + someone made IsValidZipEntryFileName a static method and didn't tell me 2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches 2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw #i95863# - sw/inc/segdefs{,_}.hxx: + remove obsolete files - sw/source/ui/inc/itemdef.hxx: + remove itemdef.hxx - sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx, sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx: + use sfx2/msg.hxx instead of itemdef.hxx - sw/source/core/edit/eddel.cxx: + @ JP: SwEditShell::Replace: you're right, deleting the text to be replaced first, and then inserting a space, and then replacing that space is unnecessary. whew, i'm so happy that we finally answered that question after 11 years. - sw/inc/edimp.hxx: + remove FOREACHCURSOR_START, FOREACHCURSOR_END - sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx}, sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx, unocrsr.cxx,viscrs.cxx}, sw/source/core/doc/{docbm.cxx,doccorr.cxx}, sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx}, sw/source/core/edit/editsh.cxx, sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx}, sw/source/core/layout/trvlfrm.cxx, sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx, unoportenum.cxx,unotbl.cxx}, sw/source/core/view/vprint.cxx: + remove the hideous virtual operator SwFooCursor* + make SwCursor::IsReadOnlyAvailable() virtual + make SwUnoCrsr::Clone() virtual + refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable(): replace dynamic_cast<...>(this) with new virtual methods 2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw - sw/source/filter/xml/swxml.cxx: + XMLReader::Read: load RDF metadata of the ODF document - sw/source/filter/xml/wrtxml.cxx: + SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2 #i90620#: import xml:id in text tables (does not actually work yet) - sw/source/filter/xml/xmltbli{.hxx,.cxx}: + SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID + SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id + SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id + SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id + SwXMLTableContext::SwXMLTableContext: attribute xml:id fix #i98530# - sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx: + SwXTextPortion: make constructor params const& - sw/source/core/unocore/unoportenum.cxx: + refactor to remove some code duplication + fix bug: paragraph w/out hints: bookmark before frame gets lost #i97274# handle invalid tables - sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx: + SwXMLTableContext::MakeTable(): check that the table actually contains cells, and abort (removing the inserted table nodes) if not 2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw refactor SwXTextRange and SwXParagraph - sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx: + remove 3 constructors of SwXTextRange + new method SwXTextRange::CreateParentXText + refactor SwXTextRange::CreateTextRangeFromPosition and SwXTextRange::getText - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx: + SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode + replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode - sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx: + adapt to new SwXParagraph #i90620# - sw/inc/SwMetadatable.hxx, sw/source/core/doc/SwMetadatable.cxx: + new files: base classes sw::Metadatable and sw::MetadatableMixin; also, 2 implementations of IXmlIdRegistry: sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard + setMetadataReference: handle empty stream name as auto-detect - sw/source/core/doc/makefile.mk: + add SwMetadatable add a XmlIdRegistry to SwDoc - sw/inc/doc.hxx: + SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry() - sw/source/core/doc/docnew.cxx: + initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor, because the constructor is not told whether the SwDoc is a clipboard - sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx: + SwDocShell: override GetXmlIdRegistry() #i91563#: make the SwTxtNode metadatable - sw/inc/ndtxt.hxx + SwTxtNode inherits sw::Metadatable - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx: + SwXParagraph inherits sw::MetadatableMixin #i91563#: handle SwTxtNode's metadata for delete - sw/source/core/txtnode/ndtxt.cxx: + SwTxtNode::SplitCntntNode: handle XmlId + SwTxtNode::JoinNext: merge XmlIds - sw/source/core/doc/docedt.cxx: + lcl_GetJoinFlags: document postcondition + SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty #i91563#: handle SwTxtNode's metadata for delete with undo - sw/inc/undobj.hxx + SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd - sw/source/core/undo/undel.cxx: + SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode + SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty + SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode - sw/source/core/docnode/ndcopy.cxx: + SwTxtNode::MakeCopy: register copy at XmlIdRegistry #i91563#: handle SwTxtNode's metadata for find/replace with undo - sw/source/core/undo/unins.cxx: + _UnReplaceData: rename members: add prefix m_ + _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd + _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode + _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode #i91563#: handle SwTxtNode's metadata for table-to-text with undo - sw/source/core/undo/untbl.cxx: + SwTblToTxtSave: rename members: add prefix m_ + SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd + SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode + SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText: always store the index of the first SwTxtNode in the cell, instead of the index of the first SwTxtNode in case of the first cell in a row, and the cell start node in other cases + SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode - sw/source/core/docnode/ndtbl.cxx: + lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave 2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd - sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx: + remove invocations of SFX_DECL_TYPE - sd/source/ui/slideshow/SlideShowRestarter.cxx, sd/source/ui/toolpanel/LayoutMenu.cxx, sd/source/ui/unoidl/DrawController.cxx, sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}: + fix abuses of comphelper_getProcessComponentContext (missing release) 2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath - starmath/source/document.cxx: + don't touch SfxObjectShell's privates 2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2 #i90620# - sfx2/inc/sfx2/XmlIdRegistry.hxx: + new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier and a couple of utility functions - sfx2/inc/sfx2/DocumentMetadataAccess.hxx, sfx2/source/doc/DocumentMetadataAccess.cxx: + new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess + the URI of the DocumentMetadataAccess is now the URI from which the document was loaded; for a new document, use a vnd.sun.star.tdoc URI + add new function sfx2::createBaseURI() + prevent using reserved file names + try not to recurse into embedded subdocuments - sfx2/source/doc/makefile.mk: + add DocumentMetadataAccess - sfx2/util/makefile.mk: + link libsfx2 against libxml2 (needed for xmlValidateNCName) - sfx2/source/doc/makefile.mk: + add LIBXML_CFLAGS to CFLAGS - sfx2/prj/build.lst: + add dependence on libxml2 - sfx2/prj/d.lst: + add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx - sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx: + make SfxObjectShell's members private + new method SfxObjectShell::GetAutoStyleFilterIndex + SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier - sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx: + don't touch SfxObjectShell's privates - sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx: + SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer + SfxBaseModel implements additional interface XDocumentMetadataAccess + IMPL_SfxBaseModel_DataContainer has new member: a sfx2::DocumentMetadataAccess + implementation of XDocumentMetadataAccess forwards to the sfx2::DocumentMetadataAccess member - sfx2/qa/complex/DocumentMetadataAccessTest.java, sfx2/qa/complex/{tests.sce,makefile.mk}, sfx2/qa/complex/testdocuments/TESTRDFA.odt: + add complex test: DocumentMetadataAccessTest + add RDFa test document #i95863# - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx: + refactor SfxDocumentItem so it no longer requires a XDocumentInfo + move struct CustomProperty to implementation file + remove class SfxDocumentUserPage + QueryValue,PutValue: remove MID_DOCINFO_FIELD* - sfx2/source/doc/objserv.cxx: + adapt to SfxDocumentItem change - sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx: + remove MID_DOCINFO_FIELD* + put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE - sfx2/source/doc/objxtor.cxx: + fix abuses of comphelper_getProcessComponentContext (missing release) - sfx2/source/doc/docfile.cxx: + SfxMedium::SfxMedium: don't dereference NULL, throw exception instead - sfx2/source/doc/objstor.cxx: + SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized 2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff #i90620#: implement RDFa import (interface change) - xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx: + make SvXMLImport::GetAbsoluteReference() const + add SvXMLImport::GetComponentContext() + SvXMLImport::_InitCtor(): add RDFa namespace + add SvXMLImport::AddRDFa() + SvXMLImport::endDocument() inserts RDFa into document repository - xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx: + new tokens for RDFa: XML_ABOUT, XML_DATATYPE - xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx: + new class RDFaImportHelper + adapt the code to the bleak reality of broken C++ implementations + handle empty xhtml:about attributes properly, which are actually valid relative URIs + work around broken SvXMLImport::GetAbsoluteReference - xmloff/source/core/makefile.mk: + add RDFaImportHelper.cxx #i90620#: implement RDFa export - xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx: + add SvXMLExport::EnsureNamespace(), and a stack of namespace maps + add SvXMLExport::GetComponentContext() + add SvXMLExport::AddAttributesRDFa() - xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx: + new class RDFaExportHelper + don't use std::map::data_type, which is actually called std::map::mapped_type by libstdc++ - xmloff/source/core/makefile.mk: + add RDFaExportHelper.cxx #i91563# - xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx: + XMLTextPAttrTokens: add RDFa tokens - xmloff/source/text/txtparai{.hxx,.cxx}: + import RDFa for text:p - xmloff/source/text/txtparae.cxx: + export RDFa for text:p interface change: use XHTML namespace instead of RDFA - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx}, xmloff/source/text/txtimp.cxx: + use XHTML namespace instead of RDFA #i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field - xmloff/source/text/txtparai.cxx: + new class XMLMetaImportContextBase with subclasses to import text:meta and text:meta-field - xmloff/source/text/XMLTextMarkImportContext.cxx: + change XMLTextMarkImportContext::CreateAndInsertMark to handle marks with no name (text:meta) #i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field - xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx: + add FIELD_ID_META to FieldIdEnum + new method XMLTextFieldExport::ExportMetaField() + change XMLTextFieldExport::ExportField{,AutoStyle,Helper} to take additional parameter for progress bar - xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx: + make XMLTextParagraphExport::exportTextRangeEnumeration() public + new method XMLTextParagraphExport::exportMeta() #i90620# - xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx, xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx: + rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName() + fix xml:id {im,ex}port for embedded documents and non-packages + adapt to API change: XMetadatable #i90620# GRDDL - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}: + add GRDDL namespace + add token XML_TRANSFORMATION + add grddl:transformation attribute to root elements for meta.xml, content.xml and styles.xml 2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml #i90620# - unoxml/source/rdf/librdf_repository.cxx: + librdf_Repository::importGraph: allocate buffer sized length of stream + switch from one librdf_world per repository to a single static world because redland has global variables with a brain-damaged life-cycle... + exportGraph: use new raptor 1.4.18 feature to disable writing an xml:base attribute in RDF/XML files - unoxml/source/rdf/librdf_repository.cxx: unoxml/qa/complex/RDFRepositoryTest.java: + adapt to predicate is URI change + adapt to RDFa API change + adapt to API change: RDFa has multiple predicates... + adapt to API change: XMetadatable derives from XURI + allow xhtml:datatype without xhtml:content + adapt to API change: attribute MetadataReference is StringPair - unoxml/source/rdf/CURI.cxx: + add some more URI constants 2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package - package/inc/ImplValidCharacters.hxx: + remove (moved to comphelper) 2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper - comphelper/inc/comphelper/processfactory.hxx, comphelper/source/processfactory/processfactory.cxx: + add getProcessComponentContext() + change return type of comphelper_getProcessComponentContext to Reference - comphelper/inc/comphelper/stl_types.hxx: + add OUStringBufferAppender + add algorithm intersperse - comphelper/source/misc/string.cxx: + rewrite convertCommaSeparated with intersperse and OUStringBufferAppender - comphelper/inc/comphelper/stlunosequence.hxx: + fix bug: begin() on empty sequence != end() 2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi #i96209# - offapi/com/sun/star/text/fieldmaster/*.idl: + rename module from FieldMaster to fieldmaster - offapi/type_reference/{typelibrary_history.txt,types.rdb}: + update reference types.rdb #i90620# - offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}: + API change: XMetadatable derives from XURI + API change: replace XmlId (string) with MetadataReference (StringPair) - offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl, XNamedGraph.idl,XRepository.idl}: + the predicate of a statement is a URI, not a Resource - offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl: + rename: s/Package/Document/ + remove uuid + remove everything related to mapping + graph names are now generated from base URI and file names + load methods: improve error handling with XInteractionHandler - offapi/com/sun/star/rdf/XDocumentRepository.idl: + change: RDFa permits using multiple predicates in one attribute + setStatementRDFa: subject is now XResource, object is now XMetadatable - offapi/com/sun/star/rdf/URIs.idl: + add some more URI constants - offapi/com/sun/star/rdf: + fix @since tags and replace with 2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland fix #i93768# - redland/raptor-1.4.17.patch, redland/raptor/makefile.mk: + disable GRDDL parser to prevent call to libxslt xsltSetDefaultSecurityPrefs, which breaks xmlhelp - redland/raptor/makefile.mk, redland/raptor-1.4.17.patch, redland/raptor-1.4.18.patch: + upgrade raptor to 1.4.18 + deactivate serializer for RSS/Atom (does not build) - redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch, redland/rasqal-0.9.16.patch, + upgrade rasqal to 0.9.16 - redland/redland/makefile.mk, redland/redland-1.0.7.patch, redland/redland-1.0.8.patch: + upgrade redland to 1.0.8 - redland/redlandversion.mk: + the librasqal SONAME has changed --- scp2/source/ooo/file_library_ooo.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index cc07b3254b40..c5cffb6cf870 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1742,7 +1742,7 @@ File gid_File_Lib_Rasqal #endif #else #ifdef _gcc3 - Name = "librasqal-0.dll"; + Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll)); #else Name = "rasqal.dll"; #endif From 9e7efde23d5e956723527e769347beaa0559cae9 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Fri, 3 Jul 2009 10:14:57 +0000 Subject: [PATCH 03/30] CWS-TOOLING: integrate CWS perftest08 2009-07-02 10:03:16 +0200 lla r273621 : #159516# support systems with no JAVA_HOME 2009-07-02 10:00:25 +0200 lla r273620 : #159516# if path is null this not an error 2009-07-01 14:36:05 +0200 lla r273583 : #159516# add check for wrong cygwin path 2009-06-22 13:18:14 +0200 lla r273223 : #159516# add PipeConnectionString 2009-06-18 21:44:59 +0200 lla r273137 : #159516# cleanups 2009-06-18 21:44:17 +0200 lla r273136 : #159516# handle null 2009-06-18 21:42:56 +0200 lla r273135 : #159516# add getElementCount() function 2009-06-15 10:40:05 +0200 lla r272966 : CWS-TOOLING: rebase CWS perftest08 to trunk@272827 (milestone: DEV300:m50) 2009-06-02 09:06:22 +0200 lla r272480 : CWS-TOOLING: rebase CWS perftest08 to trunk@272291 (milestone: DEV300:m49) 2009-05-08 11:40:22 +0200 mib r271710 : #159717#: File name info for performance test (added void to hasLogFile() parameter list) 2009-05-05 14:14:25 +0200 mib r271514 : #159717#: File name info for performance test 2009-05-04 15:23:01 +0200 mib r271466 : #159717#: File name infor for performance test 2009-05-04 15:22:27 +0200 mib r271465 : #159717#: File name infor for performance test 2009-05-04 15:21:56 +0200 mib r271464 : #159717#: File name infor for performance test 2009-05-04 15:21:18 +0200 mib r271462 : #159717#: File name infor for performance test 2009-04-29 16:23:40 +0200 lla r271383 : #159516# cleanups 2009-04-29 16:23:20 +0200 lla r271382 : #159516# cleanups 2009-04-08 12:23:01 +0200 lla r270631 : #159516# typo 2009-04-07 10:30:35 +0200 lla r270580 : #159516# add prototype 2009-04-07 10:21:15 +0200 lla r270579 : #159516# cleanup 2009-04-03 09:05:26 +0200 lla r270448 : #159516# small cleanups 2009-03-30 13:22:26 +0200 lla r270221 : #159517# merge perftest07 --- solenv/bin/checkapi | 9 +++- solenv/bin/install-sh | 3 ++ solenv/bin/installoffice | 15 +++--- solenv/bin/installoffice.btm | 72 +++++++++++++++++++++------ solenv/bin/installoffice.pl | 46 ++++++++++++++--- solenv/bin/installoffice_impress.oxt | Bin 0 -> 1311 bytes 6 files changed, 113 insertions(+), 32 deletions(-) create mode 100755 solenv/bin/install-sh create mode 100755 solenv/bin/installoffice_impress.oxt diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi index 4725045c9583..6ddabfe9a46d 100755 --- a/solenv/bin/checkapi +++ b/solenv/bin/checkapi @@ -8,6 +8,7 @@ fi JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT +# it is possible to give an other OOoRunner.jar if [ -n "$RUNNERJAR" ]; then myCLASSPATH=$RUNNERJAR else @@ -26,8 +27,12 @@ elif [ -n "$JAVA_HOME" ]; then JAVABIN=$JAVA_HOME/bin/java fi else - echo "please set environment variable JAVA_HOME" - exit 1 + # there seems to be some machines without real java + JAVABIN=$(which java) + if [ -z "$JAVABIN" ]; then + echo "please set environment variable JAVA_HOME" + exit 1 + fi fi if [ x${USER}x = xx ]; then diff --git a/solenv/bin/install-sh b/solenv/bin/install-sh new file mode 100755 index 000000000000..fb942ef71665 --- /dev/null +++ b/solenv/bin/install-sh @@ -0,0 +1,3 @@ +;; This file is automatically created by diff_all_filter.pl +;; Fri Mar 27 08:02:00 2009 + diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice index 602934958b53..29645688b56a 100755 --- a/solenv/bin/installoffice +++ b/solenv/bin/installoffice @@ -1,3 +1,4 @@ +#!/bin/bash #************************************************************************* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -5,10 +6,6 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: installoffice,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -27,7 +24,6 @@ # for a copy of the LGPLv3 License. #***********************************************************************/ -#!/bin/bash EXIT_SUCCESS=0 EXIT_FAILURE=1 EXIT_ERROR=2 @@ -47,6 +43,8 @@ usage() { echo "[-d] installation with debug output" >&2 echo "" >&2 echo "[-a] the office will be patched to run without FirstStartWizard" >&2 + echo "" >&2 + echo "[-i] impress should open documents without autopilot" >&2 exit $EXIT_FAILURE } @@ -63,7 +61,7 @@ fi DESTPATH=/tmp/$USER PARAM="" -while getopts ':mt:acdhot' OPTION ; do +while getopts ':mt:aicdhot' OPTION ; do case $OPTION in d) PARAM="$PARAM -debug true" ;; @@ -73,6 +71,8 @@ while getopts ':mt:acdhot' OPTION ; do ;; a) PARAM="$PARAM -autorun true" ;; + i) PARAM="$PARAM -autoimpress true" + ;; t) DESTPATH="$OPTARG" ;; h) usage $EXIT_SUCCESS @@ -93,7 +93,10 @@ LOCALUNPACKDIR=$DESTPATH/unpack export LOCALINSTALLDIR export LOCALUNPACKDIR +echo "export LOCALINSTALLDIR" +echo "export LOCALUNPACKDIR" +unset LD_LIBRARY_PATH unset FORCE2ARCHIVE echo "### $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@" diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm index 983ee9e3df02..ffd6633fafcd 100755 --- a/solenv/bin/installoffice.btm +++ b/solenv/bin/installoffice.btm @@ -28,6 +28,54 @@ REM * REM * for a copy of the LGPLv3 License. REM ************************************************************************/ + +SET DESTPATH=%USERNAME% +SET DEBUG=false +SET OOO=false +SET PARAM= + +for %opt in (%&%) DO ( + iff "%opt%" == "-d" THEN + SET PARAM=%PARAM% -debug true + shift + + elseiff "%opt%" == "-o" THEN + SET PARAM=%PARAM% -ooo true + shift + + elseiff "%opt%" == "-c" THEN + SET PARAM=%PARAM% -cwscheckapi true + shift + + elseiff "%opt%" == "-a" THEN + SET PARAM=%PARAM% -autorun true + shift + + elseiff "%opt%" == "-i" THEN + SET PARAM=%PARAM% -autoimpress true + shift + + elseiff "%opt%" == "-t" THEN + SET DESTPATH=%2 + shift + shift + + elseiff "%opt%" == "-h" THEN + goto usage + + elseiff "%opt%" == "/h" THEN + goto usage + + elseiff "%opt%" == "%DESTPATH%" THEN + shift + + else + echo wrong param: %opt% + goto usage + endiff +) + +iff "%DESTPATH%" == "%USERNAME%" THEN iff EXIST e:\ then iff EXIST e:\temp then set temppath=e:\temp @@ -44,25 +92,15 @@ elseiff EXIST c:\temp then else set temppath=%TMP% endiff - -SET DESTPATH=%temppath%\%USERNAME% -SET DEBUG=false -SET OOO=false -SET PARAM= - -for %opt in (%&%) DO ( - if "%opt%" == "-d" (SET PARAM=%PARAM% -debug true ^ shift) - if "%opt%" == "-o" (SET PARAM=%PARAM% -ooo true ^ shift) - if "%opt%" == "-c" (SET PARAM=%PARAM% -cwscheckapi true ^ shift) - if "%opt%" == "-a" (SET PARAM=%PARAM% -autorun true ^ shift) - if "%opt%" == "-t" (SET DESTPATH=%2 ^ shift ^ shift) - if "%opt%" == "-h" goto usage - if "%opt%" == "/h" goto usage -) + DESTPATH=%temppath%\%USERNAME% +endiff SET LOCALINSTALLDIR=%DESTPATH%\office SET LOCALUNPACKDIR=%DESTPATH%\unpack +echo LOCALINSTALLDIR=%LOCALINSTALLDIR% +echo LOCALUNPACKDIR=%LOCALUNPACKDIR% +echo call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %& call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %& quit %? @@ -75,8 +113,10 @@ quit %? echo. echo [-o] force OpenOffice.org installation instead of StarOffice>&2 echo. - echo [-t] target path: path wehre tho office should installed to. The default is '%DESTPATH%'>&2 + echo [-t] target path: path where the office should installed to. The default is '%DESTPATH%'>&2 echo. echo [-a] the office will be patched to run without FirstStartWizard >&2 echo. + echo [-i] impress should open documents without autopilot + echo. quit 1 diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl index a8ef48e53df6..4a50eb891636 100755 --- a/solenv/bin/installoffice.pl +++ b/solenv/bin/installoffice.pl @@ -39,6 +39,9 @@ my $script = $0; ( our $script_name = $script ) =~ s/^.*\b(\w+)\.pl$/$1/; ( our $script_path = $script ) =~ s/$script_name.*//; +# Prototypes +sub installOffice(); + our $debug = 0; # run without executing commands our $is_command_infos = 1; # print command details before exec @@ -54,6 +57,9 @@ our $cleanup = 0; # should the office be startable without user interaction our $autorun = 0; +# should impress open documents without autopilot +our $autoimpress = 0; + # force openOffice.org installation if StarOffice is available our $is_ooo = 0; @@ -292,18 +298,31 @@ sub installOffice(){ makeAutoRun($destinationPath); } + if ($autoimpress) { + makeAutoImpress($destinationPath); + } + return $success; } +sub makeAutoImpress(){ + my $destinationPath = shift; + + if (patchXCU ($destinationPath, $script_path.$script_name."_impress.oxt") != 0) { + print_error("could not register ".$script_path.$script_name."_impress.oxt", "1"); + } + return 0; +} + + sub makeAutoRun(){ my $destinationPath = shift; patchBootstraprc($destinationPath); - - if (patchXCU ($destinationPath) != 0) { - print_error("could not patch XCU files", "1"); + if (patchXCU ($destinationPath, $script_path.$script_name.".oxt") != 0) { + print_error("could not register ".$script_path.$script_name.".oxt", "1"); } return 0; } @@ -340,6 +359,7 @@ sub patchBootstraprc(){ sub patchXCU(){ my $destinationPath = shift; + my $oxt = shift; my $unopkg=""; find sub { $unopkg=$File::Find::name if -e _ && /$UNOPKGBIN$/ }, $destinationPath; @@ -351,8 +371,8 @@ sub patchXCU(){ $unopkg = "\"$unopkg\""; } - my $unopkgCommand = "$unopkg add $script_path".$script_name.".oxt"; - print "patch xcu files for automatic office start...\n" if $debug; + my $unopkgCommand = "$unopkg add $oxt"; + print "register oxt file ...\n" if $debug; print "call $unopkgCommand\n" if $debug; my $success=0; $success = system($unopkgCommand); @@ -471,12 +491,17 @@ sub getInstsetUtilFolder(){ my $instsetFolder = $RootDir.$PS.$instset; my $utilFolder=""; - if(-w $instsetFolder) { + if( open(DATEI, ">$instsetFolder".$PS."touch")) + { + close(DATEI); + unlink($instsetFolder.$PS."touch"); print "$instsetFolder is writable \n" if $debug; $utilFolder = $RootDir.$PS.$instset.$PS."util"; - } else { + } + else + { print "$instsetFolder is NOT writable \n" if $debug; - print "copy $instset to $destPath$PS..n" if $debug; + print "copy $instset to $destPath$PS..\n" if $debug; my $prjPath=$destPath.$PS.".."; my $command = "$ENV{COPYPRJ} -x $instset $prjPath"; @@ -874,6 +899,11 @@ sub parseArgs if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autorun = 1 }; } + if ( $ARGV[$i] =~ /^-autoimpress$/ ) { + my $value = $ARGV[++$i]; + if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autoimpress = 1 }; + } + if ( $ARGV[$i] =~ /^-debug$/ ) { my $value = $ARGV[++$i]; if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $debug = 1 }; diff --git a/solenv/bin/installoffice_impress.oxt b/solenv/bin/installoffice_impress.oxt new file mode 100755 index 0000000000000000000000000000000000000000..31c7bfa45c0697721442fb7c6728901ede8aee8c GIT binary patch literal 1311 zcmWIWW@Zs#U|`^2h+SM|`Qs+D%xfU8nUR5kn?aPpGq<29wYXTXBDpj)gp+}paj~u^ z2!~d%FvJ(JFs4q3^*(GM()Rwlw$r=oB~{9*Zv|2mEJQ;-m@Qi#8&T!wv1#k?@5|m^ zIJ9ok9{J~%E_v{VUE{BbUaK-u-=wrpz+hdrsHnFq zkE@YaUB^XHrwPnUmKjPJeOkNY^yl6W7iJ0kZH@oz{G15%ypvUUs>zZCFl5$~L6C1E|y3WIjzMf^`{?%(e7l4oDida^c!)0{_c)hmut#g;8? zGPmyqiENfr51O#?Q~tr}W+vO$y4!B_U!#2gt+9(2XMt(W{eK_67W+LZ+n{$3vc%s{73w;LXS+#*8bY@`7Uv7>ph=MQ3^NH=nt_ Date: Fri, 3 Jul 2009 12:24:35 +0000 Subject: [PATCH 04/30] CWS-TOOLING: integrate CWS dbaperf2 2009-06-22 11:04:36 +0200 msc r273202 : #100000# fix to run this test 2009-06-22 09:41:04 +0200 msc r273200 : #100000# correct case 2009-06-22 09:02:42 +0200 msc r273199 : new SRB 2009-06-22 08:53:26 +0200 msc r273198 : #100000 2009-06-15 12:36:32 +0200 oj r272976 : test 2009-06-12 14:23:23 +0200 msc r272918 : #101587# unused feature was removed 2009-06-12 06:45:17 +0200 oj r272903 : use GUI instead of OS 2009-06-11 09:12:30 +0200 oj r272845 : remove unused dep 2009-06-11 09:11:09 +0200 oj r272844 : ColumnAliasInOrderBy not supported 2009-06-11 08:27:00 +0200 oj r272843 : CWS-TOOLING: rebase CWS dbaperf2 to trunk@272827 (milestone: DEV300:m50) 2009-06-10 15:30:17 +0200 msc r272822 : #100000 2009-06-10 15:27:40 +0200 msc r272820 : #102515# new function for the database type list 2009-06-10 15:26:09 +0200 msc r272818 : move file to dbaccess/tools/dbcreatetools.inc 2009-06-10 15:20:10 +0200 msc r272816 : #102515# new function for the database type list 2009-06-10 12:34:46 +0200 oj r272803 : #i101587# check extension 2009-06-10 11:53:45 +0200 oj r272800 : remove unused code 2009-06-09 09:57:25 +0200 oj r272752 : #i101587# EscapeDateTime moved into features section 2009-06-09 09:56:26 +0200 oj r272751 : enable finish 2009-06-08 11:50:37 +0200 oj r272726 : #i102588# move convert tzo saveDataSource 2009-06-05 11:54:20 +0200 jsk r272676 : #i102515# - NEW: Functions to retrieve Database names from API 2009-06-05 10:52:22 +0200 jsk r272671 : NEW: Functions to retrieve Database names from API 2009-06-05 09:36:54 +0200 oj r272666 : handle win and unx differently 2009-06-05 09:36:28 +0200 oj r272665 : handle win and unx differently 2009-06-04 13:41:56 +0200 oj r272625 : #i101268# make use of stringbuffer instead of oustring 2009-06-04 10:18:14 +0200 oj r272612 : add SAL_DLLPUBLIC_EXPORT 2009-05-28 10:56:33 +0200 oj r272381 : #i101587# create langpacks 2009-05-28 10:41:59 +0200 oj r272380 : #i101587# create langpacks 2009-05-28 10:29:30 +0200 oj r272379 : #i101587# create langpacks 2009-05-07 10:11:46 +0200 oj r271635 : fix compile warnings 2009-05-07 07:01:31 +0200 oj r271619 : change type from int32 to PathID 2009-05-07 06:53:19 +0200 oj r271618 : add all 2009-05-06 14:57:02 +0200 oj r271595 : add missing lib 2009-05-06 14:56:54 +0200 oj r271594 : no used anymore 2009-05-06 14:56:08 +0200 oj r271593 : no used anymore 2009-05-06 14:54:25 +0200 oj r271592 : no used anymore 2009-05-06 14:45:59 +0200 oj r271591 : add missing lib 2009-05-06 14:41:54 +0200 oj r271590 : change wnt 2009-05-06 14:22:21 +0200 oj r271589 : #i101587# use config for the drivers 2009-05-06 14:21:39 +0200 oj r271588 : #i101587# add new set for metadata and config data for driver 2009-05-06 14:19:36 +0200 oj r271587 : #i101587# handle metadata and props of driver 2009-05-06 10:11:11 +0200 oj r271570 : #i101587# correct wrong use of reference 2009-05-06 09:24:33 +0200 oj r271567 : #i101587# add new set for metadata 2009-05-06 08:52:06 +0200 oj r271563 : #i101587# add driver configuration 2009-05-06 08:51:04 +0200 oj r271562 : #i101587# add driver configuration 2009-05-04 10:24:41 +0200 oj r271442 : CWS-TOOLING: rebase CWS dbaperf2 to trunk@271427 (milestone: DEV300:m47) 2009-04-28 07:06:22 +0200 oj r271303 : compile error 2009-04-27 14:12:48 +0200 oj r271270 : #i101268# make use of stringbuffer instead of oustring 2009-04-27 14:12:27 +0200 oj r271269 : #i101268# make use of stringbuffer instead of oustring 2009-04-27 09:30:10 +0200 oj r271255 : use string buffer when possible 2009-04-24 11:56:01 +0200 oj r271207 : #i101268# remove end() call from loop 2009-04-23 14:24:03 +0200 oj r271171 : add dep 2009-04-23 13:25:25 +0200 oj r271164 : #i101268# add config entries for database drivers 2009-04-23 13:07:13 +0200 oj r271161 : #i101268# add config entries for database drivers 2009-04-23 13:06:33 +0200 oj r271160 : #i101268# add parent url pattern entry for driver node 2009-04-23 13:05:39 +0200 oj r271159 : #i101268# add config entry for driver node 2009-04-23 13:04:09 +0200 oj r271157 : #i101268# add config entry for driver node 2009-04-23 06:41:32 +0200 oj r271142 : #i101268# add new configuration file Drivers 2009-04-22 13:49:19 +0200 oj r271103 : convert EOL 2009-04-22 13:29:17 +0200 oj r271101 : #i101268# use of driver configuration entries for features and properties 2009-04-22 13:28:08 +0200 oj r271100 : #i101268# use of driver configuration entries for features and properties 2009-04-22 13:15:26 +0200 oj r271098 : #i101268# add new configuration file Drivers 2009-04-22 13:14:43 +0200 oj r271097 : #i101268# use of driver configuration entries for features and properties --- scp2/source/calc/file_calc.scp | 6 ++ scp2/source/calc/module_calc.scp | 2 +- scp2/source/ooo/directory_ooo.scp | 30 +++++++-- scp2/source/ooo/file_library_ooo.scp | 85 ++++++++++++++++++++++-- scp2/source/ooo/file_ooo.scp | 7 ++ scp2/source/ooo/module_hidden_ooo.scp | 13 ++++ scp2/source/ooo/module_lang_template.scp | 1 + 7 files changed, 133 insertions(+), 11 deletions(-) diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 904960fdbdb1..89096b80f87c 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -41,6 +41,12 @@ End STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis) +File gid_File_Oo_Office_Dataaccess_Calc_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/calc.xcu"; +End STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc) STD_UNO_LIB_FILE( gid_File_Lib_Date, date) diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index eac234c7793a..939b2cd81ac1 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -45,7 +45,7 @@ Module gid_Module_Prg_Calc_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml, + Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml, gid_File_Lib_Solver,gid_File_Lib_Lpsolve, gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs, gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu, diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index a7b58c83e72b..a6e2eba60361 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -207,6 +207,11 @@ Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui DosName = "UI"; End +Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess + ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; + HostName = "DataAccess"; +End + Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; DosName = "OOoImprovement"; @@ -747,6 +752,11 @@ Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui HostName = "UI"; End +Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess + ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; + HostName = "DataAccess"; +End + Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; HostName = "OOoImprovement"; @@ -792,6 +802,11 @@ Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui HostName = "UI"; End +Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess + ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; + HostName = "DataAccess"; +End + Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice; HostName = "ucb"; @@ -922,11 +937,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting HostName = "Scripting"; End -Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "DataAccess"; -End - Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; HostName = "Addons"; @@ -957,6 +967,16 @@ Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc HostName = "Misc"; End +Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess + ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; + HostName = "DataAccess"; +End + +Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers + ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess; + HostName = "Drivers"; +End + Directory gid_Dir_Autotext ParentID = gid_Dir_Share; DosName = "autotext"; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index c5cffb6cf870..fb04a05f0952 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -39,10 +39,22 @@ End #endif #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) ) STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas) +File gid_File_Oo_Office_Dataaccess_Adabas_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/adabas.xcu"; +End #endif #if defined(WNT) STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado) +File gid_File_Oo_Office_Dataaccess_Ado_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/ado.xcu"; +End #endif STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl) @@ -267,10 +279,15 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm) STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase ) +File gid_File_Oo_Office_Dataaccess_Dbase_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/dbase.xcu"; +End STD_LIB_FILE( gid_File_Lib_Dbfile , file) - -STD_LIB_FILE(gid_File_Lib_Odbcbase,odbcbase) +STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) File gid_File_Lib_Dbpool @@ -435,7 +452,12 @@ End #ifdef UNX #ifdef ENABLE_KAB - +File gid_File_Oo_Office_Dataaccess_Kab_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/kab.xcu"; +End File gid_File_Lib_Kab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -454,7 +476,12 @@ End #endif #ifdef MACOSX - +File gid_File_Oo_Office_Dataaccess_Macab_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/macab.xcu"; +End File gid_File_Lib_Macab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -473,6 +500,12 @@ End #endif // #ifdef ENABLE_KAB #ifdef ENABLE_EVOAB2 +File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/evoab2.xcu"; +End STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab) @@ -502,6 +535,12 @@ File gid_File_Lib_Filterconfig1 Name = SPECIAL_NAME(filterconfig1); End +File gid_File_Oo_Office_Dataaccess_Flat_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/flat.xcu"; +End STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat) #ifdef WNT @@ -781,11 +820,22 @@ End #ifdef SOLAR_JAVA STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) +File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/jdbc.xcu"; +End #endif #ifdef SOLAR_JAVA - +File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/hsqldb.xcu"; +End File gid_File_Lib_Hsqldb_2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -904,6 +954,13 @@ End #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX) // #i91209# +File gid_File_Oo_Office_Dataaccess_Mozab_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/mozab.xcu"; +End + STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab) STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) @@ -1011,7 +1068,25 @@ End #endif STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) +File gid_File_Oo_Office_Dataaccess_Mysql_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/mysql.xcu"; +End STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc) +File gid_File_Oo_Office_Dataaccess_Odbc_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; + Name = "/registry/spool/DataAccess/odbc.xcu"; +End + +File gid_File_Registry_Drivers_Zip + Dir = gid_Dir_Share_Registry_Res_Lang; + ARCHIVE_TXT_FILE_BODY; + EXTRA_ALL_LANG(fcfg_drivers); +End // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 69afeed98f26..5ddbbe70b70f 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1513,6 +1513,13 @@ File gid_File_Oo_Office_Dataaccess_Xcu Name = "/registry/data/org/openoffice/Office/DataAccess.xcu"; End +File gid_File_Oo_Office_Dataaccess_Drivers_Xcs + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess; + Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs"; +End + File gid_File_Oo_Office_Ui_Dbucommands_Xcs TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 3d9aefb92e2f..c08852aae29a 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -174,10 +174,12 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Dba, gid_File_Lib_Dbacfg, gid_File_Lib_Dbase2, + gid_File_Oo_Office_Dataaccess_Dbase_Xcu, gid_File_Lib_Dbaxml, gid_File_Lib_Dbt, gid_File_Lib_Dbfile, gid_File_Lib_Drawinglayer, + gid_File_Oo_Office_Dataaccess_Flat_Xcu, gid_File_Lib_Flat, gid_File_Lib_For, gid_File_Lib_Forui, @@ -279,6 +281,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Comphelper2, gid_File_Lib_Sysmgr1, gid_File_Lib_Adabas, + gid_File_Oo_Office_Dataaccess_Adabas_Xcu, gid_File_Lib_Cached1, gid_File_Lib_Curl, gid_File_Lib_Db, @@ -286,8 +289,11 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, gid_File_Lib_Evoab_2, + gid_File_Oo_Office_Dataaccess_Evoab_Xcu, gid_File_Lib_Kab_1, + gid_File_Oo_Office_Dataaccess_Kab_Xcu, gid_File_Lib_Kab_Drv_1, + gid_File_Oo_Office_Dataaccess_Macab_Xcu, gid_File_Lib_Macab_1, gid_File_Lib_Macab_Drv_1, gid_File_Lib_Evtatt, @@ -309,14 +315,19 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Localedata_Es, gid_File_Lib_Localedata_Euro, gid_File_Lib_Localedata_Others, + gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu, gid_File_Lib_Hsqldb_2, gid_File_Lib_Jdbc, + gid_File_Oo_Office_Dataaccess_Jdbc_Xcu, gid_File_Lib_Mcnttype, + gid_File_Oo_Office_Dataaccess_Mozab_Xcu, gid_File_Lib_Mozab_2, gid_File_Lib_Mozabdrv, gid_File_Lib_Mozbootstrap, gid_File_Lib_Mysql, + gid_File_Oo_Office_Dataaccess_Mysql_Xcu, gid_File_Lib_Odbc, + gid_File_Oo_Office_Dataaccess_Odbc_Xcu, gid_File_Lib_Officebean, gid_File_Lib_Openssl, gid_File_Lib_Package2, @@ -376,6 +387,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Stdc_5, gid_File_Lib_Accessbridge, gid_File_Lib_Ado, + gid_File_Oo_Office_Dataaccess_Ado_Xcu, gid_File_Lib_Dl, gid_File_Lib_Dnd, gid_File_Lib_Dtrans, @@ -666,6 +678,7 @@ Module gid_Module_Root_Files_6 gid_File_Oo_Office_Ui_Controller_Xcu, gid_File_Oo_Office_Dataaccess_Xcs, gid_File_Oo_Office_Dataaccess_Xcu, + gid_File_Oo_Office_Dataaccess_Drivers_Xcs, gid_File_Oo_Office_Ui_Dbucommands_Xcs, gid_File_Oo_Office_Ui_Dbucommands_Xcu, gid_File_Oo_Office_Ui_Basewindowstate_Xcs, diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index b62635f11650..d28fa5bb54dd 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -47,6 +47,7 @@ Module gid_Module_Langpack_Basis_Template gid_File_Extra_Wordbook, gid_File_Extra_Wordbook_Lang, gid_File_Registry_Filter_Zip, + gid_File_Registry_Drivers_Zip, gid_File_Registry_Lang, gid_File_Registry_Spool_Langpack_Lang, gid_File_Registry_Spool_Oo_Common_Ctl_Xcu, From 1996f06c101a67115119bfd5325ced58c92c7f8a Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 6 Jul 2009 10:25:59 +0000 Subject: [PATCH 05/30] CWS-TOOLING: integrate CWS ause104 2009-06-24 15:58:35 +0200 hjs r273351 : #i103061# dicard HOMEPATH and HOMEDIR; use matching perl 2009-06-24 13:57:45 +0200 hjs r273342 : #i103062# - use according dmake var --- solenv/config/sdev300.ini | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 041b2246e93a..e2c3784362f2 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -132,9 +132,9 @@ common SOLARSRC SOLAR_JAVA SPEW - STLPORT4 - WITH_FONTOOO - WITH_LANG + STLPORT4 + WITH_FONTOOO + WITH_LANG } restore { @@ -3484,7 +3484,11 @@ wntmsci12 SOLAR_SOURCE_ROOT o: USE_SHELL 4nt BTOOLDIR %WORK_STAMP% - PERLDIR btw\perl\bin\perl + PERLDIR btw\%WORK_STAMP%\perl\bin\perl + } + common02:0 IF %OSTYPE% == cygwin + { + PERL perl } common1 { @@ -3562,8 +3566,8 @@ wntmsci12 } jdk13 { - HOMEDRIVE %DEVROOT% - HOMEPATH $/jdk131 +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/jdk131 JAVAHOME %JDK13PATH% JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32 @@ -3581,8 +3585,8 @@ wntmsci12 } jdk14 { - HOMEDRIVE %DEVROOT% - HOMEPATH $/jdk141 +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/jdk141 JAVAHOME %JDK14PATH% JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include @@ -3600,8 +3604,8 @@ wntmsci12 } jdk15 { - HOMEDRIVE %DEVROOT% - HOMEPATH $/jdk151 +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/jdk151 JAVAHOME %JDK15PATH% JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include @@ -3623,8 +3627,8 @@ wntmsci12 } ojdk16 { - HOMEDRIVE %DEVROOT% - HOMEPATH $/openjdk-6-b08-windows-i586 +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/openjdk-6-b08-windows-i586 JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32 @@ -3685,7 +3689,7 @@ wntmsci12 $dp(TMP) $dp(TEMP) } - order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02:0 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre reset { COPYALL From 7b2964448edbcfe0d27265761d41a2bda0d2d63d Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 6 Jul 2009 10:30:52 +0000 Subject: [PATCH 06/30] CWS-TOOLING: integrate CWS unoapi04 2009-06-26 14:00:27 +0200 lla r273410 : #i102248# cleanups 2009-06-26 13:36:44 +0200 lla r273407 : #i102248# fix problem with too long sleeps and waits 2009-06-26 08:34:17 +0200 lla r273393 : #i102248# cleanups 2009-06-26 08:28:43 +0200 lla r273392 : #i102248# cleanups 2009-06-25 13:17:19 +0200 lla r273379 : #i102248# add prototypes 2009-06-25 11:31:02 +0200 lla r273371 : #i102248# cleanups 2009-06-25 11:15:18 +0200 lla r273370 : #i102248# add a selftest for demonstration. 2009-06-25 10:53:35 +0200 lla r273369 : #i102248# add a selftest for demonstration. 2009-06-25 10:38:10 +0200 lla r273368 : #i102248# add a selftest for demonstration. 2009-06-23 11:09:35 +0200 lla r273266 : #i102248# cleanup 2009-06-23 11:00:15 +0200 lla r273265 : #i10i108248# add cwstestresult to cwscheckapi 2009-06-23 10:59:50 +0200 lla r273264 : #i10i108248# add cwstestresult to cwscheckapi 2009-06-23 10:58:47 +0200 lla r273263 : #i102248# add selftest --- solenv/bin/checkapi | 23 ++- solenv/bin/checkapi.btm | 8 +- solenv/bin/cwscheckapi | 254 ++++++++++++++++++++--------- solenv/bin/cwscheckapi.btm | 48 ++++-- solenv/bin/cwstouched | 2 +- solenv/bin/cwstouched.pl | 51 ++++-- solenv/bin/reportErrorCheckAPI.btm | 17 ++ 7 files changed, 288 insertions(+), 115 deletions(-) create mode 100755 solenv/bin/reportErrorCheckAPI.btm diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi index 6ddabfe9a46d..2a47bb8cf83e 100755 --- a/solenv/bin/checkapi +++ b/solenv/bin/checkapi @@ -1,4 +1,5 @@ #!/bin/sh + PS=":" # cygwin: if [ "$GUI" = "WNT" ]; then @@ -15,8 +16,15 @@ else myCLASSPATH=$JARFOLDER/OOoRunner.jar fi -myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar -myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB +myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}\ +${JARFOLDER}/unoil.jar${PS}\ +${JARFOLDER}/jurt.jar${PS}\ +${JARFOLDER}/juh.jar${PS}\ +${JARFOLDER}/java_uno.jar + +myCLASSPATH=$myCLASSPATH${PS}\ +/net/unoapi/export/unoapi/bin/mysql.jar${PS}\ +$SOLVER_LIB if [ -n "$JAVAI" ]; then JAVABIN=$JAVAI @@ -51,12 +59,13 @@ if [ -n "$RUNNERPROPS" ]; then PARAM="$PARAM -runnerini $RUNNERPROPS" fi -MYXDEBUG="" -if [ -n "$XDEBUG" ]; then - # export XDEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001" - MYXDEBUG=$XDEBUG +DEBUG_THE_API="" +if [ -n "$DEBUGAPI" ]; then + export DEBUGAPI="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9002,suspend=y" + DEBUG_THE_API=$DEBUGAPI fi -COMMAND="$JAVABIN -Xmx120m $MYXDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*" +COMMAND="$JAVABIN -Xmx120m $DEBUG_THE_API -cp $myCLASSPATH org.openoffice.Runner $PARAM $*" echo $COMMAND $COMMAND +# if COMMAND fails, it returns also the exitcode diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm index fde6802f50dd..7af444eb601f 100644 --- a/solenv/bin/checkapi.btm +++ b/solenv/bin/checkapi.btm @@ -1,4 +1,4 @@ -rem @echo off +@echo off setlocal @@ -27,13 +27,13 @@ IFF "%RUNNERPROPS%" != "" THEN SET PARAM=%PARAM% -runnerini %RUNNERPROPS% ENDIFF -SET MYXDEBUG +rem SET MYXDEBUG="" IFF "%XDEBUG%" != "" THEN REM SET XDEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 - SET MYXDEBUG=%XDEBUG + SET MYXDEBUG=%XDEBUG% ENDIFF -set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %& +set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG% -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %& echo %COMMAND diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi index 357a40a20ee5..ddb56fd1d7c1 100755 --- a/solenv/bin/cwscheckapi +++ b/solenv/bin/cwscheckapi @@ -34,80 +34,136 @@ EXIT_FAILURE=1 EXIT_ERROR=2 EXIT_BUG=10 -usage() { - echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-i] [-t] [-s] [-a]" >&2 - echo "" >&2 - echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2 - echo "" >&2 - echo "[-k] keep Office installation, otherwise it will be removed after test" >&2 - echo "" >&2 - echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2 - echo "" >&2 - echo "[-d] debug installation and UnoAPI-Tests" >&2 - echo "" >&2 - echo "[-i] debug installation" >&2 - echo "" >&2 - echo "[-t] debug UnoAPI-Tests" >&2 - echo "" >&2 - echo "[-s] skip installation of Office" >&2 - echo "" >&2 - echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2 - echo "" >&2 - echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2 - echo "" >&2 - exit $EXIT_FAILURE +# report the given error parameter to cwstestresult if the is one. +# 0: no error send ok or parameter $2 +# 1: failure +# 2...: incomplete +function reportError() +{ + ERRORCODE=$1 + if [ -e $SOLARENV/bin/cwstestresult.pl ]; then + if [ $ERRORCODE -eq 0 ]; then + PT_STATUS=${2:-ok} # use default 'ok' or $2 + elif [ $ERRORCODE -eq 1 ]; then + PT_STATUS=failed + else + PT_STATUS=incomplete + fi + + if [ "$OSTYPE" == "cygwin" ]; then + CWSENV=Windows + elif [ "$OSTYPE" == "linux" ]; then + CWSENV=Linux + elif [ "$OSTYPE" == "solaris" ]; then + CWSENV=SolarisX86 + else + CWSENV=Unknown + fi + perl $SOLARENV/bin/cwstestresult.pl -c $CWS_WORK_STAMP -n CWSCheckAPI -p $CWSENV $PT_STATUS + else + echo "No cwstestresult.pl found." + fi } +usage() { + echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-u] [-t] [-s] [-a]" >&2 + echo "" >&2 + echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2 + echo "" >&2 + echo "[-k] keep Office installation, otherwise it will be removed after test" >&2 + echo "" >&2 + echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2 + echo "" >&2 + echo "[-d] debug installation and UnoAPI-Tests" >&2 + # echo "" >&2 + # echo "[-i] debug installation" >&2 + echo "" >&2 + echo "[-t] debug UnoAPI-Tests" >&2 + echo "" >&2 + echo "[-s] skip installation of Office" >&2 + echo "" >&2 + echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2 + echo "" >&2 + echo "[-u] UseInstalledOffice: do not install an office" >&2 + echo "" >&2 + echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2 + echo "" >&2 + exit $EXIT_FAILURE +} + +# we start cwscheckapi +reportError 0 running + if [ "$PROEXT" != ".pro" ]; then echo "ERROR: cwscheckapi works only on pro-versions" >&2 + reportError 2 exit $EXIT_FAILURE fi if [ x${USER}x = xx ]; then if [ x${LOGNAME}x = xx ]; then echo "ERROR: could not determine username. Please export variable USER" >&2 + reportError 2 exit $EXIT_FAILURE else USER=$LOGNAME export USER fi fi - -DEBUG_I=false + +#DEBUG_I=false DEBUG_T=false INSTALL=true -ATTACH=ture +ATTACH=true MODULES="auto" OOO=false KEEPOFFICE=false +USE_INSTALLED_OFFICE=false -while getopts ':m:dkitsaho' OPTION ; do +while getopts ':m:dkutsaho' OPTION ; do case $OPTION in - d) DEBUG_I=true - DEBUG_T=true + d) +# DEBUG_I=true + DEBUG_T=true ;; - m) MODULES="$OPTARG" + m) + MODULES="$OPTARG" ;; - k) KEEPOFFICE=true + k) + KEEPOFFICE=true ;; - o) OOO=true + o) + OOO=true ;; - i) DEBUG_I=true +# i) +# DEBUG_I=true +# ;; + t) + DEBUG_T=true ;; - t) DEBUG_T=true + s) + INSTALL=false ;; - s) INSTALL=false + a) + ATTACH=false ;; - a) ATTACH=false + u) + USE_INSTALLED_OFFICE=true + INSTALL=false + KEEPOFFICE=true + echo "make sure your office is started with parameter -accept=pipe,name=$USER;urp;" ;; - h) usage $EXIT_SUCCESS + h) + usage $EXIT_SUCCESS ;; - \?) echo "unkown option \"-$OPTARG\"." >&2 - usage $EXIT_ERROR - ;; - *) echo "this is not possible...">&2 + \?) + echo "unkown option \"-$OPTARG\"." >&2 + usage $EXIT_ERROR + ;; + *) + echo "this is not possible...">&2 usage $EXIT_BUG ;; esac @@ -140,24 +196,24 @@ export LOCALUNPACKDIR unset FORCE2ARCHIVE -date 2>&1 - if [ $INSTALL = true ]; then - - if [ $DEBUG_I = true ]; then - echo "start installation: `date`" - echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I" - fi + date 2>&1 + +# if [ $DEBUG_I = true ]; then +# echo "start installation: `date`" +# echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I" +# fi perl -w $SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -ooo $OOO -debug $DEBUG_I - + EXITVAL=$? if [ $EXITVAL -ne 0 ]; then echo "ERROR: could not install office" + reportError 2 exit $EXITVAL fi - echo "`date` installation successfull, start testing...." + echo "`date` installation successfull, start testing...." fi SOFFICE="soffice" @@ -170,38 +226,57 @@ if [ "$GUI" = "WNT" ]; then SOFFICE="soffice.exe" PS=";" CYGWIN="-Cygwin true" - SHELL=`which bash` - SHELL=`cygpath -w $SHELL` + SHELL=$(which bash) + SHELL=$(cygpath -w $SHELL) if [ ! -f $SHELL ]; then echo "could not determine bash shell" + reportError 2 exit 1 fi fi -if [ $DEBUG_T = true ]; then - echo find $LOCALINSTALLDIR -name $SOFFICE -fi +# if [ $DEBUG_T = true ]; then +# echo find $LOCALINSTALLDIR -name $SOFFICE +# fi -OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE` +if [ $USE_INSTALLED_OFFICE = false ]; then -if [ ! -f "$OFFICEBIN" ]; then - echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR" - exit 1 -fi + OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE` -if [ "$GUI" = "WNT" ]; then + if [ ! -f "$OFFICEBIN" ]; then + echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR" + reportError 2 + exit 1 + fi + + if [ "$GUI" = "WNT" ]; then # transform /tmp/... -> c:\tmp\... - OFFICEBIN=`cygpath -w $OFFICEBIN` + OFFICEBIN=`cygpath -w $OFFICEBIN` + fi +else + OFFICEBIN=$SOFFICE + echo "Use already installed and running office." fi JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT -myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar -myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/OOoRunner.jar -myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB + +myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}\ +${JARFOLDER}/unoil.jar${PS}\ +${JARFOLDER}/jurt.jar${PS}\ +${JARFOLDER}/juh.jar${PS}\ +${JARFOLDER}/java_uno.jar + +myCLASSPATH=$myCLASSPATH${PS}\ +${JARFOLDER}/OOoRunner.jar + +myCLASSPATH=$myCLASSPATH${PS}\ +/net/unoapi/export/unoapi/bin/mysql.jar${PS}\ +$SOLVER_LIB + PARAM="" if [ -n "$JAVAI" ]; then - JAVABIN=$JAVAI + JAVABIN=$JAVAI elif [ -n "$JAVA_HOME" ]; then if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then JAVABIN=$JAVA_HOME/bin/sparcv9/java @@ -209,19 +284,20 @@ elif [ -n "$JAVA_HOME" ]; then JAVABIN=$JAVA_HOME/bin/java fi else - echo "please set environment variable JAVA_HOME" - exit 1 + echo "please set environment variable JAVA_HOME" + reportError 2 + exit 1 fi if [ -n "$WORK_STAMP" ]; then - if [ -n "$CWS_WORK_STAMP" ]; then + if [ -n "$CWS_WORK_STAMP" ]; then PARAM="$PARAM -Version cws_${CWS_WORK_STAMP}" - else - echo "######" - echo CAUTION! You are working on the MWS - echo "######" + else + echo "######" + echo CAUTION! You are working on the MWS + echo "######" PARAM="$PARAM -Version ${WORK_STAMP}_${UPDMINOR}" - fi + fi fi PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'" @@ -241,12 +317,33 @@ if [ $DEBUG_T = true ]; then PARAM="$PARAM -debug true -log true" fi -#XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 " +# Sample command +# /so/env/Linux_JDK_1.5.0_06/bin/java +# -Xmx120m $XDEBUG +# -cp :/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/ridl.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/unoil.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/jurt.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/juh.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/java_uno.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/OOoRunner.jar:/net/unoapi/export/unoapi/bin/mysql.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/lib.m50 +# org.openoffice.Runner +# -Version cws_unoapi04 +# -cmd '/tmp/ll93751/cwscheckapi/office/staroffice9/program/soffice -nofirststartwizard -accept=pipe,name=ll93751;urp; -norestore -nocrashreport -nolockcheck -enableautomation' +# -cs pipe,name=ll93751 +# -NoOffice true +# -SRC_ROOT /net/so-cwsserv02/export/cws/unoapi04/DEV300/src.m50 +# -COMP_ENV unxlngi6 +# -Shell /bin/bash +# -tb java_complex +# -TimeOut 90000 +# -o 'complex.unoapi.CheckModuleAPI::module(auto)' + +# XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y " + +# set DEBUGAPI if you want to debug the checkapi +# DEBUGAPI=t + COMMAND="$JAVABIN -Xmx120m $XDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*" echo "$COMMAND" LOGFILE=$CWSCHECKAPIPATH/cwscheckapi.log $COMMAND | tee $LOGFILE +EXITVAL=$? if [ $KEEPOFFICE = false ]; then echo "remove office instrallation in $LOCALINSTALLDIR..." @@ -256,4 +353,11 @@ fi echo echo A logfile could be found here: $LOGFILE -date 2>&1 \ No newline at end of file +date 2>&1 + +# send the results via cwstestresult.pl to EIS +if [ $EXITVAL -eq 0 ]; then + reportError 0 ok +else + reportError 1 +fi diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm index 96e2dd7c2afc..64c624dd4bba 100755 --- a/solenv/bin/cwscheckapi.btm +++ b/solenv/bin/cwscheckapi.btm @@ -28,10 +28,13 @@ REM * REM * for a copy of the LGPLv3 License. REM ************************************************************************/ -echo off +rem echo on + +call reportErrorCheckAPI.btm 0 running iff "%PROEXT" != ".pro" THEN echo ERROR: cwscheckapi works only on pro-versions >&2 + call reportErrorCheckAPI.btm 2 quit 1 endiff @@ -42,6 +45,7 @@ SET ATTACH=true SET MODULES=auto SET OOO=false SET KEEPOFFICE=false +SET USE_INSTALLED_OFFICE=false for %opt in (%&%) DO ( if "%opt%" == "-d" (SET DEBUG_I=true ^ SET DEBUG_T=true ^ shift) @@ -51,6 +55,7 @@ for %opt in (%&%) DO ( if "%opt%" == "-m" (SET MODULES=%2 ^ shift ^ shift) if "%opt%" == "-t" (SET DEBUG_T=true ^ shift) if "%opt%" == "-s" (SET INSTALL=false ^ shift) + if "%opt%" == "-u" (SET USE_INSTALLED_OFFICE=true ^ SET INSTALL=false ^ SET KEEPOFFICE=true ^ shift) if "%opt%" == "-a" (SET attach=false ^ shift) if "%opt%" == "-h" goto usage if "%opt%" == "/h" goto usage @@ -81,25 +86,33 @@ iff "%INSTALL%" == "true" THEN IFF %? NE 0 THEN echo ERROR: coud not install office >&2 + call reportErrorCheckAPI.btm 2 quit %? ENDIFF ENDIFF setlocal -SET CWD=%_CWD% -cdd %LOCALINSTALLDIR% -SET ffindtxt="ffind.txt" -ffind /s /f /m soffice.exe > %ffindtxt -SET FindFile=%@FILEOPEN[%ffindtxt%, READ] -SET OfficeBin=%@FILEREAD[%FindFile] -set dummy=%@FILECLOSE[%FindFile] -DEL /q %ffindtxt -cdd %CWD +IFF %USE_INSTALLED_OFFICE% == "false" then -IFF NOT EXIST %OFFICEBIN% THEN - echo could not find 'soffice.exe' in subfolders of %OFFICEBIN% >&2 - quit 1 + SET CWD=%_CWD% + cdd %LOCALINSTALLDIR% + SET ffindtxt="ffind.txt" + ffind /s /f /m soffice.exe > %ffindtxt + SET FindFile=%@FILEOPEN[%ffindtxt%, READ] + SET OfficeBin=%@FILEREAD[%FindFile] + set dummy=%@FILECLOSE[%FindFile] + DEL /q %ffindtxt + cdd %CWD + + IFF NOT EXIST %OFFICEBIN% THEN + echo could not find 'soffice.exe' in subfolders of %OFFICEBIN% >&2 + call reportErrorCheckAPI.btm 2 + quit 1 + ENDIFF +ELSE + SET OFFICEBIN=soffice.exe + echo "Use already installed office." ENDIFF SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT% @@ -111,6 +124,7 @@ ELSEIFF "%JAVA_HOME%" != "" THEN SET JAVABIN=%JAVA_HOME%\bin\java ELSE echo please set environment variable JAVA_HOME >&2 + call reportErrorCheckAPI.btm 2 quit 1 ENDIFF @@ -125,6 +139,7 @@ ELSE echo ###### >&2 echo ERROR: could not determine your CWS or MWS version >&2 echo ###### >&2 + call reportErrorCheckAPI.btm 2 quit 1 ENDIFF @@ -148,6 +163,7 @@ set COMMANDO=%JAVABIN% -Xmx120m -cp %MYCLASSPATH% org.openoffice.Runner %PARAM% echo %COMMANDO SET LOGFILE=%CWSCHECKAPIPATH%\cwscheckapi.log %COMMANDO |& tee %LOGFILE% +set EXITVAL=%? IFF %KEEPOFFICE% == "false" THEN echo remove office instrallation in %LOCALINSTALLDIR%... @@ -157,6 +173,12 @@ fi echo . echo A logfile could be found here: %LOGFILE% +IFF %EXITVAL% NE 0 THEN + call reportErrorCheckAPI.btm 1 +ELSE + call reportErrorCheckAPI.btm 0 ok +ENDIFF + endlocal quit 0 diff --git a/solenv/bin/cwstouched b/solenv/bin/cwstouched index 1847ce388d76..dac08c07f9a7 100755 --- a/solenv/bin/cwstouched +++ b/solenv/bin/cwstouched @@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then echo No environment found, please use 'configure' or 'setsolar' exit 1 fi -exec perl -w $SOLARENV/bin/cwstouched.pl \ No newline at end of file +exec perl -w $SOLARENV/bin/cwstouched.pl diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl index 0171e39d9fd4..03e5095e78b4 100755 --- a/solenv/bin/cwstouched.pl +++ b/solenv/bin/cwstouched.pl @@ -42,6 +42,10 @@ use lib (@lib_dirs); use Cws; +# Prototypes +sub getMinor($); +sub getCwsWorkStamp(); + my $workstamp = $ENV{'WORK_STAMP'}; my $solenv= $ENV{'SOLARENV'}; my $cwsWorkStamp = getCwsWorkStamp(); @@ -53,12 +57,16 @@ my $svndiff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/ta my @diff = `$svndiff`; my @modules; -foreach(@diff){ - if (/.*svn:\/\/svn.services.openoffice.org.*/){ +foreach(@diff) +{ + if (/.*svn:\/\/svn.services.openoffice.org.*/) + { $_ =~ /.*$oldWorkStamp\/(\w*)/; my $newModule=$1; - if (defined($newModule)){ - if ( ! grep(/$newModule/,@modules)){ + if (defined($newModule)) + { + if ( ! grep(/$newModule/,@modules)) + { push(@modules, $newModule); } @@ -66,17 +74,20 @@ foreach(@diff){ } } -foreach(@modules){ +foreach(@modules) +{ print "$_\n"; } exit(0); -sub getMinor{ +sub getMinor($) +{ my $workst = shift; my $min=""; - if ( ! defined($ENV{'UPDMINOR'})){ + if ( ! defined($ENV{'UPDMINOR'})) + { my $cws = Cws->new(); $cws->child($workst); $cws->master($ENV{'WORK_STAMP'}); @@ -85,18 +96,22 @@ sub getMinor{ # check if we got a valid child workspace my $id = $cws->eis_id(); - if ( !$id ) { + if ( !$id ) + { print("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.\n"); exit(1); } my @milestones = $cws->milestone(); foreach (@milestones) { - if ( defined($_) ) { + if ( defined($_) ) + { $min=$_; } } - } else { + } + else + { $min = $ENV{'UPDMINOR'}; } @@ -104,25 +119,31 @@ sub getMinor{ return $min; } -sub getCwsWorkStamp { +sub getCwsWorkStamp() +{ my $cwsWorkSt=""; - if ( ! defined($ENV{'CWS_WORK_STAMP'})){ + if ( ! defined($ENV{'CWS_WORK_STAMP'})) + { my $currPath= cwd; chdir($ENV{'SOLARENV'}); my @info = `svn info`; - foreach(@info) { - if ( /URL:.*/ ){ + foreach(@info) + { + if ( /URL:.*/ ) + { # URL: svn+ssh://svn@svn.services.openoffice.org/ooo/cws/qadev37/solenv $_ = ~ /.*svn.services.openoffice.org(.*\/(.*))\/\w*/; $cwsWorkSt=$2; #qadev37 } } - } else { + } + else + { $cwsWorkSt = $ENV{'CWS_WORK_STAMP'}; } return $cwsWorkSt diff --git a/solenv/bin/reportErrorCheckAPI.btm b/solenv/bin/reportErrorCheckAPI.btm new file mode 100755 index 000000000000..4340ad347259 --- /dev/null +++ b/solenv/bin/reportErrorCheckAPI.btm @@ -0,0 +1,17 @@ +set ERRORCODE=%1% +iff exist %SOLARENV%/bin/cwstestresult.pl then + iff %ERRORCODE% EQ 0 then + set PT_STATUS=%2% + else + iff %ERRORCODE% EQ 1 then + set PT_STATUS=failed + else + set PT_STATUS=incomplete + endiff + endiff + + set CWSENV=Windows + call perl5 %SOLARENV%/bin/cwstestresult.pl -c %CWS_WORK_STAMP% -n CWSCheckAPI -p %CWSENV% %PT_STATUS% +else + echo "No cwstestresult.pl found." +endiff From f8f3f6e3df0a15e4f389e630c8f215892b436419 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 6 Jul 2009 11:31:40 +0000 Subject: [PATCH 07/30] CWS-TOOLING: integrate CWS native251 2009-06-23 17:59:51 +0200 is r273302 : #i93770# BrOffice Langpack for Windows finds BrOffice 2009-06-23 17:57:02 +0200 is r273301 : #i94580# improved dependencies for scp templates --- .../windows/msi_templates/bro_patchcodes.txt | 3 ++ .../msi_templates/brodev_patchcodes.txt | 3 ++ instsetoo_native/util/openoffice.lst | 6 +-- scp2/source/templates/makefile.mk | 41 ++++--------------- 4 files changed, 16 insertions(+), 37 deletions(-) create mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt create mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt new file mode 100644 index 000000000000..cc1c3032930c --- /dev/null +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt @@ -0,0 +1,3 @@ +# OpenOffice 2 UpgradeCodes + +{1552EC17-8CE9-4E58-A009-991468B8E806} # OOo UpgradeCode \ No newline at end of file diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt new file mode 100644 index 000000000000..daf492715fd5 --- /dev/null +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt @@ -0,0 +1,3 @@ +# OpenOffice 2 UpgradeCodes + +{D8B206B8-6822-48C2-A799-E35BFD585035} # OOo UpgradeCode \ No newline at end of file diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 514de56e4888..23fa322063cd 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -370,7 +370,7 @@ BrOffice USE_FILEVERSION 1 LIBRARYVERSION 9.2.0 CODEFILENAME codes_broo.txt - PATCHCODEFILE ooo_patchcodes.txt + PATCHCODEFILE bro_patchcodes.txt DOWNLOADBANNER brobanner.bmp DOWNLOADBITMAP brobitmap.bmp DOWNLOADSETUPICO ooosetup.ico @@ -437,7 +437,7 @@ BrOffice_wJRE USE_FILEVERSION 1 LIBRARYVERSION 9.2.0 CODEFILENAME codes_broo.txt - PATCHCODEFILE ooo_patchcodes.txt + PATCHCODEFILE bro_patchcodes.txt JAVAPRODUCT 1 DOWNLOADBANNER brobanner.bmp DOWNLOADBITMAP brobitmap.bmp @@ -510,7 +510,7 @@ BrOffice_Dev USE_FILEVERSION 1 JAVAPRODUCT 1 LIBRARYVERSION 9.2.0 - PATCHCODEFILE ooo_patchcodes.txt + PATCHCODEFILE brodev_patchcodes.txt CODEFILENAME codes_broodev.txt DOWNLOADBANNER brobanner.bmp DOWNLOADBITMAP brobitmap.bmp diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk index 547873850426..03b359068b26 100755 --- a/scp2/source/templates/makefile.mk +++ b/scp2/source/templates/makefile.mk @@ -46,38 +46,11 @@ COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso)) ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc -.PHONY $(INCCOM)$/alllangmodules.inc: +.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk +.IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)" +PHONYTEMPL=.PHONY +.ENDIF # "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)" +$(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_root.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_base.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_base.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_calc.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_calc.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_draw.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_draw.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_impress.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_impress.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_math.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_math.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_writer.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_writer.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ - -.PHONY $(INCCOM)$/alllangmodules_binfilter.inc: - @@-$(RENAME) $@ $@.tmp - $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ + $(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@ + @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk From 9394dadcc0453cd5947e098f77b32f6ff7673051 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 6 Jul 2009 14:40:18 +0000 Subject: [PATCH 08/30] CWS-TOOLING: integrate CWS sdk311_DEV300 2009-06-09 10:22:56 +0200 jsc r272754 : #i101883# adapt number 2009-06-03 13:25:57 +0200 jsc r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion 2009-06-03 13:20:14 +0200 jsc r272558 : #i101883# ensure correct archive or package name 2009-06-02 14:56:40 +0200 jsc r272506 : #i101883# ensure correct archive or package name 2009-05-27 11:26:35 +0200 jsc r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310@272261 (milestone: OOO310:m12) 2009-05-26 15:15:13 +0200 jsc r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings --- instsetoo_native/util/openoffice.lst | 2 +- solenv/bin/modules/installer/download.pm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 23fa322063cd..a9b9080c8f40 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -284,7 +284,7 @@ OpenOffice_SDK { Settings { - downloadname OOo-SDK_{productversion}_{os}_install_{languages} + downloadname OOo-SDK_{packageversion}_{os}_install_{languages} variables { PRODUCTNAME OpenOffice.org diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 6c6baef328ab..07062d306e11 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -576,6 +576,7 @@ sub set_download_filename my $type = get_installation_type(); my $language = get_downloadname_language($languagestringref); my $addon = get_downloadname_addon(); + if ( $installer::globals::product =~ /_Dev\s*$/ ) { my $localminor = ""; @@ -659,6 +660,10 @@ sub resolve_variables_in_downloadname if ( $allvariables->{'PRODUCTVERSION'} ) { $productversion = $allvariables->{'PRODUCTVERSION'}; } $downloadname =~ s/\{productversion\}/$productversion/; + my $ppackageversion = ""; + if ( $allvariables->{'PACKAGEVERSION'} ) { $packageversion = $allvariables->{'PACKAGEVERSION'}; } + $downloadname =~ s/\{packageversion\}/$packageversion/; + my $extension = ""; if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; } $extension = lc($extension); From 342496b8ad625eb5b95a7edea4836ea3266880bd Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 7 Jul 2009 06:34:02 +0000 Subject: [PATCH 09/30] CWS-TOOLING: integrate CWS jl128_DEV300 2009-06-09 17:02:57 +0200 is r272784 : #i102493# update to jre6u14 2009-06-09 16:44:21 +0200 is r272782 : #i102493# update to jre6u14 2009-06-09 16:18:47 +0200 is r272780 : #i102493# update to jre6u14 2009-06-09 16:17:33 +0200 is r272779 : #i102493# update to jre6u14 --- instsetoo_native/util/openoffice.lst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index a9b9080c8f40..7e65e07d3053 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -123,7 +123,7 @@ OpenOffice_wJRE BASEPRODUCTVERSION 3.2 UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt ADDSYSTEMINTEGRATION 1 EVAL @@ -194,7 +194,7 @@ OpenOffice_Dev SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93 UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 @@ -412,7 +412,7 @@ BrOffice_wJRE PROGRESSFRAMECOLOR UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt ADDSYSTEMINTEGRATION 1 EVAL @@ -487,7 +487,7 @@ BrOffice_Dev SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93 UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 From d792a6ab32a6ed19b2bba64ec11774041f6079c1 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 7 Jul 2009 07:00:55 +0000 Subject: [PATCH 10/30] CWS-TOOLING: integrate CWS tkr22_DEV300 2009-06-10 16:22:32 +0200 tkr r272826 : #100878# ucpdav1 lib has now the patch flag 2009-06-08 14:38:33 +0200 tkr r272731 : CWS-TOOLING: rebase CWS tkr22 to branches/OOO310@272261 (milestone: OOO310:m12) 2009-06-08 13:10:16 +0200 tkr r272728 : #100878# add Wspiapi.h to ne_sockets to prevent win2000 crashes --- scp2/source/ooo/file_library_ooo.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index fb04a05f0952..27f1538df545 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1507,7 +1507,7 @@ File gid_File_Lib_Ucpchelp1 End #ifndef DISABLE_NEON -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) +SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1) #endif SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1) From 48c4b0ec1f32c8df9b1d0b48b7d08d026df15ec0 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 7 Jul 2009 07:03:34 +0000 Subject: [PATCH 11/30] CWS-TOOLING: integrate CWS native250_DEV300 2009-06-25 11:55:49 +0200 is r273374 : #159953# Patch IDs for Solaris Sparc and x86 2009-06-15 16:48:23 +0200 is r273000 : #159953# update of service tags --- solenv/bin/make_installer.pl | 3 ++- solenv/bin/modules/installer/epmfile.pm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index eefe7930afb3..059fd4cbbf17 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1687,7 +1687,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) installer::epmfile::create_new_directory_structure($newepmdir); $installer::globals::postprocess_specialepm = 1; - if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); } + # solaris patch not needed anymore + # if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); } } } else # this is the standard epm (not relocatable) or ( nonlinux and nonsolaris ) diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 08113d70deaf..b41de206b485 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -1092,10 +1092,10 @@ sub set_revision_in_pkginfo my $micro = $3; my $finalmajor = $major; - my $finalminor = 0; + my $finalminor = $minor; my $finalmicro = 0; - if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; } + # if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; } $version = "$finalmajor.$finalminor.$finalmicro"; } From e13f42a237d47209cf7d74ce8c45efeca0bbd09c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 7 Jul 2009 07:40:36 +0000 Subject: [PATCH 12/30] CWS-TOOLING: integrate CWS ooo311gsl04_DEV300 2009-06-25 18:59:25 +0200 pl r273391 : add forgotten patch flags for cws: ooo311gsl01,ooo311gsl02,ooo311gsl03,ooo311gsl04,svp02,c28v001 2009-06-25 18:05:10 +0200 pl r273388 : CWS-TOOLING: rebase CWS ooo311gsl04 to branches/OOO310@272865 (milestone: OOO310:m13) 2009-06-15 16:57:19 +0200 pl r273001 : #i98804# check for nil 2009-06-11 07:14:52 +0200 hdu r272842 : #i102603# make rotated+shuffled text export work again --- scp2/source/ooo/file_library_ooo.scp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 27f1538df545..f07438c17a66 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -428,7 +428,7 @@ End #endif -STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) +STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer) SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj) @@ -596,7 +596,7 @@ End #ifdef QUARTZ File gid_File_Lib_Fps_Aqua TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); RegistryID = gid_Starregistry_Services_Rdb; Dir = gid_Dir_Program; Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno); @@ -1163,7 +1163,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr File gid_File_Lib_Vclplug_Gen Name = LIBNAME(vclplug_gen); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = gid_Dir_Program; End #endif @@ -1173,7 +1173,7 @@ End File gid_File_Lib_Vclplug_Gtk Name = LIBNAME(vclplug_gtk); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = gid_Dir_Program; End #endif @@ -1182,7 +1182,7 @@ End File gid_File_Lib_Vclplug_Kde Name = LIBNAME(vclplug_kde); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = gid_Dir_Program; End #endif @@ -1208,7 +1208,7 @@ End #endif #if defined UNX && ! defined QUARTZ -STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp ) +STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp ) STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) #endif @@ -1547,7 +1547,11 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx ) File gid_File_Lib_Vcl Name = LIBNAME(vcl); TXT_FILE_BODY; +<<<<<<< .working Styles = (PACKED,UNO_COMPONENT,PATCH); +======= + Styles = (PACKED,PATCH,UNO_COMPONENT); +>>>>>>> .merge-right.r273775 Dir = gid_Dir_Program; RegistryID = gid_Starregistry_Services_Rdb; End From 4e7fb1be99b6eed7d7c63f6f947dea52a8267bbe Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 7 Jul 2009 10:20:40 +0000 Subject: [PATCH 13/30] #i10000# MAXPROC added for lucopy --- solenv/config/sdev300.ini | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index e2c3784362f2..4049394a258c 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -72,6 +72,10 @@ common { ENABLE_CRASHDUMP STATIC } + maxproc + { + MAXPROC maxproc=%MAXPROCESS% + } nojava { DISABLE_JAVA TRUE @@ -117,7 +121,7 @@ common STL_ROOT UPDATER } - order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump + order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc reset { ENVCFLAGS @@ -153,6 +157,7 @@ common envroot nojava pro + maxproc MAXPROCESS shell STAR_USE_SHELL tmp SOL_TMP_DIR verbose VERBOSE @@ -536,7 +541,7 @@ unxfbsdi { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -547,7 +552,7 @@ unxfbsdi sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -859,7 +864,7 @@ unxlngi6 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -870,7 +875,7 @@ unxlngi6 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -1171,7 +1176,7 @@ unxlngx6 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1182,7 +1187,7 @@ unxlngx6 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -1492,7 +1497,7 @@ unxmacxi { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1503,7 +1508,7 @@ unxmacxi sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -1797,7 +1802,7 @@ unxsoli4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1808,7 +1813,7 @@ unxsoli4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -2111,7 +2116,7 @@ unxsols4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2122,7 +2127,7 @@ unxsols4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -2971,7 +2976,7 @@ wntgcci1 { 150: set MYENV_PATH=%PATH 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% + 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC% 260: set PATH=%MYENV_PATH 270: unset MYENV_PATH 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% @@ -2981,7 +2986,7 @@ wntgcci1 { 150: setenv MYENV_PATH $PATH 160: setenv PATH $SSX_PATH - 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 260: setenv PATH $MYENV_PATH 270: unsetenv MYENV_PATH 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2996,7 +3001,7 @@ wntgcci1 260: export PATH=$MYENV_PATH 270: unset MYENV_PATH 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR @@ -3714,7 +3719,7 @@ wntmsci12 { 150: set MYENV_PATH=%PATH 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% + 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC% 260: set PATH=%MYENV_PATH 270: unset MYENV_PATH 300: call pcleaner.btm From 6183d60aa7e9cf597f5262967f68d516fc648afb Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 7 Jul 2009 10:27:54 +0000 Subject: [PATCH 14/30] DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index d88e1fd863e1..a153f30b95a9 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m51(Build:9408) -BUILD=9408 -LAST_MINOR=m51 +RSCREVISION=300m52(Build:9411) +BUILD=9411 +LAST_MINOR=m52 SOURCEVERSION=DEV300 From 4f3065b4aaf4d7603591946179b0489e05e9bfdc Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 7 Jul 2009 11:01:44 +0000 Subject: [PATCH 15/30] #i10000# MAXPROC: Undefined variable. --- solenv/config/sdev300.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 4049394a258c..b7a9f15301a4 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -48,6 +48,7 @@ common wrapper_override_cc_wrapper TRUE ZIPSOURCE 1 BUILD_QADEVOOO YES + MAXPROC maxproc=15 } common:0 IF %UPDATER% == YES { From dc6e451d19658bf60917bc71c8087056d0ab6d52 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 14 Jul 2009 09:45:48 +0000 Subject: [PATCH 16/30] #i10000# build breaker in local environment --- solenv/bin/clipatchconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl index 91025ea8c2be..63e6a0f48830 100644 --- a/solenv/bin/clipatchconfig.pl +++ b/solenv/bin/clipatchconfig.pl @@ -31,7 +31,7 @@ use warnings; use strict; -use diagnostics; +# use diagnostics; sub trim; sub readRedirectionValues($); From 2cb7649648771d723097d18dfdde7e1c162fd620 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 15 Jul 2009 11:06:05 +0000 Subject: [PATCH 17/30] CWS-TOOLING: integrate CWS moz2seamonkey01 2009-06-18 20:56:43 +0200 fs r273133 : #i10000# corrected resolved of merge conflict 2009-06-18 20:55:34 +0200 fs r273132 : #i10000# corrected resolved of merge conflict 2009-06-18 10:49:26 +0200 fs r273105 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@272827 (milestone: DEV300:m50) 2009-06-17 20:48:35 +0200 fs r273094 : #i84961# removed 'pointless and buggy' echo statement 2009-05-22 11:27:08 +0200 fs r272176 : #i101763# provided by tono@openoffice.org make compile with mingw 2009-05-22 11:22:25 +0200 fs r272175 : #i101763# provided by tono@openoffice.org allow compilation in with mingw 2009-04-15 12:09:28 +0200 fs r270830 : unconditionally disable moz executables 2009-03-27 12:29:38 +0100 fs r270149 : ignore some configure-related files 2009-03-27 11:47:35 +0100 fs r270145 : SolarisSparc needs libfreebl_32fpu_3.so 2009-03-27 11:38:09 +0100 fs r270141 : regxpcom call not needed nowadays / also pack libfreebl3 (needed for signature/encryption) 2009-03-26 21:40:17 +0100 fs r270108 : superseded by 1.1.14 version 2009-03-24 13:07:21 +0100 fs r269938 : xptitemp.dat seemingly not needed anymore 2009-03-23 12:56:29 +0100 fs r269869 : files with : in their name break the build 2009-03-23 12:22:01 +0100 fs r269866 : files with : in their name break the build 2009-03-21 23:12:06 +0100 fs r269843 : manual resync: merge the changes which happened on TRUNK in mozilla-source-1.7.5.patch herein 2009-03-21 21:58:17 +0100 fs r269841 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@269781 (milestone: DEV300:m44) 2009-03-18 12:04:25 +0100 fs r269649 : in SunHH environment, use pre-requisites from /so/env 2009-03-16 12:33:18 +0100 pastea_p r269522 : correct makefile.mk sorry again 2009-03-15 17:32:43 +0100 pastea_p r269506 : last files about migration to 1.1.14 2009-03-15 17:19:39 +0100 pastea_p r269505 : Migrates some files to 1.1.14 2009-03-04 07:45:40 +0100 fs r268782 : also add pref.xpt 2009-02-27 09:57:37 +0100 fs r268555 : #i66338# for the moment, disable Mozilla-based code for unxlngx6 2009-02-23 10:56:28 +0100 fs r268346 : syntax 2009-02-19 14:14:56 +0100 fs r268283 : make PrintPDE compile in Sun's internal build environment by removing some unneeded stuff 2009-02-18 15:40:40 +0100 fs r268236 : #i66338# re-enable MozAB on Mac 2009-02-18 15:39:55 +0100 fs r268235 : #i66338# 2009-02-18 15:30:38 +0100 fs r268232 : #i66338# tar => $(TAR) (provided by hjs) 2009-02-18 15:28:45 +0100 fs r268231 : more build envs supported (thanks to hjs for all this work!) 2009-02-18 15:27:02 +0100 fs r268230 : #i66338# 2009-02-18 15:23:04 +0100 fs r268229 : #i66338# let it build on Solaris, in Sun Hamburg's build environment 2009-02-18 12:00:12 +0100 fs r268210 : #i10000# 2009-02-18 08:17:29 +0100 fs r268198 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now 2009-02-18 08:16:50 +0100 fs r268197 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now 2009-02-14 14:05:24 +0100 fs r267757 : redo the Windows related changes lost with recent resync 2009-02-14 00:06:33 +0100 ericb r267755 : #i94628# remove the config_office dir now 2009-02-14 00:04:59 +0100 ericb r267754 : #i94628# remove all files in config_office now 2009-02-14 00:01:26 +0100 ericb r267753 : #i94628# remove guw in config_office 2009-02-13 23:53:00 +0100 ericb r267752 : #i94628# remove files in config_office 2009-02-13 16:02:58 +0100 fs r267725 : #i10000# 2009-02-12 18:14:31 +0100 ericb r267685 : #i94628# new generated configure 2009-02-12 18:13:52 +0100 ericb r267684 : #i94628# fix a path issue for finding seamonkey01 2009-02-12 14:39:17 +0100 ericb r267662 : #i94628# removing seamonkey.1.1.12 patch 2009-02-12 14:21:04 +0100 ericb r267658 : #i94628# the new configure, after autoconf 2009-02-12 14:13:21 +0100 ericb r267656 : #i94628# other missing changes for Windows 2009-02-12 14:04:26 +0100 ericb r267655 : #i94628# recommit configure.in changes after config_office removing 2009-02-12 13:46:12 +0100 ericb r267653 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41) 2009-02-12 12:00:48 +0100 ericb r267643 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41) 2009-02-11 13:28:50 +0100 pl r267595 : #i94628# add MACDEVSDK variable for unxmacxi 2009-02-06 09:44:15 +0100 ericb r267446 : #i98957# provide the zipped archives too 2009-02-06 09:43:32 +0100 ericb r267445 : #i98957# make seamonkey buildable on OpenSolaris, adding the right options for configure 2009-02-06 09:42:45 +0100 ericb r267444 : #i98957# make seamonkey buildable on OpenSolaris 2009-02-02 09:41:57 +0100 fs r267252 : #i66338# 2009-02-02 09:41:43 +0100 fs r267251 : #i66338# 2009-01-30 15:12:03 +0100 fs r267200 : code consolidation - MQueryHelper now uses MLdapAttributeMap's fillCardFromResult and fillResultFromCard, which makes the code as such shorter, and eliminates information duplication 2009-01-30 11:53:31 +0100 fs r267189 : reworked the statement parsing / statement execution / result set creation: now we don't anymore create three result sets (two of them leaking) for a single prepared statement ... 2009-01-29 20:37:01 +0100 fs r267170 : #i10000# 2009-01-29 20:32:50 +0100 fs r267169 : more explicit return type of parseSql 2009-01-29 17:32:56 +0100 fs r267163 : slightly refactored the statement class hierarchy (basically remove OStatement_BASE2, and renamed the other base classes) 2009-01-29 17:14:58 +0100 fs r267161 : #i66338# first implementation to re-enable LDAP access. Still work in progress (but hey, you can see the data already :) 2009-01-12 11:25:56 +0100 fs r266138 : allow using a debug-enabled version of Mozilla/SeaMonkey when MOZILLA_ENABLE_DEBUG is set 2009-01-10 22:01:40 +0100 fs r266126 : #i95772# nsldap32v50.dll also needs an embedded manifest (the LDP configuration backend links directly against it) 2009-01-09 11:15:32 +0100 fs r266065 : manifests for DLLs need to have ID 2, not 1 2009-01-08 20:02:24 +0100 fs r266035 : #i95772# embed manifest file in shared libs built in directory/c-sdk, too 2009-01-05 20:45:38 +0100 ericb r265886 : #i66338# commiting the correct configure for the tinderboxes 2009-01-05 17:42:34 +0100 ericb r265883 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@265758 (milestone: DEV300:m38) 2008-12-16 15:34:26 +0100 ericb r265550 : #i94628# change for seamonkey1.1.13 : do not forget to do autoconf in config_office before configure 2008-12-16 15:25:37 +0100 pastea_p r265547 : 1.1.12 to 1.1.13 2008-12-16 14:20:18 +0100 pastea_p r265540 : correct the hunk about no core_abspath which one broke linux build 2008-12-16 13:10:06 +0100 pastea_p r265535 : Change name of patch to 1.1.13 2008-12-15 23:32:54 +0100 pastea_p r265518 : 2008-12-12 18:43:36 +0100 pastea_p r265435 : update to 1.1.13 2008-12-12 10:56:38 +0100 fs r265398 : #i95772# embed .manifest files into SHARED_LIBRARYs built in nsprpub, too 2008-12-12 09:56:38 +0100 fs r265391 : #i95772# don't use regxpcomp on Windows, it's not needed 2008-12-11 11:22:43 +0100 fs r265269 : #i95772# Moz/SeaMonkey libs on Windows now link against msvc?80.dll 2008-12-10 13:45:51 +0100 fs r265182 : proper OSL_ENSURE message 2008-11-13 13:18:03 +0100 fs r263635 : #i95772# more patches 2008-11-13 12:14:41 +0100 fs r263630 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip 2008-11-13 12:13:33 +0100 fs r263629 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip 2008-11-13 12:08:22 +0100 fs r263628 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip 2008-11-13 12:04:15 +0100 fs r263627 : #i95772# 2008-11-12 08:23:20 +0100 fs r263575 : i95772# use xpcom_core on Windows, too 2008-11-11 21:02:14 +0100 fs r263574 : i95772# use xpcom_core.lib on Windows, too 2008-11-11 20:58:07 +0100 fs r263573 : i95772# use xpcom_core.lib on Windows, too 2008-11-11 15:05:42 +0100 fs r263564 : alternative fix for part 1 of #i94957# 2008-11-10 22:18:14 +0100 fs r263541 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842) 2008-11-10 22:15:57 +0100 fs r263540 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842) 2008-11-10 09:28:26 +0100 fs r263509 : #i95772# when building on WNT, embed the .manifest file into the .dll/.exe 2008-11-10 09:19:06 +0100 fs r263508 : collect single patches which comprise the complete patch 2008-11-06 09:10:21 +0100 fs r263360 : #i95772# core_abspath does not work on Windows, too (at least in security/nss/cmd/shlibsign). Replace with 'cygpath -d -a' 2008-11-02 22:51:27 +0100 fs r263277 : #i95772# sanitize INCLUDEDIR and GENHEADERS to use cygwin path notation - cygwin's make 1.81 doesn't cope with Windows path notation 2008-11-02 22:50:15 +0100 fs r263276 : #i95772# no --enable-system-cairo on Windows 2008-10-18 20:12:36 +0200 pastea_p r262297 : 2008-10-16 17:15:35 +0200 ericb r262267 : #i94957# fix the breakage in connectivity, for the seamonkey migration 2008-10-16 17:14:49 +0200 ericb r262266 : #i94957# fix the breakage in connectivity, for the seamonkey migration 2008-10-16 16:58:21 +0200 ericb r262263 : #i94957# fix the breakage in connectivity, for the seamonkey migration 2008-10-15 20:16:28 +0200 ericb r262242 : #i94628# use mac as default toolkit on mac 2008-10-14 18:54:13 +0200 ericb r262216 : #i90774# modify the configure.in for moz2seamonkey migration 2008-10-14 18:48:57 +0200 ericb r262215 : #i90774# commit moz2seamonkey changes for svn migration 2008-10-14 18:47:05 +0200 ericb r262214 : #i90774# commit moz2seamonkey changes for svn migration --- configure.in | 56 ++++++++++++++++------------ scp2/source/ooo/file_library_ooo.scp | 13 +++---- solenv/config/sdev300.ini | 2 + 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/configure.in b/configure.in index 94d57c0245df..e46776bb2ad0 100644 --- a/configure.in +++ b/configure.in @@ -1760,12 +1760,15 @@ dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out AC_MSG_RESULT([found Compiler version $CCNUMVER.]) if test "$CCNUMVER" -ge "001500000000"; then COMEX=12 + MSVSVER=2008 AC_MSG_RESULT([found .NET 2008 / VS 9.0.]) elif test "$CCNUMVER" -ge "001400000000"; then COMEX=11 + MSVSVER=2005 AC_MSG_RESULT([found .NET 2005.]) elif test "$CCNUMVER" -ge "001300102240"; then COMEX=10 + MSVSVER=2003 AC_MSG_RESULT([found .NET 2003.]) else AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.]) @@ -4126,9 +4129,14 @@ AC_SUBST(MOZILLA_VERSION) AC_MSG_CHECKING([for toolkit mozilla should use]) if test -z "$with_mozilla_toolkit"; then - if test "$_os" != "WINNT"; then - MOZILLA_TOOLKIT=gtk2 - AC_MSG_RESULT([gtk2]) + if test "$_os" != "WINNT" ; then + if test "$_os" = "Darwin" ; then + MOZILLA_TOOLKIT=mac + AC_MSG_RESULT([mac]) + else + MOZILLA_TOOLKIT=gtk2 + AC_MSG_RESULT([gtk2]) + fi fi else MOZILLA_TOOLKIT=$with_mozilla_toolkit @@ -4150,7 +4158,7 @@ else enable_build_mozilla= fi -AC_MSG_CHECKING([whether to build Mozilla]) +AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey]) if test -n "$enable_build_mozilla"; then BUILD_MOZAB="TRUE" AC_MSG_RESULT([yes]) @@ -4160,17 +4168,25 @@ else fi if test "$BUILD_MOZAB" = "TRUE"; then + if test "$_os" = "WINNT"; then + if test "$WITH_MINGWIN" != "yes"; then + # compiling with MSVC. Only supported platform here is MSVS2005 at the moment. + if test "$MSVSVER" != "2005"; then + AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only.]) + fi + else + AC_MSG_WARN([Building SeaMonkey with mingwin is not tested, and likely to break.]) + echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn + fi + fi + if test -z "$MOZILLA_VERSION"; then - MOZILLA_VERSION=1.7.5 - fi - if test "$MOZILLA_VERSION" = "1.7b" ; then - MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source" - else - MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}" + MOZILLA_VERSION=1.1.14 fi + MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" for e in gz bz2; do AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e]) - if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then + if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then AC_MSG_RESULT([not found]) HAVE_MOZILLA_TARBALL=n else @@ -4179,22 +4195,16 @@ if test "$BUILD_MOZAB" = "TRUE"; then fi done if test "$HAVE_MOZILLA_TARBALL" != "y"; then - AC_MSG_ERROR([Mozilla source archive not found. + AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/]) +http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/]) fi if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([for glib and libIDL binaries]) - if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \ - -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \ - -o ! -e "./moz/download/wintools.zip" ; then -AC_MSG_ERROR([One or more of the following archives is missing in moz/download/ - vc71-glib-1.2.10-bin.zip - vc71-libIDL-0.6.8-bin.zip -(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/) - wintools.zip -(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)]) + AC_MSG_CHECKING([for moztools binaries]) + if test ! -e "moz/download/vc8-moztools.zip" ; then + AC_MSG_ERROR([The following file is missing in moz/download: vc8-moztools.zip +(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)]) else AC_MSG_RESULT([ok]) fi diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f07438c17a66..1be88f725057 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1771,20 +1771,17 @@ End STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore) -#if defined WNT && \ - (defined M1310 || \ - ((defined M1400 || defined M1500) && \ - !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA))) -File gid_File_Moz_Msvcp71 +#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA +File gid_File_Moz_Msvcp80 TXT_FILE_BODY; Dir = gid_Dir_Program; - Name = SCP2_URE_DL_NORMAL("msvcp71" SCP2_STDLP_DEBUG); + Name = SCP2_URE_DL_NORMAL("msvcp80"); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -File gid_File_Moz_Msvcr71 +File gid_File_Moz_Msvcr80 TXT_FILE_BODY; Dir = gid_Dir_Program; - Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG); + Name = SCP2_URE_DL_NORMAL("msvcr80"); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End #endif diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index b7a9f15301a4..a16d69ed30b1 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -991,6 +991,7 @@ unxlngx6 SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH% SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl + WITH_MOZILLA NO } common0 { @@ -1307,6 +1308,7 @@ unxmacxi SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx + MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk } common1 { From 44a9cb47e88ef146354aa79d1c2ea6f38fec59fe Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 15 Jul 2009 14:31:28 +0000 Subject: [PATCH 18/30] CWS-TOOLING: integrate CWS native254 2009-07-06 11:53:05 +0200 is r273730 : #159765# setting of unixrights for Windows not required 2009-07-03 14:34:49 +0200 is r273699 : #160182# new ooo transformation wizard --- solenv/bin/make_installer.pl | 5 +- .../bin/modules/installer/scppatchsoname.pm | 47 ++++++++++++++++--- solenv/bin/modules/installer/simplepackage.pm | 18 ++++--- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 059fd4cbbf17..f20cab0365fe 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -949,11 +949,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "ScpActions"); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions5.log", $scpactionsinproductlanguageresolvedarrayref); } - # Editing scpactions with flag SCPZIP_REPLACE. + # Editing scpactions with flag SCPZIP_REPLACE and PATCH_SO_NAME. installer::scpzipfiles::resolving_scpzip_replace_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6.log", $scpactionsinproductlanguageresolvedarrayref); } + installer::scppatchsoname::resolving_patchsoname_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref); + if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6a.log", $scpactionsinproductlanguageresolvedarrayref); } + ######################################################### # language dependent links part ######################################################### diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm index 5d445d92dc13..bc358903093c 100644 --- a/solenv/bin/modules/installer/scppatchsoname.pm +++ b/solenv/bin/modules/installer/scppatchsoname.pm @@ -51,6 +51,20 @@ sub change_length_of_string } } +######################################################################################## +# The length of the new string must be identical with the length of the old string +######################################################################################## + +sub change_length_of_string_with_letter +{ + my ($newstringref, $oldstring, $onestring) = @_; + + while ( length($$newstringref) < length($oldstring) ) + { + $$newstringref = $$newstringref . $onestring; + } +} + ######################################################################################## # Converting a string to a unicode string ######################################################################################## @@ -78,24 +92,47 @@ sub convert_to_unicode sub replace_productname_in_file { - my ($sourcepath, $destpath, $variableshashref, $filedescription) = @_; + my ($sourcepath, $destpath, $variableshashref, $onefilehash, $styles) = @_; my $onefile = installer::files::read_binary_file($sourcepath); + # searching for "x" + my $onestring = "x" . chr(0); my $replacestring = ""; for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; } my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'}; - if ( $filedescription ne "" ) { $productname = $filedescription; } + if ( exists($onefilehash->{'FileDescription'}) ) { $productname = $onefilehash->{'FileDescription'}; } my $unicode_productname = convert_to_unicode($productname); change_length_of_string(\$unicode_productname, $replacestring); - my $found = $onefile =~ s/$replacestring/$unicode_productname/s; + my $found1 = $onefile =~ s/$replacestring/$unicode_productname/sg; + + my $found2 = 0; + + if ( $styles =~ /\bPATCH_SO_NAME_Z\b/ ) + { + # searching for "z" + + $onestring = "z" . chr(0); + $replacestring = ""; + for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; } + + my $productname2 = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'}; + if ( exists($onefilehash->{'FileDescriptionZ'}) ) { $productname2 = $onefilehash->{'FileDescriptionZ'}; } + my $unicode_productname2 = convert_to_unicode($productname2); + + change_length_of_string_with_letter(\$unicode_productname2, $replacestring, $onestring); + + $found2 = $onefile =~ s/$replacestring/$unicode_productname2/sg; + } installer::files::save_binary_file($onefile, $destpath); + my $found = $found1 + $found2; + return $found; } @@ -142,8 +179,6 @@ sub resolving_patchsoname_flag my $destinationpath = $replacedir . $onefilename; my $movepath = $destinationpath . ".orig"; - if ( exists($onefile-> {'FileDescription'}) ) { $filedescription = $onefile-> {'FileDescription'}; } - # if (!(-f $destinationpath)) # do nothing if the file already exists # { @@ -152,7 +187,7 @@ sub resolving_patchsoname_flag if ( $copysuccess ) { # Now the file can be patch (binary!) - my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $filedescription); + my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $onefile, $styles); if ($found == 0) { diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index e43a8325f775..771e0980c2f5 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -404,14 +404,18 @@ sub create_simple_package else { installer::systemactions::copy_one_file($source, $destination); - # see issue 102274 - my $unixrights = ""; - if ( $onefile->{'UnixRights'} ) - { - $unixrights = $onefile->{'UnixRights'}; - my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1"; - system($localcall); + if ( ! $installer::globals::iswindowsbuild ) + { + # see issue 102274 + my $unixrights = ""; + if ( $onefile->{'UnixRights'} ) + { + $unixrights = $onefile->{'UnixRights'}; + + my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1"; + system($localcall); + } } } } From 4a9eb3a6059f9a6d2bc5074b7f79acb5cbf31882 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 15 Jul 2009 16:00:45 +0000 Subject: [PATCH 19/30] CWS-TOOLING: integrate CWS ause105 2009-07-08 17:57:23 +0200 hjs r273843 : #i103418# add missing dependency on localized .hrc files 2009-07-08 17:28:46 +0200 hjs r273841 : #i103416# handle new solver subdir sdf 2009-07-08 11:27:47 +0200 hjs r273823 : #i103409# disable cmd.exe autorun 2009-07-07 19:23:23 +0200 hjs r273813 : #i103394# fix path handling of files failed in first run of rebase.exe --- solenv/bin/cws.pl | 2 +- solenv/inc/_tg_srs.mk | 40 ++++++++++++++++++++-------------------- solenv/inc/tg_srs.mk | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl index bca7fe3cc271..288b908ea7fe 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -1117,7 +1117,7 @@ sub update_solver my $solver = shift; my $milestone = shift; - my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml'); + my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml', 'sdf'); use Archive::Zip qw( :ERROR_CODES :CONSTANTS ); diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index bc23ed5ffbba..3d260248b3b0 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -15,7 +15,7 @@ ALLTAR : $(HIDSRS1PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) +$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr @@ -31,7 +31,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -66,7 +66,7 @@ ALLTAR : $(HIDSRS2PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) +$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr @@ -82,7 +82,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -117,7 +117,7 @@ ALLTAR : $(HIDSRS3PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) +$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr @@ -133,7 +133,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -168,7 +168,7 @@ ALLTAR : $(HIDSRS4PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) +$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr @@ -184,7 +184,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -219,7 +219,7 @@ ALLTAR : $(HIDSRS5PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) +$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr @@ -235,7 +235,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -270,7 +270,7 @@ ALLTAR : $(HIDSRS6PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) +$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr @@ -286,7 +286,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -321,7 +321,7 @@ ALLTAR : $(HIDSRS7PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) +$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr @@ -337,7 +337,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -372,7 +372,7 @@ ALLTAR : $(HIDSRS8PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) +$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr @@ -388,7 +388,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -423,7 +423,7 @@ ALLTAR : $(HIDSRS9PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) +$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr @@ -439,7 +439,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -474,7 +474,7 @@ ALLTAR : $(HIDSRS10PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) +$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr @@ -490,7 +490,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES) .ENDIF # "$(WITH_LANG)"!="" diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk index 1c34aaa16b57..d4a04f8e0e11 100644 --- a/solenv/inc/tg_srs.mk +++ b/solenv/inc/tg_srs.mk @@ -47,7 +47,7 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) +$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr @@ -63,7 +63,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZE $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES) .ENDIF # "$(WITH_LANG)"!="" From 12981b955e57687d5ac3e8c40f7b602b65d7dba0 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 16 Jul 2009 09:56:45 +0000 Subject: [PATCH 20/30] CWS-TOOLING: integrate CWS ooo311gsl05_DEV300 2009-06-30 17:18:18 +0200 pl r273524 : add patch flags for CWS ooo311gsl05 2009-06-30 16:22:06 +0200 pl r273519 : #i102485# correct landscape printing 2009-06-30 08:45:25 +0200 hdu r273486 : #i102378# fix PDF-export on PPC (thanks cloph!) --- scp2/source/ooo/file_library_ooo.scp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 1be88f725057..2434342df43d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1547,11 +1547,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx ) File gid_File_Lib_Vcl Name = LIBNAME(vcl); TXT_FILE_BODY; -<<<<<<< .working Styles = (PACKED,UNO_COMPONENT,PATCH); -======= - Styles = (PACKED,PATCH,UNO_COMPONENT); ->>>>>>> .merge-right.r273775 Dir = gid_Dir_Program; RegistryID = gid_Starregistry_Services_Rdb; End From 263df25c0b501a306f0d8111cf094c93ef1cff3a Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 16 Jul 2009 10:52:40 +0000 Subject: [PATCH 21/30] CWS-TOOLING: integrate CWS mingwport21 2009-07-01 15:17:50 +0200 tono r273595 : i#102971: mingw port without solarbindir in PATH 2009-07-01 15:15:44 +0200 tono r273591 : i#90212: dmake not releasing file descriptor --- dmake/unix/runargv.c | 15 ++++++++++++--- solenv/inc/tg_ext.mk | 6 +++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c index 5979d04bc546..4be342bbb273 100644 --- a/dmake/unix/runargv.c +++ b/dmake/unix/runargv.c @@ -553,8 +553,11 @@ char **cmd; /* Simulate a reference to *cmd. */ /* Restore stdout/stderr if needed. */ if( old_stdout != -1 ) { dup2(old_stdout, 1); - if( old_stderr != -1 ) + close(old_stdout); + if( old_stderr != -1 ) { dup2(old_stderr, 2); + close(old_stderr); + } } internal = 1; @@ -593,8 +596,11 @@ char **cmd; /* Simulate a reference to *cmd. */ if( old_stdout != -1 ) { dup2(old_stdout, 1); - if( old_stderr != -1 ) + close(old_stdout); + if( old_stderr != -1 ) { dup2(old_stderr, 2); + close(old_stderr); + } } if(pid.pid == (DMHANDLE)-1) { /* spawn failed */ @@ -649,8 +655,11 @@ char **cmd; /* Simulate a reference to *cmd. */ * failed. */ if( old_stdout != -1 ) { dup2(old_stdout, 1); - if( old_stderr != -1 ) + close(old_stdout); + if( old_stderr != -1 ) { dup2(old_stderr, 2); + close(old_stderr); + } } fprintf(stderr, "%s: Error executing '%s': %s", Pname, argv[0], strerror(errno) ); diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 6a06591ab795..f000775b2279 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -47,7 +47,11 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS) .EXPORT : LDFLAGS .ENDIF -PATH!:=.:$(SOLARBINDIR):$(PATH) +.IF "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt" +PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH) +.ELSE # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt" +PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH) +.ENDIF # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt" .EXPORT : PATH #override From f46813f452685d41abfa389a4634e02dffc2c4bd Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 16 Jul 2009 13:36:50 +0000 Subject: [PATCH 22/30] CWS-TOOLING: integrate CWS tbo07 2009-07-15 12:50:18 +0200 tbo r274002 : #ii97838# fine tuning of text 2009-07-09 11:58:53 +0200 tbo r273855 : #i102592# add configur switch --enable-hids 2009-07-07 18:37:46 +0200 tbo r273812 : last fixes 2009-06-30 17:44:03 +0200 tbo r273527 : #i97838# dynamik hid.lst found 2009-06-30 12:53:57 +0200 tbo r273503 : #i100285# use other name of dialog 2009-06-25 18:56:33 +0200 tbo r273390 : CWS-TOOLING: rebase CWS tbo07 to trunk@272827 (milestone: DEV300:m50) 2009-06-25 15:31:23 +0200 tbo r273383 : #i100285# use other name of dialog 2009-06-25 14:15:33 +0200 tbo r273381 : #i100285# use other name of dialog + context problem with macos 2009-05-20 16:36:54 +0200 tbo r272140 : readme.txt fot the lost hid.lst file 2009-05-20 16:30:31 +0200 tbo r272139 : removal of hid.lst file 2009-05-20 16:28:26 +0200 tbo r272138 : corrections 2009-05-16 19:27:00 +0200 tbo r271982 : #i# copy hid.lst from OOo installation to global/hid 2009-04-21 13:36:36 +0200 tbo r271034 : #i101044# 2009-04-20 18:49:50 +0200 tbo r271009 : #i101044# 2009-04-20 18:47:35 +0200 tbo r271008 : #i100909# --- configure.in | 16 ++++++++++++++++ set_soenv.in | 3 +-- solenv/config/sdev300.ini | 1 - 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e46776bb2ad0..cc9a533e5553 100644 --- a/configure.in +++ b/configure.in @@ -61,6 +61,9 @@ AC_ARG_WITH(vba-package-format, AC_ARG_ENABLE(pch, [ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++. ],,) +AC_ARG_ENABLE(hids, +[ --enable-hids Enables generation of HelpId lists. +],,) AC_ARG_ENABLE(mozilla, [ --disable-mozilla OO.o usually includes a strangely hacked up mozilla binary for your platform, to build without this @@ -1491,6 +1494,19 @@ else fi AC_SUBST(ENABLE_PCH) +dnl =================================================================== +dnl Set the NO_HIDS variable. (enable with --enable-hids) +dnl =================================================================== +AC_MSG_CHECKING([whether to enable hid list feature]) +if test -n "$enable_hids" && test "$enable_hids" != "no"; then + NO_HIDS="" + AC_MSG_RESULT([yes]) +else + NO_HIDS="TRUE" + AC_MSG_RESULT([no]) +fi +AC_SUBST(NO_HIDS) + dnl =================================================================== dnl Search all the common names for GNU make dnl =================================================================== diff --git a/set_soenv.in b/set_soenv.in index 1ee948f0a226..2c496efc1d73 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -186,7 +186,6 @@ $CALL_CDECL = "TRUE"; $COMMON_OUTDIR = ""; $common_build = ""; $NO_REC_RES = "TRUE"; -$NO_HIDS = "TRUE"; $SO3 = "TRUE"; $SOLAR_JAVA = "@SOLAR_JAVA@"; $SOLAR_PLUGIN = "TRUE"; @@ -1622,7 +1621,6 @@ ToFile( "common_build", $common_build, "e" ); ToFile( "BMP_WRITES_FLAG", $BMP_WRITES_FLAG, "e" ); ToFile( "BUILD_SOSL_RELEASE", $BUILD_SOSL_RELEASE, "e" ); ToFile( "NO_REC_RES", $NO_REC_RES, "e" ); -ToFile( "NO_HIDS", $NO_HIDS, "e" ); ToFile( "SO3", $SO3, "e" ); ToFile( "SOLAR_PLUGIN", $SOLAR_PLUGIN, "e" ); ToFile( "UPDATER", $UPDATER, "e" ); @@ -1816,6 +1814,7 @@ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" ); ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" ); ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" ); ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" ); +ToFile( "NO_HIDS", "@NO_HIDS@", "e" ); ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" ); ToFile( "WITH_GPC", "@WITH_GPC@", "e" ); ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e"); diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index a16d69ed30b1..b3ed56475e85 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -1295,7 +1295,6 @@ unxmacxi HAVE_GCC_VISIBILITY_FEATURE TRUE LIBRARY_PATH %SYSBASE%/usr/lib MKOUT %PERL% %SOLARENV%/bin/mkout.pl - NO_HIDS TRUE PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon SOLAREXTRALIB -L%SOLAR_STLLIBPATH% From 830873068a3fa3d973831d81f3215fba7faae69d Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 16 Jul 2009 14:59:24 +0000 Subject: [PATCH 23/30] CWS-TOOLING: integrate CWS native255_DEV300 2009-07-10 11:34:13 +0200 is r273881 : #158814# naming schema of windows patches 2009-07-08 17:50:35 +0200 is r273842 : #158814# msp naming schema 2009-07-08 15:46:43 +0200 is r273836 : #158814# msp naming schema --- solenv/bin/make_installer.pl | 2 +- solenv/bin/modules/installer/windows/admin.pm | 12 ++++++-- solenv/bin/modules/installer/windows/msp.pm | 28 +++++++++++++++---- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index f20cab0365fe..13052fa1a116 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -2311,7 +2311,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # Temp path for administrative installations: $installer::globals::temppath # Path of new installation set: $finalinstalldir # Path of old installation set: $installer::globals::updatedatabasepath - my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $filesinproductlanguageresolvedarrayref); + my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $languagesarrayref, $filesinproductlanguageresolvedarrayref); ($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $mspdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number); installer::worker::clean_output_tree(); # removing directories created in the output tree } diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index 7e8a14a94123..8cd2b402561c 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -58,11 +58,17 @@ sub unpack_cabinet_file # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack # cabinet files. +# if ( $^O =~ /cygwin/i ) +# { +# $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory +# $expandfile =~ s/\\/\//; +# if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); } +# } + if ( $^O =~ /cygwin/i ) { - $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory - $expandfile =~ s/\\/\//; - if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); } + $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe); + chomp $expandfile; } my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log"; diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index e65b649885f0..0a5a35f05693 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -286,20 +286,36 @@ sub check_and_save_tables } } +#################################################################### +# Setting the languages for the service packs +#################################################################### + +sub create_langstring +{ + my ( $languagesarrayref ) = @_; + + my $langstring = ""; + for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ ) { $langstring = $langstring . "_" . ${$languagesarrayref}[$i]; } + + return $langstring; +} + #################################################################### # Setting the name of the msp database #################################################################### sub set_mspfilename { - my ($allvariables, $mspdir) = @_; + my ($allvariables, $mspdir, $languagesarrayref) = @_; - my $databasename = $allvariables->{'PRODUCTNAME'} . $allvariables->{'PRODUCTVERSION'}; + my $databasename = $allvariables->{'PRODUCTNAME'}; $databasename = lc($databasename); $databasename =~ s/\.//g; $databasename =~ s/\-//g; $databasename =~ s/\s//g; + if ( $allvariables->{'MSPPRODUCTVERSION'} ) { $databasename = $databasename . $allvariables->{'MSPPRODUCTVERSION'}; } + # possibility to overwrite the name with variable DATABASENAME # if ( $allvariables->{'DATABASENAME'} ) { $databasename = $allvariables->{'DATABASENAME'}; } @@ -312,8 +328,10 @@ sub set_mspfilename if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 )) { my $windowspatchlevel = 0; - if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; } + if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'MSPPATCHLEVEL'}; } $databasename = $databasename . "_servicepack_" . $windowspatchlevel; + my $languagestring = create_langstring($languagesarrayref); + $databasename = $databasename . $languagestring; } else { @@ -1139,7 +1157,7 @@ sub analyze_msimsp_logfile sub create_msp_patch { - my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $filesarray) = @_; + my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $languagesarrayref, $filesarray) = @_; my $force = 1; # print this message even in 'quiet' mode installer::logger::print_message( "\n******************************************\n" ); @@ -1221,7 +1239,7 @@ sub create_msp_patch check_and_save_tables($tablelist, $localmspdir); # Setting the name of the new msp file - my $mspfilename = set_mspfilename($allvariables, $mspdir); + my $mspfilename = set_mspfilename($allvariables, $mspdir, $languagesarrayref); # Editing tables edit_tables($tablelist, $localmspdir, $olddatabase, $newdatabase, $mspfilename, $allvariables, $languagestringref); From 3de95500d3ee4df22078e40f006b927a065940b8 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 16 Jul 2009 18:54:19 +0000 Subject: [PATCH 24/30] DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index a153f30b95a9..333b90355ad2 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m52(Build:9411) -BUILD=9411 -LAST_MINOR=m52 +RSCREVISION=300m53(Build:9412) +BUILD=9412 +LAST_MINOR=m53 SOURCEVERSION=DEV300 From e164b6fa26beb78b5c6db7a581475c8241743301 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Fri, 17 Jul 2009 12:48:43 +0000 Subject: [PATCH 25/30] #i10000# #i103467# build fix --- scp2/source/ooo/file_library_ooo.scp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2434342df43d..0c7e4a3a9bff 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -958,7 +958,11 @@ File gid_File_Oo_Office_Dataaccess_Mozab_Xcu TXT_FILE_BODY; Styles = (PACKED); Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; +#ifdef WNT Name = "/registry/spool/DataAccess/mozab.xcu"; +#else + Name = "/registry/spool/DataAccess/mozab2.xcu"; +#endif End STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab) From 463d4f42adb155d10114340f3a54208f17003cf9 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 20 Jul 2009 12:59:30 +0000 Subject: [PATCH 26/30] #i10000# build fix --- solenv/bin/clipatchconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl index 63e6a0f48830..aa73d86991d2 100644 --- a/solenv/bin/clipatchconfig.pl +++ b/solenv/bin/clipatchconfig.pl @@ -134,4 +134,4 @@ sub trim($) $string =~ s/^\s+//; $string =~ s/\s+$//; return $string; -} +} \ No newline at end of file From d912b1f69906acc4ccc0f86088a1d9628fdd8eee Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 20 Jul 2009 13:16:32 +0000 Subject: [PATCH 27/30] #i10000# l10n fix for a locale environment --- solenv/inc/target.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 8c1ba38e17e7..0264ac9bb7c6 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1393,9 +1393,10 @@ $(UNIXTEXT) : $(UNIXTEXT:f) .IF "$(LOCALIZESDF)"!="" "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) - @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip - @@-cp -r $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET)$/* $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME) - @@-$(RM) -rf $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET) + @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET) + @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip + @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)$/* $(COMMONMISC)$/$(PRJNAME) + @@-$(RM) -rf $(COMMONMISC)$/$(PRJNAME)_$(TARGET) .ENDIF # "$(LOCALIZESDF)"!="" .ENDIF # "$(LOCALIZATION_FOUND)"=="" .ENDIF # "$(WITH_LANG)"!="" From 02b56de0ab6de9cabcf1af6b7a2dd42adea2b1f2 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 20 Jul 2009 14:43:55 +0000 Subject: [PATCH 28/30] #i10000# ar removed --- instsetoo_native/util/pack.lst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index 1709883abde9..2e62a4938998 100755 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -7,12 +7,12 @@ # Product List_of_platforms List_of_languages Target -OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar openoffice +OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US openoffice OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice #BrOffice pt-BR broffice #OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12 en-US openofficewithjre #BrOffice_wJRE pt-BR brofficewithjre -OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US|ar openofficedev +OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US openofficedev #BrOffice_Dev pt-BR brofficedev OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo #URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure From f02665fc157b2dcb482d4c315818fe99b4967591 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 21 Jul 2009 09:46:41 +0000 Subject: [PATCH 29/30] #i10000# latest and greatest --- configure | 98 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 7a99031fc470..8ba4664381db 100755 --- a/configure +++ b/configure @@ -910,6 +910,7 @@ PERL HAVE_LD_HASH_STYLE _cc GNUMAKE +NO_HIDS ENABLE_PCH HAVE_LD_BSYMBOLIC_FUNCTIONS GCCVER @@ -1020,6 +1021,7 @@ enable_lockdown enable_vba with_vba_package_format enable_pch +enable_hids enable_mozilla with_fonts with_ppds @@ -1824,6 +1826,8 @@ Optional Features: --enable-pch EXPERIMENTAL: Enables precompiled header support for C++. + --enable-hids Enables generation of HelpId lists. + --disable-mozilla OO.o usually includes a strangely hacked up mozilla binary for your platform, to build without this version, use this option. @@ -2882,6 +2886,11 @@ if test "${enable_pch+set}" = set; then enableval=$enable_pch; fi +# Check whether --enable-hids was given. +if test "${enable_hids+set}" = set; then + enableval=$enable_hids; +fi + # Check whether --enable-mozilla was given. if test "${enable_mozilla+set}" = set; then enableval=$enable_mozilla; @@ -6131,6 +6140,19 @@ $as_echo "no" >&6; } fi +{ $as_echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5 +$as_echo_n "checking whether to enable hid list feature... " >&6; } +if test -n "$enable_hids" && test "$enable_hids" != "no"; then + NO_HIDS="" + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + NO_HIDS="TRUE" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + { $as_echo "$as_me:$LINENO: checking for GNU make" >&5 $as_echo_n "checking for GNU make... " >&6; } for a in "$MAKE" $GNUMAKE make gmake gnumake; do @@ -6743,14 +6765,17 @@ $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; } $as_echo "found Compiler version $CCNUMVER." >&6; } if test "$CCNUMVER" -ge "001500000000"; then COMEX=12 + MSVSVER=2008 { $as_echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 $as_echo "found .NET 2008 / VS 9.0." >&6; } elif test "$CCNUMVER" -ge "001400000000"; then COMEX=11 + MSVSVER=2005 { $as_echo "$as_me:$LINENO: result: found .NET 2005." >&5 $as_echo "found .NET 2005." >&6; } elif test "$CCNUMVER" -ge "001300102240"; then COMEX=10 + MSVSVER=2003 { $as_echo "$as_me:$LINENO: result: found .NET 2003." >&5 $as_echo "found .NET 2003." >&6; } else @@ -18182,10 +18207,16 @@ fi { $as_echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 $as_echo_n "checking for toolkit mozilla should use... " >&6; } if test -z "$with_mozilla_toolkit"; then - if test "$_os" != "WINNT"; then - MOZILLA_TOOLKIT=gtk2 - { $as_echo "$as_me:$LINENO: result: gtk2" >&5 + if test "$_os" != "WINNT" ; then + if test "$_os" = "Darwin" ; then + MOZILLA_TOOLKIT=mac + { $as_echo "$as_me:$LINENO: result: mac" >&5 +$as_echo "mac" >&6; } + else + MOZILLA_TOOLKIT=gtk2 + { $as_echo "$as_me:$LINENO: result: gtk2" >&5 $as_echo "gtk2" >&6; } + fi fi else MOZILLA_TOOLKIT=$with_mozilla_toolkit @@ -18208,8 +18239,8 @@ else enable_build_mozilla= fi -{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla" >&5 -$as_echo_n "checking whether to build Mozilla... " >&6; } +{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 +$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; } if test -n "$enable_build_mozilla"; then BUILD_MOZAB="TRUE" { $as_echo "$as_me:$LINENO: result: yes" >&5 @@ -18221,18 +18252,29 @@ $as_echo "no" >&6; } fi if test "$BUILD_MOZAB" = "TRUE"; then + if test "$_os" = "WINNT"; then + if test "$WITH_MINGWIN" != "yes"; then + # compiling with MSVC. Only supported platform here is MSVS2005 at the moment. + if test "$MSVSVER" != "2005"; then + { { $as_echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5 +$as_echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;} + { (exit 1); exit 1; }; } + fi + else + { $as_echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5 +$as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;} + echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn + fi + fi + if test -z "$MOZILLA_VERSION"; then - MOZILLA_VERSION=1.7.5 - fi - if test "$MOZILLA_VERSION" = "1.7b" ; then - MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source" - else - MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}" + MOZILLA_VERSION=1.1.14 fi + MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" for e in gz bz2; do { $as_echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 $as_echo_n "checking for $MOZILLA_SOURCE_VERSION.tar.$e... " >&6; } - if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then + if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then { $as_echo "$as_me:$LINENO: result: not found" >&5 $as_echo "not found" >&6; } HAVE_MOZILLA_TARBALL=n @@ -18243,34 +18285,24 @@ $as_echo "found" >&6; } fi done if test "$HAVE_MOZILLA_TARBALL" != "y"; then - { { $as_echo "$as_me:$LINENO: error: Mozilla source archive not found. + { { $as_echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/" >&5 -$as_echo "$as_me: error: Mozilla source archive not found. +http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5 +$as_echo "$as_me: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/" >&2;} +http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: checking for glib and libIDL binaries" >&5 -$as_echo_n "checking for glib and libIDL binaries... " >&6; } - if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \ - -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \ - -o ! -e "./moz/download/wintools.zip" ; then -{ { $as_echo "$as_me:$LINENO: error: One or more of the following archives is missing in moz/download/ - vc71-glib-1.2.10-bin.zip - vc71-libIDL-0.6.8-bin.zip -(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/) - wintools.zip -(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)" >&5 -$as_echo "$as_me: error: One or more of the following archives is missing in moz/download/ - vc71-glib-1.2.10-bin.zip - vc71-libIDL-0.6.8-bin.zip -(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/) - wintools.zip -(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)" >&2;} + { $as_echo "$as_me:$LINENO: checking for moztools binaries" >&5 +$as_echo_n "checking for moztools binaries... " >&6; } + if test ! -e "moz/download/vc8-moztools.zip" ; then + { { $as_echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip +(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5 +$as_echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip +(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;} { (exit 1); exit 1; }; } else { $as_echo "$as_me:$LINENO: result: ok" >&5 From cc69c7cae006a3a5f6e054e6221858f6ef6514d5 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Tue, 21 Jul 2009 13:29:33 +0000 Subject: [PATCH 30/30] Create DEV300_m53 milestone tag from trunk@274201