diff options
author | Xisco Fauli <anistenis@gmail.com> | 2011-08-21 21:50:13 +0200 |
---|---|---|
committer | Xisco Fauli <anistenis@gmail.com> | 2011-08-21 21:50:13 +0200 |
commit | 6c76e4db034fd2c43884698b1a30225fd00b3bfd (patch) | |
tree | 1937cb9be81cd2b9f3d0ad27adcc7a7531b8f29d /splitbuild | |
parent | e9440fb5a0579096423c081b0f0a2185b628e896 (diff) | |
parent | 36703ca1de68cd62782d0d425123521a5bc6732b (diff) |
Merge branch 'master' into feature/gsoc2011_wizards
Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx
Diffstat (limited to 'splitbuild')
-rw-r--r-- | splitbuild/base.lst | 1 | ||||
-rw-r--r-- | splitbuild/binfilter.lst | 1 | ||||
-rwxr-xr-x | splitbuild/bm | 4 | ||||
-rw-r--r-- | splitbuild/build.lst | 1 | ||||
-rw-r--r-- | splitbuild/calc.lst | 1 | ||||
-rw-r--r-- | splitbuild/common.lst | 1 | ||||
-rw-r--r-- | splitbuild/content.lst | 1 | ||||
-rw-r--r-- | splitbuild/draw.lst | 1 | ||||
-rw-r--r-- | splitbuild/extensions.lst | 1 | ||||
-rw-r--r-- | splitbuild/extern.lst | 1 | ||||
-rwxr-xr-x | splitbuild/filter.lst | 1 | ||||
-rw-r--r-- | splitbuild/framework.lst | 1 | ||||
-rw-r--r-- | splitbuild/gui.lst | 1 | ||||
-rw-r--r-- | splitbuild/prj/build.lst | 1 | ||||
-rw-r--r-- | splitbuild/prj/d.lst | 1 | ||||
-rw-r--r-- | splitbuild/start.lst | 1 | ||||
-rw-r--r-- | splitbuild/uno.lst | 1 | ||||
-rw-r--r-- | splitbuild/writer.lst | 1 |
18 files changed, 21 insertions, 0 deletions
diff --git a/splitbuild/base.lst b/splitbuild/base.lst new file mode 100644 index 000000000000..cda4527f3496 --- /dev/null +++ b/splitbuild/base.lst @@ -0,0 +1 @@ +reportdesign dbaccess diff --git a/splitbuild/binfilter.lst b/splitbuild/binfilter.lst new file mode 100644 index 000000000000..1baa90b768cf --- /dev/null +++ b/splitbuild/binfilter.lst @@ -0,0 +1 @@ +binfilter diff --git a/splitbuild/bm b/splitbuild/bm new file mode 100755 index 000000000000..16872f1413d5 --- /dev/null +++ b/splitbuild/bm @@ -0,0 +1,4 @@ +build --genconf --clear +build --genconf --add `cat $1` +build --all $2 $3 $4 + diff --git a/splitbuild/build.lst b/splitbuild/build.lst new file mode 100644 index 000000000000..e19d9cebed73 --- /dev/null +++ b/splitbuild/build.lst @@ -0,0 +1 @@ +crashrep javainstaller2 packimages postprocess scp2 testtools instsetoo_native diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst new file mode 100644 index 000000000000..d9e4a9f180a1 --- /dev/null +++ b/splitbuild/calc.lst @@ -0,0 +1 @@ +chart2 scaddins sccomp sc diff --git a/splitbuild/common.lst b/splitbuild/common.lst new file mode 100644 index 000000000000..2b92492afa3d --- /dev/null +++ b/splitbuild/common.lst @@ -0,0 +1 @@ +basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml xmlhelp xmloff xmlscript wizards diff --git a/splitbuild/content.lst b/splitbuild/content.lst new file mode 100644 index 000000000000..dd8d40c75da7 --- /dev/null +++ b/splitbuild/content.lst @@ -0,0 +1 @@ +dictionaries extras helpcontent2 diff --git a/splitbuild/draw.lst b/splitbuild/draw.lst new file mode 100644 index 000000000000..6f83eca0069d --- /dev/null +++ b/splitbuild/draw.lst @@ -0,0 +1 @@ +animations sd slideshow diff --git a/splitbuild/extensions.lst b/splitbuild/extensions.lst new file mode 100644 index 000000000000..86fe24b8830d --- /dev/null +++ b/splitbuild/extensions.lst @@ -0,0 +1 @@ +migrationanalysis reportbuilder sdext swext diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst new file mode 100644 index 000000000000..9876dd7348d7 --- /dev/null +++ b/splitbuild/extern.lst @@ -0,0 +1 @@ +afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib diff --git a/splitbuild/filter.lst b/splitbuild/filter.lst new file mode 100755 index 000000000000..9659e019d7cb --- /dev/null +++ b/splitbuild/filter.lst @@ -0,0 +1 @@ +filter hwpfilter oox writerfilter writerperfect xmerge
\ No newline at end of file diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst new file mode 100644 index 000000000000..1333e7dc7eec --- /dev/null +++ b/splitbuild/framework.lst @@ -0,0 +1 @@ +automation avmedia basic basctl cui desktop drawinglayer extensions forms formula framework idl scripting sfx2 svx xmlsecurity vbahelper diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst new file mode 100644 index 000000000000..d64284379728 --- /dev/null +++ b/splitbuild/gui.lst @@ -0,0 +1 @@ +accessibility canvas cppcanvas dtrans editeng fpicker padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst new file mode 100644 index 000000000000..0356e8b8d975 --- /dev/null +++ b/splitbuild/prj/build.lst @@ -0,0 +1 @@ +spl splitbuild :: postprocess NULL diff --git a/splitbuild/prj/d.lst b/splitbuild/prj/d.lst new file mode 100644 index 000000000000..b87dd52c7da2 --- /dev/null +++ b/splitbuild/prj/d.lst @@ -0,0 +1 @@ +#dummy d.lst file diff --git a/splitbuild/start.lst b/splitbuild/start.lst new file mode 100644 index 000000000000..3838044a8c4a --- /dev/null +++ b/splitbuild/start.lst @@ -0,0 +1 @@ +soltools diff --git a/splitbuild/uno.lst b/splitbuild/uno.lst new file mode 100644 index 000000000000..31ee787564de --- /dev/null +++ b/splitbuild/uno.lst @@ -0,0 +1 @@ +autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst new file mode 100644 index 000000000000..28bd99c6372e --- /dev/null +++ b/splitbuild/writer.lst @@ -0,0 +1 @@ +hwpfilter starmath sw writerfilter writerperfect |