summaryrefslogtreecommitdiff
path: root/udkapi
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-03-13 14:18:52 +0100
committerMichael Stahl <mstahl@redhat.com>2013-03-13 14:33:55 +0100
commit3f07029fc23923a290f94797a5d4b9b7276bca29 (patch)
tree2d9d63b40dbc831957d1819d171bbfa373a18439 /udkapi
parent14574684dd8ccc04db94b10b331765ca5aa1d781 (diff)
gbuild: refactor SDK packaging of IDL files:
- UnoApi: stop delivering IDL files to $(OUTDIR)/idl - add ZipUnoApi to package IDL files for SDK - convert udkapi and offapi to ZipUnoApi and package them in scp2 - odk: remove ugly CustomTarget_idl that uses "find" Change-Id: I8dc4e0e7d0dc51c1abf18f31bfe095760d3c2104
Diffstat (limited to 'udkapi')
-rw-r--r--udkapi/UnoApi_udkapi.mk85
1 files changed, 42 insertions, 43 deletions
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index a226b4271817..004218a70823 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,22 +26,21 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApi_UnoApi,udkapi))
+$(eval $(call gb_ZipUnoApi_ZipUnoApi,udkapi))
$(eval $(call gb_UnoApi_set_include,udkapi,\
$$(INCLUDE) \
-I$(SRCDIR)/udkapi \
))
-
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
udk-modules \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
PropertyBag \
PropertySet \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
Bridge \
IiopBridge \
OleApplicationRegistration \
@@ -51,12 +50,12 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,
OleObjectFactory \
UrpBridge \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
ApplicationRegistration \
BridgeSupplier \
Factory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
DataInputStream \
DataOutputStream \
MarkableInputStream \
@@ -65,50 +64,50 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
ObjectOutputStream \
Pump \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
MultiServiceFactory \
RegistryServiceManager \
ServiceManager \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\
Dynamic \
Java \
Java2 \
SharedLibrary \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\
CoreReflection \
TypeDescriptionManager \
TypeDescriptionProvider \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\
DefaultRegistry \
NestedRegistry \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
Engine \
InvocationAdapterFactory \
JavaScript \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
BootstrapMacroExpander \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
Introspection \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\
BridgeFactory \
UnoUrlResolver \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\
Acceptor \
Connector \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\
EnumerableMap \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
Pipe \
SequenceInputStream \
SequenceOutputStream \
@@ -116,43 +115,43 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
TextInputStream \
TextOutputStream \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\
JavaVirtualMachine \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/reflection,\
theCoreReflection \
ProxyFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\
ImplementationRegistration \
SimpleRegistry \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\
AccessController \
Policy \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
AllListenerAdapter \
Converter \
Invocation \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\
NamingService \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
ExternalUriReferenceTranslator \
UriReferenceFactory \
UriSchemeParser_vndDOTsunDOTstarDOTexpand \
UriSchemeParser_vndDOTsunDOTstarDOTscript \
VndSunStarPkgUrlReferenceFactory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/util,\
MacroExpander \
theMacroExpander \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
Ambiguous \
Defaulted \
GetDirectPropertyTolerantResult \
@@ -207,7 +206,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
XTolerantMultiPropertySet \
XVetoableChangeListener \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
BridgeExistsException \
InvalidProtocolChangeException \
ModelDependent \
@@ -221,7 +220,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
XProtocolProperties \
XUnoUrlResolver \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
Currency \
Date \
Decimal \
@@ -230,7 +229,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautoma
SCode \
XAutomationObject \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\
AlreadyAcceptingException \
ConnectionSetupException \
NoConnectException \
@@ -241,7 +240,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\
XConnectionBroadcaster \
XConnector \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\
ContainerEvent \
ElementExistException \
NoSuchElementException \
@@ -280,7 +279,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\
XStringKeyMap \
XUniqueIDAccess \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
AlreadyConnectedException \
BufferSizeExceededException \
ConnectException \
@@ -326,7 +325,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
XTruncate \
XXMLExtractor \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
InvalidJavaSettingsException \
JavaDisabledException \
JavaInitializationException \
@@ -339,7 +338,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
XJavaThreadRegister_11 \
XJavaVM \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
ArrayIndexOutOfBoundsException \
ClassNotFoundException \
DisposedException \
@@ -376,11 +375,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
XTypeProvider \
XUnoTunnel \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\
CannotActivateFactoryException \
XImplementationLoader \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\
FieldAccessMode \
InvalidTypeNameException \
InvocationTargetException \
@@ -426,7 +425,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\
XTypeDescriptionEnumerationAccess \
XUnionTypeDescription \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
CannotRegisterImplementationException \
InvalidRegistryException \
InvalidValueException \
@@ -438,7 +437,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
XRegistryKey \
XSimpleRegistry \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
AllEventObject \
ArrayWrapper \
BasicErrorException \
@@ -482,7 +481,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
XStarBasicModuleInfo \
XTypeConverter \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
AccessControlException \
AllPermission \
RuntimePermission \
@@ -491,7 +490,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
XAction \
XPolicy \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
XInteractionAbort \
XInteractionContinuation \
XInteractionHandler \
@@ -499,7 +498,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
XInteractionRequest \
XInteractionRetry \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
DeploymentException \
Exception \
RuntimeException \
@@ -516,7 +515,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
XUnloadingPreference \
XWeak \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
RelativeUriExcessParentSegments \
XExternalUriReferenceTranslator \
XUriReference \
@@ -528,7 +527,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
XVndSunStarScriptUrl \
XVndSunStarScriptUrlReference \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_ZipUnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
XMacroExpander \
XVeto \
))