Modified: openoffice/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx (original) +++ openoffice/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx Sun Aug 7 19:24:03 2016 @@ -474,7 +474,6 @@ #include "rtl/ustring.hxx" #include "sal/config.h" #include "sal/types.h" -#include "setup_native/qswin32.h" #include "sot/clsids.hxx" #include "sot/exchange.hxx" #include "sot/factory.hxx"
Modified: openoffice/trunk/main/sfx2/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/prj/build.lst (original) +++ openoffice/trunk/main/sfx2/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,3 +1,3 @@ -sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL +sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2\prj nmake - all sf_prj NULL Modified: openoffice/trunk/main/sfx2/source/appl/shutdowniconw32.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/appl/shutdowniconw32.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/appl/shutdowniconw32.cxx (original) +++ openoffice/trunk/main/sfx2/source/appl/shutdowniconw32.cxx Sun Aug 7 19:24:03 2016 @@ -49,7 +49,7 @@ #include <stdio.h> #include <io.h> #include <osl/thread.h> -#include <setup_native/qswin32.h> +#include <sfx2/qswin32.h> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.h> Modified: openoffice/trunk/main/sfx2/source/doc/objmisc.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/doc/objmisc.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/doc/objmisc.cxx (original) +++ openoffice/trunk/main/sfx2/source/doc/objmisc.cxx Sun Aug 7 19:24:03 2016 @@ -66,7 +66,7 @@ #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #include <com/sun/star/uno/Reference.h> Modified: openoffice/trunk/main/sfx2/source/inet/inettbc.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/inet/inettbc.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/inet/inettbc.cxx (original) +++ openoffice/trunk/main/sfx2/source/inet/inettbc.cxx Sun Aug 7 19:24:03 2016 @@ -39,7 +39,7 @@ #include <svl/folderrestriction.hxx> #include <vcl/toolbox.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #ifndef _VOS_THREAD_HXX //autogen #include <vos/thread.hxx> Modified: openoffice/trunk/main/sfx2/source/menu/virtmenu.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/menu/virtmenu.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/menu/virtmenu.cxx (original) +++ openoffice/trunk/main/sfx2/source/menu/virtmenu.cxx Sun Aug 7 19:24:03 2016 @@ -32,7 +32,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <comphelper/processfactory.hxx> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <tools/urlobj.hxx> #include "virtmenu.hxx" Modified: openoffice/trunk/main/sfx2/source/statbar/stbitem.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/statbar/stbitem.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/statbar/stbitem.cxx (original) +++ openoffice/trunk/main/sfx2/source/statbar/stbitem.cxx Sun Aug 7 19:24:03 2016 @@ -54,7 +54,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #include <toolkit/helper/convert.hxx> Modified: openoffice/trunk/main/sfx2/source/view/viewfrm.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/view/viewfrm.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/view/viewfrm.cxx (original) +++ openoffice/trunk/main/sfx2/source/view/viewfrm.cxx Sun Aug 7 19:24:03 2016 @@ -32,7 +32,7 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <vcl/splitwin.hxx> #include <unotools/moduleoptions.hxx> #include <svl/intitem.hxx> Modified: openoffice/trunk/main/sfx2/source/view/viewsh.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/view/viewsh.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/view/viewsh.cxx (original) +++ openoffice/trunk/main/sfx2/source/view/viewsh.cxx Sun Aug 7 19:24:03 2016 @@ -58,7 +58,7 @@ #include <framework/actiontriggerhelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <sfx2/app.hxx> Modified: openoffice/trunk/main/shell/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/shell/prj/build.lst (original) +++ openoffice/trunk/main/shell/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,4 +1,4 @@ -sl shell : L10N:l10n offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL +sl shell : L10N:l10n offapi rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL sl shell\inc nmake - all sl_inc NULL sl shell\source\win32 nmake - w sl_win32 sl_inc NULL sl shell\source\win32\sysmail nmake - w sl_win32_sysmail sl_inc NULL Modified: openoffice/trunk/main/slideshow/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/slideshow/prj/build.lst (original) +++ openoffice/trunk/main/slideshow/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,4 +1,4 @@ -pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia LIBXSLT:libxslt NULL +pe slideshow : tools sal cppu vcl comphelper cppuhelper offapi cppcanvas basegfx svtools unotools toolkit animations avmedia LIBXSLT:libxslt NULL pe slideshow usr1 - all pe_mkout NULL pe slideshow\inc nmake - all pe_inc NULL pe slideshow\source\engine nmake - all pe_engine pe_inc NULL Modified: openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk (original) +++ openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk Sun Aug 7 19:24:03 2016 @@ -242,8 +242,8 @@ $(call gb_ResTarget_get_imagelist_target $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1)) -$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1))) -$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1))) +$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) +$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1)) endef Modified: openoffice/trunk/main/solenv/gbuild/ComponentTarget.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/ComponentTarget.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/ComponentTarget.mk (original) +++ openoffice/trunk/main/solenv/gbuild/ComponentTarget.mk Sun Aug 7 19:24:03 2016 @@ -33,19 +33,27 @@ $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --nonet --stringparam uri \ '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2)) - endef +# creates 2 componentfiles: the first is for the installation set, +# the second is for using the component during the build. +# bit of a hack, hopefully inbuild can be removed when solver layout is fixed. define gb_ComponentTarget__rules -$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET) +$$(call gb_ComponentTarget_get_inbuild_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET) $$(call gb_ComponentTarget__command,$$@,$$<,$$*) -$$(call gb_ComponentTarget_get_clean_target,%) : - $$(call gb_Output_announce,$$*,$(false),CMP,1) - rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*) +$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET) + $$(call gb_ComponentTarget__command,$$@,$$<,$$*) endef +$(call gb_ComponentTarget_get_clean_target,%) : + $(call gb_Output_announce,$$*,$(false),CMP,1) + rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \ + $(call gb_ComponentTarget_get_target,$*) \ + $(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \ + $(call gb_ComponentTarget_get_inbuild_target,$*) \ + $(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo)))) $(call gb_ComponentTarget_get_target,%) : @@ -56,9 +64,15 @@ $(call gb_ComponentTarget_get_external_t define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) +$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3) $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) +$(call gb_ComponentTarget_get_inbuild_target,$(1)) : \ + COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE) $(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1)) -$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1))) +$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : \ + $(call gb_ComponentTarget_get_inbuild_target,$(1)) +$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) +$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1)) endef Modified: openoffice/trunk/main/solenv/gbuild/CustomTarget.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/CustomTarget.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/CustomTarget.mk (original) +++ openoffice/trunk/main/solenv/gbuild/CustomTarget.mk Sun Aug 7 19:24:03 2016 @@ -32,56 +32,44 @@ define gb_CustomTarget__command endef -define gb_CustomTarget__rules -$$(call gb_CustomTarget_get_repo_target,$(1),%) : - $$(call gb_Output_announce,$$*,$$(true),MAK,3) - $$(call gb_CustomTarget__command,$$@,$$*) - -$$(call gb_CustomTarget_get_target,%) : $$(call gb_CustomTarget_get_repo_target,$(1),%) - $$(call gb_Helper_abbreviate_dirs,\ - touch $$@) - -endef +$(call gb_CustomTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),MAK,3) + $(call gb_CustomTarget__command,$@,$*) .PHONY: $(call gb_CustomTarget_get_clean_target,%) $(call gb_CustomTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),MAK,3) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(call gb_CustomTarget_get_workdir,$*) && \ - rm -f $(call gb_CustomTarget_get_target,$*) \ - $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*))) - - -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(eval $(call gb_CustomTarget__rules,$(reponame)))) + rm -f $(call gb_CustomTarget_get_target,$*)) define gb_CustomTarget__get_makefile $(1)/$(2)/Makefile endef define gb_CustomTarget_CustomTarget -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ - $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1)))) - -$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1)) - +$(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\ + $(error CustomTarget: no or invalid repository given; known repositories: \ + $(gb_JavaClassSet_REPOSITORYNAMES))) +gb_CustomTarget_REPO_$(1) := $(2) +$(call gb_CustomTarget_get_target,$(1)) : \ + $(call gb_CustomTarget__get_makefile,$($(2)),$(1)) +$(call gb_CustomTarget_get_workdir,$(1))/% : \ + $(call gb_CustomTarget_get_target,$(1)) endef define gb_CustomTarget_add_dependency -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ - $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2))) - +$(eval $(call gb_CustomTarget_get_target,$(1)) : \ + $($(gb_CustomTarget_REPO_$(1)))/$(2)) endef define gb_CustomTarget_add_dependencies $(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency))) - endef define gb_CustomTarget_add_outdir_dependency -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ - $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2))) - +$(eval $(call gb_CustomTarget_get_target,$(1)) : $(2)) endef define gb_CustomTarget_add_outdir_dependencies Modified: openoffice/trunk/main/solenv/gbuild/Deliver.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Deliver.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/Deliver.mk (original) +++ openoffice/trunk/main/solenv/gbuild/Deliver.mk Sun Aug 7 19:24:03 2016 @@ -30,25 +30,46 @@ gb_Deliver_CLEARONDELIVER := $(true) define gb_Deliver_init gb_Deliver_DELIVERABLES := +gb_Deliver_DELIVERABLES_INDEX := endef -define gb_Deliver_add_deliverable -gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1)) +define gb_Deliver_do_add +$$(if $(3),,$$(error - missing third parameter for deliverable $(1))) +gb_Deliver_DELIVERABLES_$(notdir $(3)) += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1)) +gb_Deliver_DELIVERABLES_INDEX := $(sort $(gb_Deliver_DELIVERABLES_INDEX) $(notdir $(3))) $(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TIME : $(1)) endef +define gb_Deliver_add_deliverable +ifeq ($(MAKECMDGOALS),showdeliverables) +$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3)) +else +ifneq ($(CWS_WORK_STAMP),) +else +$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3)) +endif +endif + +endef + ifeq ($(strip $(gb_Deliver_GNUCOPY)),) -define gb_Deliver_deliver +define gb_Deliver__deliver mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2) endef else -define gb_Deliver_deliver +define gb_Deliver__deliver mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2) endef endif +define gb_Deliver_deliver +$(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\ + $(error gb_Deliver_deliver:\ + file does not exist in solver, and cannot be delivered: $(2))) +endef + # We are currently only creating a deliver.log, if only one module gets build. # As it is possible to add gbuild modules into other (which is done for example for @@ -60,7 +81,7 @@ ifeq ($$(words $(gb_Module_ALLMODULES)), $$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1)) deliverlog : COMMAND := \ mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \ - && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(gb_Deliver_DELIVERABLES))) \ + && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(foreach list,$$(gb_Deliver_DELIVERABLES_INDEX),$$(gb_Deliver_DELIVERABLES_$$(list))))) \ && $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \ > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \ && rm -f $$$${RESPONSEFILE} @@ -85,7 +106,7 @@ endef showdeliverables : $(eval MAKEFLAGS := s) - $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\ + $(foreach deliverable,$(sort $(foreach list,$(gb_Deliver_DELIVERABLES_INDEX),$(gb_Deliver_DELIVERABLES_$(list)))),\ $(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable))))) true # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/Executable.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Executable.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/Executable.mk (original) +++ openoffice/trunk/main/solenv/gbuild/Executable.mk Sun Aug 7 19:24:03 2016 @@ -43,16 +43,22 @@ $(call gb_Executable__Executable_impl,$( endef define gb_Executable__Executable_impl +$(call gb_Executable_set_targettype_gui,$(2)) $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Executable) $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Executable_Executable_platform,$(1),$(2)) $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1)))) -$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2))) +$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1)) endef +define gb_Executable_set_targettype_gui +$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2) +endef + + define gb_Executable_forward_to_Linktarget gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3)) @@ -68,15 +74,25 @@ $(eval $(foreach method,\ add_exception_objects \ add_noexception_objects \ add_generated_exception_objects \ + set_yaccflags \ + add_cflags \ set_cflags \ + add_cxxflags \ set_cxxflags \ + add_objcxxflags \ set_objcxxflags \ + add_defs \ set_defs \ set_include \ + add_ldflags \ set_ldflags \ + add_libs \ set_library_path_flags \ + add_api \ add_linked_libs \ add_linked_static_libs \ + use_external \ + use_externals \ add_package_headers \ add_sdi_headers \ add_precompiled_header \ Modified: openoffice/trunk/main/solenv/gbuild/GoogleTest.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/GoogleTest.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/GoogleTest.mk (original) +++ openoffice/trunk/main/solenv/gbuild/GoogleTest.mk Sun Aug 7 19:24:03 2016 @@ -57,6 +57,9 @@ endef define gb_GoogleTest__GoogleTest_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),GoogleTest) +$(call gb_LinkTarget_add_defs,$(2),\ + $(gb_GoogleTest_DEFS) \ +) $(call gb_LinkTarget_add_linked_libs,$(2),gtest) $(call gb_GoogleTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_GoogleTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) @@ -79,15 +82,25 @@ $(eval $(foreach method,\ add_objcxxobjects \ add_exception_objects \ add_noexception_objects \ + set_yaccflags \ + add_cflags \ set_cflags \ + add_cxxflags \ set_cxxflags \ + add_objcxxflags \ set_objcxxflags \ + add_defs \ set_defs \ set_include \ + add_ldflags \ set_ldflags \ + add_libs \ set_library_path_flags \ + add_api \ add_linked_libs \ add_linked_static_libs \ + use_external \ + use_externals \ add_package_headers \ add_sdi_headers \ add_precompiled_header \ Modified: openoffice/trunk/main/solenv/gbuild/Helper.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Helper.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/Helper.mk (original) +++ openoffice/trunk/main/solenv/gbuild/Helper.mk Sun Aug 7 19:24:03 2016 @@ -95,6 +95,7 @@ gb_Helper_REPOSITORYNAMES += $(1) endef +# RepositoryExternal.mk is optional define gb_Helper_add_repository gb_Helper_CURRENTREPOSITORY := include $(1)/Repository.mk @@ -102,6 +103,7 @@ ifeq ($$(gb_Helper_CURRENTREPOSITORY),) $$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in Repository.mk for repository $(1))) endif $$(gb_Helper_CURRENTREPOSITORY) := $(1) +-include $(1)/RepositoryExternal.mk endef @@ -137,6 +139,12 @@ define gb_Helper_register_executables ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),) $$(eval $$(call gb_Output_error,$(1) is not a valid group for executables. Valid groups are: $$(gb_Executable_VALIDGROUPS))) endif +$(foreach group,$(gb_Executable_VALIDGROUPS),\ + $(foreach target,$(2),\ + $(if $(filter $(target),$(gb_Executable_$(group))),\ + $(call gb_Output_error,gb_Helper_register_executables: already registered: $(target))))) +$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\ + $(call gb_Output_error,gb_Helper_register_executables: contains duplicates: $(2))) gb_Executable_$(1) += $(2) @@ -146,6 +154,12 @@ define gb_Helper_register_libraries ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),) $$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS))) endif +$(foreach group,$(gb_Library_VALIDGROUPS),\ + $(foreach target,$(2),\ + $(if $(filter $(target),$(gb_Library_$(group))),\ + $(call gb_Output_error,gb_Helper_register_libraries: already registered: $(target))))) +$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\ + $(call gb_Output_error,gb_Helper_register_libraries: contains duplicates: $(2))) gb_Library_$(1) += $(2) @@ -155,6 +169,12 @@ define gb_Helper_register_static_librari ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),) $$(eval $$(call gb_Output_error,$(1) is not a valid group for static libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS))) endif +$(foreach group,$(gb_StaticLibrary_VALIDGROUPS),\ + $(foreach target,$(2),\ + $(if $(filter $(target),$(gb_StaticLibrary_$(group))),\ + $(call gb_Output_error,gb_Helper_register_static_libraries: already registered: $(target))))) +$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\ + $(call gb_Output_error,gb_Helper_register_static_libraries: contains duplicates: $(2))) gb_StaticLibrary_$(1) += $(2) Modified: openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk (original) +++ openoffice/trunk/main/solenv/gbuild/JavaClassSet.mk Sun Aug 7 19:24:03 2016 @@ -27,51 +27,81 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACO define gb_JavaClassSet__command $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \ + $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\ + $(filter-out $(JARDEPS),$(3)),\ + $(filter-out $(JARDEPS),$(4))) &&\ touch $(1)) endef -define gb_JavaClassSet__rules -$$(call gb_JavaClassSet_get_repo_target,$(1),%) : - $$(call gb_JavaClassSet__command,$$@,$$*,$$?) - -$$(call gb_JavaClassSet_get_target,%) : $$(call gb_JavaClassSet_get_repo_target,$(1),%) - $$(call gb_Output_announce,$$*,$$(true),JCS,3) - $$(call gb_Helper_abbreviate_dirs,\ - touch $$@) - -endef +$(call gb_JavaClassSet_get_target,%) : + $(call gb_Output_announce,$*,$(true),JCS,3) + $(call gb_JavaClassSet__command,$@,$*,$?,$^) $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),JCS,3) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_JavaClassSet_get_target,$*))) - -$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),$(eval $(call gb_JavaClassSet__rules,$(reponame)))) - +# no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar) +# UGLY: cannot use target local variable for REPO because it's needed in prereq define gb_JavaClassSet_JavaClassSet +$(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\ + $(error JavaClassSet: no or invalid repository given; known repositories: \ + $(gb_JavaClassSet_REPOSITORYNAMES))) +gb_JavaClassSet_REPO_$(1) := $(2) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := endef define gb_JavaClassSet__get_sourcefile -$(1)/$(2).java +$($(1))/$(2).java endef define gb_JavaClassSet_add_sourcefile -$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\ - $(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2)))) - +$(eval $(call gb_JavaClassSet_get_target,$(1)) : \ + $(call gb_JavaClassSet__get_sourcefile,$(gb_JavaClassSet_REPO_$(1)),$(2))) endef define gb_JavaClassSet_add_sourcefiles $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefile))) - endef define gb_JavaClassSet_set_classpath -$(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2)) +endef + +# problem: currently we can't get these dependencies to work +# build order dependency is a hack to get these prerequisites out of the way in the build command +define gb_JavaClassSet_add_jar +$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2)) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) +endef + +# this does not generate dependency on the jar +define gb_JavaClassSet_add_system_jar +$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) +endef + +define gb_JavaClassSet_add_jars +$(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar))) +endef + +define gb_JavaClassSet_add_system_jars +$(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar))) +endef + +# this forwards to functions that must be defined in RepositoryExternal.mk. +# $(call gb_LinkTarget_use_external,library,external) +define gb_JavaClassSet_use_external +$(eval $(if $(value gb_JavaClassSet__use_$(2)),\ + $(call gb_JavaClassSet__use_$(2),$(1)),\ + $(error gb_JavaClassSet_use_external: unknown external: $(2)))) +endef +define gb_JavaClassSet_use_externals +$(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) endef # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/JunitTest.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/JunitTest.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/JunitTest.mk (original) +++ openoffice/trunk/main/solenv/gbuild/JunitTest.mk Sun Aug 7 19:24:03 2016 @@ -50,7 +50,7 @@ $(call gb_JunitTest_get_target,$(1)) : C $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) -$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1))) +$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1))) $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1)))) endef Modified: openoffice/trunk/main/solenv/gbuild/Library.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Library.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/Library.mk (original) +++ openoffice/trunk/main/solenv/gbuild/Library.mk Sun Aug 7 19:24:03 2016 @@ -64,21 +64,20 @@ endef define gb_Library__Library_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Library) -$(call gb_LinkTarget_set_defs,$(2),\ - $$(DEFS) \ +$(call gb_LinkTarget_add_defs,$(2),\ $(gb_Library_DEFS) \ ) $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) $$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1)))) -$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2))) +$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1)) endef define gb_Library_set_componentfile $(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1))) -$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) +$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_ComponentTarget_get_outdir_inbuild_target,$(2)) $(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2)) endef @@ -111,16 +110,26 @@ $(eval $(foreach method,\ add_exception_objects \ add_noexception_objects \ add_generated_exception_objects \ + set_yaccflags \ + add_cflags \ set_cflags \ + add_cxxflags \ set_cxxflags \ + add_objcxxflags \ set_objcxxflags \ + add_defs \ set_defs \ set_include \ + add_ldflags \ set_ldflags \ + add_libs \ set_library_path_flags \ + add_api \ add_linked_libs \ add_linked_static_libs \ add_external_libs \ + use_external \ + use_externals \ add_package_headers \ add_sdi_headers \ add_precompiled_header \ Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original) +++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Sun Aug 7 19:24:03 2016 @@ -21,34 +21,60 @@ +#the following user-defined variables are supported: +# CPPFLAGS +# CFLAGS +# CXXFLAGS +# OBJCXXFLAGS +# LDFLAGS + +# CFLAGS from environment override debug/optimization flags +ifeq ($(gb_DEBUGLEVEL),2) +CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) +CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) +OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) +else +CFLAGS ?= $(gb_COMPILEROPTFLAGS) +CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) +OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) +endif -# CObject class -gb_CObject_REPOS := $(gb_REPOS) +# For every object there is a dep file (if gb_FULLDEPS is active). +# The dep file depends on the object: the Object__command also updates the +# dep file as a side effect. +# In the dep file rule just touch it so it's newer than the object. -gb_CObject_get_source = $(1)/$(2).c -# defined by platform -# gb_CObject__command - -# this rule generates an "always rebuild" dep file, to have something to include. -# the dep file will be overridden on the fly, when the object is compiled +# The gb_Object__command_dep generates an "always rebuild" dep file; +# It is _only_ used in case the user deletes the object dep file. ifeq ($(gb_FULLDEPS),$(true)) -define gb_CObject__command_dep +define gb_Object__command_dep mkdir -p $(dir $(1)) && \ - echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1) + echo '$(2) : $$(gb_Helper_PHONY)' > $(1) endef else -gb_CObject__command_dep = +gb_Object__command_dep = \ + $(call gb_Output_error,gb_Object__command_dep is only for gb_FULLDEPS) endif + +# CObject class + +gb_CObject_REPOS := $(gb_REPOS) + +gb_CObject_get_source = $(1)/$(2).c +# defined by platform +# gb_CObject__command + define gb_CObject__rules $$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%) - $$(call gb_CObject__command,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE)) + $$(call gb_CObject__command,$$@,$$*,$$<,$$(call gb_CObject_get_dep_target,$$*)) ifeq ($(gb_FULLDEPS),$(true)) -$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_source,$(1),%) - $$(call gb_CObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE)) +$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_target,%) + $$(if $$(wildcard $$@),touch $$@,\ + $$(call gb_Object__command_dep,$$@,$$(call gb_CObject_get_target,$$*))) endif endef @@ -69,22 +95,9 @@ gb_CxxObject_get_source = $(1)/$(2).cxx # defined by platform # gb_CxxObject__command -# This rule generates an "always rebuild" dep file, to have something to -# include. The dep file will be overridden on the fly, when the object is -# compiled. -ifeq ($(gb_FULLDEPS),$(true)) -define gb_CxxObject__command_dep -mkdir -p $(dir $(1)) && \ - echo '$(call gb_CxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1) - -endef -else -gb_CxxObject__command_dep = -endif - # Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget) -# are the same as the CXXFLAGS and DEFS we want to use for this object. This -# should usually be the case. The DEFS/CXXFLAGS would have too be manually +# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This +# should usually be the case. The DEFS/T_CXXFLAGS would have too be manually # overridden for one object file for them to differ. PCH_CXXFLAGS/PCH_DEFS # should never be overridden on an object -- they should be the same as for the # whole linktarget. In general it should be cleaner to use a static library @@ -93,16 +106,16 @@ endif define gb_CxxObject__set_pchflags ifeq ($(gb_ENABLE_PCH),$(true)) ifneq ($(strip $$(PCH_NAME)),) -ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS))) +ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS))) $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME)) else -ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS))) +ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS))) $$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME)) else $$(info No precompiled header available for $$*.) $$(info precompiled header flags ( ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS))) $$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS))) -$$(info . object flags : $$(sort $$(CXXFLAGS) $$(DEFS))) +$$(info . object flags : $$(sort $$(T_CXXFLAGS) $$(DEFS))) $$@ : PCHFLAGS := endif endif @@ -113,12 +126,13 @@ endef define gb_CxxObject__rules $$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%) $$(eval $$(gb_CxxObject__set_pchflags)) - $$(call gb_CxxObject__command,$$@,$$*,$$<) + $$(call gb_CxxObject__command,$$@,$$*,$$<,$$(call gb_CxxObject_get_dep_target,$$*)) ifeq ($(gb_FULLDEPS),$(true)) -$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_source,$(1),%) - $$(eval $$(gb_CxxObject__set_pchflags)) - $$(call gb_CxxObject__command_dep,$$@,$$*,$$<) +$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_target,%) + $$(if $$(wildcard $$@),touch $$@,\ + $$(eval $$(gb_CxxObject__set_pchflags))\ + $$(call gb_Object__command_dep,$$@,$$(call gb_CxxObject_get_target,$$*))) endif endef @@ -140,27 +154,13 @@ gb_GenCxxObject_get_source = $(WORKDIR)/ # defined by platform # gb_CxxObject__command -# This rule generates an "always rebuild" dep file, to have something to -# include. The dep file will be overridden on the fly, when the object is -# compiled. -ifeq ($(gb_FULLDEPS),$(true)) -define gb_GenCxxObject__command_dep -mkdir -p $(dir $(1)) && \ - echo '$(call gb_GenCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1) -endef -else -gb_GenCxxObject__command_dep = -endif - $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%) - $(call gb_CxxObject__command,$@,$*,$<) + $(call gb_CxxObject__command,$@,$*,$<,$(call gb_GenCxxObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_source,%) - $(call gb_GenCxxObject__command_dep,$@,$*,$<) - -$(call gb_GenCxxObject_get_dep_target,%) : - $(eval $(call gb_Output_error,Unable to find generated C++ file $(call gb_GenCxxObject_get_source,$*) in WORKDIR.)) +$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%) + $(if $(wildcard $@),touch $@,\ + $(call gb_Object__command_dep,$@,$(call gb_GenCxxObject_get_target,$*))) endif gb_GenCxxObject_GenCxxObject = @@ -174,25 +174,14 @@ gb_ObjCxxObject_get_source = $(1)/$(2).m # defined by platform # gb_ObjCxxObject__command -# this rule generates an "always rebuild" dep file, to have something to include. -# the dep file will be overridden on the fly, when the object is compiled -ifeq ($(gb_FULLDEPS),$(true)) -define gb_ObjCxxObject__command_dep -mkdir -p $(dir $(1)) && \ - echo '$(call gb_ObjCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1) - -endef -else -gb_ObjCxxObject__command_dep = -endif - define gb_ObjCxxObject__rules $$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%) - $$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE)) + $$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(call gb_ObjCxxObject_get_dep_target,$$*)) ifeq ($(gb_FULLDEPS),$(true)) -$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%) - $$(call gb_ObjCxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE)) +$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_target,%) + $$(if $$(wildcard $$@),touch $$@,\ + $$(call gb_Object__command_dep,$$@,$$(call gb_ObjCxxObject_get_target,$$*))) endif endef @@ -322,6 +311,10 @@ $(call gb_LinkTarget_get_headers_target, # Therefore it is important that objects are only directly depended on by the # linktarget. This for example means that you cannot build a single object # alone, because then you would directly depend on the object. +# +# A note about flags: because the overriding the global variables with a target +# local variable of the same name is considered obscure, the target local +# variables have a T_ prefix. define gb_LinkTarget_LinkTarget $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := $(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1) @@ -335,24 +328,25 @@ $(call gb_LinkTarget_get_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(gb_COMPILEROPTFLAGS) -$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) +$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) +$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) -$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(LDFLAGS) $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := $(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_LIBS := +$(call gb_LinkTarget_get_target,$(1)) : LIBS := $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := @@ -362,21 +356,17 @@ $(call gb_LinkTarget_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(1)) : NATIVERES := ifeq ($(gb_FULLDEPS),$(true)) -ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),) -include $(call gb_LinkTarget_get_dep_target,$(1)) -else -$(firstword $(MAKEFILE_LIST)) : $(call gb_LinkTarget_get_dep_target,$(1)) -endif +-include $(call gb_LinkTarget_get_dep_target,$(1)) $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS := -$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(gb_COMPILEROPTFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) +$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS) +$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) +$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := @@ -385,7 +375,22 @@ endif endef +define gb_LinkTarget_add_defs +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2) +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2) +endif +endef + define gb_LinkTarget_set_defs +ifeq (,) +$$(call gb_Output_error,\ + gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.) +else $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2) $(call gb_LinkTarget_get_headers_target,$(1)) \ @@ -395,33 +400,75 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2) endif +endif + +endef + +define gb_LinkTarget_add_cflags +$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS += $(2) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS += $(2) +endif endef define gb_LinkTarget_set_cflags -$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $(2) +ifeq (,) +$$(call gb_Output_error,\ + gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.) +else +$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2) +endif endif endef +define gb_LinkTarget_add_cxxflags +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2) +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2) +endif +endef + define gb_LinkTarget_set_cxxflags +ifeq (,) +$$(call gb_Output_error,\ + gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.) +else $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $(2) +$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2) endif +endif + +endef +define gb_LinkTarget_add_objcxxflags +$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS += $(2) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS += $(2) +endif endef define gb_LinkTarget_set_objcxxflags -$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $(2) +ifeq (,) +$$(call gb_Output_error,\ + gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.) +else +$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2) +endif endif endef @@ -444,8 +491,28 @@ endif endef +define gb_LinkTarget_add_ldflags +$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2) +endef + +# real use in RepositoryExternal.mk define gb_LinkTarget_set_ldflags -$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2) +$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2) +endef + +define gb_LinkTarget_add_api +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc)) +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api)) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api)) +endif + +endef + +define gb_LinkTarget_add_libs +$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef define gb_LinkTarget_add_linked_libs @@ -516,7 +583,7 @@ $(call gb_LinkTarget_get_clean_target,$( $(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2)) $(call gb_CObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) -$(call gb_CObject_get_target,$(2)) : CFLAGS += $(3) +$(call gb_CObject_get_target,$(2)) : T_CFLAGS += $(3) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2) @@ -531,7 +598,7 @@ $(call gb_LinkTarget_get_clean_target,$( $(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2)) $(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) -$(call gb_CxxObject_get_target,$(2)) : CXXFLAGS += $(3) +$(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2) @@ -546,7 +613,7 @@ $(call gb_LinkTarget_get_clean_target,$( $(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2)) $(call gb_ObjCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) -$(call gb_ObjCxxObject_get_target,$(2)) : OBJCXXFLAGS += $(3) +$(call gb_ObjCxxObject_get_target,$(2)) : T_OBJCXXFLAGS += $(3) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2) @@ -561,7 +628,7 @@ $(call gb_LinkTarget_get_clean_target,$( $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2)) $(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) -$(call gb_GenCxxObject_get_target,$(2)) : CXXFLAGS += $(3) $(gb_COMPILEROPTFLAGS) +$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(CXXFLAGS) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2) @@ -571,11 +638,11 @@ endif endef define gb_LinkTarget_add_noexception_object -$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)) +$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(CXXFLAGS)) endef define gb_LinkTarget_add_exception_object -$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)) +$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(CXXFLAGS)) endef define gb_LinkTarget_add_cobjects @@ -670,4 +737,17 @@ endif endef +# this forwards to functions that must be defined in RepositoryExternal.mk. +# $(call gb_LinkTarget_use_external,library,external) +define gb_LinkTarget_use_external +$(eval $(if $(value gb_LinkTarget__use_$(2)),\ + $(call gb_LinkTarget__use_$(2),$(1)),\ + $(error gb_LinkTarget_use_external: unknown external: $(2)))) +endef + +# $(call gb_LinkTarget_use_externals,library,externals) +gb_LinkTarget_use_externals = \ + $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external))) + + # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/Output.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Output.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/Output.mk (original) +++ openoffice/trunk/main/solenv/gbuild/Output.mk Sun Aug 7 19:24:03 2016 @@ -56,7 +56,7 @@ gb_Output_BELL := $(shell echo|awk 'BEGI # - gb_COLOR is set # - we have a known term ifneq ($(strip $(gb_COLOR)),) -ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color),) +ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color xtermc),) gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE) Modified: openoffice/trunk/main/solenv/gbuild/Package.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Package.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/Package.mk (original) +++ openoffice/trunk/main/solenv/gbuild/Package.mk Sun Aug 7 19:24:03 2016 @@ -30,8 +30,7 @@ $(foreach destination,$(call gb_PackageP define gb_PackagePart_PackagePart $(OUTDIR)/$(1) : $(2) $(2) :| $(3) -$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2)) - +$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2),$(3)) endef @@ -40,8 +39,9 @@ endef .PHONY : $(call gb_Package_get_clean_target,%) $(call gb_Package_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),PKG,2) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(FILES)) + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \ + && cat $${RESPONSEFILE} | xargs rm -f \ + && rm -f $${RESPONSEFILE} $(call gb_Package_get_preparation_target,%) : mkdir -p $(dir $@) && touch $@ @@ -76,7 +76,7 @@ endef define gb_Package_add_customtarget $(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2)) $(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) -$(call gb_CustomTarget_CustomTarget,$(2)) +$(eval $(call gb_CustomTarget_CustomTarget,$(2),$(3))) endef Modified: openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk (original) +++ openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk Sun Aug 7 19:24:03 2016 @@ -59,15 +59,14 @@ endef define gb_StaticLibrary__StaticLibrary_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary) -$(call gb_LinkTarget_set_defs,$(2),\ - $$(DEFS) \ +$(call gb_LinkTarget_add_defs,$(2),\ $(gb_StaticLibrary_DEFS) \ ) $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2)) $$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1)))) -$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2))) +$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1)) endef @@ -86,13 +85,20 @@ $(eval $(foreach method,\ add_exception_objects \ add_noexception_objects \ add_generated_exception_objects \ + add_cflags \ set_cflags \ + add_cxxflags \ set_cxxflags \ + add_objcxxflags \ set_objcxxflags \ + add_defs \ set_defs \ set_include \ + add_ldflags \ set_ldflags \ + add_libs \ set_library_path_flags \ + add_api \ add_linked_libs \ add_linked_static_libs \ add_package_headers \ Modified: openoffice/trunk/main/solenv/gbuild/TargetLocations.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/TargetLocations.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/TargetLocations.mk (original) +++ openoffice/trunk/main/solenv/gbuild/TargetLocations.mk Sun Aug 7 19:24:03 2016 @@ -24,11 +24,14 @@ # outdir target pattern gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component +gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT) -gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin +gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin $(OUTDIR)/idl $(OUTDIR)/pck gb_PackagePart_get_target = $(OUTDIR)/$(1) gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res +gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar +gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip define gb_Library_get_target $(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES))) @@ -44,6 +47,7 @@ endef gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1) gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component +gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1) @@ -52,6 +56,8 @@ gb_GenCxxObject_get_target = $(WORKDIR)/ gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1) gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1) gb_GoogleTest_get_target = $(WORKDIR)/GoogleTest/$(1).test +gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar +gb_Jar_get_classsetname = Jar/$(1) gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1) gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done @@ -61,6 +67,10 @@ gb_JunitTest_get_userdir = $(WORKDIR)/Ju gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1) gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1) gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1) +gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb +gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb +gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) +gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1) gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1) gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1) gb_Module_get_target = $(WORKDIR)/Module/$(1) @@ -78,6 +88,8 @@ gb_SrsPartMergeTarget_get_target = $(WOR gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1) gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX) +gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip +gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done define gb_Library_get_external_headers_target $(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES))) @@ -99,6 +111,7 @@ $(eval $(call gb_Helper_make_clean_targe AllLangResTarget \ ComponentTarget \ JavaClassSet \ + Jar \ JunitTest \ LinkTarget \ Module \ @@ -111,6 +124,8 @@ $(eval $(call gb_Helper_make_clean_targe SrsTarget \ GoogleTest \ CustomTarget \ + UnoApiTarget \ + Zip \ )) $(eval $(call gb_Helper_make_outdir_clean_targets,\ @@ -118,18 +133,19 @@ $(eval $(call gb_Helper_make_outdir_clea Library \ Package \ StaticLibrary \ + UnoApiOutTarget \ )) $(eval $(call gb_Helper_make_dep_targets,\ CObject \ CxxObject \ ObjCxxObject \ + GenCxxObject \ LinkTarget \ SrsPartTarget \ SrsTarget \ + UnoApiTarget \ )) -# needs to use same dep target because we use gb_CxxObject__command -gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target) # other getters Modified: openoffice/trunk/main/solenv/gbuild/gbuild.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/gbuild.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/gbuild.mk (original) +++ openoffice/trunk/main/solenv/gbuild/gbuild.mk Sun Aug 7 19:24:03 2016 @@ -207,6 +207,8 @@ include $(GBUILDDIR)/Deliver.mk $(eval $(call gb_Deliver_init)) +include $(SOLARENV)/inc/minor.mk + # We are using a set of scopes that we might as well call classes. # It is important to include them in the right order as that is @@ -237,9 +239,12 @@ include $(foreach class, \ CustomTarget \ PrecompiledHeaders \ GoogleTest \ + Jar \ JavaClassSet \ JunitTest \ Module \ + UnoApiTarget \ + Zip \ ,$(GBUILDDIR)/$(class).mk) # optional extensions that should never be essential @@ -257,5 +262,8 @@ endif export gb_AWK export gb_XSLTPROC +export GBUILDDIR +# FIXME exporting SRCDIR seems kind of a hack +export SRCDIR # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk Sun Aug 7 19:24:03 2016 @@ -165,17 +165,18 @@ endef # CObject class +# $(call gb_CObject__command,object,relative-source,source,dep-file) define gb_CObject__command $(call gb_Output_announce,$(2),$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ - $(DEFS) $(CFLAGS) \ + $(DEFS) \ + $(T_CFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CObject_get_target,$(2)) \ - -MF $(call gb_CObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -189,17 +190,18 @@ endef # CxxObject class +# $(call gb_CxxObject__command,object,relative-source,source,dep-file) define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(CXXFLAGS) \ + $(DEFS) \ + $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CxxObject_get_target,$(2)) \ - -MF $(call gb_CxxObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -219,22 +221,18 @@ gb_LinkTarget__RPATHS := \ SDKBIN:\dORIGIN/../../ure-link/lib \ NONEBIN:\dORIGIN/../lib:\dORIGIN \ -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) ifeq ($(gb_DEBUGLEVEL),0) gb_LinkTarget_LDFLAGS += -Wl,-O1 endif -gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline - ifeq ($(gb_DEBUGLEVEL),2) ifeq ($(COM),CLANG) -gb_LinkTarget_CXXFLAGS += -ggdb3 -fno-inline -gb_LinkTarget_CFLAGS += -ggdb3 -fno-inline +gb_DEBUG_CFLAGS := -ggdb3 -fno-inline else -gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline -gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline +gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline endif endif @@ -246,13 +244,15 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_CXX) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(subst \d,$$,$(RPATH)) \ + $(T_LDFLAGS) \ $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ $(patsubst %,-l%,$(EXTERNAL_LIBS)) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ + $(LIBS) \ -o $(1)) endef @@ -296,16 +296,16 @@ gb_Library_UNOEXT := .uno$(gb_Library_PL endif gb_Library_PLAINLIBS_NONE += \ + fontconfig \ + Xrender \ dl \ freetype \ - jpeg \ m \ pthread \ X11 \ Xext \ SM \ - ICE \ - z + ICE gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ Modified: openoffice/trunk/main/solenv/gbuild/platform/linux.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/linux.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/linux.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/linux.mk Sun Aug 7 19:24:03 2016 @@ -137,6 +137,12 @@ gb_LinkTarget_LDFLAGS += \ endif +ifeq ($(gb_DEBUGLEVEL),0) +gb_LinkTarget_LDFLAGS += -Wl,-O1 +endif + +gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline + ifeq ($(gb_DEBUGLEVEL),2) gb_COMPILEROPTFLAGS := -O0 else @@ -158,35 +164,43 @@ endef # CObject class +# $(call gb_CObject__command,object,relative-source,source,dep-file) define gb_CObject__command $(call gb_Output_announce,$(2),$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ - $(DEFS) $(CFLAGS) \ + $(DEFS) \ + $(T_CFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CObject_get_target,$(2)) \ - -MF $(call gb_CObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef +# convert parametters filesystem root to native notation +# does some real work only on windows, make sure not to +# break the dummy implementations on unx* +define gb_Helper_convert_native +$(1) +endef # CxxObject class +# $(call gb_CxxObject__command,object,relative-source,source,dep-file) define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(CXXFLAGS) \ + $(DEFS) \ + $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CxxObject_get_target,$(2)) \ - -MF $(call gb_CxxObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -206,14 +220,9 @@ gb_LinkTarget__RPATHS := \ SDKBIN:\dORIGIN/../../ure-link/lib \ NONEBIN:\dORIGIN/../lib:\dORIGIN \ -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) -ifeq ($(gb_DEBUGLEVEL),2) -gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline -gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline - -endif gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) @@ -223,13 +232,15 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_CXX) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(subst \d,$$,$(RPATH)) \ + $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ $(patsubst %,-l%,$(EXTERNAL_LIBS)) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ + $(LIBS) \ -o $(1)) endef @@ -273,16 +284,16 @@ gb_Library_UNOEXT := .uno$(gb_Library_PL endif gb_Library_PLAINLIBS_NONE += \ + fontconfig \ + Xrender \ dl \ freetype \ - jpeg \ m \ pthread \ X11 \ Xext \ SM \ - ICE \ - z + ICE gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ @@ -405,6 +416,19 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH gb_Library_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ + NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \ + +# UnoApiTarget +gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc +gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET) +gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge +gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET) +gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare +gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) +gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker +gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET) +gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview +gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET) # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Sun Aug 7 19:24:03 2016 @@ -137,6 +137,8 @@ gb_LinkTarget_LDFLAGS := \ $(subst -L../lib , ,$(SOLARLIB)) \ #man ld says: obsolete -Wl,-multiply_defined,suppress \ +gb_DEBUG_CFLAGS := -g + ifeq ($(gb_DEBUGLEVEL),2) gb_COMPILEROPTFLAGS := -O0 else @@ -156,20 +158,27 @@ define gb_Helper_convert_native $(1) endef +# convert parametters filesystem root to native notation +# does some real work only on windows, make sure not to +# break the dummy implementations on unx* +define gb_Helper_convert_native +$(1) +endef + # CObject class define gb_CObject__command $(call gb_Output_announce,$(2),$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ - $(DEFS) $(CFLAGS) \ + $(DEFS) \ + $(T_CFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CObject_get_target,$(2)) \ - -MF $(call gb_CObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -181,14 +190,14 @@ endef define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(CXXFLAGS) \ + $(DEFS) \ + $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CxxObject_get_target,$(2)) \ - -MF $(call gb_CxxObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -199,14 +208,14 @@ endef define gb_ObjCxxObject__command $(call gb_Output_announce,$(2),$(true),OCX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(OBJCXXFLAGS) \ + $(DEFS) \ + $(T_OBJCXXFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \ - -MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -230,15 +239,9 @@ define gb_LinkTarget__get_installname $(if $(2),-install_name '$(2)$(1)',) endef -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) -gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS) - -ifeq ($(gb_DEBUGLEVEL),2) -gb_LinkTarget_CFLAGS += -g -gb_LinkTarget_CXXFLAGS += -g -gb_LinkTarget_OBJCXXFLAGS += -g -endif +gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) @@ -264,20 +267,23 @@ $(call gb_Helper_abbreviate_dirs,\ $(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(subst \d,$$,$(RPATH)) \ + $(T_LDFLAGS) \ $(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ $(patsubst %,-l%,$(EXTERNAL_LIBS)) \ > $${DYLIB_FILE} && \ $(gb_CXX) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(subst \d,$$,$(RPATH)) \ + $(T_LDFLAGS) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ + $(LIBS) \ -o $(1) \ `cat $${DYLIB_FILE}` && \ $(if $(filter Library,$(TARGETTYPE)),\ @@ -323,10 +329,8 @@ gb_Library__FRAMEWORKS := \ gb_Library_PLAINLIBS_NONE += \ Cocoa \ objc \ - jpeg \ m \ - pthread \ - z + pthread gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ @@ -450,6 +454,20 @@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PA gb_Library_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ + NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \ + +# UnoApiTarget + +gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc +gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET) +gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge +gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET) +gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare +gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) +gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker +gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET) +gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview +gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET) # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Sun Aug 7 19:24:03 2016 @@ -163,17 +163,18 @@ endef # CObject class +# $(call gb_CObject__command,object,relative-source,source,dep-file) define gb_CObject__command $(call gb_Output_announce,$(2),$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ - $(DEFS) $(CFLAGS) \ + $(DEFS) \ + $(T_CFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CObject_get_target,$(2)) \ - -MF $(call gb_CObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -181,17 +182,18 @@ endef # CxxObject class +# $(call gb_CxxObject__command,object,relative-source,source,dep-file) define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(CXXFLAGS) \ + $(DEFS) \ + $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CxxObject_get_target,$(2)) \ - -MF $(call gb_CxxObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -281,14 +283,9 @@ endef # LinkTarget class -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) - -ifeq ($(gb_DEBUGLEVEL),2) -gb_LinkTarget_CFLAGS += -g -gb_LinkTarget_CXXFLAGS += -g -gb_LinkTarget_OBJCXXFLAGS += -g -endif +gb_DEBUG_CFLAGS := -g gb_LinkTarget_INCLUDE :=\ $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \ @@ -319,13 +316,14 @@ $(call gb_Helper_abbreviate_dirs_native, $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ - $(LDFLAGS) \ + $(T_LDFLAGS) \ @$${RESPONSEFILE} \ $(if $(DLLTARGET), $(DLLDEF)) \ $(NATIVERES) \ $(patsubst %.lib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ $(patsubst %,-l%,$(EXTERNAL_LIBS)) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ + $(LIBS) \ $(if $(DLLTARGET),-o $(DLLTARGET), -o $(1) ); \ RC=$$?; rm $${RESPONSEFILE} \ $(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLDEF) ) \ @@ -355,7 +353,7 @@ endef # Library class -gb_Library_DEFS := -D_DLL +gb_Library_DEFS := -D_DLL_ gb_Library_TARGETTYPEFLAGS := -Zdll gb_Library_get_rpath := @@ -367,9 +365,7 @@ gb_Library_PLAINLIBS_NONE += \ ft2lib \ dl \ freetype \ - jpeg \ m \ - z \ pthread gb_Library_LAYER := \ @@ -433,11 +429,11 @@ $(call gb_Library_get_clean_target,$(1)) $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \ $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \ -$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3))) -$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3))) +$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3)),$(1)) +$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3)),$(1)) endif -$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3)) +$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) $(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) @@ -499,7 +495,7 @@ define gb_Executable_Executable_platform #$(call gb_Executable_get_target,$(1)) \ #$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest -#$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest) +#$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest,$(1)) #$(call gb_LinkTarget_get_target,$(2)) \ #$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) @@ -638,5 +634,19 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}: gb_Library_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ + NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \ + +# UnoApiTarget + +gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe +gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET) +gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe +gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET) +gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe +gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) +gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe +gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET) +gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe +gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET) # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/platform/solaris.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/solaris.mk?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/solaris.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/solaris.mk Sun Aug 7 19:24:03 2016 @@ -104,6 +104,9 @@ gb_LinkTarget_LDFLAGS := \ -PIC \ -library=no%Cstd \ + +gb_DEBUG_CFLAGS := -g + ifeq ($(gb_DEBUGLEVEL),2) gb_COMPILEROPTFLAGS := else @@ -131,21 +134,28 @@ define gb_Helper_convert_native $(1) endef +# convert parametters filesystem root to native notation +# does some real work only on windows, make sure not to +# break the dummy implementations on unx* +define gb_Helper_convert_native +$(1) +endef + # CObject class define gb_CObject__command $(call gb_Output_announce,$(2),$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - rm -f $(call gb_CObject_get_dep_target,$(2)) && \ - mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ + rm -f $(4) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ -c $(3) \ -o $(1) \ -xMMD \ - -xMF $(call gb_CObject_get_dep_target,$(2)) \ - $(DEFS) $(CFLAGS) \ + -xMF $(4) \ + $(DEFS) \ + $(T_CFLAGS) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -156,14 +166,14 @@ endef define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(CXXFLAGS) \ + $(DEFS) \ + $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ -xMMD \ - -xMF $(call gb_CxxObject_get_dep_target,$(2)) \ + -xMF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -183,13 +193,9 @@ gb_LinkTarget__RPATHS := \ SDKBIN:\dORIGIN/../../ure-link/lib \ NONEBIN:\dORIGIN/../lib:\dORIGIN \ -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) -ifeq ($(gb_DEBUGLEVEL),2) -gb_LinkTarget_CXXFLAGS += -g -gb_LinkTarget_CFLAGS += -g -endif gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) @@ -199,13 +205,15 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_CXX) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(subst \d,$$,$(RPATH)) \ + $(T_LDFLAGS) \ $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ $(patsubst %,-l%,$(EXTERNAL_LIBS)) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ + $(LIBS) \ -o $(1)) endef @@ -256,13 +264,13 @@ gb_Library_PLAINLIBS_NONE += \ $(gb_STDLIBS) \ dl \ freetype \ - jpeg \ + nsl \ pthread \ + socket \ X11 \ Xext \ SM \ - ICE \ - z + ICE gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ @@ -391,6 +399,19 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH gb_Library_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ + NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \ + +# UnoApiTarget +gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc +gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET) +gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge +gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET) +gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare +gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) +gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker +gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET) +gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview +gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET) # vim: set noet sw=4 ts=4:
