From 6b33492f9562aec6c4f8744f8a063fa30e169225 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 7 Sep 2003 18:11:43 +0000 Subject: [PATCH] moved python setup.py support into scripts/functions - obsoleting some $pkg.conf files git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1332 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 6 +++++ package/base/python/python-pkg.conf | 30 --------------------- package/jsaw/gnuplotpy/gnuplotpy.conf | 24 ----------------- package/jsaw/numpy/numpy.conf | 7 ++--- package/jsaw/pynumarray/pynumarray.conf | 24 ----------------- package/jsaw/pytables/pytables.conf | 24 ----------------- package/jsaw/scientificpy/scientificpy.conf | 24 ----------------- package/mathieu/bittorrent/bittorrent.conf | 24 ----------------- package/mathieu/duplicity/duplicity.conf | 24 ----------------- scripts/functions | 25 +++++++++++------ 10 files changed, 25 insertions(+), 187 deletions(-) delete mode 100644 package/base/python/python-pkg.conf delete mode 100644 package/jsaw/gnuplotpy/gnuplotpy.conf delete mode 100644 package/jsaw/pynumarray/pynumarray.conf delete mode 100644 package/jsaw/pytables/pytables.conf delete mode 100644 package/jsaw/scientificpy/scientificpy.conf delete mode 100644 package/mathieu/bittorrent/bittorrent.conf delete mode 100644 package/mathieu/duplicity/duplicity.conf diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 2c2b07133..a735c78c2 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,10 @@ +*) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2) + + - Sebastian Jaenicke: slrn patches + - moved python setup.py support into scripts/functions - obsoleting some + $pkg.conf files + *) 2003-09-06 (2.0.0-rc1 - 2.0.0-rc2) - fixed nvrec and libsdl_gfx for non x86 builds diff --git a/package/base/python/python-pkg.conf b/package/base/python/python-pkg.conf deleted file mode 100644 index fb15c2c15..000000000 --- a/package/base/python/python-pkg.conf +++ /dev/null @@ -1,30 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/python/python-pkg.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -pyconfopt="--prefix $root/$prefix" -python_pkg_main() { - python setup.py build install $pyconfopt -} - -custmain=python_pkg_main - diff --git a/package/jsaw/gnuplotpy/gnuplotpy.conf b/package/jsaw/gnuplotpy/gnuplotpy.conf deleted file mode 100644 index 61ca152db..000000000 --- a/package/jsaw/gnuplotpy/gnuplotpy.conf +++ /dev/null @@ -1,24 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jsaw/python/gnuplotpy/gnuplotpy.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. package/*/*/python-pkg.conf diff --git a/package/jsaw/numpy/numpy.conf b/package/jsaw/numpy/numpy.conf index 85a6638a6..79cb4e350 100644 --- a/package/jsaw/numpy/numpy.conf +++ b/package/jsaw/numpy/numpy.conf @@ -21,14 +21,11 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. package/*/*/python-pkg.conf - -numpy_main() { - python_pkg_main +numpy_pi() { echo "Copying tutorial...." #@FIXME cp -av Demo/NumTut /usr/lib/python*/site-packages/ } -custmain=numpy_main \ No newline at end of file +hook_add postinstall 3 numpy_main diff --git a/package/jsaw/pynumarray/pynumarray.conf b/package/jsaw/pynumarray/pynumarray.conf deleted file mode 100644 index 1db202f2d..000000000 --- a/package/jsaw/pynumarray/pynumarray.conf +++ /dev/null @@ -1,24 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jsaw/python/pynumarray/pynumarray.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. package/*/*/python-pkg.conf diff --git a/package/jsaw/pytables/pytables.conf b/package/jsaw/pytables/pytables.conf deleted file mode 100644 index 5bbbbdd8f..000000000 --- a/package/jsaw/pytables/pytables.conf +++ /dev/null @@ -1,24 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jsaw/python/pytables/pytables.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. package/*/*/python-pkg.conf diff --git a/package/jsaw/scientificpy/scientificpy.conf b/package/jsaw/scientificpy/scientificpy.conf deleted file mode 100644 index ea42ffb63..000000000 --- a/package/jsaw/scientificpy/scientificpy.conf +++ /dev/null @@ -1,24 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jsaw/python/scientificpy/scientificpy.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. package/*/*/python-pkg.conf diff --git a/package/mathieu/bittorrent/bittorrent.conf b/package/mathieu/bittorrent/bittorrent.conf deleted file mode 100644 index a22d16a29..000000000 --- a/package/mathieu/bittorrent/bittorrent.conf +++ /dev/null @@ -1,24 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mathieu/bittorrent/bittorrent.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. package/*/*/python-pkg.conf diff --git a/package/mathieu/duplicity/duplicity.conf b/package/mathieu/duplicity/duplicity.conf deleted file mode 100644 index 2467beb59..000000000 --- a/package/mathieu/duplicity/duplicity.conf +++ /dev/null @@ -1,24 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mathieu/duplicity/duplicity.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. package/*/*/python-pkg.conf diff --git a/scripts/functions b/scripts/functions index a74b5e442..d3718ae5e 100644 --- a/scripts/functions +++ b/scripts/functions @@ -533,15 +533,24 @@ build_this_package() { -f Imakefile -a $runxmkmf = 1 ]; then xmkmf -a fi + # + if [ -f Makefile -o -f makefile ] ; then + # Build it + # + hook_eval premake + if [ "$makeopt" ] + then eval "$MAKE $makeopt"; fi + hook_eval inmake + if [ "$makeinstopt" ] + then eval "$MAKE $makeinstopt"; fi + hook_eval postmake + elif [ -f setup.py ] ; then + pyconfopt="${pyconfopt:=--prefix $root/$prefix}" + eval python setup.py build install $pyconfopt + else + abort "Build type not determined / supported!" - # Build it - # - hook_eval premake - if [ "$makeopt" ]; then eval "$MAKE $makeopt"; fi - hook_eval inmake - if [ "$makeinstopt" ]; then eval "$MAKE $makeinstopt"; fi - hook_eval postmake - + fi else eval "$custmain" for x in preconf premake inmake postmake; do