[Libreoffice-commits] core.git: external/libcmis external/Module_external.mk libcmis/boost-win.patch libcmis/libcmis-0.4.1-empty-path.patch libcmis/libcmis-0.4.1.patch libcmis/Makefile libcmis/Module_libcmis.mk libcmis/README libcmis/StaticLibrary_cmis.mk libcmis/UnpackedTarball_cmis.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                        |    1 
 external/Module_external.mk                     |    1 
 external/libcmis/Makefile                       |    7 +
 external/libcmis/Module_libcmis.mk              |   17 ++++
 external/libcmis/README                         |    8 ++
 external/libcmis/StaticLibrary_cmis.mk          |   75 ++++++++++++++++++
 external/libcmis/UnpackedTarball_cmis.mk        |   24 ++++++
 external/libcmis/boost-win.patch                |   84 +++++++++++++++++++++
 external/libcmis/libcmis-0.4.1-empty-path.patch |   13 +++
 external/libcmis/libcmis-0.4.1.patch            |   95 ++++++++++++++++++++++++
 libcmis/Makefile                                |    7 -
 libcmis/Module_libcmis.mk                       |   21 -----
 libcmis/README                                  |    8 --
 libcmis/StaticLibrary_cmis.mk                   |   75 ------------------
 libcmis/UnpackedTarball_cmis.mk                 |   24 ------
 libcmis/boost-win.patch                         |   84 ---------------------
 libcmis/libcmis-0.4.1-empty-path.patch          |   13 ---
 libcmis/libcmis-0.4.1.patch                     |   95 ------------------------
 18 files changed, 324 insertions(+), 328 deletions(-)

New commits:
commit a52215833280fd2c76d6df491a199f1ffab3e040
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 18:55:45 2013 +0200

    fdo#70393: move libcmis to a subdir of external
    
    Change-Id: I602ae9b173e42d668cd9383fa0d2517576db12bf
    Reviewed-on: https://gerrit.libreoffice.org/6326
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index fe4fc94..f7f85d7 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	$(call gb_Helper_optional,CDR,libcdr) \
-	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 6764ac41..c65474e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,BSH,beanshell) \
 	$(call gb_Helper_optional,CAIRO,cairo) \
 	$(call gb_Helper_optional,CLUCENE,clucene) \
+	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,CPPUNIT,cppunit) \
 	$(call gb_Helper_optional,CT2N,ct2n) \
 	$(call gb_Helper_optional,CURL,curl) \
diff --git a/libcmis/Makefile b/external/libcmis/Makefile
similarity index 71%
rename from libcmis/Makefile
rename to external/libcmis/Makefile
index ccb1c85..e4968cf 100644
--- a/libcmis/Makefile
+++ b/external/libcmis/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/libcmis/Module_libcmis.mk b/external/libcmis/Module_libcmis.mk
similarity index 93%
rename from libcmis/Module_libcmis.mk
rename to external/libcmis/Module_libcmis.mk
index ad8aa7a..b45f1ed 100644
--- a/libcmis/Module_libcmis.mk
+++ b/external/libcmis/Module_libcmis.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
-ifeq ($(SYSTEM_CMIS),NO)
-
 $(eval $(call gb_Module_add_targets,libcmis,\
 	StaticLibrary_cmis \
 	UnpackedTarball_cmis \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/libcmis/README b/external/libcmis/README
similarity index 100%
rename from libcmis/README
rename to external/libcmis/README
diff --git a/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk
similarity index 100%
rename from libcmis/StaticLibrary_cmis.mk
rename to external/libcmis/StaticLibrary_cmis.mk
diff --git a/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk
similarity index 76%
rename from libcmis/UnpackedTarball_cmis.mk
rename to external/libcmis/UnpackedTarball_cmis.mk
index d984c85..75f5753 100644
--- a/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -14,11 +14,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
-						libcmis/libcmis-0.4.1.patch \
-						libcmis/libcmis-0.4.1-empty-path.patch))
+						external/libcmis/libcmis-0.4.1.patch \
+						external/libcmis/libcmis-0.4.1-empty-path.patch))
 
 ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/boost-win.patch))
+$(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/libcmis/boost-win.patch b/external/libcmis/boost-win.patch
similarity index 100%
rename from libcmis/boost-win.patch
rename to external/libcmis/boost-win.patch
diff --git a/libcmis/libcmis-0.4.1-empty-path.patch b/external/libcmis/libcmis-0.4.1-empty-path.patch
similarity index 100%
rename from libcmis/libcmis-0.4.1-empty-path.patch
rename to external/libcmis/libcmis-0.4.1-empty-path.patch
diff --git a/libcmis/libcmis-0.4.1.patch b/external/libcmis/libcmis-0.4.1.patch
similarity index 100%
rename from libcmis/libcmis-0.4.1.patch
rename to external/libcmis/libcmis-0.4.1.patch