[Libreoffice-commits] .: 38 commits - animations/Library_animcore.mk basegfx/Library_basegfx.mk bridges/CustomTarget_gcc3_ios_arm.mk bridges/inc bridges/Jar_java_uno.mk bridges/Library_cc50_solaris_intel.mk bridges/Library_cc50_solaris_sparc.mk bridges/Library_cc5_solaris_sparc64.mk bridges/Library_gcc3_aix_powerpc.mk bridges/Library_gcc3_ios_arm.mk bridges/Library_gcc3_linux_alpha.mk bridges/Library_gcc3_linux_arm.mk bridges/Library_gcc3_linux_hppa.mk bridges/Library_gcc3_linux_ia64.mk bridges/Library_gcc3_linux_intel.mk bridges/Library_gcc3_linux_m68k.mk bridges/Library_gcc3_linux_mips.mk bridges/Library_gcc3_linux_powerpc64.mk bridges/Library_gcc3_linux_powerpc.mk bridges/Library_gcc3_linux_s390.mk bridges/Library_gcc3_linux_s390x.mk bridges/Library_gcc3_linux_sparc.mk bridges/Library_gcc3_linux_x86-64.mk bridges/Library_gcc3_macosx_intel.mk bridges/Library_gcc3_macosx_powerpc.mk bridges/Library_gcc3_solaris_intel.mk bridges/Library_gcc3_solaris_sparc.mk bridges/Library_java_uno.mk bri dges/Library_mingw_intel.mk bridges/Library_msvc_win32_intel.mk bridges/Library_msvc_win32_x86-64.mk bridges/Makefile bridges/Module_bridges.mk bridges/prj bridges/source bridges/unotypes bridges/version.mk cli_ure/CliLibrary_cli_basetypes.mk cli_ure/CliLibrary_cli_ure.mk cli_ure/CliNativeLibrary_cli_cppuhelper.mk cli_ure/CliUnoApi_cli_uretypes.mk cli_ure/CustomTarget_cli_ure_assemblies.mk cli_ure/Executable_climaker.mk cli_ure/inc cli_ure/Library_cli_cppuhelper_native.mk cli_ure/Library_cli_uno.mk cli_ure/Makefile cli_ure/Module_cli_ure.mk cli_ure/Package_config.mk cli_ure/Package_version.mk cli_ure/prj cli_ure/source cli_ure/unotypes cli_ure/util cli_ure/version clucene/prj codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk comphelper/Library_comphelper.mk cppu/CustomTarget_cppu_allheaders.mk cppuhelper/CustomTarget_cppuhelper_allheaders. mk cross_tail_build/prj i18npool/CustomTarget_localedata.mk Makefile.top Module_cross_tail_build.mk Module_tail_build.mk reportbuilder/Configuration_reportbuilder.mk Repository.mk sal/CustomTarget_sal_allheaders.mk salhelper/CustomTarget_salhelper_allheaders.mk solenv/gbuild starmath/Module_starmath.mk tail_build/prj testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTarget_uno_test.mk xmlscript/Library_xmlscript.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 21 23:18:43 PDT 2012
Makefile.top | 4
Module_cross_tail_build.mk | 36 +
Module_tail_build.mk | 28 +
Repository.mk | 10
animations/Library_animcore.mk | 5
basegfx/Library_basegfx.mk | 1
bridges/CustomTarget_gcc3_ios_arm.mk | 22 +
bridges/Jar_java_uno.mk | 33 +
bridges/Library_cc50_solaris_intel.mk | 67 +++
bridges/Library_cc50_solaris_sparc.mk | 61 +++
bridges/Library_cc5_solaris_sparc64.mk | 64 +++
bridges/Library_gcc3_aix_powerpc.mk | 62 +++
bridges/Library_gcc3_ios_arm.mk | 76 +++
bridges/Library_gcc3_linux_alpha.mk | 62 +++
bridges/Library_gcc3_linux_arm.mk | 65 +++
bridges/Library_gcc3_linux_hppa.mk | 66 +++
bridges/Library_gcc3_linux_ia64.mk | 66 +++
bridges/Library_gcc3_linux_intel.mk | 70 +++
bridges/Library_gcc3_linux_m68k.mk | 62 +++
bridges/Library_gcc3_linux_mips.mk | 62 +++
bridges/Library_gcc3_linux_powerpc.mk | 62 +++
bridges/Library_gcc3_linux_powerpc64.mk | 62 +++
bridges/Library_gcc3_linux_s390.mk | 62 +++
bridges/Library_gcc3_linux_s390x.mk | 62 +++
bridges/Library_gcc3_linux_sparc.mk | 66 +++
bridges/Library_gcc3_linux_x86-64.mk | 73 +++
bridges/Library_gcc3_macosx_intel.mk | 66 +++
bridges/Library_gcc3_macosx_powerpc.mk | 62 +++
bridges/Library_gcc3_solaris_intel.mk | 62 +++
bridges/Library_gcc3_solaris_sparc.mk | 62 +++
bridges/Library_java_uno.mk | 46 ++
bridges/Library_mingw_intel.mk | 76 +++
bridges/Library_msvc_win32_intel.mk | 65 +++
bridges/Library_msvc_win32_x86-64.mk | 69 +++
bridges/Makefile | 7
bridges/Module_bridges.mk | 95 ++++
bridges/inc/makefile.mk | 40 --
bridges/prj/build.lst | 31 -
bridges/prj/d.lst | 11
bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk | 66 ---
bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk | 74 ---
bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk | 52 --
bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk | 73 ---
bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk | 76 ---
bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk | 73 ---
bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 79 ---
bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk | 77 ---
bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk | 79 ---
bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk | 89 ----
bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk | 75 ---
bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk | 76 ---
bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk | 76 ---
bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk | 75 ---
bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk | 73 ---
bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk | 73 ---
bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk | 81 ----
bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 87 ----
bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk | 72 ---
bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk | 74 ---
bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk | 69 ---
bridges/source/cpp_uno/gcc3_solaris_sparc/makefile.mk | 73 ---
bridges/source/cpp_uno/mingw_intel/makefile.mk | 95 ----
bridges/source/cpp_uno/msvc_win32_intel/makefile.mk | 83 ----
bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk | 83 ----
bridges/source/cpp_uno/shared/component.cxx | 4
bridges/source/cpp_uno/shared/makefile.mk | 57 --
bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/makefile.mk | 44 --
bridges/source/jni_uno/jni_bridge.cxx | 4
bridges/source/jni_uno/makefile.mk | 86 ----
bridges/unotypes/makefile.mk | 41 --
bridges/version.mk | 31 -
cli_ure/CliLibrary_cli_basetypes.mk | 33 +
cli_ure/CliLibrary_cli_ure.mk | 33 +
cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 25 +
cli_ure/CliUnoApi_cli_uretypes.mk | 22 +
cli_ure/CustomTarget_cli_ure_assemblies.mk | 62 +++
cli_ure/Executable_climaker.mk | 41 ++
cli_ure/Library_cli_cppuhelper_native.mk | 57 ++
cli_ure/Library_cli_uno.mk | 38 +
cli_ure/Makefile | 7
cli_ure/Module_cli_ure.mk | 30 +
cli_ure/Package_config.mk | 17
cli_ure/Package_version.mk | 14
cli_ure/inc/makefile.mk | 31 -
cli_ure/prj/build.lst | 11
cli_ure/prj/d.lst | 13
cli_ure/source/basetypes/makefile.mk | 96 ----
cli_ure/source/climaker/makefile.mk | 117 -----
cli_ure/source/makefile.mk | 39 -
cli_ure/source/native/makefile.mk | 152 -------
cli_ure/source/native/msvc.map | 24 -
cli_ure/source/native/path.cxx | 2
cli_ure/source/uno_bridge/bridge_exports.map | 26 -
cli_ure/source/uno_bridge/cli_bridge.cxx | 4
cli_ure/source/uno_bridge/makefile.mk | 77 ---
cli_ure/source/ure/makefile.mk | 93 ----
cli_ure/unotypes/makefile.mk | 70 ---
cli_ure/util/makefile.pmk | 26 -
cli_ure/version/makefile.mk | 37 -
clucene/prj/build.lst | 2
codemaker/Executable_cppumaker.mk | 5
codemaker/Executable_javamaker.mk | 5
codemaker/StaticLibrary_codemaker.mk | 6
codemaker/StaticLibrary_codemaker_cpp.mk | 5
codemaker/StaticLibrary_codemaker_java.mk | 5
comphelper/Library_comphelper.mk | 5
cppu/CustomTarget_cppu_allheaders.mk | 2
cppuhelper/CustomTarget_cppuhelper_allheaders.mk | 2
cross_tail_build/prj/build.lst | 2
i18npool/CustomTarget_localedata.mk | 7
reportbuilder/Configuration_reportbuilder.mk | 2
sal/CustomTarget_sal_allheaders.mk | 2
salhelper/CustomTarget_salhelper_allheaders.mk | 2
solenv/gbuild/CliAssembly.mk | 178 ++++++++
solenv/gbuild/CliLibrary.mk | 199 ++++++++++
solenv/gbuild/CliNativeLibrary.mk | 139 ++++++
solenv/gbuild/CliUnoApi.mk | 165 ++++++++
solenv/gbuild/Configuration.mk | 13
solenv/gbuild/CppunitTest.mk | 4
solenv/gbuild/Helper.mk | 5
solenv/gbuild/InstallModuleTarget.mk | 25 -
solenv/gbuild/InstallScript.mk | 2
solenv/gbuild/InternalUnoApi.mk | 3
solenv/gbuild/Library.mk | 7
solenv/gbuild/LinkTarget.mk | 12
solenv/gbuild/TargetLocations.mk | 21 +
solenv/gbuild/UnoApi.mk | 2
solenv/gbuild/UnoApiMerge.mk | 3
solenv/gbuild/UnoApiTarget.mk | 25 -
solenv/gbuild/gbuild.mk | 4
solenv/gbuild/platform/IOS_ARM_GCC.mk | 5
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 15
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 21 +
solenv/gbuild/platform/com_GCC_defs.mk | 4
solenv/gbuild/platform/macosx.mk | 5
solenv/gbuild/platform/solaris.mk | 5
solenv/gbuild/platform/unxgcc.mk | 5
starmath/Module_starmath.mk | 8
tail_build/prj/build.lst | 2
testtools/CustomTarget_bridgetest_javamaker.mk | 7
testtools/CustomTarget_uno_test.mk | 8
xmlscript/Library_xmlscript.mk | 5
142 files changed, 3179 insertions(+), 3138 deletions(-)
New commits:
commit ecf56eda2fa41a5bed01294670e82d61c0f98798
Author: David Tardon <dtardon at redhat.com>
Date: Mon Sep 17 11:38:09 2012 +0200
make starmath's gbuild module name the same as dir
Otherwise make starmath.all does not work as expected.
Change-Id: I747b7dd9f1cd6347d6fe8d5edbbb0dff079a253b
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index cbee845..bb86634 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -21,20 +21,20 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Module_Module,sm))
+$(eval $(call gb_Module_Module,starmath))
-$(eval $(call gb_Module_add_targets,sm,\
+$(eval $(call gb_Module_add_targets,starmath,\
AllLangResTarget_sm \
Library_sm \
Library_smd \
Package_uiconfig \
))
-#$(eval $(call gb_Module_add_check_targets,sm,\
+#$(eval $(call gb_Module_add_check_targets,starmath,\
# CppunitTest_starmath_qa_cppunit \
#))
-$(eval $(call gb_Module_add_subsequentcheck_targets,sm,\
+$(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
JunitTest_starmath_unoapi \
))
commit 778de55e0aa7dff3be5ac50dc20a552b2d5a5879
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jul 29 12:21:38 2012 +0200
add newly eligible modules to cross_tail_build
Change-Id: I41113b6e4f53aa0e4b52e08e34938d34838feced
diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index bf9ed3a..2df5cb5 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -31,33 +31,69 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
autodoc \
basegfx \
binaryurp \
+ bridges \
+ cli_ure \
+ $(if $(filter CLUCENE,$(BUILD_TYPE)),\
+ clucene \
+ ) \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),\
+ codemaker \
+ ) \
+ comphelper \
cosv \
+ cppu \
+ cppuhelper \
i18npool \
i18nutil \
idl \
+ idlc \
io \
javaunohelper \
+ jurt \
+ jvmaccess \
+ jvmfwk \
$(if $(filter DESKTOP,$(BUILD_TYPE)),\
l10ntools \
helpcompiler \
) \
o3tl \
+ offapi \
+ officecfg \
oovbaapi \
$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
qadevOOo \
) \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),\
+ rdbmaker \
+ ) \
regexp \
+ registry \
remotebridges \
+ ridljar \
rsc \
+ sal \
+ salhelper \
sax \
shell \
+ stoc \
+ store \
tools \
+ $(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\
+ translations \
+ ) \
+ ucbhelper \
+ ucpp \
+ udkapi \
udm \
unoil \
unotest \
unotools \
ure \
+ $(if $(filter NATIVE,$(BUILD_TYPE)),\
+ xml2cmp \
+ ) \
xmlhelp \
+ xmlreader \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index f9c4292..ec26db2 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure CLUCENE:clucene DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu jurt LIBLANGTAG:liblangtag LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal salhelper solenv stoc ucbhelper udkapi ZLIB:zlib NULL
+ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools ZLIB:zlib NULL
ctb tail_build\prj nmake - all ctb_prj NULL
commit f60ee814c180708e8af7482b553a3dc47e98c5fa
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jul 29 11:59:35 2012 +0200
add newly eligible modules to tail_build
Change-Id: I3afc9dfb56ab29abaec1cb5dc60689be3243a1b1
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 8aa58c3..47a7b29 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -39,12 +39,20 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
$(if $(filter BLUEZ,$(BUILD_TYPE)),\
bluez_bluetooth \
) \
+ bridges \
canvas \
chart2 \
+ cli_ure \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),\
+ codemaker \
+ ) \
+ comphelper \
configmgr \
connectivity \
cosv \
cppcanvas \
+ cppu \
+ cppuhelper \
cpputools \
cui \
dbaccess \
@@ -73,8 +81,14 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
i18npool \
i18nutil \
idl \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),\
+ idlc \
+ ) \
io \
javaunohelper \
+ jurt \
+ jvmaccess \
+ jvmfwk \
libcdr \
libcmis \
libmspub \
@@ -97,6 +111,8 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
) \
np_sdk \
o3tl \
+ offapi \
+ officecfg \
oovbaapi \
oox \
package \
@@ -108,11 +124,17 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
qadevOOo \
) \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),\
+ rdbmaker \
+ ) \
regexp \
+ registry \
remotebridges \
reportbuilder \
reportdesign \
+ ridljar \
rsc \
+ salhelper \
sane \
sax \
sc \
@@ -130,6 +152,8 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
smoketest \
sot \
starmath \
+ stoc \
+ store \
svl \
svtools \
svx \
@@ -143,6 +167,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
tubes \
twain \
ucb \
+ ucbhelper \
+ ucpp \
+ udkapi \
udm \
unixODBC \
UnoControls \
@@ -167,6 +194,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
helpcompiler \
xmlhelp) \
xmloff \
+ xmlreader \
xmlscript \
xmlsecurity \
))
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 603b6bf..fae7b9f 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CLUCENE:clucene CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CLUCENE:clucene CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib external readlicense_oo RHINO:rhino sal solenv soltools xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 436717844f93e17b455a70db30c995629e0e0a6a
Author: David Tardon <dtardon at redhat.com>
Date: Tue Sep 18 09:30:49 2012 +0200
add missing deps on URE stuff
Change-Id: I8d17305372ac01ab43a7092d9b8a842f114adb3f
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 192478c..9210142 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -38,7 +38,10 @@ $(i18npool_LDDIR)/localedata_%.cxx : \
$(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(i18npool_LDDIR)/saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/types.rdb \
- $(call gb_Executable_get_target_for_build,saxparser)
+ $(call gb_Executable_get_target_for_build,saxparser) \
+ $(call gb_Rdb_get_outdir_target,ure/services) \
+ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+ $(call gb_Package_get_target,cppuhelper_unorc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
commit 8f16dc3de4d59db6db5f4a6c2692809f6b4417fb
Author: David Tardon <dtardon at redhat.com>
Date: Mon Sep 17 18:47:50 2012 +0200
use package instead of explicit include path
Change-Id: I11048d24b21549aa3ae79995a2c252c00e56d771
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index 69293e2..e3ab77d 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -26,11 +26,6 @@
$(eval $(call gb_Executable_Executable,cppumaker))
-$(eval $(call gb_Executable_set_include,cppumaker,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_use_libraries,cppumaker,\
reg \
sal \
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
index cd5a1aa..2997e37 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -26,11 +26,6 @@
$(eval $(call gb_Executable_Executable,javamaker))
-$(eval $(call gb_Executable_set_include,javamaker,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_use_libraries,javamaker,\
reg \
sal \
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index c55209f..bbea555 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -28,14 +28,10 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
$(eval $(call gb_StaticLibrary_use_packages,codemaker,\
+ codemaker_inc \
sal_generated \
))
-$(eval $(call gb_StaticLibrary_set_include,codemaker,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
codemaker/source/codemaker/dependencies \
codemaker/source/codemaker/exceptiontree \
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index 3f18114..b8cabf4 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -27,9 +27,8 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
-$(eval $(call gb_StaticLibrary_set_include,codemaker_cpp,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
+$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
+ codemaker_inc \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index b9e2396..6538e38 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -27,9 +27,8 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
-$(eval $(call gb_StaticLibrary_set_include,codemaker_java,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
+$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
+ codemaker_inc \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
commit 1a62e464cf1b88fde049bb857e513209b0134a2b
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 16 15:32:34 2012 +0200
add missing deps on headers
Change-Id: Icaeba832c527ba81a9f152ea011548e8b9843b5e
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 1ff89b4..013704d 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -28,7 +28,10 @@
$(eval $(call gb_Library_Library,animcore))
-$(eval $(call gb_Library_use_package,animcore,animations_inc))
+$(eval $(call gb_Library_use_packages,animcore,\
+ animations_inc \
+ comphelper_inc \
+))
$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index c2c9230..60f81a8 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,basegfx))
$(eval $(call gb_Library_use_packages,basegfx,\
basegfx_inc \
+ comphelper_inc \
o3tl_inc \
))
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index b2f9db4..2ca986a 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -9,7 +9,10 @@
$(eval $(call gb_Library_Library,xmlscript))
-$(eval $(call gb_Library_use_package,xmlscript,xmlscript_inc))
+$(eval $(call gb_Library_use_packages,xmlscript,\
+ tools_inc \
+ xmlscript_inc \
+))
$(eval $(call gb_Library_set_componentfile,xmlscript,xmlscript/util/xmlscript))
commit 360df63b633421f0d06f6c30e5ed9db3fa2016a5
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 16 19:50:15 2012 +0200
SOVERSION is used by LinkTarget, so set it there
Relying on inheritance of variables by prerequisites may cause all sorts
of weird problems, e.g., an executable being linked with
-Wl,--soname=... just because a library with explicitly set soname
happened to depend on it. I wonder if we should make most of the
target-specific variables private....
Change-Id: Id337ace462973e7af12e62414b81739e3e873d96
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index ff478b4..01ee922 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -62,7 +62,6 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk
endif
$(call gb_Library_get_target,$(1)) : AUXTARGETS :=
$(call gb_Library_get_target,$(1)) : SOVERSION :=
-$(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT :=
$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
endef
@@ -84,15 +83,11 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L
endef
define gb_Library__set_soversion_script
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
- $(3)
+$(call gb_LinkTarget_set_soversion_script,$(call gb_Library_get_linktargetname,$(1)),$(2),$(3))
$(call gb_Library_get_target,$(1)) : SOVERSION := $(2)
-$(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT := $(3)
$(call gb_Library_get_target,$(1)) \
$(call gb_Library_get_clean_target,$(1)) : \
AUXTARGETS += $(call gb_Library_get_target,$(1)).$(2)
-$(call gb_LinkTarget_add_auxtargets,$(call gb_Library_get_linktargetname,$(1)),\
- $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2))
endef
# for libraries that maintain stable ABI: set SOVERSION and version script
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3c670e8..7a34de0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -495,6 +495,8 @@ $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS :=
$(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
$(call gb_LinkTarget_get_target,$(1)) : VISIBILITY :=
$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS :=
+$(call gb_LinkTarget_get_target,$(1)) : SOVERSION :=
+$(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT :=
ifeq ($(gb_FULLDEPS),$(true))
-include $(call gb_LinkTarget_get_dep_target,$(1))
@@ -519,12 +521,22 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 :=
$(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : VISIBILITY :=
$(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : SOVERSION :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : SOVERSIONSCRIPT :=
endif
gb_LinkTarget_CXX_SUFFIX_$(1) := cxx
endef
+define gb_LinkTarget_set_soversion_script
+$(call gb_LinkTarget_get_target,$(1)) : $(3)
+$(call gb_LinkTarget_get_target,$(1)) : SOVERSION := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := $(3)
+$(call gb_LinkTarget_add_auxtargets,$(1),$(call gb_LinkTarget_get_target,$(1)).$(2))
+
+endef
+
define gb_LinkTarget_add_defs
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
commit 7531ac91d8496d00c7b010f8ce20bfee97cc9362
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 16 12:40:58 2012 +0200
fix URE deps
Change-Id: Ifbcd2c7db1985ca8fcc74dbbe74ffb93177d6490
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index b78d913..5de9b93 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -156,8 +156,10 @@ endef
define gb_CppunitTest_use_ure
$(call gb_CppunitTest_use_rdb,$(1),ure/services)
$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unobootstrapprotector)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexceptionprotector)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,cppuhelper_unorc)
endef
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 265a1c3..180a93f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -49,6 +49,8 @@ ifneq ($(origin CXX),default)
gb_CXX := $(CXX)
endif
+gb_CPPU_ENV := msci
+
gb_COMPILERDEFS := \
-DMSC \
-D_CRT_NON_CONFORMING_SWPRINTFS \
@@ -57,7 +59,7 @@ gb_COMPILERDEFS := \
-D_MT \
-D_DLL \
-DBOOST_MEM_FN_ENABLE_CDECL \
- -DCPPU_ENV=msci \
+ -DCPPU_ENV=$(gb_CPPU_ENV) \
-DM1500 \
gb_CPUDEFS := -D_X86_=1
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 1b606a0..e03aa88 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -52,9 +52,11 @@ endif
gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
+gb_CPPU_ENV := gcc3
+
gb_COMPILERDEFS := \
-D$(COM) \
- -DCPPU_ENV=gcc3 \
+ -DCPPU_ENV=$(gb_CPPU_ENV) \
-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE)
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index ac907f5..bed453d 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -36,7 +36,9 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Rdb_get_outdir_target,uno_services) \
$(call gb_Rdb_get_outdir_target,ure/services) \
$(call gb_Executable_get_target_for_build,uno) \
- $(call gb_InternalUnoApi_get_target,bridgetest)
+ $(call gb_InternalUnoApi_get_target,bridgetest) \
+ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+ $(call gb_Package_get_target,cppuhelper_unorc)
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_target_for_build,uno) \
-ro $(OUTDIR)/xml/uno_services.rdb \
commit ebe48dc2b1a3ab3df2457d4c2be7bd9cbe960c30
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Aug 5 21:29:20 2012 +0200
honour --enable-lto on windows too
Change-Id: I78637034d9fdd4a5528fe1e9c9bc752086954526
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 4ce3295..265a1c3 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -237,6 +237,8 @@ define gb_create_deps
endef
endif
+gb_COMPILER_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
+
# Helper class
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
@@ -275,6 +277,7 @@ $(call gb_Helper_abbreviate_dirs,\
unset INCLUDE && \
$(gb_CC) \
$(DEFS) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \
$(T_CFLAGS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-Fd$(PDBFILE) \
@@ -296,6 +299,7 @@ $(call gb_Helper_abbreviate_dirs,\
unset INCLUDE && \
$(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \
$(DEFS) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \
$(T_CXXFLAGS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
-Fd$(PDBFILE) \
@@ -386,6 +390,10 @@ gb_Library_TARGETTYPEFLAGS := \
-DLL \
$(gb_Windows_PE_TARGETTYPEFLAGS)
+ifeq ($(ENABLE_LTO),TRUE)
+gb_Library_TARGETTYPEFLAGS += -LTCG
+endif
+
gb_Library_get_rpath :=
gb_Library_SYSPRE := i
commit b03fd9b3a6ad31d0ca03c662da29cc70a21ca423
Author: David Tardon <dtardon at redhat.com>
Date: Tue Aug 7 07:49:15 2012 +0200
fix configuration deps
Change-Id: Ie431fadb4f11284e231112744af80bfb5c219d94
diff --git a/reportbuilder/Configuration_reportbuilder.mk b/reportbuilder/Configuration_reportbuilder.mk
index 1e6b30e..4690cfc 100644
--- a/reportbuilder/Configuration_reportbuilder.mk
+++ b/reportbuilder/Configuration_reportbuilder.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Configuration_Configuration,sun-report-builder,nodeliver))
-$(eval $(call gb_Configuration_use_configuration,sun-report-builder,officecfg))
+$(eval $(call gb_Configuration_use_configuration,sun-report-builder,registry))
$(eval $(call gb_Configuration_add_schemas,sun-report-builder,reportbuilder/registry/schema,\
org/openoffice/Office/ReportDesign.xcs \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 12225c6..e02d0da 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -505,7 +505,7 @@ endef
#
# Example:
# # foo needs schemas from the main configuration
-# $(eval $(call gb_Configuration_use_configuration,foo,officecfg))
+# $(eval $(call gb_Configuration_use_configuration,foo,registry))
define gb_Configuration_use_configuration
$(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2))
$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index ef8f320..b78d913 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -266,7 +266,7 @@ endef
# Use standard configuration.
define gb_CppunitTest_use_configuration
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,officecfg)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,registry)
$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry))
endef
commit 7edc1390e4472ee469656e8094ee17669a3e0f49
Author: David Tardon <dtardon at redhat.com>
Date: Tue Aug 7 07:47:50 2012 +0200
let's do this the other way around...
This reverts commit 587ac17d51ded650ed72bb68a126587a9c2ca698.
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index df476ae..503a0a4 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -16,13 +16,13 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_Configuration_Configuration,officecfg))
+$(eval $(call gb_Configuration_Configuration,registry))
-$(eval $(call gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\
+$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
$(addprefix org/openoffice/,$(addsuffix .xcs,$(officecfg_XCSFILES))) \
))
-$(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Inet.xcu \
org/openoffice/System.xcu \
org/openoffice/UserProfile.xcu \
@@ -52,7 +52,7 @@ $(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\
org/openoffice/ucb/Configuration.xcu \
))
-$(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
org/openoffice/Inet-macosx.xcu \
org/openoffice/Inet-unixdesktop.xcu \
org/openoffice/Inet-wnt.xcu \
@@ -113,11 +113,11 @@ $(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/da
))
# perhaps this file should be moved 2 levels up?
-$(eval $(call gb_Configuration_add_spool_langpack,officecfg,officecfg/registry/data/org/openoffice,\
+$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
Langpack.xcu \
))
-$(eval $(call gb_Configuration_add_localized_datas,officecfg,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
org/openoffice/Setup.xcu \
org/openoffice/Office/Accelerators.xcu \
org/openoffice/Office/Common.xcu \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 96319d6..6e583e9 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
+# we need to explicitly depend on library writerfilter because it is not implied
+# by a link relation
+$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter)
+
# vim: set noet sw=4 ts=4:
commit cbae5ff373a43e5ad3b5d3b55727e783fa8451d2
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Aug 6 10:22:56 2012 +0200
fix typo causing missing dependency
Change-Id: I9ac316b0491d2c2c69308c0a78e1be0009bf2caf
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 503a0a4..df476ae 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -16,13 +16,13 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_Configuration_Configuration,registry))
+$(eval $(call gb_Configuration_Configuration,officecfg))
-$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
+$(eval $(call gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\
$(addprefix org/openoffice/,$(addsuffix .xcs,$(officecfg_XCSFILES))) \
))
-$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\
org/openoffice/Inet.xcu \
org/openoffice/System.xcu \
org/openoffice/UserProfile.xcu \
@@ -52,7 +52,7 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/ucb/Configuration.xcu \
))
-$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/data,\
org/openoffice/Inet-macosx.xcu \
org/openoffice/Inet-unixdesktop.xcu \
org/openoffice/Inet-wnt.xcu \
@@ -113,11 +113,11 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
))
# perhaps this file should be moved 2 levels up?
-$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
+$(eval $(call gb_Configuration_add_spool_langpack,officecfg,officecfg/registry/data/org/openoffice,\
Langpack.xcu \
))
-$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_localized_datas,officecfg,officecfg/registry/data,\
org/openoffice/Setup.xcu \
org/openoffice/Office/Accelerators.xcu \
org/openoffice/Office/Common.xcu \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 6e583e9..96319d6 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -63,8 +63,4 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
-# we need to explicitly depend on library writerfilter because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter)
-
# vim: set noet sw=4 ts=4:
commit 00252dab4a3582a299ed297ddb637c20af8b1962
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Aug 6 00:40:31 2012 +0200
missing package dependency
Change-Id: I4171de4ad24ac1bb9956171f3256cbcd766dae29
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 5a2074a..76c75f1 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -19,7 +19,10 @@
$(eval $(call gb_Library_Library,comphelper))
-$(eval $(call gb_Library_use_package,comphelper,comphelper_inc))
+$(eval $(call gb_Library_use_packages,comphelper,\
+ comphelper_inc \
+ officecfg_cppheader \
+))
$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
commit 61ce5b882fa232bb9aaff8650238bf4007249759
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Aug 5 15:17:52 2012 +0200
gbuild: add missing dependency on regmerge
visible with 'make udkapi.all'
Change-Id: I7fcd72e4d6849e3457551d85d507a15f6f72077b
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index b22484d..2ddfeb3 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -225,6 +225,7 @@ endef
define gb_UnoApiTarget_add_idlfiles
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3))
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET)
endef
commit a235dff703c3cb6318a6166fce4d13557661b2a8
Author: David Tardon <dtardon at redhat.com>
Date: Thu Aug 2 11:32:42 2012 +0200
fix Library/LinkTarget build on mingw
Parallel MinGW build broke in clucene every now and then because the
link target tried to put map file directly into $(OUTDIR)/bin, which did
not exist yet (and actually nothing in Library depends on it, so I guess
it was just luckily created in time by delivery of soltools in the cases
where the build succeeded).
The map file is now created in $(WORKDIR) (as it should be) and then
delivered through AUXTARGETS.
Change-Id: I62373f0b71a6c4f3b59fa779f9ec48154485a174
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index a3bd1a8..b244ceb 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -163,7 +163,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(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) \
- -Wl$(COMMA)-Map$(COMMA)$(basename $(DLLTARGET)).map \
+ -Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \
-Wl$(COMMA)--out-implib$(COMMA)$(1) \
-o $(dir $(1))/$(notdir $(DLLTARGET))))
endef
@@ -298,16 +298,16 @@ gb_Library_IARCEXT := .a
gb_Library_ILIBEXT := .lib
define gb_Library_Library_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(OUTDIR)/bin/$(notdir $(3)))
+$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
$(call gb_LinkTarget_add_auxtargets,$(2),\
$(patsubst %.dll,%.map,$(3)) \
)
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
+$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3)) $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.map,$(3)))
$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
commit 24219ada3786feeaba2e2bd6b21548b9b5483b9c
Author: David Tardon <dtardon at redhat.com>
Date: Thu Aug 2 11:31:46 2012 +0200
clucene build needs solenv
Change-Id: I5e41370b54a6054b9a488ae523a9d83b47f20415
diff --git a/clucene/prj/build.lst b/clucene/prj/build.lst
index c33dcb2..9e008cf 100644
--- a/clucene/prj/build.lst
+++ b/clucene/prj/build.lst
@@ -1,3 +1,3 @@
-cl clucene : ZLIB:zlib BOOST:boost NULL
+cl clucene : ZLIB:zlib BOOST:boost solenv NULL
cl clucene usr1 - all cl_mkout NULL
cl clucene\prj nmake - all cl_prj NULL
commit dd3d9e28436f135ab8c5c107d381556326cb3863
Author: David Tardon <dtardon at redhat.com>
Date: Wed Aug 1 09:38:07 2012 +0200
ensure IDL files of used UnoApis are in place
Change-Id: I27740a60b9b5ff7ef5541713b2f85e03f8e70c7d
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index e01e2fd..3dd32ee 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -52,6 +52,8 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out)
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+
$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
@@ -71,6 +73,7 @@ endef
define gb_InternalUnoApi__use_api
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 75e2fd3..58a5407 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -155,6 +155,8 @@ gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstwo
gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx
+gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external
+gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers
gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap$(2)
gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive$(2)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index da9a4af..a5ecfda 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -47,6 +47,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clea
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl)
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc)
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
$(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
@@ -132,6 +133,7 @@ endef
define gb_UnoApi__use_api
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2))
endef
diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk
index 3ce9ad5..d321219 100644
--- a/solenv/gbuild/UnoApiMerge.mk
+++ b/solenv/gbuild/UnoApiMerge.mk
@@ -38,6 +38,8 @@ $(call gb_UnoApiMerge_get_target,$(1)) :| $(dir $(call gb_UnoApiMerge_get_target
$(call gb_UnoApiMerge_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
$(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+
$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1))))
@@ -50,6 +52,7 @@ endef
define gb_UnoApiMerge__use_api
$(call gb_UnoApiTarget_merge_api,$(1),$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2))
endef
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 844816a..b22484d 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -137,6 +137,12 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3
$(if $(4),,$(error No root has been set for the rdb file))
endef
+$(call gb_UnoApiTarget_get_external_headers_target,%) :
+ mkdir -p $(dir $@) && touch $@
+
+$(call gb_UnoApiTarget_get_headers_target,%) : $(call gb_UnoApiTarget_get_external_headers_target,%)
+ mkdir -p $(dir $@) && touch $@
+
$(call gb_UnoApiTarget_get_target,%) :
$(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT))
$(call gb_UnoApiTarget__command,$@,$*)
@@ -145,7 +151,9 @@ $(call gb_UnoApiTarget_get_target,%) :
$(call gb_UnoApiTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UNO,4)
-$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_UnoApiTarget_get_target,$*))
+ rm -f $(call gb_UnoApiTarget_get_target,$*) \
+ $(call gb_UnoApiTarget_get_external_headers_target,$*) \
+ $(call gb_UnoApiTarget_get_headers_target,$*))
-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
$(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \
$(call gb_UnoApiPartTarget_get_target,$*)
@@ -210,6 +218,7 @@ $(call gb_UnoApiTarget_get_target,$(1)) : \
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
$(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) :| $(call gb_UnoApiTarget_get_external_headers_target,$(1))
endef
commit 0906641801275f3b9e67cf1916f86691f26de9c3
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jul 30 20:09:14 2012 +0200
add necessary deps for the test to run
Change-Id: I341b9bf3343f38d93b11ca3265fb8dbb0434aca8
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 7c8d016..ac907f5 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -29,8 +29,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
# this target is phony to run it every time
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
+# NOTE: the dependency on ure/services.rdb is there because we need some
+# of the URE libs from stoc and this is the easiest way to ensure they
+# are available when the test is run .-)
$(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Rdb_get_outdir_target,uno_services) \
+ $(call gb_Rdb_get_outdir_target,ure/services) \
$(call gb_Executable_get_target_for_build,uno) \
$(call gb_InternalUnoApi_get_target,bridgetest)
$(call gb_Helper_abbreviate_dirs,\
commit e11f0576b9b992b038f69b358889bfccdeca4cef
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jul 30 10:07:37 2012 +0200
add missing dep on types.rdb
Change-Id: Iddd10613dc5705eeaac53ff080692da2ad455720
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index d8c260d..192478c 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -36,7 +36,9 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \
$(i18npool_LDDIR)/localedata_%.cxx : \
$(SRCDIR)/i18npool/source/localedata/data/%.xml \
- $(i18npool_LDDIR)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
+ $(i18npool_LDDIR)/saxparser.rdb \
+ $(OUTDIR_FOR_BUILD)/bin/types.rdb \
+ $(call gb_Executable_get_target_for_build,saxparser)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
commit d40ec00ad9073977112431e297bac1d501848b9a
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jul 30 09:48:00 2012 +0200
add missing dependency
Change-Id: Ibfe60fde8010755ee8c3ce1afce669400a44f6e2
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index ed7c094..c55209f 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
+$(eval $(call gb_StaticLibrary_use_packages,codemaker,\
+ sal_generated \
+))
+
$(eval $(call gb_StaticLibrary_set_include,codemaker,\
-I$(SRCDIR)/codemaker/inc \
$$(INCLUDE) \
commit 7678287ad1da677f0f9a0c5cf33c83ce90b121e5
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jul 30 08:48:34 2012 +0200
add missing dep on types.rdb
Change-Id: I2cfff38e6b18b8949dd712b9fc60aef2a593b40b
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index d55126a..00ea2b6 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -30,8 +30,11 @@ testtools_JAVADIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_jav
$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_JAVADIR)/done
-$(testtools_JAVADIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
- $(call gb_Executable_get_target_for_build,javamaker) | $(testtools_JAVADIR)/.dir
+$(testtools_JAVADIR)/done : \
+ $(call gb_UnoApiTarget_get_target,bridgetest) \
+ $(OUTDIR)/bin/types.rdb \
+ $(call gb_Executable_get_target_for_build,javamaker) \
+ | $(testtools_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
commit c29ed576e2e5d39bc2dcc85c028ba525cadf4d5d
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jul 30 07:45:49 2012 +0200
dependency on makefile needs full path
Change-Id: I0733abb5c736ab393259fd6a005a89b887304f10
diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk
index 66ac061..ce9f214 100644
--- a/cppu/CustomTarget_cppu_allheaders.mk
+++ b/cppu/CustomTarget_cppu_allheaders.mk
@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \
$(cppu_allheaders_DIR)/cppu_allheaders.hxx
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
-$(cppu_allheaders_DIR)/cppu_allheaders.hxx : CustomTarget_cppu_allheaders.mk \
+$(cppu_allheaders_DIR)/cppu_allheaders.hxx : $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \
| $(cppu_allheaders_DIR)/.dir $(SRCDIR)/cppu/Package_inc.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all cppu/ includes\n' > $@
diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
index 8438a1d..582a42a 100644
--- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
+++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \
- CustomTarget_cppuhelper_allheaders.mk \
+ $(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \
| $(cppuhelper_allheaders_DIR)/.dir $(SRCDIR)/cppuhelper/Package_inc.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all cppuhelper/ includes\n' > $@
diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk
index d59fb05..dfef1ea 100644
--- a/sal/CustomTarget_sal_allheaders.mk
+++ b/sal/CustomTarget_sal_allheaders.mk
@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,sal/allheaders) : \
$(sal_allheaders_DIR)/sal_allheaders.hxx
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
-$(sal_allheaders_DIR)/sal_allheaders.hxx : CustomTarget_sal_allheaders.mk \
+$(sal_allheaders_DIR)/sal_allheaders.hxx : $(SRCDIR)/sal/CustomTarget_sal_allheaders.mk \
| $(sal_allheaders_DIR)/.dir $(SRCDIR)/sal/Package_inc.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all sal/ includes\n' > $@
diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk
index bc11fca..2ec5a62 100644
--- a/salhelper/CustomTarget_salhelper_allheaders.mk
+++ b/salhelper/CustomTarget_salhelper_allheaders.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \
- CustomTarget_salhelper_allheaders.mk \
+ $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \
| $(salhelper_allheaders_DIR)/.dir $(SRCDIR)/salhelper/Package_inc.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all salhelper/ includes\n' > $@
commit 77103991898befbf20b723ea368af86eded1c36f
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jul 30 07:09:46 2012 +0200
fix dep for configuration schemas
Configuration of extensions can use schemas from the main configuration
(officecfg). Now that officecfg is in tail_build, we need to make sure
that building of any such configuration only starts _after_ officecfg
has been done.
Change-Id: I95c775bb9c15c2e3aad930189d5524957cb5c49d
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 61254ce..12225c6 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -323,13 +323,17 @@ endef
$(call gb_Configuration_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),CFG,1)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_Configuration_get_target,$*))
+ rm -f $(call gb_Configuration_get_target,$*) $(call gb_Configuration_get_preparation_target,$*))
$(call gb_Configuration_get_target,%) :
$(call gb_Output_announce,$*,$(true),CFG,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
+$(call gb_Configuration_get_preparation_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && touch $@)
+
# TODO: ?
define gb_Configuration_Configuration_nozip
$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
@@ -362,7 +366,8 @@ define gb_Configuration_add_schema
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcsTarget_get_clean_target,$(2)/$(3))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : \
- $(call gb_Configuration__get_source,$(1),$(2)/$(3))
+ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
+ $(call gb_Configuration_get_preparation_target,$(1))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3)
$(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
$(call gb_Configuration_get_target,$(1)) : \
@@ -502,7 +507,7 @@ endef
# # foo needs schemas from the main configuration
# $(eval $(call gb_Configuration_use_configuration,foo,officecfg))
define gb_Configuration_use_configuration
-$(call gb_Configuration_get_target,$(1)) : $(call gb_Configuration_get_target,$(2))
+$(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2))
$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 7a2240e..75e2fd3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -90,6 +90,7 @@ gb_CliNativeLibraryTarget_get_target = $(WORKDIR)/CliNativeLibraryTarget/$(1)$(g
gb_CliUnoApiTarget_get_target = $(WORKDIR)/CliUnoApiTarget/$(1)$(gb_CliUnoApiTarget_EXT)
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
gb_ComponentsTarget_get_target = $(WORKDIR)/ComponentsTarget/$(1).components
+gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
commit f4688d62d10e8f1862c90491cb5b911f61d107d1
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jul 29 13:21:20 2012 +0200
add missing deps on tools
Change-Id: Idcb3dee7315412287e167abb7f76c9050696d94a
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 2a11c05..5125b4c 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -48,7 +48,7 @@ $(call gb_Helper_abbreviate_dirs,\
export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
$(gb_ScpTemplateTarget_COMMAND) \
$(call gb_ScpTemplateTarget__if_silent,,-verbose) \
- -i $(3) \
+ -i $(SCP_TEMPLATE) \
-o $(1) \
)
endef
@@ -56,8 +56,8 @@ endef
$(dir $(call gb_ScpTemplateTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ScpTemplateTarget_get_target,%) :
- $(call gb_ScpTemplateTarget__command,$@,$*,$<)
+$(call gb_ScpTemplateTarget_get_target,%) : $(gb_ScpTemplateTarget_TARGET)
+ $(call gb_ScpTemplateTarget__command,$@,$*)
.PHONY : $(call gb_ScpTemplateTarget_get_clean_target,%)
$(call gb_ScpTemplateTarget_get_clean_target,%) :
@@ -68,6 +68,7 @@ $(call gb_ScpTemplateTarget_get_clean_target,%) :
define gb_ScpTemplateTarget_ScpTemplateTarget
$(call gb_ScpTemplateTarget_get_target,$(1)) : $(call gb_ScpTemplateTarget_get_source,$(1))
$(call gb_ScpTemplateTarget_get_target,$(1)) :| $(dir $(call gb_ScpTemplateTarget_get_target,$(1))).dir
+$(call gb_ScpTemplateTarget_get_target,$(1)) : SCP_TEMPLATE := $(call gb_ScpTemplateTarget_get_source,$(1))
endef
@@ -121,7 +122,7 @@ endef
$(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ScpMergeTarget_get_target,%) :
+$(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
$(call gb_ScpMergeTarget__command,$@,$*,$<)
.PHONY : $(call gb_ScpMergeTarget_get_clean_target,%)
@@ -149,15 +150,15 @@ gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpConvertTarget_TA
define gb_ScpConvertTarget__command
$(call gb_Output_announce,$(2),$(true),SCC,1)
$(call gb_Helper_abbreviate_dirs,\
- $(gb_ScpConvertTarget_COMMAND) $(SCP_FLAGS) -o $(1) $(3) \
+ $(gb_ScpConvertTarget_COMMAND) $(SCP_FLAGS) -o $(1) $(SCP_CONVERT_ULF) \
)
endef
$(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ScpConvertTarget_get_target,%) :
- $(call gb_ScpConvertTarget__command,$@,$*,$<)
+$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_TARGET)
+ $(call gb_ScpConvertTarget__command,$@,$*)
.PHONY : $(call gb_ScpConvertTarget_get_clean_target,%)
$(call gb_ScpConvertTarget_get_clean_target,%) :
@@ -168,6 +169,7 @@ $(call gb_ScpConvertTarget_get_clean_target,%) :
define gb_ScpConvertTarget_ScpConvertTarget
$(call gb_ScpConvertTarget_get_target,$(1)) : $(2)
$(call gb_ScpConvertTarget_get_target,$(1)) :| $(dir $(call gb_ScpConvertTarget_get_target,$(1))).dir
+$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_CONVERT_ULF := $(2)
$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS :=
$(call gb_ScpConvertTarget_ScpConvertTarget_platform,$(1))
@@ -182,15 +184,15 @@ gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET)
define gb_ScpTarget__command
$(call gb_Output_announce,$(2),$(true),SCP,2)
$(call gb_Helper_abbreviate_dirs,\
- $(gb_ScpTarget_COMMAND) -l $(SCP_ULF) -s $(3) -o $(1) \
+ $(gb_ScpTarget_COMMAND) -l $(SCP_ULF) -s $(SCP_SOURCE) -o $(1) \
)
endef
$(dir $(call gb_ScpTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ScpTarget_get_target,%) :
- $(call gb_ScpTarget__command,$@,$*,$<)
+$(call gb_ScpTarget_get_target,%) : $(gb_ScpTarget_TARGET)
+ $(call gb_ScpTarget__command,$@,$*)
$(call gb_ScpTarget_get_external_target,%) :
touch $@
@@ -200,7 +202,7 @@ $(call gb_ScpTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),SCP,2)
rm -f \
$(call gb_ScpTarget_get_target,$*) \
- $(call gb_ScpTarget_get_external_target,$*) \
+ $(call gb_ScpTarget_get_external_target,$*)
# gb_ScpTarget_ScpTarget(<target>)
define gb_ScpTarget_ScpTarget
@@ -211,6 +213,7 @@ $(call gb_ScpTarget_get_target,$(1)) :| $(call gb_ScpTarget_get_external_target,
$(call gb_ScpTarget_get_external_target,$(1)) :| $(dir $(call gb_ScpTarget_get_target,$(1))).dir
$(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(call gb_ScpTarget_get_external_target,$(1))
$(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpPreprocessTarget_get_clean_target,$(1))
+$(call gb_ScpTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_target,$(1))
$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(gb_Helper_PHONY)
endef
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 6bacfe2..6b22c43 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -67,7 +67,7 @@ $(dir $(call gb_InstallScriptTarget_get_target,%))%/.dir :
$(dir $(call gb_InstallScriptTarget_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_InstallScriptTarget_get_target,%) :
+$(call gb_InstallScriptTarget_get_target,%) : $(gb_InstallScriptTarget_TARGET)
$(call gb_InstallScriptTarget__command,$@,$*)
.PHONY : $(call gb_InstallScriptTarget_get_clean_target,%)
commit a91b866abcf3fd93c5c92f3a113428e0834e36a5
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jul 29 13:59:16 2012 +0200
depend on tools as necessary
Change-Id: Ib13f95a55ffcdd7f9314744a18ae48aa123406dd
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 3c84bd3..844816a 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -30,6 +30,7 @@
gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc)
gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET)
+gb_UnoApiPartTarget_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp)
# The .urd files are actually created by the gb_UnoApiPartTarget__command,
# invoked for the per-directory .done files.
@@ -68,7 +69,8 @@ define gb_UnoApiPartTarget__command
endef
$(call gb_UnoApiPartTarget_get_target,%.done) : \
- $(gb_UnoApiPartTarget_IDLCTARGET)
+ $(gb_UnoApiPartTarget_IDLCTARGET) \
+ | $(gb_UnoApiPartTarget_UCPPTARGET)
$(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCTARGET),$?))
ifeq ($(gb_FULLDEPS),$(true))
@@ -135,10 +137,7 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3
$(if $(4),,$(error No root has been set for the rdb file))
endef
-# FIXME cannot have a dependency on $(gb_UnoApiTarget_RDBMAKERTARGET) here
-# because that leads to dependency cycle because rdbmaker depends on offapi
-$(call gb_UnoApiTarget_get_target,%) : $(gb_UnoApiTarget_XML2CMPTARGET) \
- $(gb_UnoApiTarget_REGCOMPARETARGET) $(gb_UnoApiTarget_REGMERGETARGET)
+$(call gb_UnoApiTarget_get_target,%) :
$(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT))
$(call gb_UnoApiTarget__command,$@,$*)
@@ -231,6 +230,7 @@ endef
define gb_UnoApiTarget_merge_api
$(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb)))
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET)
endef
@@ -249,6 +249,8 @@ define gb_UnoApiTarget_set_xmlfile
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML := $(SRCDIR)/$(2)
$(call gb_UnoApiTarget_get_target,$(1)) : $(SRCDIR)/$(2)
$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XMLRDB)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XML2CMPTARGET)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_RDBMAKERTARGET)
endef
@@ -258,6 +260,7 @@ endef
define gb_UnoApiTarget_set_reference_rdbfile
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGCOMPARETARGET)
endef
commit 61c0a3a63d46c7a0df1f337233d6c571186adc9e
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jul 29 17:32:40 2012 +0200
switch bridges to gbuild
Change-Id: Ia19ff61f1f7fb446298472acd6722b57ddaeddec
diff --git a/Makefile.top b/Makefile.top
index acedfe8..fcbc03e 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -44,6 +44,7 @@ basic\
bean\
binaryurp\
boost\
+bridges\
canvas\
chart2\
cli_ure\
@@ -191,7 +192,6 @@ apache-commons\
beanshell\
berkeleydb\
binfilter \
-bridges\
cairo\
cppunit\
crashrep\
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 195d306..01bebce 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
$(if $(filter GCCLINUX6,$(COM)$(OS)$(CPU)$(CPUNAME)),\
Library_gcc3_linux_m68k \
) \
- $(if $(filter GCCLINUXM,$(COM)$(OS)$(CPU)),\
+ $(if $(and $(filter GCCM,$(COM)$(CPU)),$(filter ANDROID LINUX,$(OS))),\
Library_gcc3_linux_mips \
) \
$(if $(filter GCCLINUXPPOWERPC64,$(COM)$(OS)$(CPU)$(CPUNAME)),\
diff --git a/bridges/inc/makefile.mk b/bridges/inc/makefile.mk
deleted file mode 100644
index a7ab4cd..0000000
--- a/bridges/inc/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=bridges
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst
index 4537a5f..e416fa0 100644
--- a/bridges/prj/build.lst
+++ b/bridges/prj/build.lst
@@ -1,32 +1,3 @@
br bridges : cppuhelper jurt jvmaccess salhelper NULL
br bridges usr1 - all br_mkout NULL
-br bridges\inc nmake - all br_inc NULL
-br bridges\unotypes nmake - all br_unotypes NULL
-br bridges\source\cpp_uno\mingw_intel nmake - w br_gcc3i br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\msvc_win32_x86-64 nmake - w br_mscx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_x86-64 nmake - u br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_aix_powerpc nmake - u br_gcc3ap br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_mips nmake - u br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_m68k nmake - u br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u br_gcc3l3 br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u br_gcc3l3_64 br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_sparc nmake - u br_gcc3ls br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_arm nmake - u br_gcc3lr br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u br_gcc3la br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u br_gcc3lh br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u br_gcc3ll br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_macosx_intel nmake - u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake - u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_ios_arm nmake - u br_gcc3iosr br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64 br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_solaris_sparc nmake - u br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_solaris_intel nmake - u br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\jni_uno nmake - all br_jni_uno br_unotypes br_inc NULL
-br bridges\source\jni_uno\java\com\sun\star\bridges\jni_uno nmake - all br_jni_uno_java br_unotypes br_inc NULL
+br bridges\prj nmake - all br_inc NULL
diff --git a/bridges/prj/d.lst b/bridges/prj/d.lst
index a8d03e1..e69de29 100644
--- a/bridges/prj/d.lst
+++ b/bridges/prj/d.lst
@@ -1,11 +0,0 @@
-..\%__SRC%\lib\libjava_uno* %_DEST%\lib\libjava_uno*
-..\%__SRC%\bin\java_uno* %_DEST%\bin\java_uno*
-..\%__SRC%\class\java_uno*.jar %_DEST%\bin\java_uno*.jar
-
-..\%__SRC%\bin\msci_uno.* %_DEST%\bin\msci_uno.*
-..\%__SRC%\bin\mscx_uno.* %_DEST%\bin\mscx_uno.*
-..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin\gcc3_uno.dll
-..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib\libgcc2_uno.*
-..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib\libgcc3_uno.*
-..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin\gcc3_uno.*
-..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib\libsunpro5_uno.*
diff --git a/bridges/prj/dmake b/bridges/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk b/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
deleted file mode 100644
index 2299d92..0000000
--- a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=sunpro5_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-# disable check for PIC code as it would complain about
-# hand coded assembler
-CHECKFORPIC=
-
-.IF "$(COM)$(CPU)" == "C50I" || "$(COM)$(CPU)" == "C52I"
-
-CFLAGS += -O5 -xO5
-
-SLOFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/except.obj \
- $(SLO)$/call.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB= i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH= URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-.INCLUDE : target.mk
-
-$(SLO)$/%.obj: %.s
- CC -c -o $(SLO)$/$(@:b).o $< && touch $@
-
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
deleted file mode 100644
index 13ee9c7..0000000
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=sunpro5_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-# disable check for PIC code as it would complain about
-# hand coded assembler
-CHECKFORPIC=
-
-.IF "$(COM)" == "C52" && "$(CPU)"=="S"
-
-SLOFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/except.obj \
- $(SLO)$/call.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB= i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH= URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-.INCLUDE : target.mk
-
-
-$(SLO)$/%.obj: %.s
- CC -KPIC -c -o $(SLO)$/$(@:b).o $< && touch $@
-
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk b/bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk
deleted file mode 100644
index 0cee42c..0000000
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ := ..$/..$/..
-PRJNAME := bridges
-TARGET := sunpro5_uno
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-.IF "$(COM)" == "C52" && "$(CPU)" == "U"
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = \
- $(SLO)$/callvirtualmethod.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/exceptions.obj \
- $(SLO)$/fp.obj \
- $(SLO)$/isdirectreturntype.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/vtableslotcall.obj
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-SHL1STDLIBS = $(CPPULIB) $(SALLIB)
-SHL1RPATH = URELIB
-SHL1VERSIONMAP = ..$/..$/bridge_exports.map
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.ENDIF
-
-.INCLUDE: target.mk
-
-$(SLO)$/%.obj: %.s
- CC -m64 -KPIC -c -o $(SLO)$/$(@:b).o $<
- touch $@
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk b/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
deleted file mode 100644
index ceea135..0000000
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCAIXPgcc3"
-
-NOOPTFILES= \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/cpp2uno.obj
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/except.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS= $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB) \
- -ldl
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk
deleted file mode 100644
index e38399c..0000000
--- a/bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCIOSRgcc3"
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)/except.obj \
- $(SLO)/cpp2uno.obj \
- $(SLO)/uno2cpp.obj \
- $(SLO)/helper.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=../../bridge_exports.map
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)/cpp_uno_shared.lib
-SHL1RPATH = URELIB
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(SLO)/helper.obj: helper.S $(MISC)/codesnippets.S generate-snippets.pl
- $(CC) $(CFLAGS) -c -I $(MISC) -o $(SLO)/helper.o helper.S
- touch $@
-
-$(MISC)/codesnippets.S: generate-snippets.pl
- $(PERL) generate-snippets.pl >$@
-
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
deleted file mode 100644
index 02fe524..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXL"
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/except.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
deleted file mode 100644
index f419c3c..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" || "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCANDROIDRgcc3"
-
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-NOOPTFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/except.obj \
- $(SLO)$/uno2cpp.obj
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/except.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/armhelper.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(SLO)$/%.obj: %.S
- $(CXX) -c -o $(SLO)$/$(@:b).o $< -fPIC ; touch $@
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
deleted file mode 100644
index f0a2ecd..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXH"
-
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-NOOPTFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/except.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/call.obj
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/except.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/call.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
deleted file mode 100644
index 9405db8..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXAgcc3"
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-NOOPTFILES= \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/cpp2uno.obj
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/except.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/call.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-
-SHL1OBJS= $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(SLO)$/%.obj: %.s
- $(CC) -c -o $(SLO)$/$(@:b).o $< -fpic ; touch $@
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
deleted file mode 100644
index e48bfce..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCANDROIDIgcc3" || \
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-# In case the compiler supports AVX this code segfaults so specifically turn
-# it off.
-.IF "$(HAVE_GCC_AVX)" == "TRUE"
- CFLAGSCXX+= -mno-avx
-.ENDIF
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/except.obj \
- $(SLO)$/callvirtualmethod.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/call.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(SLO)$/%.obj: %.s
- $(CC) -c -o $(SLO)$/$(@:b).o $<
- touch $@
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
deleted file mode 100644
index 17e343a..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUX6gcc3"
-
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-NOOPTFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/except.obj \
- $(SLO)$/uno2cpp.obj
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/except.obj \
- $(SLO)$/uno2cpp.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
deleted file mode 100644
index 3c6ab81..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXM" || "$(COM)$(OS)$(CPU)" == "GCCANDROIDM"
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-CFLAGSNOOPT=-O0
-
-NOOPTFILES = \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/cpp2uno.obj
-
-SLOFILES= \
- $(SLO)$/except.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj
-
-
-SHL1TARGET=$(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-
-SHL1OBJS= $(SLOFILES)
-SHL1LIBS =$(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
deleted file mode 100644
index c563c8e..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUXPgcc3POWERPC"
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-NOOPTFILES= \
- $(SLO)$/uno2cpp.obj
-
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/except.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS= $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
deleted file mode 100644
index 10e634e..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUXPgcc3POWERPC64"
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-NOOPTFILES= \
- $(SLO)$/uno2cpp.obj \
- $(SLO)$/cpp2uno.obj
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/except.obj \
- $(SLO)$/cpp2uno.obj \
- $(SLO)$/uno2cpp.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-
-SHL1OBJS= $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
deleted file mode 100644
index f4161e9..0000000
--- a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUX3gcc3S390"
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
- $(SLO)$/except.obj \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list