[Libreoffice-commits] core.git: cppunit/android.patch cppunit/disable-dynloading.patch cppunit/ExternalPackage_cppunit.mk cppunit/ExternalProject_cppunit.mk cppunit/ios.patch cppunit/Makefile cppunit/Module_cppunit.mk cppunit/README cppunit/unix.patch cppunit/UnpackedTarball_cppunit.mk cppunit/windows.patch cppunit/wundef.patch external/cppunit external/Module_external.mk RepositoryModule_host.mk
Khaled Hosny
khaledhosny at eglug.org
Thu Oct 17 10:17:40 PDT 2013
RepositoryModule_host.mk | 1
cppunit/ExternalPackage_cppunit.mk | 50 ----------------------
cppunit/ExternalProject_cppunit.mk | 63 ----------------------------
cppunit/Makefile | 7 ---
cppunit/Module_cppunit.mk | 24 ----------
cppunit/README | 3 -
cppunit/UnpackedTarball_cppunit.mk | 34 ---------------
cppunit/android.patch | 33 --------------
cppunit/disable-dynloading.patch | 25 -----------
cppunit/ios.patch | 18 --------
cppunit/unix.patch | 15 ------
cppunit/windows.patch | 48 ---------------------
cppunit/wundef.patch | 12 -----
external/Module_external.mk | 1
external/cppunit/ExternalPackage_cppunit.mk | 50 ++++++++++++++++++++++
external/cppunit/ExternalProject_cppunit.mk | 63 ++++++++++++++++++++++++++++
external/cppunit/Makefile | 7 +++
external/cppunit/Module_cppunit.mk | 18 ++++++++
external/cppunit/README | 3 +
external/cppunit/UnpackedTarball_cppunit.mk | 34 +++++++++++++++
external/cppunit/android.patch | 33 ++++++++++++++
external/cppunit/disable-dynloading.patch | 25 +++++++++++
external/cppunit/ios.patch | 18 ++++++++
external/cppunit/unix.patch | 15 ++++++
external/cppunit/windows.patch | 48 +++++++++++++++++++++
external/cppunit/wundef.patch | 12 +++++
26 files changed, 327 insertions(+), 333 deletions(-)
New commits:
commit 7223027a3a7e6599e387559d85f1eaebf3bbbd6c
Author: Khaled Hosny <khaledhosny at eglug.org>
Date: Thu Oct 17 01:32:29 2013 +0200
fdo#70393: move cppunit to a subdir of external
Change-Id: I96ab796757af0c6c6741059b35fcaeefc2bf4507
Reviewed-on: https://gerrit.libreoffice.org/6286
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 0ec4fca..ee95730 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cppcanvas \
cppu \
cppuhelper \
- $(call gb_Helper_optional,CPPUNIT,cppunit) \
cpputools \
$(call gb_Helper_optional,CRASHREP,crashrep) \
$(call gb_Helper_optional,CT2N,ct2n) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 7d6880e..2c8b492 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,CPPUNIT,cppunit) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
))
diff --git a/cppunit/ExternalPackage_cppunit.mk b/external/cppunit/ExternalPackage_cppunit.mk
similarity index 100%
rename from cppunit/ExternalPackage_cppunit.mk
rename to external/cppunit/ExternalPackage_cppunit.mk
diff --git a/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk
similarity index 100%
rename from cppunit/ExternalProject_cppunit.mk
rename to external/cppunit/ExternalProject_cppunit.mk
diff --git a/cppunit/Makefile b/external/cppunit/Makefile
similarity index 100%
rename from cppunit/Makefile
rename to external/cppunit/Makefile
diff --git a/cppunit/Module_cppunit.mk b/external/cppunit/Module_cppunit.mk
similarity index 86%
rename from cppunit/Module_cppunit.mk
rename to external/cppunit/Module_cppunit.mk
index 53ed611..f0af9e8 100644
--- a/cppunit/Module_cppunit.mk
+++ b/external/cppunit/Module_cppunit.mk
@@ -9,16 +9,10 @@
$(eval $(call gb_Module_Module,cppunit))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-
-ifeq ($(SYSTEM_CPPUNIT),NO)
$(eval $(call gb_Module_add_targets,cppunit,\
UnpackedTarball_cppunit \
ExternalPackage_cppunit \
ExternalProject_cppunit \
))
-endif
-
-endif
# vim: set noet sw=4 ts=4:
diff --git a/cppunit/README b/external/cppunit/README
similarity index 100%
rename from cppunit/README
rename to external/cppunit/README
diff --git a/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk
similarity index 79%
rename from cppunit/UnpackedTarball_cppunit.mk
rename to external/cppunit/UnpackedTarball_cppunit.mk
index 0a5f649..e1a77a5 100644
--- a/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -12,22 +12,22 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit))
$(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit))
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
- cppunit/windows.patch \
- cppunit/unix.patch \
- cppunit/wundef.patch \
+ external/cppunit/windows.patch \
+ external/cppunit/unix.patch \
+ external/cppunit/wundef.patch \
))
ifeq ($(OS),ANDROID)
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
- cppunit/android.patch \
+ external/cppunit/android.patch \
))
else ifeq ($(OS),IOS)
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
- cppunit/ios.patch \
+ external/cppunit/ios.patch \
))
endif
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
- cppunit/disable-dynloading.patch \
+ external/cppunit/disable-dynloading.patch \
))
endif
diff --git a/cppunit/android.patch b/external/cppunit/android.patch
similarity index 100%
rename from cppunit/android.patch
rename to external/cppunit/android.patch
diff --git a/cppunit/disable-dynloading.patch b/external/cppunit/disable-dynloading.patch
similarity index 100%
rename from cppunit/disable-dynloading.patch
rename to external/cppunit/disable-dynloading.patch
diff --git a/cppunit/ios.patch b/external/cppunit/ios.patch
similarity index 100%
rename from cppunit/ios.patch
rename to external/cppunit/ios.patch
diff --git a/cppunit/unix.patch b/external/cppunit/unix.patch
similarity index 100%
rename from cppunit/unix.patch
rename to external/cppunit/unix.patch
diff --git a/cppunit/windows.patch b/external/cppunit/windows.patch
similarity index 100%
rename from cppunit/windows.patch
rename to external/cppunit/windows.patch
diff --git a/cppunit/wundef.patch b/external/cppunit/wundef.patch
similarity index 100%
rename from cppunit/wundef.patch
rename to external/cppunit/wundef.patch
More information about the Libreoffice-commits
mailing list