[Libreoffice-commits] .: 91 commits - bootstrap.1 configure.in Module_tail_build.mk RepositoryExternal.mk RepositoryFixes.mk Repository.mk scp2/source scp2/util set_soenv.in solenv/bin solenv/gbuild solenv/inc source_soenv.sh tail_build/Makefile
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:48:01 PDT 2011
Module_tail_build.mk | 1
Repository.mk | 53
RepositoryExternal.mk | 363 ++++++
RepositoryFixes.mk | 110 -
bootstrap.1 | 17
configure.in | 114 --
scp2/source/canvas/makefile.mk | 1
scp2/source/canvas/mtfrenderer.scp | 40
scp2/source/ooo/file_library_ooo.scp | 23
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/util/makefile.mk | 1
set_soenv.in | 18
solenv/bin/build_client.pl | 2
solenv/bin/id-lang.map | 102 -
solenv/bin/mkdocs.sh | 18
solenv/bin/modules/installer/download.pm | 2
solenv/bin/modules/installer/helppack.pm | 126 +-
solenv/bin/modules/installer/scriptitems.pm | 12
solenv/bin/modules/installer/simplepackage.pm | 4
solenv/bin/modules/installer/windows/createfolder.pm | 2
solenv/bin/modules/installer/windows/directory.pm | 52
solenv/bin/modules/installer/windows/property.pm | 2
solenv/bin/modules/installer/worker.pm | 4
solenv/bin/modules/installer/xpdinstaller.pm | 6
solenv/bin/modules/installer/ziplist.pm | 4
solenv/bin/modules/par2script/work.pm | 148 +-
solenv/bin/modules/pre2par/language.pm | 44
solenv/gbuild/ComponentTarget.mk | 30
solenv/gbuild/CppunitTest.mk | 16
solenv/gbuild/CustomTarget.mk | 43
solenv/gbuild/Deliver.mk | 10
solenv/gbuild/Executable.mk | 14
solenv/gbuild/Helper.mk | 20
solenv/gbuild/Jar.mk | 166 ++
solenv/gbuild/JavaClassSet.mk | 77 -
solenv/gbuild/JunitTest.mk | 2
solenv/gbuild/Library.mk | 13
solenv/gbuild/LinkTarget.mk | 269 ++--
solenv/gbuild/Output.mk | 2
solenv/gbuild/Package.mk | 2
solenv/gbuild/StaticLibrary.mk | 9
solenv/gbuild/TargetLocations.mk | 15
solenv/gbuild/Zip.mk | 83 +
solenv/gbuild/gbuild.mk | 5
solenv/gbuild/gbuild_simple.mk | 58 +
solenv/gbuild/platform/macosx.mk | 53
solenv/gbuild/platform/solaris.mk | 36
solenv/gbuild/platform/unxgcc.mk | 40
solenv/gbuild/platform/windows.mk | 32
solenv/gbuild/platform/winmingw.mk | 63 -
solenv/gbuild/templates/Executable.mk | 9
solenv/gbuild/templates/Library.mk | 5
solenv/inc/doxygen.cfg | 1074 +++++++++----------
solenv/inc/libs.mk | 6
solenv/inc/postwin.h | 2
solenv/inc/prewin.h | 2
solenv/inc/unxobsd.mk | 39
source_soenv.sh | 124 ++
tail_build/Makefile | 12
59 files changed, 2225 insertions(+), 1377 deletions(-)
New commits:
commit d6c53ceb896f33623b348501676c6002b2777e4f
Merge: 6196897... d648978...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:22:58 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 619689733c460836ac990487f0708c4325911b68
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:59:33 2011 +0200
bump workdir up a few levels
diff --git a/set_soenv.in b/set_soenv.in
index 99a4ffb..aa46b86 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -957,7 +957,7 @@ else
$SOLARVERSION = '$SOLARVER';
#Location of gnu make directories.
-$WORKDIR = '$SOLARVER/$INPATH/workdir';
+$WORKDIR = '$SRC_ROOT/workdir/$INPATH';
$OUTDIR = '$SOLARVER/$INPATH';
#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
$SOLARDEFIMG = PathFormat($SRC_ROOT.$DEFIMGS);
commit 47da3d734574046b8faeb0fdae459bcbc4bdcfd3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:23:18 2011 +0200
keep gbuild calls consistent at now, even if it is a bit longer
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 2a58568..9186579 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -877,11 +877,11 @@ endif
endef
# this forwards to functions that must be defined in RepositoryExternal.mk.
-# $(call gb_LinkTarget_use_external,library,external)
+# $(eval $(call gb_LinkTarget_use_external,library,external))
define gb_LinkTarget_use_external
-$(eval $(if $(value gb_LinkTarget__use_$(2)),\
+$(if $(value gb_LinkTarget__use_$(2)),\
$(call gb_LinkTarget__use_$(2),$(1)),\
- $(error gb_LinkTarget_use_external: unknown external: $(2))))
+ $(error gb_LinkTarget_use_external: unknown external: $(2)))
endef
# $(call gb_LinkTarget_use_externals,library,externals)
commit 8f987805d391862b878cd8224801f27f2b52c513
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 10:17:18 2011 +0200
adaptions to dbaccess revert-to-master-gbuilidization
diff --git a/Repository.mk b/Repository.mk
index 1b5dd1d..3169c2e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
dbaxml \
dbmm \
dbtools \
- dbui \
+ dbu \
desktop_detector \
doctok \
drawinglayer \
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index f98231c..4da10dd 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -54,8 +54,11 @@ STD_RES_FILE( gid_File_Res_Abp, abp)
STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
STD_RES_FILE( gid_File_Res_Dbp, dbp)
-STD_LIB_FILE( gid_File_Lib_Dbu, dbui)
-STD_RES_FILE( gid_File_Res_Dbu, dbui)
+STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
+STD_RES_FILE( gid_File_Res_Dbu, dbu)
+
+STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
+STD_RES_FILE( gid_File_Res_Adabasui, adabasui)
STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
commit b7db23486cd815f4f344919e5e30bacd8b6dd314
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 02:39:24 2011 +0200
readd rtftok because we postpone gnumake4 for writerfilter
* gnumake4's writerfilter gbuildization got pushed in a seperate branch
* it might or might not be merged to master later
diff --git a/Repository.mk b/Repository.mk
index bf8df09..1b5dd1d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
rpt \
rptui \
rptxml \
+ rtftok \
sax \
sb \
sc \
commit 56f0ed8156c1d5f052162a3dd249326a85ace1c2
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:02:42 2011 +0200
postmerge fixes for gnumake4
diff --git a/Repository.mk b/Repository.mk
index a296b46..bf8df09 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -90,7 +90,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
rpt \
rptui \
rptxml \
- rtftok \
sax \
sb \
sc \
@@ -140,7 +139,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
test \
- cairo \
cppunit \
fileacc \
icui18n \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 3a6b0f0..573572f 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -73,8 +73,8 @@ $(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call g
$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
endef
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 4b985a7..3088bcc 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -77,7 +77,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
endef
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 4116c4f..023fe36 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -62,7 +62,7 @@ $(call gb_Zip_get_target,$(1)) : FILES :=
$(call gb_Zip_get_target,$(1)) : LOCATION := $(2)
gb_Package_Location_$(1) := $(2)
$(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call gb_Zip_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1))
$(call gb_Zip_get_outdir_target,$(1)) : $(call gb_Zip_get_target,$(1))
endef
commit cbb4c3ef2cf531eb0cd99c153d37536da534e5e0
Merge: 407206b... f04a96d...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:27:57 2011 +0200
resyncing to master
diff --cc Repository.mk
index bf8df09,5f4586d..a296b46
--- a/Repository.mk
+++ b/Repository.mk
@@@ -139,9 -134,19 +140,10 @@@ $(eval $(call gb_Helper_register_librar
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
test \
+ cairo \
cppunit \
- crypto \
fileacc \
icui18n \
- icule \
- icuuc \
- icule \
- graphite2_off \
- cppunit \
- rdf \
- ssl \
- xslt \
))
diff --cc RepositoryFixes.mk
index bf75dee,ee89377..b6c7108
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@@ -36,31 -37,14 +37,19 @@@ gb_Library_FILENAMES := $(patsubst cppu
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-
-
endif
+ifeq ($(OS),SOLARIS)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+endif
- ifeq ($(OS),MACOSX)
- gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
- endif # ifeq ($(OS),MACOSX)
-
ifeq ($(OS),WNT)
- ifneq ($(USE_MINGW),)
- gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+ ifeq ($(COM),GCC)
gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
@@@ -72,40 -54,30 +61,44 @@@ gb_Library_FILENAMES := $(patsubst xml2
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
+
+# handle libraries in msvc format that don't use an "i" prefix for their import library
+# these are libraries built by OOo, but only a few of them
+# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
+# we link against their dlls in gcc format directly
- gb_Library_NOILIBFILENAMES:=\
- icuuc \
- uwinapi \
- gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
- gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+ # Libraries not provided by mingw(-w64), available only in the Windows
+ # SDK. So if these actually are liked with somewhere, we can't
+ # cross-compile that module then using MinGW. That needs to be fixed
+ # then, and we need to use these libraries through run-time lookup of
+ # APIs. Or something.
-
+ gb_Library_SDKLIBFILENAMES:=\
+ unicows \
+# some Windows platform libraries are missing in mingw library set
+# we have to use them from the PSDK by linking against their ilibs
+gb_Library_ILIBFILENAMES:=\
++
+ unicows \
+ uuid \
+ winmm \
+
- gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
- gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+ gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
+ gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib)
gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
- gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+else #ifneq ($(USE_MINGW),)
-else
+ gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
@@@ -146,9 -131,68 +139,24 @@@ gb_Library_DLLFILENAMES := $(patsubst i
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-endif
+endif # ifneq ($(USE_MINGW),)
-endif
-
-ifeq ($(OS),SOLARIS)
-gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
-
-endif
+endif # ifeq ($(OS),WNT)
+ # Some external libraries get built as static libraries for Android
+ # because we haven't bothered fixing their configury to recognize that
+ # shared libraries can be built for the platform.
+ ifeq ($(OS),ANDROID)
+ gb_Library_FILENAMES := $(patsubst cppunit:%.so,cppunit:%.a,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst xml2:%.so,xml2:%.a,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst rdf:%.so,rdf:%.a,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst xslt:%.so,xslt:%.a,$(gb_Library_FILENAMES))
+
+ endif
+
-gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
-
-# we do not require a known rule for these, when using system libs
+
+ ifeq ($(SYSTEM_CAIRO),YES)
+ gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+ endif
-ifeq ($(SYSTEM_LIBXML),YES)
-gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_REDLAND),YES)
-gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_ICU),YES)
-gb_Library_TARGETS := $(filter-out icudata,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icui18n,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuio,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icule,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out iculx,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icutu,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_CPPUNIT),YES)
-gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
-endif
-
# vim: set noet sw=4 ts=4:
diff --cc configure.in
index 3926aa2,fa6ef65..1afc045
--- a/configure.in
+++ b/configure.in
@@@ -6237,10 -6390,7 +6293,10 @@@ dnl ===================================
AC_PATH_PROG(ZIP, zip)
test -z "$ZIP" && AC_MSG_ERROR([zip is required])
AC_PATH_PROG(UNZIP, unzip)
- test -z "$ZIP" && AC_MSG_ERROR([unzip is required])
+ test -z "$UNZIP" && AC_MSG_ERROR([unzip is required])
+if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
+ AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
+fi
dnl ===================================================================
dnl Zip must be a specific type for different build types.
@@@ -6389,71 -6539,14 +6445,20 @@@ AC_SUBST(LIBPNG_CFLAGS
AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
if test "x$enable_unix_libpng" = "xyes"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- ENABLE_QUICKSTART_LIBPNG=""
- fi
- AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
-
- dnl ===================================================================
- dnl Test whether to build cairo or rely on the system version
- dnl ===================================================================
-
- dnl ENABLE_CAIRO will be set to empty later when necessary
- ENABLE_CAIRO="TRUE"
-
- BUILD_PIXMAN=""
- SYSTEM_CAIRO=""
-
- AC_MSG_CHECKING([whether to use the system cairo])
-
- if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_system_cairo" != no \); then
- SYSTEM_CAIRO=YES
AC_MSG_RESULT([yes])
-
- PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
-
- if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
- AC_MSG_ERROR([Cairo library requires fontconfig.])
- fi
-
- if test "$with_system_xrender_headers" = "yes"; then
- AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
- AC_TRY_RUN([
- #include <X11/extensions/Xrender.h>
-
- int main(int argc, char **argv) {
- #ifdef PictStandardA8
- return 0;
- #else
- return 1;
- #endif
- }
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_ERROR([no, X headers too old.])]
- )
- fi
else
AC_MSG_RESULT([no])
- BUILD_TYPE="$BUILD_TYPE CAIRO"
- BUILD_PIXMAN=YES
+ ENABLE_QUICKSTART_LIBPNG=""
fi
+ AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
- AC_SUBST(ENABLE_CAIRO)
- AC_SUBST(BUILD_PIXMAN)
- AC_SUBST(SYSTEM_CAIRO)
- AC_SUBST(CAIRO_CFLAGS)
- AC_SUBST(CAIRO_LIBS)
+ dnl ===================================================================
+
+ENABLE_CAIRO_CANVAS="FALSE"
+if test "$enable_cairo_canvas" = "yes" -a "$ENABLE_CAIRO" = "TRUE" ; then
+ ENABLE_CAIRO_CANVAS="TRUE"
+fi
+AC_SUBST(ENABLE_CAIRO_CANVAS)
-
- dnl ===================================================================
dnl Check whether the GStreamer libraries are available.
dnl ===================================================================
diff --cc scp2/source/canvas/makefile.mk
index 4c38d16,8e59d77..c5e1f13
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@@ -41,10 -41,15 +41,14 @@@ SCP_PRODUCT_TYPE=os
PARFILES= canvascommons.par \
vclcanvas.par \
- mtfrenderer.par
- .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
+ .IF "$(GUI)"=="UNX"
+ #X11 MacOSX has no cairo-canvas
+ .IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
PARFILES+= cairocanvas.par
.ENDIF
+ .ENDIF
+
.IF "$(ENABLE_DIRECTX)" != ""
.IF "$(USE_DIRECTX5)" != ""
SCPDEFS+=-DUSE_DIRECTX5
diff --cc scp2/source/ooo/file_library_ooo.scp
index 9474eb4,bebfafe..98d25ec
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@@ -898,6 -909,14 +900,8 @@@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft
STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
-
-STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
-
-STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
-
+ STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
+
#ifdef WNT
#if defined(_gcc3)
diff --cc scp2/util/makefile.mk
index af4861d,8e1c8f2..ff2037f
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@@ -205,10 -205,14 +205,13 @@@ SCP1FILES +=
SCP1FILES += \
vclcanvas.par \
- mtfrenderer.par
- .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
+ .IF "$(GUI)"=="UNX"
+ #X11 MacOSX has no cairo-canvas
+ .IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
SCP1FILES += cairocanvas.par
.ENDIF
+ .ENDIF
.IF "$(ENABLE_LAYOUT)" == "TRUE"
SCP1FILES += layout.par
diff --cc set_soenv.in
index 5ea6bbf,9ff4b03..99a4ffb
--- a/set_soenv.in
+++ b/set_soenv.in
@@@ -1547,8 -1549,6 +1549,7 @@@ ToFile( "GTHREAD_CFLAGS", "@GTHREAD_
ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" );
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
- ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
+ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
diff --cc solenv/bin/build_client.pl
index 1dbf126,5483a13..cd97795
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@@ -357,11 -357,7 +357,7 @@@ sub do_job
delete $ENV{$_} foreach (keys %ENV);
$ENV{$_} = $$solar_vars{$_} foreach (keys %$solar_vars);
print 'Workspace: ';
- if (defined $ENV{CWS_WORK_STAMP}) {
- print $ENV{CWS_WORK_STAMP};
- } else {
- print $ENV{SOLARSRC};
- };
- print $ENV{SOLARSRC};
++ print $ENV{SOLARSRC};
print "\nplatform: $ENV{INPATH} $^O";
print "\ndir: $job_hash{job_dir}\n";
diff --cc solenv/gbuild/Deliver.mk
index 42707c0,cbf840b..ab97350
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@@ -43,8 -46,17 +46,17 @@@ $(if $(gb_LOWRESTIME),.LOW_RESOLUTION_T
endef
+ define gb_Deliver_add_deliverable
+ ifeq ($(MAKECMDGOALS),showdeliverables)
+ $(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+ else
+ $(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+ endif
+
+ endef
+
ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
-define gb_Deliver_deliver
+define gb_Deliver__deliver
mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -f) $(1) $(2) && touch -r $(1) $(2)
endef
else
diff --cc solenv/gbuild/Executable.mk
index 283d39d,077c0ac..a0baf9b
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@@ -81,24 -75,17 +81,25 @@@ $(eval $(foreach method,
add_noexception_objects \
add_generated_cxxobjects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
diff --cc solenv/gbuild/Library.mk
index 9e6d543,cd508de..3667a35
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@@ -116,24 -117,17 +116,25 @@@ $(eval $(foreach method,
add_noexception_objects \
add_generated_cxxobjects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
diff --cc solenv/gbuild/LinkTarget.mk
index f1f696e,9f32df5..2a58568
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@@ -596,19 -549,21 +596,30 @@@ endi
endef
+define gb_LinkTarget_add_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
+endef
+
+# real use in RepositoryExternal.mk
define gb_LinkTarget_set_ldflags
-$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
+endef
+
+define gb_LinkTarget_add_libs
+$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
endef
+ define gb_LinkTarget_add_api
+ $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+ $$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc))
+ $(call gb_LinkTarget_get_headers_target,$(1)) \
+ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+ ifeq ($(gb_FULLDEPS),$(true))
+ $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+ endif
+
+ endef
+
define gb_LinkTarget_add_linked_libs
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
diff --cc solenv/gbuild/TargetLocations.mk
index bcca63f,11b2b28..f66e91a
mode 100755,100644..100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@@ -28,9 -28,8 +28,9 @@@
# outdir target pattern
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
+gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
- gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT)
+ gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
gb_PackagePart_get_destinations = \
$(OUTDIR)/xml \
$(OUTDIR)/pck \
@@@ -99,9 -94,11 +100,13 @@@ gb_SrsPartTarget_get_target = $(WORKDIR
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
+ gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
+ gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb
+ gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
+ gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
+gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
+gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
define gb_Library_get_external_headers_target
$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
@@@ -137,8 -134,7 +142,9 @@@ $(eval $(call gb_Helper_make_clean_targ
SrsTemplateTarget \
CppunitTest \
CustomTarget \
- WinResTarget \
+ UnoApiTarget \
++ WinResTarget \
+ Zip \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
@@@ -157,7 -153,10 +164,8 @@@ $(eval $(call gb_Helper_make_dep_target
LinkTarget \
SrsPartTarget \
SrsTarget \
+ UnoApiTarget \
))
-# needs to use same dep target because we use gb_CxxObject__command
-gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)
# other getters
diff --cc solenv/gbuild/gbuild.mk
index 0214f14,702c7bb..220e0e3
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@@ -285,7 -293,7 +294,8 @@@ include $(foreach class,
JavaClassSet \
JunitTest \
Module \
+ UnoApiTarget \
+ Zip \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
diff --cc solenv/gbuild/platform/macosx.mk
index 5f11ede,b74a4bd..280df58
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@@ -472,6 -483,19 +480,19 @@@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_P
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
++ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+ # UnoApiTarget
+
+ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+ gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+ gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+ gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+ gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+ gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+ gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+ gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+ gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
# vim: set noet sw=4:
diff --cc solenv/gbuild/platform/solaris.mk
index e0547b8,b1076eb..b78ab48
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@@ -391,6 -398,18 +400,18 @@@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PAT
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+ # UnoApiTarget
+
+ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+ gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+ gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+ gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+ gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+ gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+ gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+ gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
# vim: set noet sw=4:
diff --cc solenv/gbuild/platform/unxgcc.mk
index 59c3a4e,19fbb67..9083d4c
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@@ -262,8 -266,7 +266,8 @@@ $(call gb_Helper_abbreviate_dirs,
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+ $(LIBS) \
- $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
+ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
-o $(1))
endef
diff --cc solenv/gbuild/platform/windows.mk
index 5e322b1,b7db476..fb244c4
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@@ -383,11 -386,10 +394,13 @@@ gb_Library_get_rpath :
gb_Library_SYSPRE := i
gb_Library_PLAINEXT := .lib
+ gb_Library_win32_OLDNAMES := oldnames
+
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
@@@ -702,6 -702,18 +715,19 @@@ gb_XSLTPROCPRECOMMAND :
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+ # UnoApiTarget
+
+ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+ gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+ gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+ gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+ gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+ gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+ gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+ gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+ gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+ gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
# vim: set noet sw=4:
diff --cc solenv/gbuild/platform/winmingw.mk
index a8e9814,dd93e79..1bf1182
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@@ -222,9 -231,9 +233,9 @@@ ende
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
$(call gb_Helper_abbreviate_dirs_native,\
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+ $(OUTDIR_FOR_BUILD)/bin/makedepend \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
-I$(dir $(3)) \
$(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
@@@ -382,49 -416,34 +393,36 @@@ define gb_LinkTarget__command_dynamicli
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
- $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
- $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
- $(gb_LINK) \
+ $(gb_CXX) $(strip \
$(gb_Executable_TARGETTYPEFLAGS) \
- $(LDFLAGS) \
+ $(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
- $(T_LDFLAGS) \
- $(gb_MINGWLIBDIR)/crt2.o \
- $(MINGW_CLIB_DIR)/crtbegin.o \
- @$${RESPONSEFILE} \
+ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
- --start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
- --start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+ $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
+ $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
+ $(LIBS) \
- $(MINGW_CLIB_DIR)/crtend.o \
- -Map $(basename $(1)).map \
- -o $(1))
+ -Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \
+ -o $(1)))
endef
define gb_LinkTarget__command_dynamiclinklibrary
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- rm -f $(1) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
- $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
- $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
- $(gb_LINK) \
+ $(gb_CXX) $(strip \
$(gb_Library_TARGETTYPEFLAGS) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
- --enable-auto-image-base \
- -e _DllMainCRTStartup at 12 \
- $(gb_MINGWLIBDIR)/dllcrt2.o \
- $(MINGW_CLIB_DIR)/crtbegin.o \
- @$${RESPONSEFILE} \
+ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
- --start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
- --start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+ $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
+ $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
+ $(LIBS) \
- $(MINGW_CLIB_DIR)/crtend.o \
- -Map $(basename $(DLLTARGET)).map \
- -o $(DLLTARGET) && touch $(1))
+ -Wl$(COMMA)-Map$(COMMA)$(basename $(DLLTARGET)).map \
+ -Wl$(COMMA)--out-implib$(COMMA)$(1) \
+ -o $(dir $(1))/$(notdir $(DLLTARGET))))
endef
define gb_LinkTarget__command_staticlinklibrary
@@@ -482,7 -518,9 +500,9 @@@ gb_Library_PLAINLIBS_NONE +=
user32 \
uuid \
uwinapi \
+ winmm \
+ version \
+ winspool \
- z \
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@@ -682,6 -727,18 +709,19 @@@ gb_XSLTPROCPRECOMMAND := $(gb_Helper_se
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
- NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
++ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
++
+ # UnoApiTarget
+
+ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
+ gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
+ gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge
+ gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+ gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare
+ gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+ gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker
+ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+ gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
+ gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
# vim: set noet sw=4:
diff --cc solenv/inc/libs.mk
index 0d1a7b0,8159386..baa8473
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@@ -69,14 -65,9 +66,9 @@@ LDAPBERLIB=-lldapbe
TOOLSLIBST=-latools
BPICONVLIB=-lbpiconv
TOOLSLIB=-ltl$(DLLPOSTFIX)
- .IF "$(GUI)$(COM)"=="WNTGCC"
- CPPULIB=-lcppu$(UDK_MAJOR)
- CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
- .ELSE # "$(GUI)$(COM)"=="WNTGCC"
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
- .ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+UCBHELPERLIB=-lucbhelper4$(COMID)
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)
OPENSSLLIBST=$(STATIC) $(OPENSSL_LIBS) $(DYNAMIC)
commit 407206b754095a34817bc3a1e7776e6d55aab5b4
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Jul 21 10:38:18 2011 +0200
revert some mismerges in set_soenv.in
diff --git a/set_soenv.in b/set_soenv.in
index 87ecc76..5ea6bbf 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1470,6 +1470,8 @@ $nmake = '"dmake"';
# VI. Open the output file.
#--------------------------
#
+open( OUT, ">$outfile" ) ||
+ die "Cannot open $outfile: $!\n";
#
#------------------------------------------
@@ -2075,6 +2077,7 @@ ToFile( "ZIPDEP", "zipdep.pl", "e" );
#
# Writing the aliases to file.
ToFile( "Aliases.", $empty, "c" );
+ToFile( "Don't set aliases when bootstrapping", $empty, "c" );
ToFile( "alias mkout", $mkout, "a" );
ToFile( "alias deliver", $deliver, "a" );
@@ -2085,7 +2088,6 @@ if ( $platform !~ m/cygwin/ )
{ ToFile( "alias nmake", $nmake, "a" );
}
-
# on Solaris, MacOSX and FreeBSD, set GNUCOPY and GNUPATCH
if ($platform =~ m/solaris|darwin|freebsd/)
{
@@ -2106,6 +2108,8 @@ print OUT "unset $unsetvars$newline";
# VIII. Closing output file.
#---------------------------
#
+close( OUT ) || print "Can't close $outfile: $!";
+
#
#------------------------------
# IX. Sourcing the output file.
@@ -2264,6 +2268,7 @@ sub ToFile {
$envvar =~ s/\\/\\\\/g;
printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar) if ( '@VERBOSE@' eq 'TRUE' );
+ print OUT "$_[ 0 ]=\"$envvar\"$newline"; # to sh file
$exportvars .= " $_[ 0 ]"; # add to export list for sh file
} else {
@@ -2274,6 +2279,7 @@ sub ToFile {
elsif ( $_[ 2 ] eq "a" )
{ # Write an alias to file.
print "The $_[ 0 ] is set to: $_[ 1 ]\n" if ( '@VERBOSE@' eq 'TRUE' ); # to stdout
+ print OUT "$_[ 0 ]=$_[ 1 ]$newline"; # to sh file
}
elsif ( $_[ 2 ] eq "c" )
{ # Write a comment to file.
@@ -2284,9 +2290,14 @@ sub ToFile {
print "$comment $_[ 0 ]$newline";
print "$comment$newline";
}
+ print OUT "$newline";
+ print OUT "$comment$newline";
+ print OUT "$comment $_[ 0 ]$newline";
+ print OUT "$comment$newline";
}
elsif ( $_[ 2 ] eq "n" )
{ #Write a newline to a file
+ print OUT "$newline";
}
elsif ( $_[ 2 ] eq "z" )
{
commit 06fea81558c6f77c5836801a75b5418f5e0b4bec
Merge: 22d71ab... 0e056e7...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 18:49:05 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 22d71ab5bbefdaff0f7951d3e994cb5eaa5d57d3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:34:51 2011 +0200
gnumake4: add wizards to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 1086afd..a1a7add 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
starmath \
sw \
unoxml \
+ wizards \
writerfilter \
))
commit 9b315ffe2bb26dac4c280dec6a197afe7350091c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:33:53 2011 +0200
gnumake4: adjust scp2 to gbuild
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 01e0b7f..f98231c 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -57,9 +57,6 @@ STD_RES_FILE( gid_File_Res_Dbp, dbp)
STD_LIB_FILE( gid_File_Lib_Dbu, dbui)
STD_RES_FILE( gid_File_Res_Dbu, dbui)
-STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
-STD_RES_FILE( gid_File_Res_Adabasui, adabasui)
-
STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 1e360be..4c38d16 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -41,7 +41,6 @@ SCP_PRODUCT_TYPE=osl
PARFILES= canvascommons.par \
vclcanvas.par \
- mtfrenderer.par
.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
PARFILES+= cairocanvas.par
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
deleted file mode 100644
index fa2a3f9..0000000
--- a/scp2/source/canvas/mtfrenderer.scp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2010 Novell, 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
- * 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.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Lib_MtfRenderer
- TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
- RegistryID = gid_Starregistry_Services_Rdb;
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libmtfrenderer.uno,UNXSUFFIX));
- #else
- Name = "mtfrenderer.uno.dll";
- #endif
-End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 87891a2..9474eb4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -898,12 +898,6 @@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
-
-STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
-
-STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
-
#ifdef WNT
#if defined(_gcc3)
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index ea4793a..af4861d 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -205,7 +205,6 @@ SCP1FILES += \
SCP1FILES += \
vclcanvas.par \
- mtfrenderer.par
.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
SCP1FILES += cairocanvas.par
commit 7887e23834e58c1b8f83c638b9aec8e6dcd9182b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 14:30:32 2011 +0200
gnumake4: fixup the component foo
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 532a4ea..3a6b0f0 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -67,12 +67,13 @@ $(call gb_ComponentTarget_get_external_target,%) :
$(call gb_Deliver_deliver,$<,$@)
define gb_ComponentTarget_ComponentTarget
-$(call gb_ComponentTarget_get_target,$(4)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
+$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
-$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(4))
-$(call gb_ComponentTarget_get_inbuild_target,$(1)) : \
- COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
+$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)))
endef
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 06ea44a..4b985a7 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -156,7 +156,8 @@ gb_Jar__get_componentprefix = \
# layer must be specified explicitly in this macro (different to libraries)
define gb_Jar_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Jar__get_componentprefix,$(3)),$(notdir $(call gb_Jar_get_target,$(1))))
-$(call gb_Jar_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Jar_get_target,$(1)) : \
+ $(call gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
endef
commit 133a058b30a552d71e327a0d6666498c34ecf62b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 11:54:50 2011 +0200
gnumake4: fix JavaClassSet clean target
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 454caac..e2ce686 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -31,14 +31,17 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
+ -cp "$(CLASSPATH)" \
+ -d $(call gb_JavaClassSet_get_classdir,$(2)) \
+ $(if $(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(4))) &&) \
touch $(1))
endef
-$(call gb_JavaClassSet_get_clean_target,%) :
+$(call gb_JavaClassSet_get_target,%) :
$(call gb_Output_announce,$*,$(true),JCS,3)
$(call gb_JavaClassSet__command,$@,$*,$?,$^)
commit 2961053324a58621572905948ce3cf1f367daaf3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 15:29:43 2011 +0200
gnumake4: remove debug output
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 20f99db..f1f696e 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -751,7 +751,6 @@ endef
define gb_LinkTarget_add_linktarget_objects
$(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
-$(info gb_LinkTarget_add_linktarget_objects,$(1),$(2))
$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget)))
endef
@@ -761,7 +760,6 @@ ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
$$(eval $$(call gb_Output_error,Cannot import objects library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
endif
-$(info gb_LinkTarget_add_library_objects,$(1),$(2))
$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib))))
endef
commit d0fded6b2fa4be190ac4cc72958c7cb2bb0e0688
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 12:41:58 2011 +0200
gnumake4: postmerge fixes
diff --git a/Repository.mk b/Repository.mk
index ece362a..bf8df09 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
dbaxml \
dbmm \
dbtools \
- dbu \
+ dbui \
desktop_detector \
doctok \
drawinglayer \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index ef24e18..532a4ea 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -52,7 +52,7 @@ $$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source
endef
$(call gb_ComponentTarget_get_clean_target,%) :
- $(call gb_Output_announce,$$*,$(false),CMP,1)
+ $(call gb_Output_announce,$*,$(false),CMP,1)
rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \
$(call gb_ComponentTarget_get_target,$*) \
$(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
commit cdaa4ae0efff22c7996057614c763682b0b97082
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 13:24:08 2011 +0200
gnumake4: fix buildbreakers from merge
diff --git a/Repository.mk b/Repository.mk
index d3f9928..ece362a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -42,17 +42,20 @@ $(eval $(call gb_Helper_register_executables,OOO, \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- adabasui \
- AppleRemote \
adabas \
adabasui \
agg \
- avmedia \
basebmp \
- basegfx \
- basebmp \
canvastools \
- cppcanvas \
+ forui \
+ odbc \
+ odbcbase \
+ oox \
+ ooxml \
+ sdbc \
+ AppleRemote \
+ avmedia \
+ basegfx \
chartcontroller \
chartmodel \
charttools \
@@ -64,13 +67,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
dbmm \
dbtools \
dbu \
-
desktop_detector \
doctok \
drawinglayer \
editeng \
for \
- forui \
frm \
fwe \
fwi \
@@ -84,10 +85,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
lwpft \
msfilter \
msword \
- odbc \
- odbcbase \
- oox \
- ooxml \
qstart_gtk \
resourcemodel \
rpt \
@@ -97,8 +94,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sb \
sc \
scd \
- sdbc \
- sdbt \
scfilt \
scui \
sd \
@@ -125,7 +120,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
unoxml \
utl \
vbahelper \
- writerfilter \
vcl \
vclplug_gen \
vclplug_gtk \
@@ -146,12 +140,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
test \
cppunit \
- crypto \
fileacc \
icui18n \
- icule \
- graphite2_off \
- ssl \
))
@@ -202,13 +192,10 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
- crypto \
- graphite2_off \
libeay32 \
ssleay32 \
ooopathutils \
salcpprt \
- ssl \
toolshelpers \
vclmain \
))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8ba5fee..bc44b89 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -272,11 +272,11 @@ endef
else # !SYSTEM_GRAPHITE
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- graphite \
+ graphite2_off \
))
define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
- graphite \
+ graphite2_off \
)
endef
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2b33705..bf75dee 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -36,35 +36,27 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-
-
-endif # ifeq ($(OS),LINUX)
+endif
ifeq ($(OS),SOLARIS)
-
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
-
endif
ifeq ($(OS),MACOSX)
-
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-
endif # ifeq ($(OS),MACOSX)
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
-
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@ -112,7 +104,6 @@ gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFIL
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-
else #ifneq ($(USE_MINGW),)
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -159,24 +150,5 @@ endif # ifneq ($(USE_MINGW),)
endif # ifeq ($(OS),WNT)
-gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
-
-# we do not require a known rule for these, when using system libs
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
-gb_Library_TARGETS := $(filter-out icudata,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icui18n,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuio,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icule,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out iculx,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icutu,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_CPPUNIT),YES)
-gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f9dea54..e435145 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -98,8 +98,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
)
$(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
$(call gb_LinkTarget_add_includes,$(2),$(filter -I%,$(CPPUNIT_CFLAGS)))
-$(call gb_LinkTarget_set_defs,$(2), \
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2), \
$(filter-out -I%,$(CPPUNIT_CFLAGS)) \
)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 00aefb4..454caac 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -14,12 +14,12 @@
#
# 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.
#
@@ -39,8 +39,8 @@ $(call gb_Helper_abbreviate_dirs_native,\
endef
$(call gb_JavaClassSet_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(true),JCS,3)
- $(call gb_JavaClassSet__command,$@,$*,$?,$^)
+ $(call gb_Output_announce,$*,$(true),JCS,3)
+ $(call gb_JavaClassSet__command,$@,$*,$?,$^)
$(call gb_JavaClassSet_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),JCS,3)
commit 3ad912abd7c2106c4ba6cd35e2ead954759d5cc8
Merge: 3382453... 3e73f63...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jun 19 11:36:52 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
Repository.mk
RepositoryFixes.mk
configure
configure.in
set_soenv.in
solenv/config/sdev300.ini
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/CustomTarget.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/Executable.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.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/platform/winmingw.mk
solenv/gbuild/templates/Executable.mk
solenv/gbuild/templates/Library.mk
solenv/inc/libs.mk
solenv/inc/unxobsd.mk
diff --cc Repository.mk
index c60677f,f01ace1..d3f9928
mode 100755,100644..100644
--- a/Repository.mk
+++ b/Repository.mk
@@@ -43,51 -42,59 +42,70 @@@ $(eval $(call gb_Helper_register_execut
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ adabasui \
AppleRemote \
+ adabas \
+ adabasui \
+ agg \
avmedia \
+ basebmp \
basegfx \
basebmp \
- canvastools \
+ canvastools \
+ cppcanvas \
+ chartcontroller \
+ chartmodel \
+ charttools \
+ chartview \
+ cppcanvas \
cui \
- dba \
- dbaxml \
- dbmm \
- dbui \
- dbpool \
- dbtools \
+ dba \
+ dbaxml \
+ dbmm \
+ dbtools \
+ dbu \
++
desktop_detector \
+ doctok \
drawinglayer \
editeng \
- eggtray \
- file \
- for \
+ for \
- forui \
+ forui \
+ frm \
fwe \
fwi \
fwk \
fwl \
fwm \
+ hwp \
i18npaper \
+ i18nregexp \
lng \
+ lwpft \
msfilter \
msword \
- oox \
- ooxml \
+ odbc \
+ odbcbase \
+ oox \
++ ooxml \
qstart_gtk \
- rpt \
- rptui \
- rptxml \
+ resourcemodel \
+ rpt \
+ rptui \
+ rptxml \
sax \
sb \
+ sc \
+ scd \
+ sdbc \
+ sdbt \
+ scfilt \
+ scui \
+ sd \
+ sdbt \
+ sdd \
+ sdfilt \
+ sdui \
sfx \
sm \
smd \
@@@ -103,11 -110,10 +121,11 @@@
textconversiondlgs \
tk \
tl \
- utl \
unordf \
unoxml \
+ utl \
vbahelper \
+ writerfilter \
vcl \
vclplug_gen \
vclplug_gtk \
@@@ -124,7 -132,19 +144,14 @@@ $(eval $(call gb_Helper_register_librar
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ test \
cppunit \
+ crypto \
+ fileacc \
+ icui18n \
+ icule \
- icuuc \
- icule \
+ graphite2_off \
- cppunit \
- rdf \
+ ssl \
- xslt \
))
@@@ -142,28 -161,18 +168,29 @@@ $(eval $(call gb_Helper_register_librar
salhelper \
))
- $(eval $(call gb_Helper_register_libraries,STLLIBS, \
- stl \
- ))
-
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ cairocanvas \
+ canvasfactory \
+ directx5canvas \
+ directx9canvas \
+ expwrap \
+ fastsax \
fsstorage \
+ gdipluscanvas \
hatchwindowfactory \
- msforms \
+ lomenubar \
- msforms \
++ msforms \
+ nullcanvas \
+ OGLTrans \
passwordcontainer \
productregistration \
+ simplecanvas \
+ slideshow \
+ vbaobj \
vbaswobj \
+ vclcanvas \
+ writerfilter_uno \
+ writerfilter_debug \
))
@@@ -174,10 -183,17 +201,16 @@@ $(eval $(call gb_Helper_register_librar
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ basegfx_s \
+ crypto \
+ graphite2_off \
+ libeay32 \
+ ssleay32 \
- jpeglib \
ooopathutils \
salcpprt \
+ ssl \
+ toolshelpers \
- vclmain \
- zlib \
+ vclmain \
))
# vim: set noet sw=4 ts=4:
diff --cc RepositoryFixes.mk
index 695c55e,a57b612..2b33705
mode 100755,100644..100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@@ -37,45 -37,22 +37,34 @@@ gb_Library_FILENAMES := $(patsubst jvmf
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
- endif
-endif
+endif # ifeq ($(OS),LINUX)
+ifeq ($(OS),SOLARIS)
-ifeq ($(OS),MACOSX)
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+#$(info libnames: $(gb_Library_FILENAMES))
endif
+ifeq ($(OS),MACOSX)
+
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
- endif
-
+endif # ifeq ($(OS),MACOSX)
ifeq ($(OS),WNT)
+
ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@@ -86,41 -62,24 +74,35 @@@ gb_Library_FILENAMES := $(patsubst sfx:
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
- ifeq ($(gb_PRODUCT),$(true))
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
- else
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
- endif
+
+# handle libraries in msvc format that don't use an "i" prefix for their import library
+# these are libraries built by OOo, but only a few of them
+# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
+# we link against their dlls in gcc format directly
gb_Library_NOILIBFILENAMES:=\
- icuuc \
- sot \
- uwinapi \
+ icuuc \
+ uwinapi \
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+# some Windows platform libraries are missing in mingw library set
+# we have to use them from the PSDK by linking against their ilibs
gb_Library_ILIBFILENAMES:=\
- unicows \
- uuid \
+ unicows \
+ uuid \
+ winmm \
gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
- gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+ gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
@@@ -128,40 -89,49 +112,35 @@@ gb_Library_DLLFILENAMES := $(patsubst s
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
- endif
-else
+else #ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-gb_Library_NOILIBFILENAMES:=\
- advapi32 \
- gdi32 \
- gdiplus \
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
- ifeq ($(gb_PRODUCT),$(true))
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
- else
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
- endif
+
+# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
+gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
- gb_Library_NOILIBFILENAMES += icule icuuc
++gb_Library_NOILIBFILENAMES += icule icuuc \
+ graphite2_off \
- gnu_getopt \
- icuuc \
- icule \
- imm32\
- kernel32 \
- msimg32 \
- msvcrt \
+ msvcprt \
- mpr \
- oldnames \
- ole32 \
- oleaut32 \
- shell32 \
+ shlwapi \
- sot \
- unicows \
- user32 \
- uuid \
- uwinapi \
+ version \
- winspool \
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@@ -176,14 -144,53 +155,28 @@@ gb_Library_DLLFILENAMES := $(patsubst i
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-endif
+endif # ifneq ($(USE_MINGW),)
-endif
-
-ifeq ($(OS),SOLARIS)
-gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
-
-endif
+endif # ifeq ($(OS),WNT)
+ gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
+
# we do not require a known rule for these, when using system libs
-
-ifeq ($(SYSTEM_LIBXML),YES)
-gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS))
-endif
-
+ ifeq ($(SYSTEM_OPENSSL),YES)
+ gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
+ endif
+
-ifeq ($(SYSTEM_REDLAND),YES)
-gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_ICU),YES)
+ gb_Library_TARGETS := $(filter-out icudata,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icui18n,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icuio,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icule,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out iculx,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icutu,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+ endif
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+ ifeq ($(SYSTEM_CPPUNIT),YES)
+ gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
endif
# vim: set noet sw=4 ts=4:
diff --cc bootstrap.1
index 2a475bf,9db4b23..db3dbb7
mode 100644,100755..100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@@ -1,24 -1,7 +1,24 @@@
+if test -z "${SOLARENV}"; then
+ if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi
+fi
+if test -z "${SOLARENV}"; then
+ echo "bootstrap: No environment set!"
+ exit 1
+fi
+
+# remove aliases set by *Env.Set.sh
+unalias mkout
+unalias deliver
+unalias build
+unalias build_client
+unalias zipdep
+unalias nmake
+unalias gunzip
+
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
# Use spawn instead of fork when building dmake on cygwin.
- if test "$GUI" = "WNT"; then
+ if test "$GUI_FOR_BUILD" = "WNT"; then
EXEEXT=".exe"
DMAKE_CONF="--enable-spawn"
else
diff --cc configure.in
index 34af2af,58dfaab..5241c6e
mode 100644,100755..100755
--- a/configure.in
+++ b/configure.in
@@@ -1,883 -1,1319 +1,1323 @@@
- 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 -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*-
+ dnl configure.in serves as input for the GNU autoconf package
+ dnl in order to create a configure script.
+
+ AC_INIT([LibreOffice], [3.5],,, [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/LibreOffice 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-ct2n,
+ AS_HELP_STRING([--enable-ext-ct2n],
+ [Enables the ConvertTextToNumber 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-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-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 LibreOffice.]),
+ ,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(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],
+ [LibreOffice 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],
+ [LibreOffice 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 LibreOffice.]),
+ ,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],
+ [LibreOffice includes an ODK, office development kit which some packagers may
+ wish 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 a 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 a 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).])
+ [
Enabling symbols disables the stripping of the solver
(--disable-strip-solver).
- ],,)
- AC_ARG_ENABLE(strip-solver,
- [ --disable-strip-solver Disable the stripping of the solver.
- By default the solver is stripped unless a build with
- debugging symbols (--enable-symbols) is requested.
+ ],
+ ,)
+ AC_ARG_ENABLE(strip-solver,
+ AS_HELP_STRING([--disable-strip-solver],
+ [Disable the stripping of the solver. By default the solver is stripped
+ unless a build with debugging symbols (--enable-symbols) is requested.])
+ [
This switch allows to override this setting.
- ],,)
+ ],
+ ,)
+
AC_ARG_ENABLE(werror,
- [ --enable-werror Turn warnings to errors. (Has no effect in modules
- where the treating of warnings as errors is disabled
- explicitely)
- ],,)
+ AS_HELP_STRING([--enable-werror],
+ [Turn warnings to errors. (Has no effect in modules where the treating
+ of warnings as errors is disabled explicitly.)]),
+ ,)
+
AC_ARG_ENABLE(debug,
- [ --enable-debug Include debugging symbols from --enable-symbols
- plus extra debugging code. Extra large build!
- (enables -g compiler flag and dmake debug=true)
- ],,)
+ AS_HELP_STRING([--enable-debug],
+ [Include debugging symbols from --enable-symbols plus extra debugging
+ code. Extra large build! (enables -g compiler flag and dmake debug=true)
+ If you need even more verbose output, build a module with
+ "build -- debug=true dbglevel=2".]))
+
AC_ARG_ENABLE(dbgutil,
- [ --enable-dbgutil Include additional debugging utilities, such as
- assertions, object counting, etc. Larger build.
- Independent from --enable-debug
- ],,)
+ AS_HELP_STRING([--enable-dbgutil],
+ [Include additional debugging utilities, such as assertions, object
+ counting, etc. Larger build. Independent from --enable-debug]))
+
AC_ARG_ENABLE(crashdump,
- [ --enable-crashdump Enable the crashdump feature code.
- ],,)
- AC_ARG_ENABLE(cl-standard,
- [ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing
- standard compiler. ( This just disavles optimization
- options and therefore removes a lot of warnings when
- using the cheaper standard compiler. )
- ],,)
+ AS_HELP_STRING([--enable-crashdump],
+ [Enable the crashdump feature.]))
+
+ AC_ARG_ENABLE(python,
+ AS_HELP_STRING([--enable-python=<no/auto/system/internal>],
+ [Enables or disables Python support at run-time and build-time.
+ Also specifies what Python to use. 'auto' is the
+ default. Note that Python can be disabled with
+ --disable-python or --enable-python=no only if no
+ translations are required.]))
+
AC_ARG_ENABLE(gtk,
- [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
- where Gtk+ is available.
- ],,enable_gtk=yes)
- AC_ARG_ENABLE(gstreamer,
- [ --disable-gstreamer Determines whether to use the GStreamer media
- backend on platforms where GStreamer is available.
- ],,enable_gstreamer=yes)
+ AS_HELP_STRING([--disable-gtk],
+ [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]),
+ ,enable_gtk=yes)
+
+ AC_ARG_ENABLE(gtk3,
+ AS_HELP_STRING([--disable-gtk3],
+ [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
+ ,enable_gtk3=no)
+
AC_ARG_ENABLE(systray,
- [ --disable-systray Determines whether to build the systray quickstarter.
- ],,enable_systray=yes)
- AC_ARG_ENABLE(cairo,
- [ --enable-cairo Determines whether to use Cairo library on
- platforms where Cairo is available.
- ],,enable_cairo=no)
- AC_ARG_WITH(system-cairo,
- [ --with-system-cairo Use Cairo libraries already on system
- ],,)
+ AS_HELP_STRING([--disable-systray],
+ [Determines whether to build the systray quickstarter.]),
+ ,enable_systray=yes)
+
+AC_ARG_ENABLE(cairo-canvas,
+[ --disable-cairo-canvas Determines whether to build the Cairo canvas on
+ platforms where Cairo is available.
+],,enable_cairo_canvas=yes)
AC_ARG_ENABLE(librsvg,
- [ --enable-librsvg Determines whether to use librsvg library on
- platforms where librsvg is available.
- (actually, it is possible to build with
- --disable-librsvg and to still have SVG support
- within a running soffice instance, since this
- dependency is a runtime only dependency.
- To have SVG suppport at runtime, the librsvg, the cairo
- and the gobject library - and all depending libraries
- as well - need to be accessible by the running soffice
- instance.
- The intention of defaulting this flag to yes is to
- indicate this fact to the build maintainer)
- ],,enable_librsvg=yes)
+ AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal>],
+ [Enables or disables use of librsvg to render SVG at run-time.
+ Also specificed what librsvg to use. 'auto' is the default.]))
+
AC_ARG_ENABLE(opengl,
- [ --enable-opengl Determines whether to build the OpenGL 3D slide
- transitions component
- ],,enable_opengl=no)
+ AS_HELP_STRING([--disable-opengl],
+ [Determines whether to build the OpenGL 3D slide transitions component.]),
+ ,enable_opengl=yes)
+
AC_ARG_ENABLE(dbus,
- [ --enable-dbus Determines whether to enable presentation mode
- screensaver control under GNOME via DBUS
- ],,enable_dbus=no)
+ AS_HELP_STRING([--enable-dbus],
+ [Determines whether to enable presentation mode screensaver control
+ under GNOME via DBUS.]),
+ ,enable_dbus=no)
+
AC_ARG_ENABLE(gconf,
- [ --disable-gconf Determines whether to use the GConf support
- ],,enable_gconf=yes)
+ AS_HELP_STRING([--disable-gconf],
+ [Determines whether to use the GConf support.]),
+ ,enable_gconf=yes)
+
AC_ARG_ENABLE(gnome-vfs,
- [ --disable-gnome-vfs Determines whether to use the Gnome Virtual Filing
- System on platforms where that VFS is available
- ],,enable_gnome_vfs=yes)
+ AS_HELP_STRING([--disable-gnome-vfs],
+ [Determines whether to use the Gnome Virtual Filing System on platforms
+ where that VFS is available.]),
+ ,enable_gnome_vfs=yes)
+
AC_ARG_ENABLE(gio,
- [ --enable-gio Determines whether to use the GIO support
- ],,enable_gio=no)
+ AS_HELP_STRING([--enable-gio],
+ [Determines whether to use the GIO support.]),
+ ,enable_gio=no)
+
AC_ARG_ENABLE(static-gtk,
- [ --enable-static-gtk Modules that are linked against gtk libraries use
- the static libraries instead of the dynamic ones.
- (enables -Bstatic linker flag for gtk libraries)
- ],,)
+ AS_HELP_STRING([--enable-static-gtk],
+ [Modules that are linked against GTK+ libraries use the static libraries
+ instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ libraries.)]),
+ ,)
+
AC_ARG_ENABLE(layout,
- [ --enable-layout Enable the compilation and use of layout dialogs
- ],,)
+ AS_HELP_STRING([--enable-layout],
+ [Enable the compilation and use of layout dialogs.]),
+ ,)
+
AC_ARG_ENABLE(build-mozilla,
- [ --disable-build-mozilla Use this option if you do not want to build the
- mozilla components from the mozilla source code but
- take precompiled zips
- ],,)
- AC_ARG_WITH(mozilla-version,
- [ --with-mozilla-version Choose which version of mozilla to use while building
- mozilla. Default: 1.7.5.
- Note that not all versions are supported.
- ],,)
- AC_ARG_WITH(mozilla-toolkit,
- [ --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla
- components. Default: gtk2
- ],,)
- AC_ARG_ENABLE(nss_module,
- [ --disable-nss-module Whether to use provided NSS module
- ],,enable_nss_module=yes)
+ AS_HELP_STRING([--disable-build-mozilla],
+ [Use this option if you do not want to build the Mozilla components from
+ the Mozilla source code but take precompiled zips.]),
+ ,)
+
+ AC_ARG_ENABLE(nss-module,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list