[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 953 commits - buildscript.sh configure.in git-hooks/pre-commit .gitignore GNUmakefile.mk instsetoo_native/inc_openoffice instsetoo_native/prj instsetoo_native/util Makefile.in Module_ooo.mk ooo.lst RepositoryFixes.mk Repository.mk scp2/inc scp2/prj scp2/source set_soenv.in soldep/bootstrp soldep/inc solenv/bin solenv/config solenv/doc solenv/gbuild solenv/inc solenv/makefile.mk solenv/prj solenv/src soltools/HIDCompiler soltools/mkdepend soltools/prj stlport/systemstlguards
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue Mar 8 21:23:41 PST 2011
.gitignore | 399 -
GNUmakefile.mk | 37
Makefile.in | 46
Module_ooo.mk | 47
Repository.mk | 135
RepositoryFixes.mk | 186
buildscript.sh | 18
configure.in | 129
git-hooks/pre-commit | 7
instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk | 5
instsetoo_native/prj/build.lst | 2
instsetoo_native/prj/d.lst | 1
instsetoo_native/util/makefile.mk | 1
instsetoo_native/util/openoffice.lst | 89
ooo.lst | 22
scp2/inc/macros.inc | 86
scp2/prj/build.lst | 2
scp2/source/base/file_base.scp | 14
scp2/source/binfilter/file_binfilter.scp | 6
scp2/source/calc/file_calc.scp | 12
scp2/source/calc/registryitem_calc.scp | 4
scp2/source/canvas/cairocanvas.scp | 3
scp2/source/canvas/canvascommons.scp | 4
scp2/source/canvas/directxcanvas.scp | 6
scp2/source/canvas/vclcanvas.scp | 2
scp2/source/draw/registryitem_draw.scp | 6
scp2/source/gnome/file_gnome.scp | 6
scp2/source/graphicfilter/file_graphicfilter.scp | 4
scp2/source/impress/file_impress.scp | 4
scp2/source/impress/module_ogltrans.scp | 3
scp2/source/impress/registryitem_impress.scp | 8
scp2/source/javafilter/file_javafilter.scp | 2
scp2/source/javafilter/registryitem_javafilter.scp | 8
scp2/source/kde/file_kde.scp | 4
scp2/source/math/file_math.scp | 4
scp2/source/onlineupdate/file_onlineupdate.scp | 2
scp2/source/ooo/common_brand.scp | 11
scp2/source/ooo/directory_ooo_macosx.scp | 4
scp2/source/ooo/file_improvement.scp | 2
scp2/source/ooo/file_library_ooo.scp | 405 -
scp2/source/ooo/file_ooo.scp | 95
scp2/source/ooo/file_resource_ooo.scp | 9
scp2/source/ooo/makefile.mk | 10
scp2/source/ooo/module_hidden_ooo.scp | 4
scp2/source/ooo/module_lang_template.scp | 9
scp2/source/ooo/module_langpack.ulf | 8
scp2/source/ooo/ooo_brand.scp | 8
scp2/source/ooo/profileitem_ooo.scp | 22
scp2/source/ooo/ure.scp | 138
scp2/source/python/file_python.scp | 4
scp2/source/python/module_python_mailmerge.scp | 3
scp2/source/testtool/file_testtool.scp | 7
scp2/source/writer/file_writer.scp | 14
scp2/source/writer/registryitem_writer.scp | 14
set_soenv.in | 45
soldep/bootstrp/command.cxx | 683 ++
soldep/bootstrp/sstring.cxx | 314
soldep/inc/soldep/command.hxx | 163
soldep/inc/soldep/listmacr.hxx | 60
soldep/inc/soldep/sstring.hxx | 105
solenv/bin/build.pl | 800 +-
solenv/bin/buildalyzer | 138
solenv/bin/createcomponent.xslt | 51
solenv/bin/deliver.pl | 32
solenv/bin/linkoo | 23
solenv/bin/macosx-change-install-names.pl | 12
solenv/bin/macosx-create-bundle | 2
solenv/bin/make_installer.pl | 42
solenv/bin/mhids.pl | 384 -
solenv/bin/modules/CreatePDBRelocators.pm | 61
solenv/bin/modules/RepositoryHelper.pm | 20
solenv/bin/modules/SourceConfig.pm | 35
solenv/bin/modules/SourceConfigHelper.pm | 422 +
solenv/bin/modules/installer/control.pm | 32
solenv/bin/modules/installer/environment.pm | 4
solenv/bin/modules/installer/globals.pm | 20
solenv/bin/modules/installer/parameter.pm | 15
solenv/bin/modules/installer/regmerge.pm | 339 -
solenv/bin/modules/installer/scriptitems.pm | 82
solenv/bin/modules/installer/servicesfile.pm | 1059 ---
solenv/bin/modules/installer/simplepackage.pm | 40
solenv/bin/modules/installer/substfilenamefiles.pm | 5
solenv/bin/modules/installer/windows/component.pm | 16
solenv/bin/modules/installer/windows/directory.pm | 107
solenv/bin/modules/installer/windows/file.pm | 234
solenv/bin/modules/installer/windows/idtglobal.pm | 24
solenv/bin/modules/installer/windows/msiglobal.pm | 110
solenv/bin/modules/installer/windows/property.pm | 4
solenv/bin/modules/par2script/check.pm | 49
solenv/bin/packcomponents.xslt | 52
solenv/bin/packmodule | 63
solenv/bin/par2script.pl | 2
solenv/bin/subsequenttests | 54
solenv/bin/transform_description.pl | 6
solenv/config/sdev300.ini | 3359 ++++++++++
solenv/doc/gbuild/doxygen.cfg | 1510 ++++
solenv/doc/gbuild/solenv/gbuild/alllangres.mk | 90
solenv/doc/gbuild/solenv/gbuild/executable.mk | 25
solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 82
solenv/doc/gbuild/solenv/gbuild/helper.mk | 42
solenv/doc/gbuild/solenv/gbuild/library.mk | 41
solenv/doc/gbuild/solenv/gbuild/linktarget.mk | 128
solenv/doc/gbuild/solenv/gbuild/package.mk | 30
solenv/doc/gbuild/solenv/gbuild/sdi.mk | 23
solenv/doc/gbuild/solenv/gbuild/static_library.mk | 39
solenv/doc/gbuild/solenv/gbuild/types.mk | 169
solenv/gbuild/AllLangResTarget.mk | 323
solenv/gbuild/BuildDirs.mk | 59
solenv/gbuild/ComponentTarget.mk | 69
solenv/gbuild/CppunitTest.mk | 96
solenv/gbuild/CustomTarget.mk | 96
solenv/gbuild/Deliver.mk | 95
solenv/gbuild/Executable.mk | 91
solenv/gbuild/Helper.mk | 168
solenv/gbuild/JavaClassSet.mk | 81
solenv/gbuild/JunitTest.mk | 97
solenv/gbuild/Library.mk | 133
solenv/gbuild/LinkTarget.mk | 641 +
solenv/gbuild/Module.mk | 212
solenv/gbuild/Output.mk | 147
solenv/gbuild/Package.mk | 80
solenv/gbuild/PrecompiledHeaders.mk | 77
solenv/gbuild/SdiTarget.mk | 71
solenv/gbuild/StaticLibrary.mk | 109
solenv/gbuild/TargetLocations.mk | 162
solenv/gbuild/Tempfile.mk | 18
solenv/gbuild/extensions/post_PackModule.mk | 62
solenv/gbuild/extensions/post_SetupLocal.mk | 68
solenv/gbuild/extensions/pre_SharedLangList.mk | 38
solenv/gbuild/gbuild.mk | 254
solenv/gbuild/platform/linux.mk | 407 +
solenv/gbuild/platform/macosx.mk | 454 +
solenv/gbuild/platform/solaris.mk | 385 +
solenv/gbuild/platform/windows.mk | 679 ++
solenv/gbuild/platform/winmingw.mk | 609 +
solenv/gbuild/processdelivered.awk | 36
solenv/gbuild/processdeps.awk | 78
solenv/gbuild/templates/AllLangResTarget.mk | 49
solenv/gbuild/templates/CppunitTest.mk | 41
solenv/gbuild/templates/Executable.mk | 45
solenv/gbuild/templates/JunitTest.mk | 49
solenv/gbuild/templates/Library.mk | 86
solenv/gbuild/templates/Makefile | 38
solenv/gbuild/templates/Module.mk | 45
solenv/gbuild/templates/Package.mk | 42
solenv/gbuild/templates/StaticLibrary.mk | 35
solenv/gbuild/templates/makefile.mk | 40
solenv/inc/_cppunit.mk | 20
solenv/inc/_tg_rslb.mk | 160
solenv/inc/_tg_scp.mk | 20
solenv/inc/_tg_sdi.mk | 90
solenv/inc/_tg_shl.mk | 170
solenv/inc/_tg_srs.mk | 140
solenv/inc/cppunit.mk | 2
solenv/inc/extension_post.mk | 15
solenv/inc/installationtest.mk | 39
solenv/inc/javaunittest.mk | 27
solenv/inc/langlist.mk | 163
solenv/inc/libs.mk | 6
solenv/inc/minor.mk | 10
solenv/inc/postmac.h | 6
solenv/inc/premac.h | 6
solenv/inc/pstrules.mk | 21
solenv/inc/rules.mk | 7
solenv/inc/settings.mk | 99
solenv/inc/target.mk | 58
solenv/inc/tg_ext.mk | 4
solenv/inc/tg_jar.mk | 12
solenv/inc/tg_java.mk | 11
solenv/inc/tg_rslb.mk | 16
solenv/inc/tg_scp.mk | 2
solenv/inc/tg_sdi.mk | 9
solenv/inc/tg_shl.mk | 17
solenv/inc/tg_srs.mk | 14
solenv/inc/unitools.mk | 6
solenv/inc/unx.mk | 3
solenv/inc/unxgcc.mk | 9
solenv/inc/unxmacx.mk | 5
solenv/inc/version.hrc | 16
solenv/inc/version.lst | 6
solenv/inc/version_so.hrc | 16
solenv/inc/versionlist.mk | 2
solenv/inc/wntgcci.mk | 4
solenv/inc/wntmsc.mk | 3
solenv/makefile.mk | 13
solenv/prj/d.lst | 6
solenv/src/component.map | 1
solenv/src/reg-component.map | 8
solenv/src/unloadablecomponent.map | 1
soltools/HIDCompiler/hidclex.l | 949 --
soltools/HIDCompiler/makefile.mk | 63
soltools/HIDCompiler/wrap_hidclex.cxx | 34
soltools/mkdepend/def.h | 4
soltools/mkdepend/include.c | 21
soltools/prj/build.lst | 1
soltools/prj/d.lst | 2
stlport/systemstlguards/postextstl.h | 37
stlport/systemstlguards/preextstl.h | 77
198 files changed, 16778 insertions(+), 5346 deletions(-)
New commits:
commit 82a634cf3ae5cad37d52baf29e21ce0e39b96637
Merge: aed9e41... 57ac77e...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 8 22:31:15 2011 -0600
Merge remote branch 'origin/feature/gnumake2.1' into integration/dev300_m101
* origin/feature/gnumake2.1: (202 commits)
Revert "starmath need to have _DLL_ defined, even on MacOS"
tweak library name on MacOS
starmath need to have _DLL_ defined, even on MacOS
add helper to set-up the libraries env, to run executable during build
the startmath module in Module_ooo must use the name of the directory
add starmath libraries to Repository.mk
make linkoo scan the solver too, for Norbert's gnumake work
-Wunitialized is not compatible with -DDEBUG
rename gb_HIRESTIME to gb_LOWRESTIME. Assume highres precision by default
add missing library for sc. Massage the delivered libraries name.
support USE_GMAKE=1 envvar to build with gmake the modules that can be.
add sc in the list of gmake-Modules
support for an alternate gbuild.lst to support gmake build
add a few comment to balance quotes, to make the editor less confused
add all the sub-directory of the RESLOCATION to search for resource
add calc related library to the Repository
tweak MacOs platform specific include to build on Macos
fixing variable exports for windows compiler (thanks ause)
fixing variable exports for windows compiler (thanks ause)
also accept debug=t
...
Conflicts:
Makefile.in
Module_ooo.mk
Repository.mk
RepositoryFixes.mk
configure.in
solenv/bin/build.pl
solenv/bin/modules/RepositoryHelper.pm
solenv/bin/packmodule
solenv/doc/gbuild/doxygen.cfg
solenv/doc/gbuild/solenv/gbuild/types.mk
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/BuildDirs.mk
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/Executable.mk
solenv/gbuild/Helper.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/Module.mk
solenv/gbuild/Output.mk
solenv/gbuild/Package.mk
solenv/gbuild/PrecompiledHeaders.mk
solenv/gbuild/SdiTarget.mk
solenv/gbuild/StaticLibrary.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/processdelivered.awk
solenv/gbuild/processdeps.awk
solenv/inc/unxgcc.mk
soltools/mkdepend/def.h
soltools/mkdepend/include.c
diff --cc .gitignore
index 904eac3,5876759..a62a773
--- a/.gitignore
+++ b/.gitignore
@@@ -57,202 -50,201 +57,203 @@@
/*/*.exe
# links to the other repositories
-MathMLDTD
-Mesa
-UnoControls
-agg
-accessibility
-afms
-animations
-apache-commons
-apple_remote
-autodoc
-automation
-avmedia
-basctl
-basebmp
-basegfx
-basic
-bean
-beanshell
-berkeleydb
-binfilter
-boost
-bridges
-cairo
-canvas
-chart2
-cli_ure
-codemaker
-comphelper
-configmgr
-connectivity
-cosv
-cppcanvas
-cppu
-cppuhelper
-cppunit
-cpputools
-crashrep
-cui
-curl
-dbaccess
-default_images
-desktop
-dictionaries
-drawinglayer
-dtrans
-editeng
-embeddedobj
-embedserv
-epm
-eventattacher
-expat
-extensions
-external
-external_images
-extras
-fileaccess
-filter
-forms
-formula
-fpicker
-framework
-graphite
-helpcontent2
-hsqldb
-hunspell
-hwpfilter
-hyphen
-i18npool
-i18nutil
-icc
-icu
-idl
-idlc
-io
-javainstaller2
-javaunohelper
-jfreereport
-jpeg
-jurt
-jvmaccess
-jvmfwk
-l10n
-l10ntools
-languagetool
-libegg
-libtextcat
-libwpd
-libwpg
-libwps
-libxml2
-libxmlsec
-libxslt
-lingucomponent
-linguistic
-lotuswordpro
-lpsolve
-lucene
-mdds
-migrationanalysis
-more_fonts
-moz
-mysqlc
-mysqlcppconn
-mythes
-neon
-nlpsolver
-np_sdk
-nss
-o3tl
-odk
-offapi
-officecfg
-offuh
-ooo_custom_images
-oovbaapi
-oox
-openssl
-package
-packimages
-padmin
-postprocess
-psprint_config
-python
-pyuno
-qadevOOo
-rdbmaker
-readlicense_oo
-redland
-regexp
-registry
-remotebridges
-reportbuilder
-reportdesign
-rhino
-ridljar
-rsc
-sal
-salhelper
-sane
-sax
-saxon
-sc
-scaddins
-sccomp
-scripting
-sd
-sdext
-setup_native
-sfx2
-shell
-slideshow
-smoketestoo_native
-sot
-starmath
-stax
-stoc
-store
-svl
-svtools
-svx
-sw
-swext
-sysui
-test
-testautomation
-testgraphical
-testtools
-tomcat
-toolkit
-tools
-twain
-ucb
-ucbhelper
-udkapi
-udm
-unixODBC
-unodevtools
-unoil
-unotools
-unoxml
-ure
-uui
-vbahelper
-vcl
-vigra
-wizards
-writerfilter
-writerperfect
-x11_extensions
-xmerge
-xml2cmp
-xmlhelp
-xmloff
-xmlscript
-xmlsecurity
-xpdf
-xsltml
-zlib
+/MathMLDTD
+/Mesa
+/UnoControls
+/agg
+/accessibility
+/afms
+/animations
+/apache-commons
+/apple_remote
+/autodoc
+/automation
+/avmedia
+/basctl
+/basebmp
+/basegfx
+/basic
+/bean
+/beanshell
+/berkeleydb
++/binaryurp
+/binfilter
+/boost
+/bridges
+/cairo
+/canvas
+/chart2
+/cli_ure
+/codemaker
+/comphelper
+/configmgr
+/connectivity
+/cosv
+/cppcanvas
+/cppu
+/cppuhelper
+/cppunit
+/cpputools
+/crashrep
+/cui
+/curl
+/dbaccess
+/default_images
+/desktop
+/dictionaries
+/drawinglayer
+/dtrans
+/editeng
+/embeddedobj
+/embedserv
+/epm
+/eventattacher
+/expat
+/extensions
+/external
+/external_images
+/extras
+/fileaccess
+/filter
+/forms
+/formula
+/fpicker
+/framework
+/graphite
+/helpcontent2
+/hsqldb
+/hunspell
+/hwpfilter
+/hyphen
+/i18npool
+/i18nutil
+/icc
+/icu
+/idl
+/idlc
+/io
+/javainstaller2
+/javaunohelper
+/jfreereport
+/jpeg
+/jurt
+/jvmaccess
+/jvmfwk
+/l10n
+/l10ntools
+/languagetool
+/libegg
+/libtextcat
+/libwpd
+/libwpg
+/libwps
+/libxml2
+/libxmlsec
+/libxslt
+/lingucomponent
+/linguistic
+/lotuswordpro
+/lpsolve
+/lucene
+/mdds
+/migrationanalysis
+/more_fonts
+/moz
+/mysqlc
+/mysqlcppconn
+/mythes
+/neon
+/nlpsolver
+/np_sdk
+/nss
+/o3tl
+/odk
+/offapi
+/officecfg
+/offuh
+/ooo_custom_images
+/oovbaapi
+/oox
+/openssl
+/package
+/packimages
+/padmin
+/postprocess
+/psprint_config
+/python
+/pyuno
+/qadevOOo
+/rdbmaker
+/readlicense_oo
+/redland
+/regexp
+/registry
+/remotebridges
+/reportbuilder
+/reportdesign
+/rhino
+/ridljar
+/rsc
+/sal
+/salhelper
+/sane
+/sax
+/saxon
+/sc
+/scaddins
+/sccomp
+/scripting
+/sd
+/sdext
+/setup_native
+/sfx2
+/shell
+/slideshow
+/smoketestoo_native
+/sot
+/starmath
+/stax
+/stoc
+/store
+/svl
+/svtools
+/svx
+/sw
+/swext
+/sysui
+/test
+/testautomation
+/testgraphical
+/testtools
+/tomcat
+/toolkit
+/tools
+/twain
+/ucb
+/ucbhelper
+/udkapi
+/udm
+/unixODBC
+/unodevtools
+/unoil
+/unotools
+/unoxml
+/ure
+/uui
+/vbahelper
+/vcl
+/vigra
+/wizards
+/writerfilter
+/writerperfect
+/x11_extensions
+/xmerge
+/xml2cmp
+/xmlhelp
+/xmloff
+/xmlreader
+/xmlscript
+/xmlsecurity
+/xpdf
+/xsltml
+/zlib
diff --cc GNUmakefile.mk
index 0000000,ccf548b..018b21e
mode 000000,100644..100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@@ -1,0 -1,37 +1,37 @@@
+ #*************************************************************************
+ #
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # Copyright 2009 by Sun Microsystems, Inc.
+ #
+ # OpenOffice.org - a multi-platform office productivity suite
+ #
+ # This file is part of OpenOffice.org.
+ #
+ # OpenOffice.org is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License version 3
+ # only, as published by the Free Software Foundation.
+ #
+ # OpenOffice.org is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU Lesser General Public License version 3 for more details
+ # (a copy is included in the LICENSE file that accompanied this code).
+ #
+ # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
++# version 3 along with OpenOffice.org. If not, see
+ # <http://www.openoffice.org/license.html>
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
+
+ ifeq ($(strip $(SOLARENV)),)
+ $(error No environment set!)
+ endif
+
+ GBUILDDIR := $(SOLARENV)/gbuild
+ include $(GBUILDDIR)/gbuild.mk
+
+ $(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk))))
+
+ # vim: set noet sw=4 ts=4:
diff --cc Module_ooo.mk
index a60bbb6,cb1d99e..f364cd8
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@@ -28,20 -28,16 +28,20 @@@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
- framework \
- sc \
- sfx2 \
- starmath \
- svl \
- svtools \
- sw \
- toolkit \
- tools \
- xmloff \
+ comphelper \
- editeng \
++ editeng \
+ framework \
+ padmin \
+ sfx2 \
+ sot \
+ svl \
+ svtools \
+ svx \
+ sw \
+ toolkit \
+ tools \
+ xmloff \
+ vbahelper \
))
# vim: set noet ts=4 sw=4:
diff --cc Repository.mk
index 87bbafa,28f1af5..80e03cf
--- a/Repository.mk
+++ b/Repository.mk
@@@ -43,43 -39,50 +43,43 @@@ $(eval $(call gb_Helper_register_execut
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- avmedia \
- basegfx \
- cui \
- drawinglayer \
- editeng \
- for \
- forui \
- fwe \
- fwi \
- fwk \
- fwl \
- fwm \
- i18npaper \
- lng \
- msfilter \
- msword \
- oox \
- qstart_gtk \
- sax \
- sb \
- sc \
- scd \
- scfilt \
- scui \
- sfx \
- sm \
- smd \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- sw \
- swd \
- swui \
- textconversiondlgs \
- tk \
- tl \
- utl \
- vbahelper \
- vcl \
- xo \
- xof \
- xcr \
+ avmedia \
+ basegfx \
+ cui \
+ drawinglayer \
+ editeng \
- eggtray \
+ fwe \
+ fwi \
+ fwk \
+ fwl \
+ fwm \
+ i18npaper \
+ lng \
+ msfilter \
+ msword \
++ oox \
+ qstart_gtk \
+ sax \
+ sb \
+ sfx \
+ sot \
+ spa \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ sw \
+ swd \
+ swui \
+ textconversiondlgs \
+ tk \
+ tl \
+ utl \
+ vbahelper \
+ vcl \
+ xcr \
+ xo \
+ xof \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
@@@ -93,11 -95,10 +93,10 @@@ $(eval $(call gb_Helper_register_librar
$(eval $(call gb_Helper_register_libraries,RTLIBS, \
- comphelper \
- i18nisolang1 \
- i18nutil \
- ucbhelper \
+ comphelper \
+ i18nisolang1 \
+ i18nutil \
+ ucbhelper \
- vos3 \
))
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
@@@ -126,12 -127,10 +125,11 @@@ $(eval $(call gb_Helper_register_librar
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- i18npaper \
- salcpprt \
- jpeglib \
- zlib \
+ jpeglib \
+ ooopathutils \
+ salcpprt \
+ vclmain \
+ zlib \
- vclmain \
))
# vim: set noet sw=4 ts=4:
diff --cc configure.in
index 3bf8475,c1d74b4..2b5ddbd
--- a/configure.in
+++ b/configure.in
@@@ -1984,8 -2010,8 +1984,8 @@@ AC_MSG_CHECKING([the GNU make version]
_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
if test "$_make_longver" -ge "038100" ; then
- AC_MSG_RESULT([$GNUMAKE $_make_version])
+ AC_MSG_RESULT([$GNUMAKE $_make_version])
- else
+else
AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
fi
AC_SUBST(GNUMAKE)
diff --cc solenv/bin/build.pl
index 121d63b,94723b5..b1ca526
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@@ -85,100 -91,105 +85,100 @@@
# #
#########################
- $modules_number++;
- $perl = "";
- $remove_command = "";
- use Cwd 'chdir';
- $perl = 'perl';
- $remove_command = 'rm -rf';
- $nul = '> /dev/null';
+ my $modules_number++;
+ my $perl = 'perl';
+ my $remove_command = 'rm -rf';
+ my $nul = '> /dev/null';
- $processes_to_run = 0;
+ my $processes_to_run = 0;
# delete $pid when not needed
- %projects_deps_hash = (); # hash of projects with no dependencies,
+ my %projects_deps_hash = (); # hash of projects with no dependencies,
# that could be built now
- %broken_build = (); # hash of hashes of the modules,
+ my %broken_build = (); # hash of hashes of the modules,
# where build was broken (error occurred)
- %folders_hashes = ();
- %running_children = ();
- $dependencies_hash = 0;
- $cmd_file = '';
- $build_all_parents = 0;
- $show = 0;
- $checkparents = 0;
- $deliver = 0;
- $pre_custom_job = '';
- $custom_job = '';
- $post_custom_job = '';
- %local_deps_hash = ();
- %PathHash = ();
- %PlatformHash = ();
- %AliveDependencies = ();
- %global_deps_hash = (); # hash of dependencies of the all modules
- %global_deps_hash_backup = (); # backup hash of external dependencies of the all modules
- %module_deps_hash_backup = (); # backup hash of internal dependencies for aech module
- %modules_with_errors = (); # hash of modules hashes, which cannot be built further
- @broken_modules_names = (); # array of modules, which cannot be built further
- @dmake_args = ();
- %dead_parents = ();
- $initial_module = '';
- $all_dependent = 1; # a flag indicating if the hash has independent keys
- $build_from_with_branches = '';
- $build_all_cont = '';
- $build_since = '';
- $dlv_switch = '';
- $child = 0;
- %processes_hash = ();
- %module_announced = ();
- $prepare = ''; # prepare for following incompatible build
- $ignore = '';
- $html = '';
- @ignored_errors = ();
- %incompatibles = ();
- %skip_modules = ();
- %exclude_branches = ();
- $only_platform = ''; # the only platform to prepare
- $only_common = ''; # the only common output tree to delete when preparing
- %build_modes = ();
- $maximal_processes = 0; # the max number of the processes run
- %modules_types = (); # modules types ('mod', 'img', 'lnk') hash
- %platforms = (); # platforms available or being working with
- %platforms_to_copy = (); # copy output trees for the platforms when --prepare
- $tmp_dir = get_tmp_dir(); # temp directory for checkout and other actions
- @possible_build_lists = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
- %build_list_paths = (); # build lists names
- %build_lists_hash = (); # hash of arrays $build_lists_hash{$module} = \($path, $xml_list_object)
- $pre_job = 'announce'; # job to add for not-single module build
- $post_job = ''; # -"-
- %windows_procs = ();
- @warnings = (); # array of warnings to be shown at the end of the process
- @errors = (); # array of errors to be shown at the end of the process
- %html_info = (); # hash containing all necessary info for generating of html page
- %module_by_hash = (); # hash containing all modules names as values and correspondent hashes as keys
- %build_in_progress = (); # hash of modules currently being built
- %build_is_finished = (); # hash of already built modules
- %modules_with_errors = (); # hash of modules with build errors
- %build_in_progress_shown = (); # hash of modules being built,
+ my %folders_hashes = ();
+ my %running_children = ();
+ my $dependencies_hash = 0;
+ my $cmd_file = '';
+ my $build_all_parents = 0;
+ my $show = 0;
+ my $checkparents = 0;
+ my $deliver = 0;
+ my $pre_custom_job = '';
+ my $custom_job = '';
+ my $post_custom_job = '';
+ my %local_deps_hash = ();
+ my %path_hash = ();
+ my %platform_hash = ();
+ my %alive_dependencies = ();
+ my %global_deps_hash = (); # hash of dependencies of the all modules
+ my %global_deps_hash_backup = (); # backup hash of external dependencies of the all modules
+ my %module_deps_hash_backup = (); # backup hash of internal dependencies for aech module
+ my @broken_modules_names = (); # array of modules, which cannot be built further
+ my @dmake_args = ();
+ my %dead_parents = ();
+ my $initial_module = '';
+ my $all_dependent = 1; # a flag indicating if the hash has independent keys
+ my $build_from_with_branches = '';
+ my $build_all_cont = '';
+ my $build_since = '';
+ my $dlv_switch = '';
+ my $child = 0;
+ my %processes_hash = ();
+ my %module_announced = ();
+ my $prepare = ''; # prepare for following incompatible build
+ my $ignore = '';
+ my $html = '';
+ my @ignored_errors = ();
+ my %incompatibles = ();
+ my %skip_modules = ();
+ my %exclude_branches = ();
+ my $only_platform = ''; # the only platform to prepare
+ my $only_common = ''; # the only common output tree to delete when preparing
+ my %build_modes = ();
+ my $maximal_processes = 0; # the max number of the processes run
+ my %modules_types = (); # modules types ('mod', 'img', 'lnk') hash
+ my %platforms = (); # platforms available or being working with
+ my %platforms_to_copy = (); # copy output trees for the platforms when --prepare
+ my $tmp_dir = get_tmp_dir(); # temp directory for checkout and other actions
- my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
++ my @possible_build_lists = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
+ my %build_list_paths = (); # build lists names
+ my %build_lists_hash = (); # hash of arrays $build_lists_hash{$module} = \($path, $xml_list_object)
+ my $pre_job = 'announce'; # job to add for not-single module build
+ my $post_job = ''; # -"-
+ my @warnings = (); # array of warnings to be shown at the end of the process
+ my @errors = (); # array of errors to be shown at the end of the process
+ my %html_info = (); # hash containing all necessary info for generating of html page
+ my %module_by_hash = (); # hash containing all modules names as values and correspondent hashes as keys
+ my %build_in_progress = (); # hash of modules currently being built
+ my %build_is_finished = (); # hash of already built modules
+ my %modules_with_errors = (); # hash of modules with build errors
+ my %build_in_progress_shown = (); # hash of modules being built,
# and shown last time (to keep order)
- $build_time = time;
- %jobs_hash = ();
- $html_path = undef;
- $build_finished = 0;
- $html_file = '';
- %had_error = (); # hack for mysterious windows problems - try run dmake 2 times if first time there was an error
- $mkout = CorrectPath("$ENV{SOLARENV}/bin/mkout.pl");
- %weights_hash = (); # hash contains info about how many modules are dependent from one module
- $grab_output = 1;
- $stop_build_on_error = 0; # for multiprocessing mode: do not build further module if there is an error
- $interactive = 0; # for interactive mode... (for testing purpose enabled by default)
- $parent_process = 1;
- $server_mode = 0;
- $setenv_string = ''; # string for configuration of the client environment
- $ports_string = ''; # string with possible ports for server
- @server_ports = ();
- $html_port = 0;
- $server_socket_obj = undef; # socket object for server
- $html_socket_obj = undef; # socket object for server
+ my $build_time = time;
+ my %jobs_hash = ();
+ my $html_path = undef;
+ my $build_finished = 0;
+ my $html_file = '';
+ my %had_error = (); # hack for mysterious windows problems - try run dmake 2 times if first time there was an error
+ my $mkout = correct_path("$ENV{SOLARENV}/bin/mkout.pl");
+ my %weights_hash = (); # hash contains info about how many modules are dependent from one module
+ my $grab_output = 1;
+ my $stop_build_on_error = 0; # for multiprocessing mode: do not build further module if there is an error
+ my $interactive = 0; # for interactive mode... (for testing purpose enabled by default)
+ my $parent_process = 1;
+ my $server_mode = 0;
+ my $setenv_string = ''; # string for configuration of the client environment
+ my $ports_string = ''; # string with possible ports for server
+ my @server_ports = ();
+ my $html_port = 0;
+ my $server_socket_obj = undef; # socket object for server
+ my $html_socket_obj = undef; # socket object for server
my %clients_jobs = ();
my %clients_times = ();
- my $client_timeout = 0; # time for client to build (in sec)...
+ my $client_timeout = 0; # time for client to build (in sec)...
# The longest time period after that
- # the server considered as an error/client crash
+ # the server considered as an error/client crash
my %lost_client_jobs = (); # hash containing lost jobs
my %job_jobdir = (); # hash containing job-dir pairs
my $reschedule_queue = 0;
@@@ -199,18 -210,8 +199,20 @@@
my $zenity_in = '';
my $zenity_out = '';
my $zenity_err = '';
+ my $allow_gbuild = 0;
- %is_gbuild = ();
++ my %is_gbuild = ();
+ my $verbose = 0;
+
+ my @modules_built = ();
+ my $deliver_command = $ENV{DELIVER};
+ my %prj_platform = ();
+ my $check_error_string = '';
+ my $dmake = '';
+ my $dmake_args = '';
+ my $echo = '';
+ my $new_line = "\n";
+ my $incompatible = 0;
+ my $local_host_ip = 'localhost';
### main ###
get_options();
@@@ -540,10 -548,17 +542,17 @@@ sub get_build_list_path
my $possible_dir_path = $module_paths{$_}.'/prj/';
if (-d $possible_dir_path) {
foreach my $build_list (@possible_build_lists) {
- my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
- if (-f $possible_build_list_path) {
- $build_list_paths{$module} = $possible_build_list_path;
- return $possible_build_list_path;
+ # if gbuild are allow we favor gbuild.lst as the build instruction
+ if($build_list ne "gbuild.lst" || $allow_gbuild) {
- my $possible_build_list_path = CorrectPath($possible_dir_path . $build_list);
++ my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
+ if (-f $possible_build_list_path) {
+ $build_list_paths{$module} = $possible_build_list_path;
+ if ($build_list eq "gbuild.lst") {
+ # print "Using gmake for module $module\n";
+ $is_gbuild{$module} = 1;
+ };
+ return $possible_build_list_path;
+ };
};
}
print_error("There's no build list for $module");
@@@ -958,37 -972,37 +967,37 @@@ sub get_deps_hash
};
s/\r\n//;
if ($_ =~ /\s+nmake\s+/o) {
- my ($Platform, $Dependencies, $Dir, $DirAlias);
+ my ($platform, $dependencies, $dir, $dir_alias);
my %deps_hash = ();
- $Dependencies = $';
+ $dependencies = $';
$dummy = $`;
$dummy =~ /(\S+)\s+(\S*)/o;
- $Dir = $2;
- $Dependencies =~ /(\w+)/o;
- $Platform = $1;
- $Dependencies = $';
- while ($Dependencies =~ /,(\w+)/o) {
- $Dependencies = $'; #'
+ $dir = $2;
+ $dependencies =~ /(\w+)/o;
+ $platform = $1;
+ $dependencies = $';
+ while ($dependencies =~ /,(\w+)/o) {
- $dependencies = $';
++ $dependencies = $'; #'
};
- $Dependencies =~ /\s+(\S+)\s+/o;
- $DirAlias = $1;
- if (!CheckPlatform($Platform)) {
- next if (defined $PlatformHash{$DirAlias});
- $DeadDependencies{$DirAlias}++;
+ $dependencies =~ /\s+(\S+)\s+/o;
+ $dir_alias = $1;
+ if (!check_platform($platform)) {
+ next if (defined $platform_hash{$dir_alias});
+ $dead_dependencies{$dir_alias}++;
next;
};
- delete $DeadDependencies{$DirAlias} if (defined $DeadDependencies{$DirAlias});
- print_error("Directory alias $DirAlias is defined at least twice!! Please, correct build.lst in module $module_to_build") if (defined $$dependencies_hash{$DirAlias});
- $PlatformHash{$DirAlias}++;
- $Dependencies = $'; #'
- print_error("$module_to_build/prj/build.lst has wrongly written dependencies string:\n$_\n") if (!$Dependencies);
- $deps_hash{$_}++ foreach (GetDependenciesArray($Dependencies));
- $$dependencies_hash{$DirAlias} = \%deps_hash;
+ delete $dead_dependencies{$dir_alias} if (defined $dead_dependencies{$dir_alias});
+ print_error("Directory alias $dir_alias is defined at least twice!! Please, correct build.lst in module $module_to_build") if (defined $$dependencies_hash{$dir_alias});
+ $platform_hash{$dir_alias}++;
- $dependencies = $';
++ $dependencies = $'; #'
+ print_error("$module_to_build/prj/build.lst has wrongly written dependencies string:\n$_\n") if (!$dependencies);
+ $deps_hash{$_}++ foreach (get_dependency_array($dependencies));
+ $$dependencies_hash{$dir_alias} = \%deps_hash;
my $local_dir = '';
- if ($Dir =~ /(\\|\/)/o) {
+ if ($dir =~ /(\\|\/)/o) {
$local_dir = "/$'";
};
- $PathHash{$DirAlias} = CorrectPath($module_paths{$module_to_build} . $local_dir);
+ $path_hash{$dir_alias} = correct_path($module_paths{$module_to_build} . $local_dir);
} elsif ($_ !~ /^\s*$/ && $_ !~ /^\w*\s/o) {
chomp;
push(@errors, $_);
@@@ -1337,34 -1348,34 +1346,34 @@@ sub get_waiters_number
#
# Getting array of dependencies from the string given
#
-sub GetDependenciesArray {
- my ($DepString, @Dependencies, $ParentPrj, $prj, $string);
- @Dependencies = ();
- $DepString = shift;
- $string = $DepString;
+sub get_dependency_array {
+ my ($dep_string, @dependencies, $parent_prj, $prj, $string);
+ @dependencies = ();
+ $dep_string = shift;
+ $string = $dep_string;
$prj = shift;
- while ($DepString !~ /^NULL/o) {
- print_error("Project $prj has wrongly written dependencies string:\n $string") if (!$DepString);
- $DepString =~ /(\S+)\s*/o;
- $ParentPrj = $1;
- $DepString = $'; #'
- if ($ParentPrj =~ /\.(\w+)$/o) {
- $ParentPrj = $`;
- if (($prj_platform{$ParentPrj} ne $1) &&
- ($prj_platform{$ParentPrj} ne 'all')) {
- print_error ("$ParentPrj\.$1 is a wrongly dependency identifier!\nCheck if it is platform dependent");
+ while ($dep_string !~ /^NULL/o) {
+ print_error("Project $prj has wrongly written dependencies string:\n $string") if (!$dep_string);
+ $dep_string =~ /(\S+)\s*/o;
+ $parent_prj = $1;
- $dep_string = $';
++ $dep_string = $'; #'
+ if ($parent_prj =~ /\.(\w+)$/o) {
+ $parent_prj = $`;
+ if (($prj_platform{$parent_prj} ne $1) &&
+ ($prj_platform{$parent_prj} ne 'all')) {
+ print_error ("$parent_prj\.$1 is a wrongly dependency identifier!\nCheck if it is platform dependent");
};
- $AliveDependencies{$ParentPrj}++ if (CheckPlatform($1));
- push(@Dependencies, $ParentPrj);
+ $alive_dependencies{$parent_prj}++ if (check_platform($1));
+ push(@dependencies, $parent_prj);
} else {
- if ((exists($prj_platform{$ParentPrj})) &&
- ($prj_platform{$ParentPrj} ne 'all') ) {
- print_error("$ParentPrj is a wrongly used dependency identifier!\nCheck if it is platform dependent");
+ if ((exists($prj_platform{$parent_prj})) &&
+ ($prj_platform{$parent_prj} ne 'all') ) {
+ print_error("$parent_prj is a wrongly used dependency identifier!\nCheck if it is platform dependent");
};
- push(@Dependencies, $ParentPrj);
+ push(@dependencies, $parent_prj);
};
};
- return @Dependencies;
+ return @dependencies;
};
diff --cc solenv/bin/modules/RepositoryHelper.pm
index dc3417e,912a158..8aa45f2
--- a/solenv/bin/modules/RepositoryHelper.pm
+++ b/solenv/bin/modules/RepositoryHelper.pm
@@@ -118,8 -118,7 +118,7 @@@ sub search_for_hg
sub search_via_build_lst {
my $self = shift;
- # my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
- my @possible_build_lists = ('build.lst'); # build lists names
- my @possible_build_lists = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
++ my @possible_build_lists = ('gbuild.lst', 'build.lst'); # build lists names
my $previous_dir = '';
my $rep_root_candidate = $self->{INITIAL_DIRECTORY};
do {
diff --cc solenv/inc/unxgcc.mk
index 8c5bbb4,6da2ccb..e5cd920
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@@ -158,38 -159,30 +158,41 @@@ LINK*=$(CXX
LINKC*=$(CC)
# default linker flags
+ .IF "$(SYSBASE)"!=""
+ LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
+ .ENDIF # "$(SYSBASE)"!=""
+#
+# The DT RPATH value is used first, before any other path, specifically before
+# the path defined in the LD_LIBRARY_PATH environment variable. This is
+# problematic since it does not allow the user to overwrite the value.
+# Therefore DT_RPATH is deprecated. The introduction of the new variant,
+# DT_RUNPATH, corrects this oversight by requiring the value is used after the
+# path in LD_LIBRARY_PATH.
+#
+# The linker option --enable-new-dtags must be used to also add DT_RUNPATH
+# entry. This will cause both, DT_RPATH and DT_RUNPATH entries, to be created
+#
LINKFLAGSDEFS*=-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
+LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
+LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\',--enable-new-dtags
LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
- LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
.ENDIF
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+LINKFLAGSAPPGUI= -Wl,-export-dynamic \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+LINKFLAGSAPPCUI= -Wl,-export-dynamic \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --cc stlport/prj/d.lst
index 9f9c087,29848a6..fe7c6f3
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@@ -1,4 -1,25 +1,3 @@@
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
- ..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
-mkdir: %_DEST%\inc%_EXT%\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl\debug
-mkdir: %_DEST%\inc%_EXT%\stl\stl\wrappers
-mkdir: %_DEST%\inc%_EXT%\stl\config
-mkdir: %_DEST%\inc%_EXT%\stl\using
-mkdir: %_DEST%\inc%_EXT%\stl\using\h
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
-..\%__SRC%\inc\*.SUNWCCH %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\stl\* %_DEST%\inc%_EXT%\stl\stl\*
-..\%__SRC%\inc\stlport\stl\debug\* %_DEST%\inc%_EXT%\stl\stl\debug\*
-..\%__SRC%\inc\stlport\stl\wrappers\* %_DEST%\inc%_EXT%\stl\stl\wrappers\*
-..\%__SRC%\inc\stlport\config\* %_DEST%\inc%_EXT%\stl\config\*
-..\%__SRC%\inc\stlport\using\* %_DEST%\inc%_EXT%\stl\using\*
-..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
-..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
-..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
-..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
commit aed9e41fc96dd7f5d38f395aaf2e05830a6e1f5f
Merge: 95b96b4... 1af423e...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 8 19:43:29 2011 -0600
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (500 commits)
masterfix DEV300: #i10000# remove hard dep
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i100000# dep. fix
masterfix DEV300: #i10000# removed one hard dep
masterfix DEV300: #i10000# fixed patch handling
masterfix DEV300: #i10000# new configure
DEV300
masterfix DEV300: #i10000# nawk -> awk
l10nmove: adjust repository handling
l10nmove: fixed regex
l10nmove: minor fixes
l10nmove: add l10n repo to gb_REPOS
DEV300 masterfix: gnumake3: subsequenttests requires in environment
ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
DEV300 masterfix: #i10000#: windows: more bizare hacks ...
locales34: have a matching configure as well
DEV300
locales34: back out change from autoreconf
gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
...
Conflicts:
configure
configure.in
instsetoo_native/prj/build.lst
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
instsetoo_native/util/pack.lst
ooo.lst
scp2/source/canvas/canvascommons.scp
scp2/source/canvas/mtfrenderer.scp
scp2/source/ooo/common_brand.scp
scp2/source/ooo/directory_ooo.scp
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/file_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
scp2/source/ooo/module_langpack.ulf
scp2/source/ooo/ure.scp
scp2/source/python/file_python.scp
scp2/source/sdkoo/sdkoo.scp
scp2/source/templates/module_langpack_accessories_templates.sct
scp2/source/templates/module_langpack_accessories_templates_root.sct
set_soenv.in
soldep/bootstrp/appdef.cxx
soldep/bootstrp/dep.cxx
soldep/bootstrp/hashtbl.cxx
soldep/bootstrp/makefile.mk
soldep/bootstrp/minormk.cxx
soldep/bootstrp/prj.cxx
soldep/bootstrp/prodmap.cxx
soldep/inc/dep.hxx
soldep/inc/minormk.hxx
soldep/inc/prodmap.hxx
soldep/inc/soldep/appdef.hxx
soldep/inc/soldep/connctr.hxx
soldep/inc/soldep/depper.hxx
soldep/inc/soldep/depwin.hxx
soldep/inc/soldep/hashtbl.hxx
soldep/inc/soldep/objwin.hxx
soldep/inc/soldep/prj.hxx
soldep/inc/soldep/sdtresid.hxx
soldep/inc/soldep/soldep.hxx
soldep/inc/soldep/soldlg.hxx
soldep/inc/soldep/tbox.hxx
soldep/prj/d.lst
soldep/source/connctr.cxx
soldep/source/depapp.hxx
soldep/source/depper.cxx
soldep/source/depwin.cxx
soldep/source/makefile.mk
soldep/source/objwin.cxx
soldep/source/soldep.cxx
soldep/source/soldlg.cxx
soldep/source/soldlg.src
soldep/source/tbox.cxx
solenv/bin/build.pl
solenv/bin/cws.pl
solenv/bin/make_installer.pl
solenv/bin/mhids.pl
solenv/bin/modules/CwsConfig.pm
solenv/bin/modules/RepositoryHelper.pm
solenv/bin/modules/installer/regmerge.pm
solenv/bin/modules/installer/scriptitems.pm
solenv/bin/modules/installer/servicesfile.pm
solenv/bin/modules/installer/simplepackage.pm
solenv/bin/modules/installer/substfilenamefiles.pm
solenv/config/ssolar.cmn
solenv/inc/_tg_rslb.mk
solenv/inc/extension_post.mk
solenv/inc/libs.mk
solenv/inc/minor.mk
solenv/inc/postset.mk
solenv/inc/settings.mk
solenv/inc/tg_rslb.mk
solenv/inc/unxlng.mk
solenv/inc/wntmsc.mk
soltools/HIDCompiler/hidclex.l
stlport/prj/d.lst
stlport/systemstlguards/postextstl.h
diff --cc .gitignore
index 4621c7b,0000000..904eac3
mode 100644,000000..100644
--- a/.gitignore
+++ b/.gitignore
@@@ -1,258 -1,0 +1,258 @@@
+# backup and temporary files
+*~
+.*.sw[op]
+
+# where the 'subrepos' and downloads are located
+/clone
+/src
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
+/*/unxmac??
+/*/unxmac??.pro
+/*/unx?bsd??
+/*/unx?bsd??.pro
+/*/unxdfly??
+/*/unxdfly??.pro
+/*/unxso???
+/*/unxso???.pro
+/*/unxaig??
+/*/unxaig??.pro
+/solver/*
- /instsetoo_native/*
+
+# autoconf generated stuff
+/aclocal.m4
+/autom4te.cache
+/autogen.lastrun
+/bootstrap
+/ChangeLog
+/config.log
+/config.parms
+/config.status
+/configure
+/Makefile
+/makefile.mk
+/set_soenv
+/visibility.cxx
+/post_download
+/bin/repo-list
+/src.downloaded
+
+# misc
+/set_soenv.last
+/set_soenv.stamp
+/warn
+/build.log
+/install
+/downloaded
+/*.Set.sh
+/winenv.set.sh
+/ID
+/tags
+/docs
+
+/*/*.exe
+
+# links to the other repositories
- MathMLDTD
- Mesa
- UnoControls
- agg
- accessibility
- afms
- animations
- apache-commons
- apple_remote
- autodoc
- automation
- avmedia
- basctl
- basebmp
- basegfx
- basic
- bean
- beanshell
- berkeleydb
- binfilter
- boost
- bridges
- cairo
- canvas
- chart2
- cli_ure
- codemaker
- comphelper
- configmgr
- connectivity
- cosv
- cppcanvas
- cppu
- cppuhelper
- cppunit
- cpputools
- crashrep
- cui
- curl
- dbaccess
- default_images
- desktop
- dictionaries
- drawinglayer
- dtrans
- editeng
- embeddedobj
- embedserv
- epm
- eventattacher
- expat
- extensions
- external
- external_images
- extras
- fileaccess
- filter
- forms
- formula
- fpicker
- framework
- graphite
- helpcontent2
- hsqldb
- hunspell
- hwpfilter
- hyphen
- i18npool
- i18nutil
- icc
- icu
- idl
- idlc
- io
- javainstaller2
- javaunohelper
- jfreereport
- jpeg
- jurt
- jvmaccess
- jvmfwk
- l10n
- l10ntools
- languagetool
- libegg
- libtextcat
- libwpd
- libwpg
- libwps
- libxml2
- libxmlsec
- libxslt
- lingucomponent
- linguistic
- lotuswordpro
- lpsolve
- lucene
- mdds
- migrationanalysis
- more_fonts
- moz
- mysqlc
- mysqlcppconn
- mythes
- neon
- nlpsolver
- np_sdk
- nss
- o3tl
- odk
- offapi
- officecfg
- offuh
- ooo_custom_images
- oovbaapi
- oox
- openssl
- package
- packimages
- padmin
- postprocess
- psprint_config
- python
- pyuno
- qadevOOo
- rdbmaker
- readlicense_oo
- redland
- regexp
- registry
- remotebridges
- reportbuilder
- reportdesign
- rhino
- ridljar
- rsc
- sal
- salhelper
- sane
- sax
- saxon
- sc
- scaddins
- sccomp
- scripting
- sd
- sdext
- setup_native
- sfx2
- shell
- slideshow
- smoketestoo_native
- sot
- starmath
- stax
- stoc
- store
- svl
- svtools
- svx
- sw
- swext
- sysui
- test
- testautomation
- testgraphical
- testtools
- tomcat
- toolkit
- tools
- twain
- ucb
- ucbhelper
- udkapi
- udm
- unixODBC
- unodevtools
- unoil
- unotools
- unoxml
- ure
- uui
- vbahelper
- vcl
- vigra
- wizards
- writerfilter
- writerperfect
- x11_extensions
- xmerge
- xml2cmp
- xmlhelp
- xmloff
- xmlscript
- xmlsecurity
- xpdf
- xsltml
- zlib
++/MathMLDTD
++/Mesa
++/UnoControls
++/agg
++/accessibility
++/afms
++/animations
++/apache-commons
++/apple_remote
++/autodoc
++/automation
++/avmedia
++/basctl
++/basebmp
++/basegfx
++/basic
++/bean
++/beanshell
++/berkeleydb
++/binfilter
++/boost
++/bridges
++/cairo
++/canvas
++/chart2
++/cli_ure
++/codemaker
++/comphelper
++/configmgr
++/connectivity
++/cosv
++/cppcanvas
++/cppu
++/cppuhelper
++/cppunit
++/cpputools
++/crashrep
++/cui
++/curl
++/dbaccess
++/default_images
++/desktop
++/dictionaries
++/drawinglayer
++/dtrans
++/editeng
++/embeddedobj
++/embedserv
++/epm
++/eventattacher
++/expat
++/extensions
++/external
++/external_images
++/extras
++/fileaccess
++/filter
++/forms
++/formula
++/fpicker
++/framework
++/graphite
++/helpcontent2
++/hsqldb
++/hunspell
++/hwpfilter
++/hyphen
++/i18npool
++/i18nutil
++/icc
++/icu
++/idl
++/idlc
++/io
++/javainstaller2
++/javaunohelper
++/jfreereport
++/jpeg
++/jurt
++/jvmaccess
++/jvmfwk
++/l10n
++/l10ntools
++/languagetool
++/libegg
++/libtextcat
++/libwpd
++/libwpg
++/libwps
++/libxml2
++/libxmlsec
++/libxslt
++/lingucomponent
++/linguistic
++/lotuswordpro
++/lpsolve
++/lucene
++/mdds
++/migrationanalysis
++/more_fonts
++/moz
++/mysqlc
++/mysqlcppconn
++/mythes
++/neon
++/nlpsolver
++/np_sdk
++/nss
++/o3tl
++/odk
++/offapi
++/officecfg
++/offuh
++/ooo_custom_images
++/oovbaapi
++/oox
++/openssl
++/package
++/packimages
++/padmin
++/postprocess
++/psprint_config
++/python
++/pyuno
++/qadevOOo
++/rdbmaker
++/readlicense_oo
++/redland
++/regexp
++/registry
++/remotebridges
++/reportbuilder
++/reportdesign
++/rhino
++/ridljar
++/rsc
++/sal
++/salhelper
++/sane
++/sax
++/saxon
++/sc
++/scaddins
++/sccomp
++/scripting
++/sd
++/sdext
++/setup_native
++/sfx2
++/shell
++/slideshow
++/smoketestoo_native
++/sot
++/starmath
++/stax
++/stoc
++/store
++/svl
++/svtools
++/svx
++/sw
++/swext
++/sysui
++/test
++/testautomation
++/testgraphical
++/testtools
++/tomcat
++/toolkit
++/tools
++/twain
++/ucb
++/ucbhelper
++/udkapi
++/udm
++/unixODBC
++/unodevtools
++/unoil
++/unotools
++/unoxml
++/ure
++/uui
++/vbahelper
++/vcl
++/vigra
++/wizards
++/writerfilter
++/writerperfect
++/x11_extensions
++/xmerge
++/xml2cmp
++/xmlhelp
++/xmloff
++/xmlreader
++/xmlscript
++/xmlsecurity
++/xpdf
++/xsltml
++/zlib
diff --cc Module_ooo.mk
index 0000000,307daf7..a60bbb6
mode 000000,100644..100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@@ -1,0 -1,47 +1,47 @@@
+ #*************************************************************************
+ #
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
++#
+ # Copyright 2000, 2010 Oracle and/or its affiliates.
+ #
+ # OpenOffice.org - a multi-platform office productivity suite
+ #
+ # This file is part of OpenOffice.org.
+ #
+ # OpenOffice.org is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License version 3
+ # only, as published by the Free Software Foundation.
+ #
+ # OpenOffice.org is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU Lesser General Public License version 3 for more details
+ # (a copy is included in the LICENSE file that accompanied this code).
+ #
+ # You should have received a copy of the GNU Lesser General Public License
+ # version 3 along with OpenOffice.org. If not, see
+ # <http://www.openoffice.org/license.html>
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
+
+ $(eval $(call gb_Module_Module,ooo))
+
+ $(eval $(call gb_Module_add_moduledirs,ooo,\
+ comphelper \
+ editeng \
+ framework \
+ padmin \
+ sfx2 \
+ sot \
+ svl \
+ svtools \
+ svx \
+ sw \
+ toolkit \
+ tools \
+ xmloff \
+ vbahelper \
+ ))
+
+ # vim: set noet ts=4 sw=4:
diff --cc configure.in
index d665598,eca0540..3bf8475
mode 100755,100644..100755
--- a/configure.in
+++ b/configure.in
@@@ -1,233 -1,161 +1,228 @@@
-dnl /******************************************************************
-dnl * vi:set sw=3 ts=3 et:
-dnl *
-dnl * Name: configure.in
-dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2008-09-08 07:38:40 $
-dnl *
-dnl * Desc: This file serves as input for the GNU autoconf package
-dnl * in order to create a configure script.
-dnl * In this stage configure just checks the pre-requisites
-dnl * necessary to build OpenOffice.org
-dnl *
-dnl *
-dnl ******************************************************************/
-AC_REVISION( $Revision: 1.290 $ )
+dnl configure.in serves as input for the GNU autoconf package
+dnl in order to create a configure script.
+
+AC_INIT([LibreOffice], [3.3],,, [http://documentfoundation.org/])
AC_PREREQ(2.50)
-AC_INIT()
echo "$@" >config.parms
-AC_ARG_WITH(gnu-patch,
-[ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD
-],,)
-AC_ARG_WITH(agg,
-[ --without-agg Disable the use of agg altogether
-],,with_agg=yes)
-AC_ARG_WITH(gnu-cp,
-[ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD
-],,)
+
+dnl ===================================================================
+dnl Optional Features (--enable/disable-)
+dnl ===================================================================
+
+dnl ---------- Extensions ----------
+
+AC_ARG_ENABLE(ext-barcode,
+ AS_HELP_STRING([--enable-ext-barcode],
+ [Enables the Barcode extension.]),
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+ AS_HELP_STRING([--enable-ext-diagram],
+ [Enables the Diagram extension.]),
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+ AS_HELP_STRING([--enable-ext-google-docs],
+ [Download and enables the Google Documents extension.]),
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+ AS_HELP_STRING([--enable-ext-hunart],
+ [Enables the Hungarian Cross-reference Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+ AS_HELP_STRING([--enable-ext-lightproof],
+ [Enables the Lightproof extension.]),
+,)
+
+AC_ARG_ENABLE(ext-mysql-connector,
+ AS_HELP_STRING([--enable-ext-mysql-connector],
+ [Enables the build of the MySQL Connector/LibO extension. This requires
+ access to the MySQL Connector/C (aka libmysql) to be given, too, with
+ either the --with-system-mysql or --with-libmysql-path option.]),
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+ AS_HELP_STRING([--enable-ext-nlpsolver],
+ [Download and enables the NLPSolver extension.]),
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+ AS_HELP_STRING([--enable-ext-numbertext],
+ [Enables the Numbertext extension.]),
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+ AS_HELP_STRING([--enable-ext-oooblogger],
+ [Download and enables the OOo Blogger extension.]),
+,)
+
+AC_ARG_ENABLE(ext-pdfimport,
+ AS_HELP_STRING([--enable-ext-pdfimport],
+ [Enables the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-console,
+ AS_HELP_STRING([--enable-ext-presenter-console],
+ [Enables the Presenter Console extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-minimizer,
+ AS_HELP_STRING([--enable-ext-presenter-minimizer],
+ [Enables the Presentation Minimizer extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-ui,
+ AS_HELP_STRING([--enable-ext-presenter-ui],
+ [Enables extra functionality during slideshows, e.g. selecting pen color.]),
+,)
+
+AC_ARG_ENABLE(ext-report-builder,
+ AS_HELP_STRING([--enable-ext-report-builder],
+ [Enables the build of the Report Builder extension.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-beanshell,
+ AS_HELP_STRING([--enable-ext-scripting-beanshell],
+ [Enables support for scripts in BeanShell.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-javascript,
+ AS_HELP_STRING([--enable-ext-scripting-javascript],
+ [Enables support for scripts in JavaScript.]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-python,
+ AS_HELP_STRING([--enable-ext-scripting-python],
+ [Enables support for scripts in Python.]),
+,)
+
+AC_ARG_ENABLE(ext-typo,
+ AS_HELP_STRING([--enable-ext-typo],
+ [Enables the Typography Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-validator,
+ AS_HELP_STRING([--enable-ext-validator],
+ [Enables the Validator extension.]),
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+ AS_HELP_STRING([--enable-ext-watch-window],
+ [Enables the Watch Window extension to Calc.]),
+,)
+
+AC_ARG_ENABLE(ext-wiki-publisher,
+ AS_HELP_STRING([--enable-ext-wiki-publisher],
+ [Enables the Wiki Publisher extension.]),
+,)
+
+dnl ---------- *** ----------
+
AC_ARG_ENABLE(graphite,
-[ --enable-graphite Enables the compilation of Graphite smart font rendering
-],,)
-AC_ARG_WITH(system-graphite,
-[ --with-system-graphite use graphite library already installed on system
-],,)
+ AS_HELP_STRING([--enable-graphite],
+ [Enables the compilation of Graphite smart font rendering.]),
+,)
+
AC_ARG_ENABLE(ldap,
-[ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
- or OpenLDAP LDAP SDK
-],,)
+ AS_HELP_STRING([--disable-ldap],
+ [Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK]),
+,)
+
AC_ARG_ENABLE(fetch-external,
-[ --disable-fetch-external Disables fetching external tarballs from web sources.
-],,)
-AC_ARG_WITH(external-tar,
-[ --with-external-tar=<TARFILE PATH> Specify path to tarfiles manually ],
-[ TARFILE_LOCATION="$withval"
-])
-AC_ARG_WITH(openldap,
-[ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead
- of the Netscape/Mozilla one
-],,)
+ AS_HELP_STRING([--disable-fetch-external],
+ [Disables fetching external tarballs from web sources.]),
+,)
+
AC_ARG_ENABLE(lockdown,
-[ --enable-lockdown Enables the gconf integration work in OOo
-],,)
+ AS_HELP_STRING([--disable-lockdown],
+ [Disables the gconf integration work in LibO.]),
+,enable_lockdown=yes)
+
AC_ARG_ENABLE(vba,
-[ --disable-vba disables the vba compatibility feature
-],,)
-AC_ARG_WITH(vba-package-format,
-[ --with-vba-package-format specify package format for vba compatibility api.
- Specifying "builtin" means the api component and
- associated type library are part of the installation set.
- Specifying "extn" creates an uno extension that is
- part of the installation set ( located in the program
- directory ) that MUST be optionly registered using
- either the unopkg executeable or the extension manager
- gui.
-
- Note: "builtin" is the default, "extn" can cause
- problems.
- Usage: --with-vba-package-format="builtin" or
- --with-vba-package-format="extn"
-],,)
+ AS_HELP_STRING([--disable-vba],
+ [Disables the vba compatibility feature.]),
+,)
+
AC_ARG_ENABLE(pch,
-[ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
-],,)
+ AS_HELP_STRING([--enable-pch],
+ [EXPERIMENTAL: Enables precompiled header support for C++.]),
+,)
+
- AC_ARG_ENABLE(hids,
- AS_HELP_STRING([--disable-hids],
- [Disables generation of HelpId lists.]),
- ,enable_hids=yes)
-
AC_ARG_ENABLE(mozilla,
-[ --disable-mozilla OO.o usually includes a strangely hacked up mozilla
- binary for your platform, to build without this
- version, use this option.
-],,enable_mozilla="yes")
-AC_ARG_WITH(fonts,
-[ --without-fonts OOo includes some third-party fonts to provide a reliable
- basis for help content, templates, samples, etc.
- When these fonts are already known to be available on the
- system then you should use this option.
-],,)
-AC_ARG_WITH(ppds,
-[ --without-ppds Removes Postscript Printer definition files from
- openoffice.org installation set, for people building
- for specific distributions where PPDs are known to be
- already available (every recent distro with CUPS
- backend)
-],,)
-AC_ARG_WITH(afms,
-[ --without-afms Removes bitmap font files from openoffice.org
- installation set, for people building for specific
- distributions where AFM files or TrueType Fonts
- are known to be available.
-],,)
+ AS_HELP_STRING([--disable-mozilla],
+ [LibO usually includes a strangely hacked up mozilla binary for your
+ platform, to build without this version, use this option.]),
+,enable_mozilla=yes)
+
AC_ARG_ENABLE(epm,
-[ --disable-epm OO.o includes self-packaging code, that requires
- epm, however epm is useless for large scale
- package building.
-],,enable_epm="yes")
-AC_ARG_WITH(epm,
-[ --with-epm Decides which epm to use. Default is to use
- the one from the system if one is built. When
- either this is not there or you say =internal
- epm will be built.
-],,)
-AC_ARG_WITH(package-format,
-[ --with-package-format specify package format(s) for OOo installsets.
- Default is "normal" one of the OS/Distribution.
+ AS_HELP_STRING([--enable-epm],
+ [LibO includes self-packaging code, that requires epm, however epm is
+ useless for large scale package building.]),
+,enable_epm=no)
+
+AC_ARG_ENABLE(activex_component,
+ AS_HELP_STRING([--disable-activex-component],
+ [Remove support for ActiveX embedding of LibO.]),
+,enable_activex_component=yes)
- Usage: --with-package-format="foo bar"
-],,)
AC_ARG_ENABLE(odk,
-[ --disable-odk OO.o includes an ODK, office development kit
- which some packagers may with to build without
-],,enable_odk="yes")
+ AS_HELP_STRING([--disable-odk],
+ [LibO includes an ODK, office development kit which some packagers may
+ with to build without.]),
+,enable_odk=yes)
+
AC_ARG_ENABLE(mathmldtd,
-[ --disable-mathmldtd disable mathmldtd
- (useful for distributions that want to avoid packaging
- it)
-],,enable_mathmldtd="yes")
+ AS_HELP_STRING([--disable-mathmldtd],
+ [Disable mathmldtd (useful for distributions that want to avoid
+ packaging it).]),
+,enable_mathmldtd=yes)
+
AC_ARG_ENABLE(evolution2,
-[ --enable-evolution2 Allows the built-in evolution 2 addressbook
- connectivity build to be enabled.
-],,)
-AC_ARG_WITH(system-stdlibs,
-[ --with-system-stdlibs use libstdc++/libgcc_s already on system
-],,)
+ AS_HELP_STRING([--enable-evolution2],
+ [Allows the built-in evolution 2 addressbook connectivity build to be
+ enabled.]))
+
AC_ARG_ENABLE(cups,
-[ --disable-cups disable cups support in the psprint project
-],,enable_cups=yes)
+ AS_HELP_STRING([--disable-cups],
+ [Disable cups support in the psprint project.]))
+
AC_ARG_ENABLE(fontconfig,
-[ --disable-fontconfig disable support for the fontconfig library
-],,enable_fontconfig=yes)
+ AS_HELP_STRING([--disable-fontconfig],
+ [Disable support for the fontconfig library.]),
+,enable_fontconfig=yes)
+
AC_ARG_ENABLE(directx,
-[ --disable-directx Remove DirectX implementation for the new XCanvas
- interface. The DirectX support requires more stuff
- installed on Windows to compile.
- (DirectX SDK, GDI+ libs)
-],,enable_directx=yes)
+ AS_HELP_STRING([--disable-directx],
+ [Remove DirectX implementation for the new XCanvas interface.
+ The DirectX support requires more stuff installed on Windows to
+ compile. (DirectX SDK, GDI+ libs)]),
+,enable_directx=yes)
+
AC_ARG_ENABLE(activex,
-[ --disable-activex Disable the use of ActiveX for windows build.
- This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+ AS_HELP_STRING([--disable-activex],
+ [Disable the use of ActiveX for windows build.])
+ [
+ This switch is mandatory when using VC++ 2008 Express.
+ ],
+,)
AC_ARG_ENABLE(atl,
-[ --disable-atl Disable the use of ATL for windows build.
- This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+ AS_HELP_STRING([--disable-atl],
+ [Disable the use of ATL for windows build.])
+ [
+ This switch is mandatory when using VC++ 2008 Express.
+ ],
+,)
AC_ARG_ENABLE(symbols,
-[ --enable-symbols Include debugging symbols in output.
- WARNING - a complete build needs 8 Gb of space and
- takes much longer. (enables -g compiler flag)
-
- --enable-symbols=SMALL sets the gcc -g1 setting
- which is smaller.
+ AS_HELP_STRING([--enable-symbols],
+ [Include debugging symbols in output. WARNING - a complete build needs
+ 8 Gb of space and takes much longer (enables -g compiler flag).])
+ [
+ --enable-symbols=SMALL
+ sets the gcc -g1 setting which is smaller.
Enabling symbols disables the stripping of the solver
(--disable-strip-solver).
@@@ -1376,152 -925,145 +1371,153 @@@ dnl The following is a list of supporte
dnl Sequential to keep the logic very simple
dnl These values may be checked and reset later.
dnl ===================================================================
-case "$build_os" in
- solaris*)
- test_gtk=yes
- test_cairo=yes
- test_kde=yes
- test_cups=yes
- test_randr=yes
- test_freetype=yes
- test_gstreamer=yes
- _os=SunOS
- AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
- if test -z "$GNUTAR"; then
- AC_MSG_ERROR([gtar (gnu tar) not found but needed. Install it (SUN Freeware package).])
- fi
- AC_SUBST(GNUTAR)
-
- dnl ===========================================================
- dnl check whether we're using solaris 6,7,8 - sparc or intel.
- dnl ===========================================================
- AC_MSG_CHECKING([the Solaris operating system release])
- _os_release=`echo $build_os | $SED -e s/solaris2\.//`
- if test "$_os_release" -lt "6"; then
- AC_MSG_ERROR([use solaris >= 6 to build OpenOffice.org])
- else
- AC_MSG_RESULT([ok ($_os_release)])
- fi
-
- dnl check whether we're using a sparc or i386 processor
- AC_MSG_CHECKING([the processor type])
- if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
- AC_MSG_RESULT([ok ($build_cpu)])
- else
- AC_MSG_ERROR([only sparc and i386 processors are supported])
- fi
- ;;
- linux-gnu*|k*bsd*-gnu*)
- test_gtk=yes
- test_cairo=yes
- test_kde=yes
- test_kde4=yes
- test_cups=yes
- test_randr=yes
- test_freetype=yes
+#defaults unless the os test overrides this:
+test_cairo=yes
+test_randr=yes
+test_cups=yes
+test_fontconfig=yes
+
+case "$host_os" in
+ solaris*)
+ test_gtk=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_freetype=yes
+ test_gstreamer=yes
- _os=Linux
- ;;
- gnu)
- test_cups=no
- _os=GNU
- ;;
- cygwin*) # Windows
- test_cups=no
- test_cairo=yes
- test_freetype=no
- test_gstreamer=no
- _os=WINNT
- ;;
- darwin*) # Mac OS X
- test_cups=yes
- test_gtk=yes
- test_cairo=yes
+ _os=SunOS
+ AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
+ if test -z "$GNUTAR"; then
+ AC_MSG_ERROR([gtar (gnu tar) not found but needed. Install it (SUN Freeware package).])
+ fi
+ AC_SUBST(GNUTAR)
+
+ dnl ===========================================================
+ dnl check whether we're using solaris 6,7,8 - sparc or intel.
+ dnl ===========================================================
+ AC_MSG_CHECKING([the Solaris operating system release])
+ _os_release=`echo $host_os | $SED -e s/solaris2\.//`
+ if test "$_os_release" -lt "6"; then
+ AC_MSG_ERROR([use solaris >= 6 to build LibreOffice])
+ else
+ AC_MSG_RESULT([ok ($_os_release)])
+ fi
+
+ dnl check whether we're using a sparc or i386 processor
+ AC_MSG_CHECKING([the processor type])
+ if test "$host_cpu" = "sparc" -o "$host_cpu" = "i386"; then
+ AC_MSG_RESULT([ok ($host_cpu)])
+ else
+ AC_MSG_ERROR([only sparc and i386 processors are supported])
+ fi
+ ;;
+ linux-gnu*|k*bsd*-gnu*)
+ test_gtk=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_kde4=yes
+ test_freetype=yes
+ test_unix_quickstarter=yes
+ _os=Linux
+ ;;
+ gnu)
test_randr=no
- test_freetype=no
- test_gstreamer=no
- _os=Darwin
- if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
- AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
- echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
- enable_systray=no
- fi
- ;;
- os2*)
- test_x=no
- test_cups=no
+ test_cairo=no
+ test_cups=no
+ _os=GNU
+ ;;
+ cygwin*) # Windows
+ test_cups=no
test_randr=no
- test_gtk=no
- test_freetype=no
- test_gstreamer=no
- _os=OS2
- ;;
- freebsd*)
- test_gtk=yes
- test_cairo=yes
- test_kde=yes
- test_kde4=yes
- test_cups=yes
- test_randr=yes
- test_freetype=yes
- test_gstreamer=yes
- AC_MSG_CHECKING([the FreeBSD operating system release])
- if test -n "$with_os_version"; then
- OSVERSION="$with_os_version"
- else
- OSVERSION=`/sbin/sysctl -n kern.osreldate`
- fi
- AC_MSG_RESULT([found OSVERSION=$OSVERSION])
- AC_MSG_CHECKING([which thread library to use])
- if test "$OSVERSION" -lt "500016"; then
- PTHREAD_CFLAGS="-D_THREAD_SAFE"
- PTHREAD_LIBS="-pthread"
- elif test "$OSVERSION" -lt "502102"; then
- PTHREAD_CFLAGS="-D_THREAD_SAFE"
- PTHREAD_LIBS="-lc_r"
- else
- PTHREAD_CFLAGS=""
- PTHREAD_LIBS="-pthread"
- fi
- AC_MSG_RESULT([$PTHREAD_LIBS])
- _os=FreeBSD
- ;;
- osf)
- test_cups=no
+ test_freetype=no
+ test_cairo=no
+ test_fontconfig=no
+ _os=WINNT
+ ;;
+ darwin*) # Mac OS X
+ test_gtk=yes
test_randr=no
- _os=OSF1
- ;;
- netbsd)
- test_gtk=yes
- test_cairo=yes
- test_kde=yes
- test_kde4=yes
- test_cups=no
- test_randr=yes
- test_freetype=yes
- test_gstreamer=yes
- PTHREAD_CFLAGS="-pthread"
- PTHREAD_LIBS="-pthread -lpthread"
- _os=NetBSD
- ;;
- aix*)
- test_cups=no
+ test_freetype=no
+ test_fontconfig=no
+ test_cairo=no
+ _os=Darwin
+ if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
+ AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
+ echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
+ enable_systray=no
+ fi
+ ;;
+ os2*)
+ test_cups=no
test_randr=no
- test_freetype=yes
- test_gstreamer=yes
- PTHREAD_LIBS=-pthread
- echo "AIX is an alpha port --- Use at own risk" >> warn
- _os=AIX
- ;;
+ test_gtk=no
+ test_cairo=no
+ test_freetype=no
+ _os=OS2
+ ;;
+ freebsd*)
+ test_gtk=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_kde4=yes
+ test_freetype=yes
+ AC_MSG_CHECKING([the FreeBSD operating system release])
+ if test -n "$with_os_version"; then
+ OSVERSION="$with_os_version"
+ else
+ OSVERSION=`/sbin/sysctl -n kern.osreldate`
+ fi
+ AC_MSG_RESULT([found OSVERSION=$OSVERSION])
+ AC_MSG_CHECKING([which thread library to use])
+ if test "$OSVERSION" -lt "500016"; then
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ elif test "$OSVERSION" -lt "502102"; then
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ PTHREAD_LIBS="-lc_r"
+ else
+ PTHREAD_CFLAGS=""
+ PTHREAD_LIBS="-pthread"
+ fi
+ AC_MSG_RESULT([$PTHREAD_LIBS])
+ _os=FreeBSD
+ ;;
+ *netbsd*)
+ test_gtk=yes
+ build_gstreamer=yes
+ test_kde=no
+ test_kde4=yes
+ test_freetype=yes
+ PTHREAD_CFLAGS="-pthread"
+ PTHREAD_LIBS="-pthread -lpthread"
+ _os=NetBSD
+ ;;
+ aix*)
+ test_cups=no
+ test_randr=no
+ test_cairo=no
+ test_freetype=yes
+ PTHREAD_LIBS=-pthread
+ _os=AIX
+ ;;
+ openbsd*)
+ test_gtk=yes
+ test_kde=yes
+ test_freetype=yes
+ PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ _os=OpenBSD
+ ;;
+ dragonfly*)
+ test_gtk=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_kde4=yes
+ test_freetype=yes
+ PTHREAD_LIBS="-pthread"
+ _os=DragonFly
+ ;;
*)
- AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
+ AC_MSG_ERROR([$_os operating system is not suitable to build LibreOffice!])
;;
esac
@@@ -1901,9 -1458,19 +1897,10 @@@ if test \( "$_os" != "WINNT" -o "$WITH_
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
- if test "$_gcc_major" -lt "3"; then
- AC_MSG_ERROR([found version "$_gcc_version", use version 3+ of the gcc compiler])
- else
- if test "$GCCVER" -eq "030203"; then
- if test "$ENABLE_SYMBOLS" = "SMALL"; then
- AC_MSG_ERROR([version "$_gcc_version" gives internal error with small.])
- fi
- fi
- fi
if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
- CC=$GCC_HOME/bin/gcc-4.0
+ export CC=$GCC_HOME/bin/gcc-4.0
+ dnl export CC to have it available in set_soenv -> config.guess
GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
GCCVER=$GCCVER2
@@@ -2377,47 -1946,44 +2353,10 @@@ AC_SUBST(WORDS_BIGENDIAN
AC_SUBST(LFS_CFLAGS)
dnl ===================================================================
- dnl Check if we are to enable vba macro interoperability feature
- dnl ===================================================================
- AC_MSG_CHECKING([whether to disable vba feature])
- if test -n "$enable_vba" && test "$enable_vba" = "no"; then
- AC_MSG_RESULT([yes])
- ENABLE_VBA=NO
- else
- AC_MSG_RESULT([no])
- ENABLE_VBA=YES
- fi
- AC_SUBST(ENABLE_VBA)
-
- if test "$ENABLE_VBA" = "YES"; then
- AC_MSG_CHECKING([how to package the vba compatibility api])
- if test -n "$with_vba_package_format"; then
- if test "$with_vba_package_format" = "extn"; then
- VBA_EXTENSION=YES
- AC_MSG_RESULT([uno extension])
- AC_MSG_WARN([--with-vba-package-format=extn can cause problems])
- else if test "$with_vba_package_format" = "builtin"; then
- VBA_EXTENSION=NO
- AC_MSG_RESULT([build into installset])
- else
- AC_MSG_ERROR([unknown packaging method])
- fi
- fi
-
- else
- VBA_EXTENSION=NO
- AC_MSG_RESULT([defaulting to build into installset])
- fi
- else
- VBA_EXTENSION=NO
- fi
- AC_SUBST(VBA_EXTENSION)
-
- dnl ===================================================================
-dnl Check if cups/cups.h is available
+dnl Check the whether vba need to be delivered as an uno package or part
+dnl of the install
dnl ===================================================================
-if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
- AC_CHECK_HEADER(cups/cups.h, [],
- [AC_MSG_ERROR([cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?])], [])
-fi
-dnl ===================================================================
-dnl Check if PAM/pam_appl.h is available on Linux or FreeBSD
-dnl ===================================================================
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
- AC_MSG_CHECKING([whether to enable pam support])
- if test -z "$enable_pam" || test "$enable_pam" != "no"; then
- AC_MSG_RESULT([yes])
- PAM=YES
- AC_CHECK_HEADER(security/pam_appl.h, [],
- [AC_MSG_ERROR([pam_appl.h could not be found. libpam-dev or pam-devel missing?])], [])
- AC_MSG_CHECKING([whether to link to libpam])
- if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then
- AC_MSG_RESULT([yes])
- PAM_LINK=YES
- AC_CHECK_LIB(pam, pam_start, [],
- [AC_MSG_ERROR(libpam not found or functional)], [])
- else
- AC_MSG_RESULT([no, dynamically open it])
- PAM_LINK=NO
- fi
- else
- AC_MSG_RESULT([no])
- PAM=NO
- PAM_LINK=NO
- dnl check getspnam_r for needed args (4 or 5)
- AX_FUNC_WHICH_GETSPNAM_R
- fi
-fi
-AC_SUBST(PAM)
-AC_SUBST(NEW_SHADOW_API)
-AC_SUBST(PAM_LINK)
if test "$_os" = "Linux"; then
AC_MSG_CHECKING([whether to link to libcrypt])
@@@ -5417,9 -4927,9 +5366,9 @@@ dnl Check for system neo
dnl ===================================================================
AC_MSG_CHECKING([which neon to use])
if test -n "$with_system_neon" -o -n "$with_system_libs" && \
- test "$with_system_neon" != "no"; then
+ test "$with_system_neon" != "no"; then
AC_MSG_RESULT([external])
- PKG_CHECK_MODULES(NEON, neon >= 0.24.0, , AC_MSG_ERROR([you need neon >= 0.24.x for system-neon]))
+ PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES
@@@ -5857,15 -5413,15 +5806,15 @@@ if test "$_os" = "SunOS" -o "$_os" = "F
GNUPATCH=$PATCH
else
if test -x "$with_gnu_patch"; then
- GNUPATCH=$with_gnu_patch
+ GNUPATCH=$with_gnu_patch
else
- AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
+ AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
fi
fi
AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([yes])
- AC_MSG_RESULT([yes])
++ AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
fi
@@@ -5872,36 -5429,35 +5822,35 @@@ f
dnl We also need to check for --with-gnu-cp
- if test -z "$with_gnu_cp"; then
- AC_PATH_PROGS(GNUCP, gnucp cp)
- if test -z $GNUCP; then
+ if test -z "$with_gnu_cp"; then
+ AC_PATH_PROGS(GNUCP, gnucp cp)
+ if test -z $GNUCP; then
AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
- fi
- else
- if test -x "$with_gnu_cp"; then
+ fi
+ else
+ if test -x "$with_gnu_cp"; then
GNUCP=$with_gnu_cp
- else
+ else
AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
- fi
- fi
+ fi
+ fi
- AC_MSG_CHECKING([whether $GNUCP is GNU cp])
- if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([yes])
- else
- if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
+ AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support])
+ if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT([yes])
+ else
- AC_MSG_RESULT([no])
- GNUCP=''
-fi
-
-if test -z "$GNUCP"; then
- if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then
- AC_MSG_ERROR([no, GNU cp from coreutils is needed. install or specify with --with-gnu-cp=/path/to/it])
++ if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no GNU cp from coreutils found - using the system's cp command])
+ if test "$_os" = "Darwin"; then
+ GNUCP=''
+ AC_MSG_RESULT([no gnucp found - using the system's cp command])
+ else
+ AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
+ fi
fi
- fi
-
fi
+
AC_SUBST(GNUPATCH)
AC_SUBST(GNUCP)
diff --cc instsetoo_native/prj/build.lst
index a810b19,490d2e4..a1d0a15
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- oon instsetoo_native :: l10n postprocess packimages testautomation NULL
-oon instsetoo_native :: L10N:l10n postprocess packimages testautomation ooo_custom_images NULL
++oon instsetoo_native :: L10N:l10n postprocess packimages testautomation NULL
oon instsetoo_native usr1 - all oon_mkout NULL
oon instsetoo_native\inc_openoffice\unix nmake - u oon_unix NULL
oon instsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL
diff --cc instsetoo_native/util/openoffice.lst
index 2ab17bf,caf297c..be5a4ec
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@@ -4,30 -4,30 +4,30 @@@ Global
{
variables
{
- OOOBASEVERSION 3.3
- OOOPACKAGEVERSION 3.3.0
- UREPACKAGEVERSION 1.7.0
+ OOOBASEVERSION 3.4
+ OOOPACKAGEVERSION 3.4.0
+ UREPACKAGEVERSION 1.8.0
URELAYERVERSION 1
- BASISROOTNAME OpenOffice.org
- UNIXBASISROOTNAME openoffice.org
- SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
+ BASISROOTNAME LibreOffice
+ UNIXBASISROOTNAME libreoffice
- SERVICETAG_PRODUCTNAME LibreOffice 3.3
- SERVICETAG_PRODUCTVERSION 3.3
- SERVICETAG_PARENTNAME LibreOffice 3.3
++ SERVICETAG_PRODUCTNAME LibreOffice 3.4
+ SERVICETAG_PRODUCTVERSION 3.4
- SERVICETAG_PARENTNAME OpenOffice.org 3.4
++ SERVICETAG_PARENTNAME LibreOffice 3.4
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1
PACKAGEPREFIX
- BASISPACKAGEPREFIX ooobasis
- UREPACKAGEPREFIX openoffice.org
- SOLSUREPACKAGEPREFIX openofficeorg
+ BASISPACKAGEPREFIX libobasis
+ UREPACKAGEPREFIX libreoffice
+ SOLSUREPACKAGEPREFIX libreoffice
USE_FILEVERSION 1
- LIBRARYVERSION 9.3.0
+ LIBRARYVERSION 9.4.0
POOLPRODUCT 1
- REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
- REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
- PROGRESSBARCOLOR 14,133,205
- PROGRESSSIZE 320,7
- PROGRESSPOSITION 185,206
+ REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
+ REGISTRATIONURL http://survey.libreoffice.org/user/index.php
+ PROGRESSBARCOLOR 126,170,23
+ PROGRESSSIZE 319,10
+ PROGRESSPOSITION 164,225
PROGRESSFRAMECOLOR 207,208,211
NATIVEPROGRESS true
REGISTRYLAYERNAME Layers
@@@ -36,8 -36,8 +36,8 @@@
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 6
+ WINDOWSPATCHLEVEL 8
- OOOVENDOR Oracle
+ OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
STARTCENTER_LAYOUT_STYLE 0
BUILDIDCWS {buildidcws}
@@@ -52,21 -52,20 +52,21 @@@ LibreOffic
{
variables
{
- PRODUCTNAME OpenOffice.org
+ PRODUCTNAME LibreOffice
+ PRODUCTNAME_BR BrOffice
- PRODUCTVERSION 3.3
+ PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
- SHORT_PRODUCTEXTENSION
++ SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
- BASEPRODUCTVERSION 3.3
+ ABOUTBOXPRODUCTVERSION 3.4.0
+ BASEPRODUCTVERSION 3.4
PCPFILENAME openoffice.pcp
- UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
- ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@@ -108,10 -104,9 +107,10 @@@
active 1
compression 5
script setup_osl
- downloadname OOo_{productversion}_{os}_install_{languages}
- langpackdownloadname OOo_{productversion}_languagepack_{os}_install_{languages}
+ downloadname LibO_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@@ -121,20 -116,19 +120,20 @@@ LibreOffice_wJR
{
variables
{
- PRODUCTNAME OpenOffice.org
+ PRODUCTNAME LibreOffice
+ PRODUCTNAME_BR BrOffice
- PRODUCTVERSION 3.3
+ PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
- SHORT_PRODUCTEXTENSION
++ SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
- BASEPRODUCTVERSION 3.3
+ ABOUTBOXPRODUCTVERSION 3.4.0
+ BASEPRODUCTVERSION 3.4
- UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
- ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@@ -176,8 -169,8 +174,8 @@@
active 1
compression 5
script setup_osljre
- downloadname OOo_{productversion}_{os}_installwjre_{languages}
+ downloadname LibO_{productversion}_{os}_installwjre_{languages}
- include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@@ -187,27 -180,27 +185,27 @@@ LibreOffice_De
{
variables
{
- PRODUCTNAME OOo-dev
+ PRODUCTNAME LibO-dev
- PRODUCTVERSION 3.3
+ PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
- SHORT_PRODUCTEXTENSION
- BASISROOTNAME OOo-dev
- UNIXBASISROOTNAME ooo-dev
++ SHORT_PRODUCTEXTENSION
+ BASISROOTNAME LibO-dev
+ UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
- BASEPRODUCTVERSION 3.3
+ ABOUTBOXPRODUCTVERSION 3.4.0
+ BASEPRODUCTVERSION 3.4
DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
+ BASISPACKAGEPREFIX libobasis-dev
+ UREPACKAGEPREFIX lodev
+ SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
- UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
- ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
FILEFORMATNAME OpenOffice.org
@@@ -248,10 -240,9 +245,10 @@@
active 1
compression 5
script setup_osljre
- downloadname OOo-dev_{productversion}_{os}_install_{languages}
- langpackdownloadname OOo_{productversion}_languagepack_{os}_install_{languages}
+ downloadname LibO-dev_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,,{solarpath}/pck.{minor}/brand_dev
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@@ -263,15 -254,13 +260,14 @@@ UR
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 1.7
- PACKAGEVERSION 1.7
+ PRODUCTVERSION 1.8
+ PACKAGEVERSION 1.8
PACKAGEREVISION 1
PRODUCTEXTENSION
+ BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION
LICENSENAME LGPL
- SERVICESPROJEKT 1
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@@ -281,11 -270,10 +277,10 @@@
DOWNLOADBITMAP urebitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
- SERVICESPROJEKT 1
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
- STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
- STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
PACKAGEMAP package_names_ext.txt
@@@ -305,12 -293,11 +300,12 @@@ LibreOffice_SD
downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME OpenOffice.org
+ PRODUCTNAME LibreOffice
+ PRODUCTNAME_BR BrOffice
- PRODUCTVERSION 3.3
+ PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@@ -351,21 -339,21 +347,21 @@@ LibreOffice_Dev_SD
downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME OOo-dev
+ PRODUCTNAME LibO-dev
- PRODUCTVERSION 3.3
+ PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc4
+ SHORT_PRODUCTEXTENSION
- BASISROOTNAME OOo-dev
- UNIXBASISROOTNAME ooo-dev
+ BASISROOTNAME LibO-dev
+ UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.3.0
+ PACKAGEVERSION 3.4.0
PACKAGEREVISION {milestone}
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
+ BASISPACKAGEPREFIX libobasis-dev
+ UREPACKAGEPREFIX lodev
+ SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
@@@ -392,6 -381,217 +389,6 @@@
active 1
compression 5
script sdkoo
- include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+ include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
}
}
-
-BrOffice
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.4
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- PROGRESSBARCOLOR
- PROGRESSSIZE
- PROGRESSPOSITION
- PROGRESSFRAMECOLOR
- NATIVEPROGRESS
- UPDATEURL http://update38.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,userland.txt,version.lst
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- CODEFILENAME codes_broo.txt
- PATCHCODEFILE bro_patchcodes.txt
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
- STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
- STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
- }
- active 1
- compression 5
- script setup_osl
- downloadname BrOo_{productversion}_{os}_install_{languages}
- langpackdownloadname BrOo_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
-
-BrOffice_wJRE
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.4
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- PROGRESSBARCOLOR
- PROGRESSSIZE
- PROGRESSPOSITION
- PROGRESSFRAMECOLOR
- NATIVEPROGRESS
- UPDATEURL http://update38.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,javaversion2.dat,userland.txt,version.lst
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- WITHJREPRODUCT 1
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- CODEFILENAME codes_broo.txt
- PATCHCODEFILE bro_patchcodes.txt
- JAVAPRODUCT 1
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
- STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
- STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
- }
- active 1
- compression 5
- script setup_osljre
- downloadname BrOo_{productversion}_{os}_installwjre_{languages}
- include {solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
-
-BrOffice_Dev
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOo-dev
- PRODUCTVERSION 3.4
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- BASISROOTNAME OOo-dev
- UNIXBASISROOTNAME ooo-dev
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
- REGISTRYLAYERNAME LayerDevBroffice
- SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
- UPDATEURL http://update38.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,javaversion2.dat,userland.txt,version.lst
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- JAVAPRODUCT 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE brodev_patchcodes.txt
- CODEFILENAME codes_broodev.txt
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
- STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
- STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
- }
- active 1
- compression 5
- script setup_osljre
- downloadname BrOo-dev_{productversion}_{os}_install_{languages}
- langpackdownloadname BrOo_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice_dev,{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
diff --cc ooo.lst
index 46577ee,8ce65c1..0f7e5a8
mode 100644,100755..100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list