[Libreoffice-commits] core.git: external/Module_external.mk external/ucpp RepositoryModule_build.mk RepositoryModule_host.mk ucpp/Executable_ucpp.mk ucpp/Makefile ucpp/Module_ucpp.mk ucpp/ucpp.patch ucpp/UnpackedTarball_ucpp.mk

[Khaled Hosny]

 RepositoryModule_build.mk             |    1 
 RepositoryModule_host.mk              |    1 
 external/Module_external.mk           |    1 
 external/ucpp/Executable_ucpp.mk      |   39 ++++++++++++++++++++++++++++++++++
 external/ucpp/Makefile                |   14 ++++++++++++
 external/ucpp/Module_ucpp.mk          |   20 +++++++++++++++++
 external/ucpp/UnpackedTarball_ucpp.mk |   20 +++++++++++++++++
 external/ucpp/ucpp.patch              |   11 +++++++++
 ucpp/Executable_ucpp.mk               |   39 ----------------------------------
 ucpp/Makefile                         |   14 ------------
 ucpp/Module_ucpp.mk                   |   20 -----------------
 ucpp/UnpackedTarball_ucpp.mk          |   20 -----------------
 ucpp/ucpp.patch                       |   11 ---------
 13 files changed, 105 insertions(+), 106 deletions(-)

New commits:
commit a06d8eb9a92a438de6677d5e4196da0919aa790d
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Nov 3 20:41:25 2013 +0200

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

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index acd899b..1a4c033 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -86,7 +86,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 		xmlhelp \
 	) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
-	$(call gb_Helper_optional,UCPP,ucpp) \
 	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a8788240..92ff4f1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -132,7 +132,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	tubes \
 	ucb \
 	ucbhelper \
-	$(call gb_Helper_optional,UCPP,ucpp) \
 	udkapi \
 	UnoControls \
 	unodevtools \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2a6977f..f5484e4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,PYTHON,python3) \
 	$(call gb_Helper_optional,REDLAND,redland) \
 	$(call gb_Helper_optional,RHINO,rhino) \
+	$(call gb_Helper_optional,UCPP,ucpp) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/ucpp/Executable_ucpp.mk b/external/ucpp/Executable_ucpp.mk
similarity index 100%
rename from ucpp/Executable_ucpp.mk
rename to external/ucpp/Executable_ucpp.mk
diff --git a/ucpp/Makefile b/external/ucpp/Makefile
similarity index 86%
rename from ucpp/Makefile
rename to external/ucpp/Makefile
index 0997e62..569ad8a 100644
--- a/ucpp/Makefile
+++ b/external/ucpp/Makefile
@@ -9,6 +9,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/ucpp/Module_ucpp.mk b/external/ucpp/Module_ucpp.mk
similarity index 100%
rename from ucpp/Module_ucpp.mk
rename to external/ucpp/Module_ucpp.mk
diff --git a/ucpp/UnpackedTarball_ucpp.mk b/external/ucpp/UnpackedTarball_ucpp.mk
similarity index 94%
rename from ucpp/UnpackedTarball_ucpp.mk
rename to external/ucpp/UnpackedTarball_ucpp.mk
index ee0543f7f..04d7113 100644
--- a/ucpp/UnpackedTarball_ucpp.mk
+++ b/external/ucpp/UnpackedTarball_ucpp.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,ucpp,$(UCPP_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,ucpp,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,ucpp,\
-    ucpp/ucpp.patch \
+    external/ucpp/ucpp.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/ucpp/ucpp.patch b/external/ucpp/ucpp.patch
similarity index 100%
rename from ucpp/ucpp.patch
rename to external/ucpp/ucpp.patch