Mon Nov 4 09:41:07 CET 2013

RepositoryModule_host.mk                            |    1 
 external/Module_external.mk                         |    1 
 external/python3/ExternalPackage_python3.mk         |  829 ++++++++++++++++++++
 external/python3/ExternalProject_python3.mk         |  142 +++
 external/python3/GeneratedPackage_python3.mk        |   18 
 external/python3/Makefile                           |    7 
 external/python3/Module_python3.mk                  |   24 
 external/python3/README                             |    1 
 external/python3/UnpackedTarball_python3.mk         |   50 +
 external/python3/i100492-freebsd.patch.1            |   80 +
 external/python3/python-3.3.0-15833.patch.1         |   28 
 external/python3/python-3.3.0-aix.patch.1           |  156 +++
 external/python3/python-3.3.0-clang.patch.1         |   13 
 external/python3/python-3.3.0-darwin.patch.1        |   63 +
 external/python3/python-3.3.0-elf-rpath.patch.1     |   13 
 external/python3/python-3.3.0-ffi-clang.patch.1     |   40 
 external/python3/python-3.3.0-gcc-4.8.patch.1       |   15 
 external/python3/python-3.3.0-i42553.patch.2        |   18 
 external/python3/python-3.3.0-implicit-int.patch.1  |   30 
 external/python3/python-3.3.0-msvc-disable.patch.1  |  123 ++
 external/python3/python-3.3.0-msvc-x64.patch.1      |  362 ++++++++
 external/python3/python-3.3.0-msvc2012.patch.1      |   72 +
 external/python3/python-3.3.0-pythreadstate.patch.1 |   15 
 external/python3/python-3.3.0-ssl.patch.1           |  370 ++++++++
 python3/ExternalPackage_python3.mk                  |  829 --------------------
 python3/ExternalProject_python3.mk                  |  142 ---
 python3/GeneratedPackage_python3.mk                 |   18 
 python3/Makefile                                    |    7 
 python3/Module_python3.mk                           |   24 
 python3/README                                      |    1 
 python3/UnpackedTarball_python3.mk                  |   50 -
 python3/i100492-freebsd.patch.1                     |   80 -
 python3/python-3.3.0-15833.patch.1                  |   28 
 python3/python-3.3.0-aix.patch.1                    |  156 ---
 python3/python-3.3.0-clang.patch.1                  |   13 
 python3/python-3.3.0-darwin.patch.1                 |   63 -
 python3/python-3.3.0-elf-rpath.patch.1              |   13 
 python3/python-3.3.0-ffi-clang.patch.1              |   40 
 python3/python-3.3.0-gcc-4.8.patch.1                |   15 
 python3/python-3.3.0-i42553.patch.2                 |   18 
 python3/python-3.3.0-implicit-int.patch.1           |   30 
 python3/python-3.3.0-msvc-disable.patch.1           |  123 --
 python3/python-3.3.0-msvc-x64.patch.1               |  362 --------
 python3/python-3.3.0-msvc2012.patch.1               |   72 -
 python3/python-3.3.0-pythreadstate.patch.1          |   15 
 python3/python-3.3.0-ssl.patch.1                    |  370 --------
 46 files changed, 2470 insertions(+), 2470 deletions(-)

New commits:
commit 9dc3f0f5af0fe64ced5d1aca2fc1ddf28c3974c9
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Nov 3 20:28:42 2013 +0200

    fdo#70393: move python3 to a subdir of external
    
    Change-Id: Ic5796f096255d2d84e39415324e8a2e06bcf09c9
    Reviewed-on: https://gerrit.libreoffice.org/6550
    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 253c52e..cf4d8c3 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	padmin \
 	postprocess \
 	psprint_config \
-	$(call gb_Helper_optional,PYTHON,python3) \
 	$(call gb_Helper_optional,PYUNO,pyuno) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
 	readlicense_oo \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index d7b041b..45f0ba2 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,POPPLER,poppler) \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
