[Libreoffice-commits] core.git: external/firebird external/Module_external.mk firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-c++11.patch.1 firebird/firebird-cygwin-msvc.patch.1 firebird/firebird-icu.patch.1 firebird/firebird-macosx.patch.1 firebird/firebird-rpath.patch.0 firebird/Makefile firebird/Module_firebird.mk firebird/UnpackedTarball_firebird.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                       |    1 
 external/Module_external.mk                    |    1 
 external/firebird/ExternalPackage_firebird.mk  |   24 
 external/firebird/ExternalProject_firebird.mk  |   57 +
 external/firebird/Makefile                     |    7 
 external/firebird/Module_firebird.mk           |   18 
 external/firebird/UnpackedTarball_firebird.mk  |   34 +
 external/firebird/firebird-c++11.patch.1       |  215 ++++++
 external/firebird/firebird-cygwin-msvc.patch.1 |  794 +++++++++++++++++++++++++
 external/firebird/firebird-icu.patch.1         |   28 
 external/firebird/firebird-macosx.patch.1      |  100 +++
 external/firebird/firebird-rpath.patch.0       |   11 
 firebird/ExternalPackage_firebird.mk           |   24 
 firebird/ExternalProject_firebird.mk           |   57 -
 firebird/Makefile                              |    7 
 firebird/Module_firebird.mk                    |   20 
 firebird/UnpackedTarball_firebird.mk           |   34 -
 firebird/firebird-c++11.patch.1                |  215 ------
 firebird/firebird-cygwin-msvc.patch.1          |  794 -------------------------
 firebird/firebird-icu.patch.1                  |   28 
 firebird/firebird-macosx.patch.1               |  100 ---
 firebird/firebird-rpath.patch.0                |   11 
 22 files changed, 1289 insertions(+), 1291 deletions(-)

New commits:
commit 1fdb6185a18990818199ad355b89c72102c6a0da
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Oct 17 19:42:29 2013 +0200

    fdo#70393: move firebird to a subdir of external
    
    Change-Id: I2cb4f4b63ab526c3d034adf8c006103cde7e7304
    Reviewed-on: https://gerrit.libreoffice.org/6302
    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 7b6cb07..4701511 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	extras \
 	fileaccess \
 	filter \
-	$(call gb_Helper_optional,FIREBIRD,firebird) \
 	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
 	formula \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index db245e5..97a2181 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,CURL,curl) \
 	$(call gb_Helper_optional,EPM,epm) \
 	$(call gb_Helper_optional,EXPAT,expat) \
+	$(call gb_Helper_optional,FIREBIRD,firebird) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
diff --git a/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk
similarity index 100%
rename from firebird/ExternalPackage_firebird.mk
rename to external/firebird/ExternalPackage_firebird.mk
diff --git a/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
similarity index 100%
rename from firebird/ExternalProject_firebird.mk
rename to external/firebird/ExternalProject_firebird.mk
diff --git a/firebird/Makefile b/external/firebird/Makefile
similarity index 100%
rename from firebird/Makefile
rename to external/firebird/Makefile
diff --git a/firebird/Module_firebird.mk b/external/firebird/Module_firebird.mk
similarity index 93%
rename from firebird/Module_firebird.mk
rename to external/firebird/Module_firebird.mk
index b1b1455..d74963f 100644
--- a/firebird/Module_firebird.mk
+++ b/external/firebird/Module_firebird.mk
@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,firebird))
 
-ifeq ($(SYSTEM_FIREBIRD),NO)
 $(eval $(call gb_Module_add_targets,firebird,\
 	ExternalPackage_firebird \
 	ExternalProject_firebird \
 	UnpackedTarball_firebird \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
similarity index 77%
rename from firebird/UnpackedTarball_firebird.mk
rename to external/firebird/UnpackedTarball_firebird.mk
index 46baf71..c4119a0 100644
--- a/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -12,23 +12,23 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,firebird))
 $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-icu.patch.1 \
-	firebird/firebird-rpath.patch.0 \
+	external/firebird/firebird-icu.patch.1 \
+	external/firebird/firebird-rpath.patch.0 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-c++11.patch.1 \
+	external/firebird/firebird-c++11.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-cygwin-msvc.patch.1 \
+	external/firebird/firebird-cygwin-msvc.patch.1 \
 ))
 endif
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-macosx.patch.1 \
+	external/firebird/firebird-macosx.patch.1 \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/firebird-c++11.patch.1 b/external/firebird/firebird-c++11.patch.1
similarity index 100%
rename from firebird/firebird-c++11.patch.1
rename to external/firebird/firebird-c++11.patch.1
diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/external/firebird/firebird-cygwin-msvc.patch.1
similarity index 100%
rename from firebird/firebird-cygwin-msvc.patch.1
rename to external/firebird/firebird-cygwin-msvc.patch.1
diff --git a/firebird/firebird-icu.patch.1 b/external/firebird/firebird-icu.patch.1
similarity index 100%
rename from firebird/firebird-icu.patch.1
rename to external/firebird/firebird-icu.patch.1
diff --git a/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
similarity index 100%
rename from firebird/firebird-macosx.patch.1
rename to external/firebird/firebird-macosx.patch.1
diff --git a/firebird/firebird-rpath.patch.0 b/external/firebird/firebird-rpath.patch.0
similarity index 100%
rename from firebird/firebird-rpath.patch.0
rename to external/firebird/firebird-rpath.patch.0