[Libreoffice-commits] .: pyuno/CustomTarget_python_wrapper.mk pyuno/Executable_python_wrapper.mk pyuno/Module_pyuno.mk Repository.mk

[David Ostrovsky]

 Repository.mk                        |    2 -
 pyuno/CustomTarget_python_wrapper.mk |   36 -----------------------------------
 pyuno/Executable_python_wrapper.mk   |    8 +++----
 pyuno/Module_pyuno.mk                |    3 --
 4 files changed, 6 insertions(+), 43 deletions(-)

New commits:
commit d633da43995f7457e487634016b2ca3bbc9245b2
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Tue Jun 19 08:16:09 2012 +0200

    deliver pyuno/python.exe in one step
    
    Change-Id: I886f4a6aec492ae498ce86d71686c8d9fb26203d

diff --git a/Repository.mk b/Repository.mk
index 2c465c2..c897be7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -105,7 +105,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 	langsupport \
 	odbcconfig \
 	officeloader \
-	python_wrapper \
+	pyuno/python \
 	quickstart \
 	sbase \
 	scalc \
diff --git a/pyuno/CustomTarget_python_wrapper.mk b/pyuno/CustomTarget_python_wrapper.mk
deleted file mode 100755
index 9f459a1..0000000
--- a/pyuno/CustomTarget_python_wrapper.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_CustomTarget_CustomTarget,pyuno/python_wrapper))
-
-python_wrapper_TARGET := $(OUTDIR)/bin/pyuno/python.exe
-
-$(call gb_CustomTarget_get_target,pyuno/python_wrapper) : $(python_wrapper_TARGET)
-
-$(python_wrapper_TARGET) : $(call gb_Executable_get_target,python_wrapper)
-	cp $< $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Executable_python_wrapper.mk b/pyuno/Executable_python_wrapper.mk
index 709db4d..0d978ca 100644
--- a/pyuno/Executable_python_wrapper.mk
+++ b/pyuno/Executable_python_wrapper.mk
@@ -24,17 +24,17 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Executable_Executable,python_wrapper))
+$(eval $(call gb_Executable_Executable,pyuno/python))
 
-$(eval $(call gb_Executable_use_static_libraries,python_wrapper,\
+$(eval $(call gb_Executable_use_static_libraries,pyuno/python,\
     ooopathutils \
 ))
 
-$(eval $(call gb_Executable_use_custom_headers,python_wrapper,\
+$(eval $(call gb_Executable_use_custom_headers,pyuno/python,\
     pyuno/pyversion \
 ))
 
-$(eval $(call gb_Executable_add_noexception_objects,python_wrapper,\
+$(eval $(call gb_Executable_add_noexception_objects,pyuno/python,\
     pyuno/zipcore/python \
 ))
 
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index e39bcd0..06356e2 100755
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -43,13 +43,12 @@ endif
 
 ifneq ($(SYSTEM_PYTHON),YES)
 
-# zipcore: python.exe on Windows
+# zipcore: pyuno/python.exe on Windows
 # zipcore: pyversion.hxx on Windows
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,pyuno,\
     CustomTarget_pyversion \
     Executable_python_wrapper \
-    CustomTarget_python_wrapper \
 ))
 endif