RepositoryExternal.mk | 6 RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/np_sdk/Makefile | 7 external/np_sdk/Module_np_sdk.mk | 23 external/np_sdk/README | 1 external/np_sdk/StaticLibrary_nputils.mk | 33 external/np_sdk/inc/LEGAL | 43 + external/np_sdk/inc/LICENSE | 567 +++++++++++++ external/np_sdk/inc/npapi.h | 886 +++++++++++++++++++++ external/np_sdk/inc/npfunctions.h | 321 +++++++ external/np_sdk/inc/npruntime.h | 393 +++++++++ external/np_sdk/inc/nptypes.h | 111 ++ external/np_sdk/npsdk/LEGAL | 43 + external/np_sdk/npsdk/LICENSE | 567 +++++++++++++ external/np_sdk/npsdk/README | 2 external/np_sdk/npsdk/jri.h | 689 ++++++++++++++++ external/np_sdk/npsdk/jri_md.h | 545 +++++++++++++ external/np_sdk/npsdk/jritypes.h | 232 +++++ external/np_sdk/npsdk/npunix.c | 507 ++++++++++++ external/np_sdk/npsdk/npupp.h | 1267 +++++++++++++++++++++++++++++++ external/np_sdk/npsdk/npwin.cxx | 358 ++++++++ external/np_sdk/npsdk/plugin.h | 44 + np_sdk/Makefile | 7 np_sdk/Module_np_sdk.mk | 23 np_sdk/README | 1 np_sdk/StaticLibrary_nputils.mk | 33 np_sdk/inc/LEGAL | 43 - np_sdk/inc/LICENSE | 567 ------------- np_sdk/inc/npapi.h | 886 --------------------- np_sdk/inc/npfunctions.h | 321 ------- np_sdk/inc/npruntime.h | 393 --------- np_sdk/inc/nptypes.h | 111 -- np_sdk/npsdk/LEGAL | 43 - np_sdk/npsdk/LICENSE | 567 ------------- np_sdk/npsdk/README | 2 np_sdk/npsdk/jri.h | 689 ---------------- np_sdk/npsdk/jri_md.h | 545 ------------- np_sdk/npsdk/jritypes.h | 232 ----- np_sdk/npsdk/npunix.c | 507 ------------ np_sdk/npsdk/npupp.h | 1267 ------------------------------- np_sdk/npsdk/npwin.cxx | 358 -------- np_sdk/npsdk/plugin.h | 44 - 43 files changed, 6643 insertions(+), 6643 deletions(-)
New commits: commit 622a6338dc9c5e1eb795f67cd3224ddfba4ab88a Author: Khaled Hosny <[email protected]> Date: Sun Nov 3 20:58:47 2013 +0200 fdo#70393: move np_sdk to a subdir of external Change-Id: Iafba7ff0d0a4b163f9d99195cab36c9968e0bd73 Reviewed-on: https://gerrit.libreoffice.org/6558 Tested-by: LibreOffice gerrit bot <[email protected]> Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 08afde3..6fa5c82 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -84,7 +84,7 @@ ifeq ($(SYSTEM_NPAPI_HEADERS),YES) define gb_LinkTarget__use_npapi_headers $(call gb_LinkTarget_set_include,$(1),\ $(NPAPI_HEADERS_CFLAGS) \ - -I$(SRCDIR)/np_sdk \ + -I$(SRCDIR)/external/np_sdk \ $$(INCLUDE) \ ) @@ -94,8 +94,8 @@ else #!SYSTEM_NPAPI_HEADERS define gb_LinkTarget__use_npapi_headers $(call gb_LinkTarget_set_include,$(1),\ - -I$(SRCDIR)/np_sdk/inc \ - -I$(SRCDIR)/np_sdk \ + -I$(SRCDIR)/external/np_sdk/inc \ + -I$(SRCDIR)/external/np_sdk \ $$(INCLUDE) \ ) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 85223e0..fb7268d 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,DESKTOP,l10ntools) \ $(call gb_Helper_optional,MARIADBC,mysqlc) \ $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ - np_sdk \ o3tl \ $(call gb_Helper_optional,ODK,odk) \ offapi \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 4633be3..f0fae3e 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif $(eval $(call gb_Module_add_moduledirs,external,\ + np_sdk \ $(call gb_Helper_optional,AFMS,afms) \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ $(call gb_Helper_optional,BOOST,boost) \ diff --git a/np_sdk/Makefile b/external/np_sdk/Makefile similarity index 71% rename from np_sdk/Makefile rename to external/np_sdk/Makefile index ccb1c85..e4968cf 100644 --- a/np_sdk/Makefile +++ b/external/np_sdk/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/np_sdk/Module_np_sdk.mk b/external/np_sdk/Module_np_sdk.mk similarity index 100% rename from np_sdk/Module_np_sdk.mk rename to external/np_sdk/Module_np_sdk.mk diff --git a/np_sdk/README b/external/np_sdk/README similarity index 100% rename from np_sdk/README rename to external/np_sdk/README diff --git a/np_sdk/StaticLibrary_nputils.mk b/external/np_sdk/StaticLibrary_nputils.mk similarity index 92% rename from np_sdk/StaticLibrary_nputils.mk rename to external/np_sdk/StaticLibrary_nputils.mk index 3ff3314..bbbd66d 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/external/np_sdk/StaticLibrary_nputils.mk @@ -22,11 +22,11 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\ - np_sdk/npsdk/npwin \ + external/np_sdk/npsdk/npwin \ )) else $(eval $(call gb_StaticLibrary_add_cobjects,nputils,\ - np_sdk/npsdk/npunix \ + external/np_sdk/npsdk/npunix \ )) endif diff --git a/np_sdk/inc/LEGAL b/external/np_sdk/inc/LEGAL similarity index 100% rename from np_sdk/inc/LEGAL rename to external/np_sdk/inc/LEGAL diff --git a/np_sdk/inc/LICENSE b/external/np_sdk/inc/LICENSE similarity index 100% rename from np_sdk/inc/LICENSE rename to external/np_sdk/inc/LICENSE diff --git a/np_sdk/inc/npapi.h b/external/np_sdk/inc/npapi.h similarity index 100% rename from np_sdk/inc/npapi.h rename to external/np_sdk/inc/npapi.h diff --git a/np_sdk/inc/npfunctions.h b/external/np_sdk/inc/npfunctions.h similarity index 100% rename from np_sdk/inc/npfunctions.h rename to external/np_sdk/inc/npfunctions.h diff --git a/np_sdk/inc/npruntime.h b/external/np_sdk/inc/npruntime.h similarity index 100% rename from np_sdk/inc/npruntime.h rename to external/np_sdk/inc/npruntime.h diff --git a/np_sdk/inc/nptypes.h b/external/np_sdk/inc/nptypes.h similarity index 100% rename from np_sdk/inc/nptypes.h rename to external/np_sdk/inc/nptypes.h diff --git a/np_sdk/npsdk/LEGAL b/external/np_sdk/npsdk/LEGAL similarity index 100% rename from np_sdk/npsdk/LEGAL rename to external/np_sdk/npsdk/LEGAL diff --git a/np_sdk/npsdk/LICENSE b/external/np_sdk/npsdk/LICENSE similarity index 100% rename from np_sdk/npsdk/LICENSE rename to external/np_sdk/npsdk/LICENSE diff --git a/np_sdk/npsdk/README b/external/np_sdk/npsdk/README similarity index 100% rename from np_sdk/npsdk/README rename to external/np_sdk/npsdk/README diff --git a/np_sdk/npsdk/jri.h b/external/np_sdk/npsdk/jri.h similarity index 100% rename from np_sdk/npsdk/jri.h rename to external/np_sdk/npsdk/jri.h diff --git a/np_sdk/npsdk/jri_md.h b/external/np_sdk/npsdk/jri_md.h similarity index 100% rename from np_sdk/npsdk/jri_md.h rename to external/np_sdk/npsdk/jri_md.h diff --git a/np_sdk/npsdk/jritypes.h b/external/np_sdk/npsdk/jritypes.h similarity index 100% rename from np_sdk/npsdk/jritypes.h rename to external/np_sdk/npsdk/jritypes.h diff --git a/np_sdk/npsdk/npunix.c b/external/np_sdk/npsdk/npunix.c similarity index 100% rename from np_sdk/npsdk/npunix.c rename to external/np_sdk/npsdk/npunix.c diff --git a/np_sdk/npsdk/npupp.h b/external/np_sdk/npsdk/npupp.h similarity index 100% rename from np_sdk/npsdk/npupp.h rename to external/np_sdk/npsdk/npupp.h diff --git a/np_sdk/npsdk/npwin.cxx b/external/np_sdk/npsdk/npwin.cxx similarity index 100% rename from np_sdk/npsdk/npwin.cxx rename to external/np_sdk/npsdk/npwin.cxx diff --git a/np_sdk/npsdk/plugin.h b/external/np_sdk/npsdk/plugin.h similarity index 93% rename from np_sdk/npsdk/plugin.h rename to external/np_sdk/npsdk/plugin.h index ec0dc04..6f7913b 100644 --- a/np_sdk/npsdk/plugin.h +++ b/external/np_sdk/npsdk/plugin.h @@ -23,7 +23,7 @@ #include "npapi.h" /* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and - NP_Shutdown in np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp., + NP_Shutdown in external/np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp., defined in extensions/source/nsplugin/source/npshell.cxx: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
