You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 22:10:21 UTC
svn commit: r1409400 [3/4] - in /incubator/ooo/branches/gbuild/main: ./
UnoControls/prj/ accessibility/prj/ animations/prj/ basctl/source/dlged/
basegfx/prj/ basic/prj/ binaryurp/prj/ binfilter/bf_svx/source/items/
binfilter/bf_svx/source/unodraw/ binf...
Modified: incubator/ooo/branches/gbuild/main/sd/source/ui/unoidl/unopage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/source/ui/unoidl/unopage.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/source/ui/unoidl/unopage.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sd/source/ui/unoidl/unopage.cxx Wed Nov 14 21:10:00 2012
@@ -37,7 +37,7 @@
#include <rtl/ustrbuf.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/metaact.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <unomodel.hxx>
Modified: incubator/ooo/branches/gbuild/main/sd/source/ui/view/ToolBarManager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/source/ui/view/ToolBarManager.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/source/ui/view/ToolBarManager.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sd/source/ui/view/ToolBarManager.cxx Wed Nov 14 21:10:00 2012
@@ -47,7 +47,7 @@
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <tools/link.hxx>
Modified: incubator/ooo/branches/gbuild/main/sd/source/ui/view/drviews8.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sd/source/ui/view/drviews8.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sd/source/ui/view/drviews8.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sd/source/ui/view/drviews8.cxx Wed Nov 14 21:10:00 2012
@@ -29,7 +29,7 @@
#include "ViewShellHint.hxx"
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <sfx2/dispatch.hxx>
#ifndef _SVXIDS_HXX
Modified: incubator/ooo/branches/gbuild/main/sdext/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sdext/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sdext/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/sdext/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
+dx sdext : L10N:l10n offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
dx sdext usr1 - all sdext_mkout NULL
dx sdext\prj get - all sdext_prj NULL
dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL
Modified: incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk Wed Nov 14 21:10:00 2012
@@ -27,6 +27,11 @@ $(eval $(call gb_CppunitTest_add_excepti
sfx2/qa/cppunit/test_metadatable \
))
+$(eval $(call gb_CppunitTest_add_api,sfx2_metadatable, \
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
sal \
sfx \
@@ -36,7 +41,6 @@ $(eval $(call gb_CppunitTest_add_linked_
$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
Modified: incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk Wed Nov 14 21:10:00 2012
@@ -29,11 +29,15 @@ $(eval $(call gb_Library_set_include,qst
-I$(SRCDIR)/sfx2/inc \
-I$(SRCDIR)/sfx2/inc/sfx2 \
-I$(SRCDIR)/sfx2/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
$(filter -I%,$(GTK_CFLAGS)) \
))
+$(eval $(call gb_Library_add_api,qstart_gtk,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_defs,qstart_gtk,\
$$(DEFS) \
-DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
Modified: incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk Wed Nov 14 21:10:00 2012
@@ -34,6 +34,11 @@ $(eval $(call gb_Library_add_sdi_headers
$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
+$(eval $(call gb_Library_add_api,sfx,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,sfx,\
-I$(SRCDIR)/sfx2/inc \
-I$(SRCDIR)/sfx2/inc/sfx2 \
@@ -42,7 +47,6 @@ $(eval $(call gb_Library_set_include,sfx
-I$(WORKDIR)/SdiTarget/sfx2/sdi \
-I$(WORKDIR)/inc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
$(LIBXML_CFLAGS) \
))
Modified: incubator/ooo/branches/gbuild/main/sfx2/source/doc/objmisc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/source/doc/objmisc.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/source/doc/objmisc.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/source/doc/objmisc.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/sfx2/source/inet/inettbc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/source/inet/inettbc.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/source/inet/inettbc.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/source/inet/inettbc.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/sfx2/source/menu/virtmenu.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/source/menu/virtmenu.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/source/menu/virtmenu.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/source/menu/virtmenu.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/sfx2/source/statbar/stbitem.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/source/statbar/stbitem.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/source/statbar/stbitem.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/source/statbar/stbitem.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/sfx2/source/view/viewfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/source/view/viewfrm.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/source/view/viewfrm.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/source/view/viewfrm.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/sfx2/source/view/viewsh.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/source/view/viewsh.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/source/view/viewsh.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/source/view/viewsh.cxx Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/shell/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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\simplemail nmake - w sl_win32_simplemail sl_inc NULL
Modified: incubator/ooo/branches/gbuild/main/slideshow/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/slideshow/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/slideshow/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/slideshow/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/solenv/gbuild/AllLangResTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/AllLangResTarget.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/AllLangResTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/AllLangResTarget.mk Wed Nov 14 21:10:00 2012
@@ -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: incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk Wed Nov 14 21:10:00 2012
@@ -58,7 +58,7 @@ define gb_ComponentTarget_ComponentTarge
$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
$(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_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk Wed Nov 14 21:10:00 2012
@@ -84,6 +84,7 @@ $(eval $(foreach method,\
set_include \
set_ldflags \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
add_package_headers \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk Wed Nov 14 21:10:00 2012
@@ -30,15 +30,30 @@ 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
mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
@@ -60,7 +75,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 +100,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: incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk Wed Nov 14 21:10:00 2012
@@ -49,7 +49,7 @@ $(call gb_Executable_get_target,$(1)) :
$(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
@@ -75,6 +75,7 @@ $(eval $(foreach method,\
set_include \
set_ldflags \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
add_package_headers \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk Wed Nov 14 21:10:00 2012
@@ -72,7 +72,7 @@ $(call gb_Library_get_target,$(1)) : $(c
$(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
@@ -118,6 +118,7 @@ $(eval $(foreach method,\
set_include \
set_ldflags \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
add_external_libs \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk Wed Nov 14 21:10:00 2012
@@ -448,6 +448,17 @@ define gb_LinkTarget_set_ldflags
$(call gb_LinkTarget_get_target,$(1)) : 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_linked_libs
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk Wed Nov 14 21:10:00 2012
@@ -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 $@
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk Wed Nov 14 21:10:00 2012
@@ -67,7 +67,7 @@ $(call gb_StaticLibrary_get_target,$(1))
$(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
@@ -93,6 +93,7 @@ $(eval $(foreach method,\
set_include \
set_ldflags \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
add_package_headers \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk Wed Nov 14 21:10:00 2012
@@ -25,7 +25,7 @@
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).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
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
@@ -61,6 +61,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)
@@ -111,6 +115,7 @@ $(eval $(call gb_Helper_make_clean_targe
SrsTarget \
CppunitTest \
CustomTarget \
+ UnoApiTarget \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
@@ -118,6 +123,7 @@ $(eval $(call gb_Helper_make_outdir_clea
Library \
Package \
StaticLibrary \
+ UnoApiOutTarget \
))
$(eval $(call gb_Helper_make_dep_targets,\
@@ -127,6 +133,7 @@ $(eval $(call gb_Helper_make_dep_targets
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)
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk Wed Nov 14 21:10:00 2012
@@ -210,6 +210,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
@@ -243,6 +245,7 @@ include $(foreach class, \
JavaClassSet \
JunitTest \
Module \
+ UnoApiTarget \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Wed Nov 14 21:10:00 2012
@@ -173,6 +173,12 @@ $(call gb_Helper_abbreviate_dirs,\
$(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
@@ -411,5 +417,17 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_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: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk Wed Nov 14 21:10:00 2012
@@ -145,6 +145,13 @@ 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
@@ -456,5 +463,16 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_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_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: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/os2.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/os2.mk Wed Nov 14 21:10:00 2012
@@ -436,11 +436,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))
@@ -502,7 +502,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))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk Wed Nov 14 21:10:00 2012
@@ -131,6 +131,13 @@ 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
@@ -397,5 +404,15 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_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_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: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 21:10:00 2012
@@ -237,6 +237,17 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR
$(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
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
# CObject class
@@ -525,11 +536,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))
@@ -600,7 +611,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2)
$(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))
@@ -756,4 +767,15 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_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_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: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed Nov 14 21:10:00 2012
@@ -207,6 +207,17 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR
$(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
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
@@ -543,7 +554,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2)
$(call gb_Library_get_target,$(1)) \
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
endef
@@ -695,4 +706,15 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_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_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: incubator/ooo/branches/gbuild/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/inc/target.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/inc/target.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/inc/target.mk Wed Nov 14 21:10:00 2012
@@ -54,7 +54,7 @@ INCEXT*=.
INCPRE*=.
INCPOST*=.
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/offuh
+UNOINCLUDES=$(SOLARINCDIR)/udkapi -I$(SOLARINCDIR)/offapi -I$(SOLARINCDIR)/oovbaapi
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
SOLARINC+=$(JDKINCS)
# make sure INCLUDE isn't set
Modified: incubator/ooo/branches/gbuild/main/sot/Library_sot.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sot/Library_sot.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sot/Library_sot.mk (original)
+++ incubator/ooo/branches/gbuild/main/sot/Library_sot.mk Wed Nov 14 21:10:00 2012
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_set_componentfi
$(eval $(call gb_Library_set_include,sot,\
-I$(SRCDIR)/sot/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,sot,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_set_defs,sot,\
Modified: incubator/ooo/branches/gbuild/main/svgio/Library_svgio.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svgio/Library_svgio.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svgio/Library_svgio.mk (original)
+++ incubator/ooo/branches/gbuild/main/svgio/Library_svgio.mk Wed Nov 14 21:10:00 2012
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_set_include,svg
-I$(SRCDIR)/svgio/inc \
-I$(SRCDIR)/svgio/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,svgio,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_set_defs,svgio,\
Modified: incubator/ooo/branches/gbuild/main/svl/Library_fsstorage.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svl/Library_fsstorage.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svl/Library_fsstorage.mk (original)
+++ incubator/ooo/branches/gbuild/main/svl/Library_fsstorage.mk Wed Nov 14 21:10:00 2012
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_include,fss
-I$(SRCDIR)/svl/inc/svl \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,fsstorage,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,fsstorage,\
comphelper \
cppu \
Modified: incubator/ooo/branches/gbuild/main/svl/Library_passwordcontainer.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svl/Library_passwordcontainer.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svl/Library_passwordcontainer.mk (original)
+++ incubator/ooo/branches/gbuild/main/svl/Library_passwordcontainer.mk Wed Nov 14 21:10:00 2012
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_include,pas
-I$(SRCDIR)/svl/inc/svl \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,passwordcontainer,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
cppu \
cppuhelper \
Modified: incubator/ooo/branches/gbuild/main/svl/Library_svl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svl/Library_svl.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svl/Library_svl.mk (original)
+++ incubator/ooo/branches/gbuild/main/svl/Library_svl.mk Wed Nov 14 21:10:00 2012
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,svl
$$(SOLARINC) \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,svl,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_set_defs,svl,\
Modified: incubator/ooo/branches/gbuild/main/svl/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svl/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svl/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/svl/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,2 +1,2 @@
-sl svl : L10N:l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
+sl svl : L10N:l10n rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
sl svl\prj nmake - all svl_prj NULL
Modified: incubator/ooo/branches/gbuild/main/svtools/Executable_bmp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/Executable_bmp.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/Executable_bmp.mk (original)
+++ incubator/ooo/branches/gbuild/main/svtools/Executable_bmp.mk Wed Nov 14 21:10:00 2012
@@ -32,7 +32,11 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/svtools/inc/svtools \
-I$(SRCDIR)/svtools/source/inc \
-I$(SRCDIR)/svtools/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_add_api,bmp,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Executable_add_linked_libs,bmp,\
Modified: incubator/ooo/branches/gbuild/main/svtools/Executable_bmpsum.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/Executable_bmpsum.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/Executable_bmpsum.mk (original)
+++ incubator/ooo/branches/gbuild/main/svtools/Executable_bmpsum.mk Wed Nov 14 21:10:00 2012
@@ -26,12 +26,16 @@ $(eval $(call gb_Executable_Executable,b
$(eval $(call gb_Executable_set_include,bmpsum,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
- -I$(OUTDIR)/inc/offuh/ \
-I$(SRCDIR)/svtools/inc/ \
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(SRCDIR)/svtools/inc/svtools/ \
))
+$(eval $(call gb_Executable_add_api,bmpsum,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
sal \
stl \
Modified: incubator/ooo/branches/gbuild/main/svtools/Executable_g2g.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/Executable_g2g.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/Executable_g2g.mk (original)
+++ incubator/ooo/branches/gbuild/main/svtools/Executable_g2g.mk Wed Nov 14 21:10:00 2012
@@ -26,12 +26,16 @@ $(eval $(call gb_Executable_Executable,g
$(eval $(call gb_Executable_set_include,g2g,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
- -I$(OUTDIR)/inc/offuh/ \
-I$(SRCDIR)/svtools/inc/ \
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(SRCDIR)/svtools/inc/svtools/ \
))
+$(eval $(call gb_Executable_add_api,g2g,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,g2g,\
jvmfwk \
sal \
Modified: incubator/ooo/branches/gbuild/main/svtools/Library_hatchwindowfactory.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/Library_hatchwindowfactory.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/Library_hatchwindowfactory.mk (original)
+++ incubator/ooo/branches/gbuild/main/svtools/Library_hatchwindowfactory.mk Wed Nov 14 21:10:00 2012
@@ -32,10 +32,14 @@ $(eval $(call gb_Library_set_include,hat
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(OUTDIR)/inc/ \
-I$(SRCDIR)/svtools/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,hatchwindowfactory,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
cppu \
cppuhelper \
Modified: incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk (original)
+++ incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk Wed Nov 14 21:10:00 2012
@@ -29,6 +29,11 @@ $(eval $(call gb_Library_add_precompiled
$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
+$(eval $(call gb_Library_add_api,svt,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,svt,\
-I$(OUTDIR)/inc/external/jpeg \
$$(INCLUDE) \
@@ -39,7 +44,6 @@ $(eval $(call gb_Library_set_include,svt
-I$(SRCDIR)/svtools/inc/svtools \
-I$(SRCDIR)/svtools/source/inc \
-I$(SRCDIR)/svtools/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,svt,\
Modified: incubator/ooo/branches/gbuild/main/svtools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/svtools/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,2 +1,2 @@
-st svtools : L10N:l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
+st svtools : L10N:l10n svl offapi toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
st svtools\prj nmake - all st_prj NULL
Modified: incubator/ooo/branches/gbuild/main/svtools/source/uno/contextmenuhelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/source/uno/contextmenuhelper.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/source/uno/contextmenuhelper.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svtools/source/uno/contextmenuhelper.cxx Wed Nov 14 21:10:00 2012
@@ -45,7 +45,7 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/image.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxmenu.hxx>
Modified: incubator/ooo/branches/gbuild/main/svtools/source/uno/statusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/source/uno/statusbarcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/source/uno/statusbarcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svtools/source/uno/statusbarcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -35,7 +35,7 @@
#include <vcl/status.hxx>
#include <svtools/imgdef.hxx>
#include <svtools/miscopt.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
using namespace ::cppu;
using namespace ::com::sun::star::awt;
Modified: incubator/ooo/branches/gbuild/main/svtools/source/uno/toolboxcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/source/uno/toolboxcontroller.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/source/uno/toolboxcontroller.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svtools/source/uno/toolboxcontroller.cxx Wed Nov 14 21:10:00 2012
@@ -33,7 +33,7 @@
#include <vcl/svapp.hxx>
#include <svtools/imgdef.hxx>
#include <svtools/miscopt.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/toolbox.hxx>
//shizhobo
#include <com/sun/star/beans/PropertyAttribute.hpp>
Modified: incubator/ooo/branches/gbuild/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/Library_svx.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/Library_svx.mk (original)
+++ incubator/ooo/branches/gbuild/main/svx/Library_svx.mk Wed Nov 14 21:10:00 2012
@@ -30,7 +30,11 @@ $(eval $(call gb_Library_set_include,svx
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/inc/pch \
$$(SOLARINC) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,svx,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_set_defs,svx,\
Modified: incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk (original)
+++ incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk Wed Nov 14 21:10:00 2012
@@ -32,12 +32,16 @@ $(eval $(call gb_Library_add_package_hea
svx_sdi \
))
+$(eval $(call gb_Library_add_api,svxcore,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,svxcore,\
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/inc/pch \
-I$(SRCDIR)/svx/source/inc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(WORKDIR)/SdiTarget/svx/sdi \
))
Modified: incubator/ooo/branches/gbuild/main/svx/Library_textconversiondlgs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/Library_textconversiondlgs.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/Library_textconversiondlgs.mk (original)
+++ incubator/ooo/branches/gbuild/main/svx/Library_textconversiondlgs.mk Wed Nov 14 21:10:00 2012
@@ -29,7 +29,11 @@ $(eval $(call gb_Library_set_include,tex
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,textconversiondlgs,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_set_defs,textconversiondlgs,\
Modified: incubator/ooo/branches/gbuild/main/svx/source/dialog/docrecovery.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/source/dialog/docrecovery.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/source/dialog/docrecovery.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/source/dialog/docrecovery.cxx Wed Nov 14 21:10:00 2012
@@ -41,7 +41,7 @@
#include <vcl/scrbar.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
//#include "com/sun/star/lang/XMultiServiceFactory.hpp"
Modified: incubator/ooo/branches/gbuild/main/svx/source/dialog/srchdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/source/dialog/srchdlg.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/source/dialog/srchdlg.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/source/dialog/srchdlg.cxx Wed Nov 14 21:10:00 2012
@@ -49,7 +49,7 @@
#include <svl/intitem.hxx>
#include <sfx2/app.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#define _SVX_SRCHDLG_CXX
#include "svx/srchdlg.hxx"
Modified: incubator/ooo/branches/gbuild/main/svx/source/form/fmPropBrw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/source/form/fmPropBrw.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/source/form/fmPropBrw.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/source/form/fmPropBrw.cxx Wed Nov 14 21:10:00 2012
@@ -64,7 +64,7 @@
#include <sfx2/objitem.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/shl.hxx>
Modified: incubator/ooo/branches/gbuild/main/svx/source/form/fmtools.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/source/form/fmtools.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/source/form/fmtools.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/source/form/fmtools.cxx Wed Nov 14 21:10:00 2012
@@ -86,7 +86,7 @@
#include <sfx2/bindings.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/string.hxx>
#include <vcl/stdtext.hxx>
Modified: incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshap2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshap2.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshap2.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshap2.cxx Wed Nov 14 21:10:00 2012
@@ -1627,7 +1627,7 @@ uno::Sequence< OUString > SAL_CALL SvxSh
#include <sfx2/fcontnr.hxx>
#endif
-#include "toolkit/unohlp.hxx"
+#include "toolkit/helper/vclunohelper.hxx"
//----------------------------------------------------------------------
SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw()
Modified: incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshape.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshape.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/source/unodraw/unoshape.cxx Wed Nov 14 21:10:00 2012
@@ -41,7 +41,7 @@
#include <comphelper/extract.hxx>
#include "svx/shapepropertynotifier.hxx"
#include <comphelper/serviceinfohelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/serviceinfohelper.hxx>
#include <rtl/uuid.h>
#include <rtl/memory.h>
Modified: incubator/ooo/branches/gbuild/main/svx/source/xoutdev/xattrbmp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/source/xoutdev/xattrbmp.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/source/xoutdev/xattrbmp.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/source/xoutdev/xattrbmp.cxx Wed Nov 14 21:10:00 2012
@@ -28,7 +28,7 @@
#include <vcl/window.hxx>
#include <vcl/virdev.hxx>
#include <vcl/bitmapex.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <svl/style.hxx>
#include <editeng/memberids.hrc>
#include <svx/dialogs.hrc>
Modified: incubator/ooo/branches/gbuild/main/svx/workben/msview/msview.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/workben/msview/msview.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/workben/msview/msview.cxx (original)
+++ incubator/ooo/branches/gbuild/main/svx/workben/msview/msview.cxx Wed Nov 14 21:10:00 2012
@@ -50,7 +50,7 @@
#include <svtools/svmedit.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/stream.hxx>
#include <tools/resmgr.hxx>
Modified: incubator/ooo/branches/gbuild/main/sw/Library_msword.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_msword.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_msword.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_msword.mk Wed Nov 14 21:10:00 2012
@@ -34,10 +34,14 @@ $(eval $(call gb_Library_set_include,msw
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/sw \
))
+$(eval $(call gb_Library_add_api,msword,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_defs,msword,\
$$(DEFS) \
))
Modified: incubator/ooo/branches/gbuild/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_sw.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_sw.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_sw.mk Wed Nov 14 21:10:00 2012
@@ -38,10 +38,14 @@ $(eval $(call gb_Library_set_include,sw,
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,sw,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_defs,sw,\
$$(DEFS) \
-DSW_DLLIMPLEMENTATION \
Modified: incubator/ooo/branches/gbuild/main/sw/Library_swd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_swd.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_swd.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_swd.mk Wed Nov 14 21:10:00 2012
@@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,swd
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,swd,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_set_defs,swd,\
Modified: incubator/ooo/branches/gbuild/main/sw/Library_swui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_swui.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_swui.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_swui.mk Wed Nov 14 21:10:00 2012
@@ -32,13 +32,17 @@ $(eval $(call gb_Library_set_include,swu
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,swui,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,swui,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,swui,\
comphelper \
cppu \
Modified: incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk Wed Nov 14 21:10:00 2012
@@ -33,10 +33,15 @@ $(eval $(call gb_Library_set_include,vba
-I$(SRCDIR)/sw/inc \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/ \
))
+$(eval $(call gb_Library_add_api,vbaswobj,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
comphelper \
cppu \
Modified: incubator/ooo/branches/gbuild/main/sw/inc/pch/precompiled_sw.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/inc/pch/precompiled_sw.hxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/inc/pch/precompiled_sw.hxx (original)
+++ incubator/ooo/branches/gbuild/main/sw/inc/pch/precompiled_sw.hxx Wed Nov 14 21:10:00 2012
@@ -835,7 +835,6 @@
#include "sys/types.h"
#include "toolkit/helper/vclunohelper.hxx"
-#include "toolkit/unohlp.hxx"
#include "tools/bigint.hxx"
#include "tools/cachestr.hxx"
Modified: incubator/ooo/branches/gbuild/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx Wed Nov 14 21:10:00 2012
@@ -36,7 +36,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <dbui.hrc>
Modified: incubator/ooo/branches/gbuild/main/sw/source/ui/envelp/mailmrge.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/source/ui/envelp/mailmrge.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/source/ui/envelp/mailmrge.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sw/source/ui/envelp/mailmrge.cxx Wed Nov 14 21:10:00 2012
@@ -59,7 +59,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdb/XResultSetAccess.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/form/runtime/XFormController.hpp>
#include <cppuhelper/implbase1.hxx>
Modified: incubator/ooo/branches/gbuild/main/sw/source/ui/uiview/view.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/source/ui/uiview/view.cxx?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/source/ui/uiview/view.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sw/source/ui/uiview/view.cxx Wed Nov 14 21:10:00 2012
@@ -95,7 +95,7 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/scanner/ScannerContext.hpp>
#include <com/sun/star/scanner/XScannerManager.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/ustrbuf.hxx>
#include <xmloff/xmluconv.hxx>
Modified: incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk (original)
+++ incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk Wed Nov 14 21:10:00 2012
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,tk,
-I$(SRCDIR)/toolkit/inc \
-I$(SRCDIR)/toolkit/inc/pch \
-I$(SRCDIR)/toolkit/source \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,tk,\
@@ -42,6 +41,11 @@ $(eval $(call gb_Library_set_defs,tk,\
-DTOOLKIT_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,tk,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,tk,\
comphelper \
cppu \
Modified: incubator/ooo/branches/gbuild/main/toolkit/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/toolkit/Package_inc.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/toolkit/Package_inc.mk (original)
+++ incubator/ooo/branches/gbuild/main/toolkit/Package_inc.mk Wed Nov 14 21:10:00 2012
@@ -60,4 +60,3 @@ $(eval $(call gb_Package_add_file,toolki
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx))
Modified: incubator/ooo/branches/gbuild/main/tools/Library_tl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/Library_tl.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/Library_tl.mk (original)
+++ incubator/ooo/branches/gbuild/main/tools/Library_tl.mk Wed Nov 14 21:10:00 2012
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,tl,
-I$(SRCDIR)/tools/inc/pch \
-I$(SRCDIR)/solenv/inc \
-I$(SRCDIR)/solenv/inc/Xp31 \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
))
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,tl,\
-DVCL \
))
+$(eval $(call gb_Library_add_api,tl,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,tl,\
basegfx \
comphelper \
Modified: incubator/ooo/branches/gbuild/main/tools/StaticLibrary_ooopathutils.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/StaticLibrary_ooopathutils.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/StaticLibrary_ooopathutils.mk (original)
+++ incubator/ooo/branches/gbuild/main/tools/StaticLibrary_ooopathutils.mk Wed Nov 14 21:10:00 2012
@@ -35,7 +35,7 @@ $(eval $(call gb_StaticLibrary_add_excep
# Instead of this evil linking of an object from $(OUTDIR)
define StaticLibrary_ooopathutils_hack
$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils),$(1)))
$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils)
$$(call gb_Deliver_deliver,$$<,$$@)
Modified: incubator/ooo/branches/gbuild/main/tools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/tools/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,2 +1,2 @@
-tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
+tl tools : cppu external offapi vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
tl tools\prj nmake - all tl_prj NULL
Modified: incubator/ooo/branches/gbuild/main/ucbhelper/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/ucbhelper/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/ucbhelper/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/ucbhelper/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-uh ucbhelper : offuh sal cppu cppuhelper salhelper NULL
+uh ucbhelper : offapi sal cppu cppuhelper salhelper NULL
uh ucbhelper usr1 - all uh_mkout NULL
uh ucbhelper\inc nmake - all uh_inc NULL
uh ucbhelper\source\client nmake - all uh_client uh_inc NULL
Modified: incubator/ooo/branches/gbuild/main/udkapi/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/udkapi/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/udkapi/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/udkapi/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,30 +1,3 @@
-ua udkapi : idlc NULL
+ua udkapi : idlc codemaker NULL
ua udkapi usr1 - all ua_mkout NULL
-ua udkapi\com\sun\star\beans nmake - all ua_bean NULL
-ua udkapi\com\sun\star\bridge nmake - all ua_brid NULL
-ua udkapi\com\sun\star\bridge\oleautomation nmake - all ua_auto ua_brid NULL
-ua udkapi\com\sun\star\connection nmake - all ua_connect NULL
-ua udkapi\com\sun\star\container nmake - all ua_cont NULL
-ua udkapi\com\sun\star\io nmake - all ua_io NULL
-ua udkapi\com\sun\star\java nmake - all ua_java NULL
-ua udkapi\com\sun\star\lang nmake - all ua_lang NULL
-ua udkapi\com\sun\star\loader nmake - all ua_load NULL
-ua udkapi\com\sun\star\reflection nmake - all ua_refl NULL
-ua udkapi\com\sun\star\registry nmake - all ua_regis NULL
-ua udkapi\com\sun\star\script nmake - all ua_scrpt NULL
-ua udkapi\com\sun\star\test nmake - all ua_test NULL
-ua udkapi\com\sun\star\test\performance nmake - all ua_tstperform NULL
-ua udkapi\com\sun\star\test\bridge nmake - all ua_tstbridge NULL
-ua udkapi\com\sun\star\corba\iop nmake - all ua_iop NULL
-ua udkapi\com\sun\star\corba\giop nmake - all ua_giop NULL
-ua udkapi\com\sun\star\corba\iiop nmake - all ua_iiop NULL
-ua udkapi\com\sun\star\corba nmake - all ua_corba NULL
-ua udkapi\com\sun\star\uno nmake - all ua_uno NULL
-ua udkapi\com\sun\star\security nmake - all ua_sec ua_uno NULL
-ua udkapi\com\sun\star\util nmake - all ua_uutil ua_lang ua_uno NULL
-ua udkapi\com\sun\star\util\logging nmake - all ua_log NULL
-ua udkapi\com\sun\star\task nmake - all ua_task ua_uno NULL
-ua udkapi\com\sun\star\uri nmake - all ua_uri ua_uno NULL
-ua udkapi\com\sun\star nmake - all ua_star NULL
-ua udkapi\util nmake - all ua_util ua_bean ua_brid ua_auto ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_sec ua_uno ua_uutil ua_log ua_task ua_uri ua_star NULL
-
+ua udkapi\prj nmake - all ua_prj NULL
Modified: incubator/ooo/branches/gbuild/main/udkapi/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/udkapi/prj/d.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/udkapi/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/udkapi/prj/d.lst Wed Nov 14 21:10:00 2012
@@ -1,55 +0,0 @@
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-mkdir: %_DEST%\bin%_EXT%\ure
-
-..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl%_EXT%\udkapi.autodoc
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\udkapi.rdb
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\ure\types.rdb
-..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin%_EXT%\udkapi_doc.rdb
-
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\beans\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-..\com\sun\star\bridge\oleautomation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-..\com\sun\star\connection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-..\com\sun\star\container\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-..\com\sun\star\io\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-..\com\sun\star\java\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-..\com\sun\star\lang\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-..\com\sun\star\registry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-..\com\sun\star\loader\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\test\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-..\com\sun\star\uno\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\uri\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
Modified: incubator/ooo/branches/gbuild/main/unotools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unotools/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/unotools/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/unotools/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-ut unotools : LIBXSLT:libxslt comphelper cppuhelper offuh tools ucbhelper NULL
+ut unotools : LIBXSLT:libxslt comphelper cppuhelper offapi tools ucbhelper NULL
ut unotools usr1 - all ut_mkout NULL
ut unotools\inc nmake - all ut_inc NULL
ut unotools\source\misc nmake - all ut_misc ut_config ut_inc NULL
Modified: incubator/ooo/branches/gbuild/main/unoxml/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unoxml/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/unoxml/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/unoxml/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,2 +1,2 @@
-ux unoxml : offuh cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
+ux unoxml : offapi cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
ux unoxml\prj nmake - all ux_prj NULL
Modified: incubator/ooo/branches/gbuild/main/vbahelper/Library_msforms.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vbahelper/Library_msforms.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vbahelper/Library_msforms.mk (original)
+++ incubator/ooo/branches/gbuild/main/vbahelper/Library_msforms.mk Wed Nov 14 21:10:00 2012
@@ -37,7 +37,12 @@ $(eval $(call gb_Library_set_componentfi
# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,msforms,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,msforms,\
+ udkapi \
+ offapi \
+ oovbaapi \
))
# add libraries to be linked to LIB; again these names need to be given as
Modified: incubator/ooo/branches/gbuild/main/vbahelper/Library_vbahelper.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vbahelper/Library_vbahelper.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vbahelper/Library_vbahelper.mk (original)
+++ incubator/ooo/branches/gbuild/main/vbahelper/Library_vbahelper.mk Wed Nov 14 21:10:00 2012
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_add_package_hea
# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,vbahelper,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,vbahelper,\
@@ -43,6 +42,12 @@ $(eval $(call gb_Library_set_defs,vbahel
-DVBAHELPER_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,vbahelper,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
# add libraries to be linked to vbahelper; again these names need to be given as
# specified in Repository.mk
$(eval $(call gb_Library_add_linked_libs,vbahelper,\
Modified: incubator/ooo/branches/gbuild/main/vbahelper/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vbahelper/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vbahelper/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/vbahelper/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,3 +1,3 @@
-vba vbahelper : oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal unotools LIBXSLT:libxslt NULL
+vba vbahelper : oovbaapi offapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal unotools LIBXSLT:libxslt NULL
vba vbahelper usr1 - all vba_mkout NULL
vba vbahelper\prj nmake - all vba_prj NULL
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_desktop_detector.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_desktop_detector.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_desktop_detector.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_desktop_detector.mk Wed Nov 14 21:10:00 2012
@@ -27,12 +27,16 @@ $(eval $(call gb_Library_Library,desktop
$(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+$(eval $(call gb_Library_add_api,desktop_detector,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,desktop_detector,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk Wed Nov 14 21:10:00 2012
@@ -35,12 +35,16 @@ endif
$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+$(eval $(call gb_Library_add_api,vcl,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
$$(FREETYPE_CFLAGS) \
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk Wed Nov 14 21:10:00 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_gen))
+$(eval $(call gb_Library_add_api,vclplug_gen,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_gen,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk Wed Nov 14 21:10:00 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_gtk))
+$(eval $(call gb_Library_add_api,vclplug_gtk,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_gtk,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk Wed Nov 14 21:10:00 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_kde))
+$(eval $(call gb_Library_add_api,vclplug_kde,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_kde,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk Wed Nov 14 21:10:00 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_kde4))
+$(eval $(call gb_Library_add_api,vclplug_kde4,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_kde4,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_svp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_svp.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_svp.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_svp.mk Wed Nov 14 21:10:00 2012
@@ -23,12 +23,16 @@
$(eval $(call gb_Library_Library,vclplug_svp))
+$(eval $(call gb_Library_add_api,vclplug_svp,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,vclplug_svp,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
))