+	$(call gb_Helper_optional,PYTHON,python3) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
similarity index 100%
rename from python3/ExternalPackage_python3.mk
rename to external/python3/ExternalPackage_python3.mk
diff --git a/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
similarity index 100%
rename from python3/ExternalProject_python3.mk
rename to external/python3/ExternalProject_python3.mk
diff --git a/python3/GeneratedPackage_python3.mk b/external/python3/GeneratedPackage_python3.mk
similarity index 100%
rename from python3/GeneratedPackage_python3.mk
rename to external/python3/GeneratedPackage_python3.mk
diff --git a/python3/Makefile b/external/python3/Makefile
similarity index 71%
rename from python3/Makefile
rename to external/python3/Makefile
index ccb1c85..e4968cf 100644
--- a/python3/Makefile
+++ b/external/python3/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/python3/Module_python3.mk b/external/python3/Module_python3.mk
similarity index 100%
rename from python3/Module_python3.mk
rename to external/python3/Module_python3.mk
diff --git a/python3/README b/external/python3/README
similarity index 100%
rename from python3/README
rename to external/python3/README
diff --git a/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
similarity index 56%
rename from python3/UnpackedTarball_python3.mk
rename to external/python3/UnpackedTarball_python3.mk
index fb30a40..62cc55e 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -20,30 +20,30 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
-	python3/i100492-freebsd.patch.1 \
-	python3/python-3.3.0-i42553.patch.2 \
-	python3/python-3.3.0-aix.patch.1 \
-	python3/python-3.3.0-darwin.patch.1 \
-	python3/python-3.3.0-msvc2012.patch.1 \
-	python3/python-3.3.0-msvc-disable.patch.1 \
-	python3/python-3.3.0-msvc-x64.patch.1 \
-	python3/python-3.3.0-ssl.patch.1 \
-	python3/python-3.3.0-implicit-int.patch.1 \
-	python3/python-3.3.0-ffi-clang.patch.1 \
-	python3/python-3.3.0-gcc-4.8.patch.1 \
-	python3/python-3.3.0-pythreadstate.patch.1 \
-	python3/python-3.3.0-clang.patch.1 \
+	external/python3/i100492-freebsd.patch.1 \
+	external/python3/python-3.3.0-i42553.patch.2 \
+	external/python3/python-3.3.0-aix.patch.1 \
+	external/python3/python-3.3.0-darwin.patch.1 \
+	external/python3/python-3.3.0-msvc2012.patch.1 \
+	external/python3/python-3.3.0-msvc-disable.patch.1 \
+	external/python3/python-3.3.0-msvc-x64.patch.1 \
+	external/python3/python-3.3.0-ssl.patch.1 \
+	external/python3/python-3.3.0-implicit-int.patch.1 \
+	external/python3/python-3.3.0-ffi-clang.patch.1 \
+	external/python3/python-3.3.0-gcc-4.8.patch.1 \
+	external/python3/python-3.3.0-pythreadstate.patch.1 \
+	external/python3/python-3.3.0-clang.patch.1 \
 ))
 
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
-	python3/python-3.3.0-15833.patch.1 \
+	external/python3/python-3.3.0-15833.patch.1 \
 ))
 endif
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
-	python3/python-3.3.0-elf-rpath.patch.1 \
+	external/python3/python-3.3.0-elf-rpath.patch.1 \
 ))
 endif
 
diff --git a/python3/i100492-freebsd.patch.1 b/external/python3/i100492-freebsd.patch.1
similarity index 100%
rename from python3/i100492-freebsd.patch.1
rename to external/python3/i100492-freebsd.patch.1
diff --git a/python3/python-3.3.0-15833.patch.1 b/external/python3/python-3.3.0-15833.patch.1
similarity index 100%
rename from python3/python-3.3.0-15833.patch.1
rename to external/python3/python-3.3.0-15833.patch.1
diff --git a/python3/python-3.3.0-aix.patch.1 b/external/python3/python-3.3.0-aix.patch.1
similarity index 100%
rename from python3/python-3.3.0-aix.patch.1
rename to external/python3/python-3.3.0-aix.patch.1
diff --git a/python3/python-3.3.0-clang.patch.1 b/external/python3/python-3.3.0-clang.patch.1
similarity index 100%
rename from python3/python-3.3.0-clang.patch.1
rename to external/python3/python-3.3.0-clang.patch.1
diff --git a/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1
similarity index 100%
rename from python3/python-3.3.0-darwin.patch.1
rename to external/python3/python-3.3.0-darwin.patch.1
diff --git a/python3/python-3.3.0-elf-rpath.patch.1 b/external/python3/python-3.3.0-elf-rpath.patch.1
similarity index 100%
rename from python3/python-3.3.0-elf-rpath.patch.1
rename to external/python3/python-3.3.0-elf-rpath.patch.1
diff --git a/python3/python-3.3.0-ffi-clang.patch.1 b/external/python3/python-3.3.0-ffi-clang.patch.1
similarity index 100%
rename from python3/python-3.3.0-ffi-clang.patch.1
rename to external/python3/python-3.3.0-ffi-clang.patch.1
diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/external/python3/python-3.3.0-gcc-4.8.patch.1
similarity index 100%
rename from python3/python-3.3.0-gcc-4.8.patch.1
rename to external/python3/python-3.3.0-gcc-4.8.patch.1
diff --git a/python3/python-3.3.0-i42553.patch.2 b/external/python3/python-3.3.0-i42553.patch.2
similarity index 100%
rename from python3/python-3.3.0-i42553.patch.2
rename to external/python3/python-3.3.0-i42553.patch.2
diff --git a/python3/python-3.3.0-implicit-int.patch.1 b/external/python3/python-3.3.0-implicit-int.patch.1
similarity index 100%
rename from python3/python-3.3.0-implicit-int.patch.1
rename to external/python3/python-3.3.0-implicit-int.patch.1
diff --git a/python3/python-3.3.0-msvc-disable.patch.1 b/external/python3/python-3.3.0-msvc-disable.patch.1
similarity index 100%
rename from python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.3.0-msvc-disable.patch.1
diff --git a/python3/python-3.3.0-msvc-x64.patch.1 b/external/python3/python-3.3.0-msvc-x64.patch.1
similarity index 100%
rename from python3/python-3.3.0-msvc-x64.patch.1
rename to external/python3/python-3.3.0-msvc-x64.patch.1
diff --git a/python3/python-3.3.0-msvc2012.patch.1 b/external/python3/python-3.3.0-msvc2012.patch.1
similarity index 100%
rename from python3/python-3.3.0-msvc2012.patch.1
rename to external/python3/python-3.3.0-msvc2012.patch.1
diff --git a/python3/python-3.3.0-pythreadstate.patch.1 b/external/python3/python-3.3.0-pythreadstate.patch.1
similarity index 100%
rename from python3/python-3.3.0-pythreadstate.patch.1
rename to external/python3/python-3.3.0-pythreadstate.patch.1
diff --git a/python3/python-3.3.0-ssl.patch.1 b/external/python3/python-3.3.0-ssl.patch.1
similarity index 100%
rename from python3/python-3.3.0-ssl.patch.1
rename to external/python3/python-3.3.0-ssl.patch.1
