[Libreoffice-commits] core.git: external/hsqldb external/Module_external.mk hsqldb/ExternalPackage_hsqldb.mk hsqldb/ExternalProject_hsqldb.mk hsqldb/Makefile hsqldb/Module_hsqldb.mk hsqldb/patches hsqldb/README hsqldb/UnpackedTarball_hsqldb.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                           |    1 
 external/Module_external.mk                        |    1 
 external/hsqldb/ExternalPackage_hsqldb.mk          |   16 +
 external/hsqldb/ExternalProject_hsqldb.mk          |   31 ++
 external/hsqldb/Makefile                           |    7 
 external/hsqldb/Module_hsqldb.mk                   |   18 +
 external/hsqldb/README                             |    5 
 external/hsqldb/UnpackedTarball_hsqldb.mk          |   32 ++
 external/hsqldb/patches/fdo36824.patch             |   11 
 external/hsqldb/patches/i103528.patch              |   11 
 external/hsqldb/patches/i104901.patch              |   27 +
 external/hsqldb/patches/i96823.patch               |   94 ++++++
 external/hsqldb/patches/i97032.patch               |   10 
 external/hsqldb/patches/jdbc-4.1.patch             |  320 +++++++++++++++++++++
 external/hsqldb/patches/limit_as_table_alias.patch |   11 
 hsqldb/ExternalPackage_hsqldb.mk                   |   16 -
 hsqldb/ExternalProject_hsqldb.mk                   |   31 --
 hsqldb/Makefile                                    |    7 
 hsqldb/Module_hsqldb.mk                            |   20 -
 hsqldb/README                                      |    5 
 hsqldb/UnpackedTarball_hsqldb.mk                   |   32 --
 hsqldb/patches/fdo36824.patch                      |   11 
 hsqldb/patches/i103528.patch                       |   11 
 hsqldb/patches/i104901.patch                       |   27 -
 hsqldb/patches/i96823.patch                        |   94 ------
 hsqldb/patches/i97032.patch                        |   10 
 hsqldb/patches/jdbc-4.1.patch                      |  320 ---------------------
 hsqldb/patches/limit_as_table_alias.patch          |   11 
 28 files changed, 594 insertions(+), 596 deletions(-)

New commits:
commit 89b7435b9a98c93253638becafe5ff28efcfac4b
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Oct 17 19:56:28 2013 +0200

    fdo#70393: move hsqldb to a subdir of external
    
    Change-Id: I01d383442ed43c602d4e4664da822c2fbb1a026f
    Reviewed-on: https://gerrit.libreoffice.org/6306
    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 c7d1748..2fd2400 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	framework \
 	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
 	$(call gb_Helper_optional,HELP,helpcontent2) \
-	$(call gb_Helper_optional,HSQLDB,hsqldb) \
 	$(call gb_Helper_optional,HUNSPELL,hunspell) \
 	hwpfilter \
 	$(call gb_Helper_optional,HYPHEN,hyphen) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 6902a71..2b8e836 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,FREETYPE,freetype) \
 	$(call gb_Helper_optional,GRAPHITE,graphite) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
+	$(call gb_Helper_optional,HSQLDB,hsqldb) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/hsqldb/ExternalPackage_hsqldb.mk b/external/hsqldb/ExternalPackage_hsqldb.mk
similarity index 100%
rename from hsqldb/ExternalPackage_hsqldb.mk
rename to external/hsqldb/ExternalPackage_hsqldb.mk
diff --git a/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk
similarity index 100%
rename from hsqldb/ExternalProject_hsqldb.mk
rename to external/hsqldb/ExternalProject_hsqldb.mk
diff --git a/hsqldb/Makefile b/external/hsqldb/Makefile
similarity index 100%
rename from hsqldb/Makefile
rename to external/hsqldb/Makefile
diff --git a/hsqldb/Module_hsqldb.mk b/external/hsqldb/Module_hsqldb.mk
similarity index 94%
rename from hsqldb/Module_hsqldb.mk
rename to external/hsqldb/Module_hsqldb.mk
index 7bf4da1..d748faa 100644
--- a/hsqldb/Module_hsqldb.mk
+++ b/external/hsqldb/Module_hsqldb.mk
@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,hsqldb))
 
-ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,hsqldb,\
 	ExternalPackage_hsqldb \
 	ExternalProject_hsqldb \
 	UnpackedTarball_hsqldb \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/hsqldb/README b/external/hsqldb/README
similarity index 100%
rename from hsqldb/README
rename to external/hsqldb/README
diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
similarity index 71%
rename from hsqldb/UnpackedTarball_hsqldb.mk
rename to external/hsqldb/UnpackedTarball_hsqldb.mk
index fc31af5..a13aa9b 100644
--- a/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -18,14 +18,14 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
-	hsqldb/patches/i96823.patch \
-	hsqldb/patches/i97032.patch \
-	hsqldb/patches/i103528.patch \
-	hsqldb/patches/i104901.patch \
-	hsqldb/patches/fdo36824.patch \
-	hsqldb/patches/limit_as_table_alias.patch \
+	external/hsqldb/patches/i96823.patch \
+	external/hsqldb/patches/i97032.patch \
+	external/hsqldb/patches/i103528.patch \
+	external/hsqldb/patches/i104901.patch \
+	external/hsqldb/patches/fdo36824.patch \
+	external/hsqldb/patches/limit_as_table_alias.patch \
 	$(if $(filter YES,$(HSQLDB_USE_JDBC_4_1)),\
-		hsqldb/patches/jdbc-4.1.patch \
+		external/hsqldb/patches/jdbc-4.1.patch \
 	) \
 ))
 
diff --git a/hsqldb/patches/fdo36824.patch b/external/hsqldb/patches/fdo36824.patch
similarity index 100%
rename from hsqldb/patches/fdo36824.patch
rename to external/hsqldb/patches/fdo36824.patch
diff --git a/hsqldb/patches/i103528.patch b/external/hsqldb/patches/i103528.patch
similarity index 100%
rename from hsqldb/patches/i103528.patch
rename to external/hsqldb/patches/i103528.patch
diff --git a/hsqldb/patches/i104901.patch b/external/hsqldb/patches/i104901.patch
similarity index 100%
rename from hsqldb/patches/i104901.patch
rename to external/hsqldb/patches/i104901.patch
diff --git a/hsqldb/patches/i96823.patch b/external/hsqldb/patches/i96823.patch
similarity index 100%
rename from hsqldb/patches/i96823.patch
rename to external/hsqldb/patches/i96823.patch
diff --git a/hsqldb/patches/i97032.patch b/external/hsqldb/patches/i97032.patch
similarity index 100%
rename from hsqldb/patches/i97032.patch
rename to external/hsqldb/patches/i97032.patch
diff --git a/hsqldb/patches/jdbc-4.1.patch b/external/hsqldb/patches/jdbc-4.1.patch
similarity index 100%
rename from hsqldb/patches/jdbc-4.1.patch
rename to external/hsqldb/patches/jdbc-4.1.patch
diff --git a/hsqldb/patches/limit_as_table_alias.patch b/external/hsqldb/patches/limit_as_table_alias.patch
similarity index 100%
rename from hsqldb/patches/limit_as_table_alias.patch
rename to external/hsqldb/patches/limit_as_table_alias.patch