Author: wade
Date: 2006-07-21 04:05:32 -0400 (Fri, 21 Jul 2006)
New Revision: 62853
Added:
trunk/release/conf/ironpython/
trunk/release/conf/ironpython/ximian-build.conf
trunk/release/conf/nant/
trunk/release/conf/nant/ximian-build.conf
trunk/release/packaging/defs/ironpython
trunk/release/packaging/defs/nant
Modified:
trunk/release/conf/boo/ximian-build.conf
trunk/release/conf/ikvm/ximian-build.conf
trunk/release/packaging/defs/boo
trunk/release/packaging/defs/ikvm
trunk/release/packaging/defs/mono
Log:
New packages:
-nant
-ironpython
Since we have nant now, update boo and ikvm to
build from the official source distributions
defs/mono:
-clean up cruft from running tests
Modified: trunk/release/conf/boo/ximian-build.conf
===================================================================
--- trunk/release/conf/boo/ximian-build.conf 2006-07-21 06:02:11 UTC (rev
62852)
+++ trunk/release/conf/boo/ximian-build.conf 2006-07-21 08:05:32 UTC (rev
62853)
@@ -18,10 +18,18 @@
</source>
<build id="default">
- <prepare>[[usrconfigure]]</prepare>
- <compile>${MAKE}</compile>
- <install>make install DESTDIR=${DESTDIR}; make -C extras install
GTKSOURCEVIEW_PREFIX="/opt/gnome" DESTDIR=${DESTDIR}</install>
-
+ <prepare>true</prepare>
+ <compile>nant -D:install.prefix=[[usrprefix]]</compile>
+ <install><![CDATA[
+nant install -D:install.prefix=[[usrprefix]] -D:install.destdir=${DESTDIR}
+
+# noarch hack...
+cd ${DESTDIR}
+mkdir -p opt/gnome/share/gtksourceview-1.0/language-specs
+cp .[[usrprefix]]/share/gtksourceview-1.0/language-specs/boo.lang
opt/gnome/share/gtksourceview-1.0/language-specs
+]]>
+ </install>
+
<psdata id="buildarch">noarch</psdata>
<builddep id="buildrequires">
@@ -30,13 +38,13 @@
<script id="postinst">
<i><![CDATA[
- update-mime-database /usr/share/mime &>/dev/null || :
+ update-mime-database [[usrprefix]]/share/mime &>/dev/null || :
]]></i>
</script>
<script id="postun">
<i><![CDATA[
- update-mime-database /usr/share/mime &>/dev/null || :
+ update-mime-database [[usrprefix]]/share/mime &>/dev/null || :
]]></i>
</script>
@@ -52,7 +60,7 @@
<i>[[usrprefix]]/lib/pkgconfig/*.pc</i>
<i>[[usrprefix]]/bin/*</i>
<!-- complete and total hack to make this noarch. -->
- <i>/usr/share/gtksourceview-1.0/language-specs/boo.lang</i>
+
<i>[[usrprefix]]/share/gtksourceview-1.0/language-specs/boo.lang</i>
<i>/opt/gnome/share/gtksourceview-1.0/language-specs/boo.lang</i>
<i>[[usrprefix]]/share/mime/packages/boo-mime-info.xml</i>
</files>
Modified: trunk/release/conf/ikvm/ximian-build.conf
===================================================================
--- trunk/release/conf/ikvm/ximian-build.conf 2006-07-21 06:02:11 UTC (rev
62852)
+++ trunk/release/conf/ikvm/ximian-build.conf 2006-07-21 08:05:32 UTC (rev
62853)
@@ -20,10 +20,49 @@
</source>
<build id="default">
- <prepare>[[usrconfigure]]</prepare>
- <compile>${MAKE}</compile>
- <install>[[usrinstall]]</install>
+ <prepare>cd ..; curl
ftp://ftp.gnu.org/gnu/classpath/classpath-0.19.tar.gz > classpath-0.19.tar.gz;
tar -zxf classpath-0.19.tar.gz</prepare>
+ <compile>nant -D:jikes.compiler=true -D:ecj.compiler=false</compile>
+ <install>
+<![CDATA[
+# Create dirs
+mkdir -p ${DESTDIR}[[usrprefix]]/bin
+mkdir -p ${DESTDIR}[[usrprefix]]/lib/ikvm
+mkdir -p ${DESTDIR}[[usrprefix]]/lib/pkgconfig
+
+#Install binaries
+find bin . -name "*\.dll" -exec cp {} ${DESTDIR}[[usrprefix]]/lib/ikvm \;
+find bin . -name "*\.exe" -exec cp {} ${DESTDIR}[[usrprefix]]/lib/ikvm \;
+
+# Generate wrapper scripts
+for f in `find bin . -name "*\.exe"` ; do
+ script_name=${DESTDIR}[[usrprefix]]/bin/`basename $f .exe`
+ cat <<EOF > $script_name
+#!/bin/sh
+exec `which mono` [[usrprefix]]/lib/ikvm/`basename $f` "\$@"
+EOF
+
+ chmod 755 $script_name
+
+done
+
+
+# Generate .pc file
+cat <<EOF > ${DESTDIR}[[usrprefix]]/lib/pkgconfig/ikvm.pc
+prefix=[[usrprefix]]
+exec_prefix=\${prefix}
+libdir=\${prefix}/lib
+
+Name: IKVM.NET
+Description: An implementation of Java for Mono and the Microsoft .NET
Framework.
+Version: 0.22
+Libs: -r:\${libdir}/ikvm/IKVM.Runtime.dll
-r:\${libdir}/ikvm/IKVM.GNU.Classpath.dll
+
+EOF
+
+]]>
+ </install>
+
<psdata id="buildarch">noarch</psdata>
<package id="default">
@@ -45,6 +84,10 @@
<i>mono-ikvm</i>
</dep>
+ <dep id="buildrequires">
+ <i>jikes</i>
+ </dep>
+
<script id="find_provides">
<i>
<![CDATA[
Added: trunk/release/conf/ironpython/ximian-build.conf
===================================================================
--- trunk/release/conf/ironpython/ximian-build.conf 2006-07-21 06:02:11 UTC
(rev 62852)
+++ trunk/release/conf/ironpython/ximian-build.conf 2006-07-21 08:05:32 UTC
(rev 62853)
@@ -0,0 +1,144 @@
+<?xml version="1.0" ?>
+
+<!DOCTYPE module SYSTEM "helix-build.dtd">
+
+<module>
+ <targetset>
+ <filter>
+ <i>.*</i>
+ </filter>
+ <name>IronPython</name>
+
+ <psdata id="copyright">MS Shared Source License</psdata>
+ <psdata
id="url">http://www.codeplex.com/Wiki/View.aspx?ProjectName=IronPython</psdata>
+
+ <source>
+ <!-- doesn't really work, just fools buildbuddy about where the tar is
-->
+ <i>SVN svn+ssh://mono-cvs.ximain.com/source/trunk</i>
+ </source>
+
+ <build id="default">
+ <prepare>rm -f *.exe *.dll;sed -i s/csc/gmcs/g Src/makefile;sed -i
"s/mkdir/mkdir -p/g" Src/makefile</prepare>
+ <compile>cd Src; make</compile>
+ <install>
+<![CDATA[
+
+# Create dirs
+mkdir -p ${DESTDIR}[[usrprefix]]/bin
+mkdir -p ${DESTDIR}[[usrprefix]]/lib/IronPython
+mkdir -p ${DESTDIR}[[usrprefix]]/lib/IronPython/Lib
+
+
+#Install binaries
+cp *.exe *.dll ${DESTDIR}[[usrprefix]]/lib/IronPython
+cp Lib/site.py ${DESTDIR}[[usrprefix]]/lib/IronPython/Lib
+
+# Pack up tutorial
+zip -r tutorial.zip Tutorial
+
+#export IRONPYTHONPATH=""
+## Build up python path
+#for pyver in 2.4 2.3 2.2 ; do
+# export IRONPYTHONPATH=$IRONPYTHONPATH:/usr/lib/python$pyver
+# export
IRONPYTHONPATH=$IRONPYTHONPATH:/usr/lib/python$pyver/site-packages
+# export IRONPYTHONPATH=$IRONPYTHONPATH:/usr/lib64/python$pyver
+# export
IRONPYTHONPATH=$IRONPYTHONPATH:/usr/lib64/python$pyver/site-packages
+#done
+#export IRONPYTHONPATH=$IRONPYTHONPATH
+
+# Generate wrapper scripts
+for f in `find bin . -name "*\.exe"` ; do
+ script_name=${DESTDIR}[[usrprefix]]/bin/`basename $f .exe`
+ cat <<EOF > $script_name
+#!/bin/sh
+exec `which mono` [[usrprefix]]/lib/IronPython/`basename $f` "\$@"
+EOF
+
+ chmod 755 $script_name
+
+done
+
+## Generate site.py (add path for each distro)
+## TODO: How to do this? Could this be more dynamic in /usr/bin/ipy?
+## or maybe it shouldn't be done at all?
+#cat <<EOF >> ${DESTDIR}[[usrprefix]]/lib/IronPython/Lib/site.py
+#
+#import sys
+#sys.path.append("[[usrprefix]]/lib/python2.4")
+#sys.path.append("[[usrprefix]]/lib64/python2.4")
+#sys.path.append("[[usrprefix]]/lib/python2.3")
+#sys.path.append("[[usrprefix]]/lib64/python2.3")
+#sys.path.append("[[usrprefix]]/lib/python2.2")
+#sys.path.append("[[usrprefix]]/lib64/python2.2")
+#
+#EOF
+# Doesn't work... site.py doesn't seem to get loaded... ?
+
+]]>
+ </install>
+
+ <psdata id="buildarch">noarch</psdata>
+
+ <package id="default">
+ <name>IronPython</name>
+
+ <psdata id="group">Development/Tools</psdata>
+
+ <files>
+ <i>[[usrprefix]]/bin/*</i>
+ <i>[[usrprefix]]/lib/IronPython</i>
+ </files>
+
+ <docs>
+ <i>License.html</i>
+ <i>FAQ.html</i>
+ <i>Readme.html</i>
+ <i>tutorial.zip</i>
+ </docs>
+
+<script id="find_provides">
+ <i>
+<![CDATA[
+#!/bin/sh
+
+filelist=`sed "s/['\"]/\\\&/g"`
+
+{
+ echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-provides
+ echo $filelist | tr [:blank:] \\n | /usr/bin/mono-find-provides
+} | sort | uniq
+
+]]>
+ </i>
+</script>
+
+<script id="find_requires">
+ <i>
+<![CDATA[
+#!/bin/sh
+
+filelist=`sed "s/['\"]/\\\&/g"`
+
+{
+ echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires
+ echo $filelist | tr [:blank:] \\n | /usr/bin/mono-find-requires
+} | sort | uniq
+]]>
+ </i>
+</script>
+
+ <description>
+ <h>Implementation of the Python programming language running on
.NET</h>
+ <p>IronPython is the code name of the new implementation of the
Python programming language running on .NET. It supports an interactive console
with fully dynamic compilation. It is well integrated with the rest of the .NET
Framework and makes all .NET libraries easily available to Python programmers,
while maintaining full compatibility with the Python language.
+ </p>
+ </description>
+ </package>
+ </build>
+ </targetset>
+</module>
+
+<!--
+ Local Variables:
+ mode: xml
+ End:
+ -->
Added: trunk/release/conf/nant/ximian-build.conf
===================================================================
--- trunk/release/conf/nant/ximian-build.conf 2006-07-21 06:02:11 UTC (rev
62852)
+++ trunk/release/conf/nant/ximian-build.conf 2006-07-21 08:05:32 UTC (rev
62853)
@@ -0,0 +1,120 @@
+<?xml version="1.0" ?>
+
+<!DOCTYPE module SYSTEM "helix-build.dtd">
+
+<module>
+ <targetset>
+ <filter>
+ <i>.*</i>
+ </filter>
+ <name>nant</name>
+
+ <psdata id="copyright">GPL</psdata>
+ <psdata id="url">http://nant.sourceforge.net</psdata>
+
+ <source>
+ <i>SVN https://svn.sourceforge.net/svnroot/nant</i>
+ </source>
+
+ <build id="default">
+ <prepare>true</prepare>
+ <compile>${MAKE}</compile>
+ <install><![CDATA[
+make install prefix=${DESTDIR}[[usrprefix]]
+
+cd ${DESTDIR}
+
+# .NET libs
+rm -Rf .[[usrprefix]]/share/NAnt/bin/lib/net
+
+# Put mono libs in the gac
+find .[[usrprefix]]/share/NAnt/bin/lib/mono -name "*\.dll" -exec gacutil -root
${RPM_BUILD_ROOT}[[usrprefix]]/lib -i {} \;
+
+# These are in the gac now, remove them
+rm -Rf .[[usrprefix]]/share/NAnt/bin/lib/mono
+
+# Rearrange things according to app guidelines
+mkdir -p .[[usrprefix]]/lib
+mv .[[usrprefix]]/share/NAnt/bin .[[usrprefix]]/lib/NAnt
+mv .[[usrprefix]]/lib/NAnt/lib/*.dll .[[usrprefix]]/lib/NAnt
+rmdir .[[usrprefix]]/lib/NAnt/lib
+
+# Cleanup cruft
+rm -Rf .[[usrprefix]]/share
+
+# Fix script
+cat <<EOF > .[[usrprefix]]/bin/nant
+#!/bin/sh
+`pkg-config mono --variable prefix`/bin/mono [[usrprefix]]/lib/NAnt/NAnt.exe
"\$@"
+EOF
+chmod 755 .[[usrprefix]]/bin/nant
+]]>
+
+ </install>
+
+ <psdata id="buildarch">noarch</psdata>
+
+ <builddep id="buildrequires">
+ <i>mono-devel</i>
+ <i>mono-data</i>
+ </builddep>
+
+ <package id="default">
+ <name>nant</name>
+
+ <psdata id="group">Development</psdata>
+
+ <files>
+ <i>[[usrprefix]]/bin</i>
+ <i>[[usrprefix]]/lib</i>
+ </files>
+
+ <docs />
+
+<!-- Use private copies of mono-find-provides until mono is updated -->
+<script id="find_provides">
+ <i>
+<![CDATA[
+#!/bin/sh
+
+filelist=`sed "s/['\"]/\\\&/g"`
+
+{
+ echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-provides
+ echo $filelist | tr [:blank:] \\n | /mono-find-provides
+} | sort | uniq
+
+]]>
+ </i>
+</script>
+
+<script id="find_requires">
+ <i>
+<![CDATA[
+#!/bin/sh
+
+filelist=`sed "s/['\"]/\\\&/g"`
+
+{
+ echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires
+ echo $filelist | tr [:blank:] \\n | /mono-find-requires
+} | sort | uniq
+]]>
+ </i>
+</script>
+
+ <description>
+ <h>Ant for .NET</h>
+ <p>NAnt is a free .NET build tool. In theory it is kind of like make
without make's wrinkles. In practice it's a lot like Ant.</p>
+ </description>
+ </package>
+ </build>
+ </targetset>
+</module>
+
+
+<!--
+ Local Variables:
+ mode: xml
+ End:
+ -->
Modified: trunk/release/packaging/defs/boo
===================================================================
--- trunk/release/packaging/defs/boo 2006-07-21 06:02:11 UTC (rev 62852)
+++ trunk/release/packaging/defs/boo 2006-07-21 08:05:32 UTC (rev 62853)
@@ -30,6 +30,7 @@
MONO_DEPS=(
mono
+ nant
)
get_destroot () {
@@ -38,14 +39,8 @@
BUILD_DIR="/tmp"
-#get_source () {
-#}
-
-#update_version_file () {
-#}
-
make_dist () {
- wget
http://primates.ximian.com/~wberrier/packaging/sources/boo/boo-$VERSION.tar.gz
-O /tmp/built-tarball/boo-$VERSION.tar.gz
+ export filename="boo-$VERSION-src.tar.bz2"
+ curl http://dist.codehaus.org/boo/distributions/$filename > $filename
}
-
Modified: trunk/release/packaging/defs/ikvm
===================================================================
--- trunk/release/packaging/defs/ikvm 2006-07-21 06:02:11 UTC (rev 62852)
+++ trunk/release/packaging/defs/ikvm 2006-07-21 08:05:32 UTC (rev 62853)
@@ -30,9 +30,10 @@
MONO_DEPS=(
mono
+ nant
)
-BUILD_DIR="dunno"
+BUILD_DIR="/tmp"
get_destroot () {
DEST_ROOT=noarch
@@ -45,7 +46,7 @@
#}
make_dist () {
- wget
http://primates.ximian.com/~wberrier/packaging/sources/ikvm/ikvm-$VERSION.tar.gz
-O /tmp/built-tarball/ikvm-$VERSION.tar.gz
+ export filename="ikvm-$VERSION.zip"
+ curl http://easynews.dl.sourceforge.net/sourceforge/ikvm/$filename >
$filename
}
-
Added: trunk/release/packaging/defs/ironpython
===================================================================
--- trunk/release/packaging/defs/ironpython 2006-07-21 06:02:11 UTC (rev
62852)
+++ trunk/release/packaging/defs/ironpython 2006-07-21 08:05:32 UTC (rev
62853)
@@ -0,0 +1,47 @@
+BUILD_HOSTS=(
+ fedora-3-i386
+)
+
+USE_HOSTS=(
+ fedora-3-i386
+ fedora-4-i386
+ fedora-4-x86_64
+ fedora-5-i386
+ fedora-5-x86_64
+ nld-9-i586
+ nld-9-x86_64
+ redhat-9-i386
+ rhel-3-i386
+ rhel-4-i386
+ sles-9-i586
+ sles-9-ia64
+ sles-9-s390
+ sles-9-s390x
+ sles-9-x86_64
+ suse-92-i586
+ suse-93-i586
+ suse-93-x86_64
+ suse-100-i586
+ suse-100-x86_64
+ suse-101-i586
+ suse-101-x86_64
+ win-4-i386
+)
+
+MONO_DEPS=(
+ mono
+)
+
+get_destroot () {
+ DEST_ROOT=noarch
+}
+
+BUILD_DIR="/tmp"
+
+make_dist () {
+ # Downloaded from
http://www.codeplex.com/Project/FileDownload.aspx?ProjectName=IronPython&DownloadId=557
+ # But no direct link, so providing one on primates
+ export filename="IronPython-$VERSION.zip"
+ curl
http://primates.ximian.com/~wberrier/packaging/sources/ironpython/$filename >
$filename
+}
+
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2006-07-21 06:02:11 UTC (rev 62852)
+++ trunk/release/packaging/defs/mono 2006-07-21 08:05:32 UTC (rev 62853)
@@ -306,6 +306,12 @@
POSTBUILD_STEP6 () {
#echo "Skipping..."
./runtime/mono-wrapper --wapi=semdel
+
+ # Clean up tmp files
+ cd /tmp
+ rm ipc*
+ rm tmp*tmp
+ rm *.exe
}
Added: trunk/release/packaging/defs/nant
===================================================================
--- trunk/release/packaging/defs/nant 2006-07-21 06:02:11 UTC (rev 62852)
+++ trunk/release/packaging/defs/nant 2006-07-21 08:05:32 UTC (rev 62853)
@@ -0,0 +1,49 @@
+BUILD_HOSTS=(
+ fedora-3-i386
+)
+
+USE_HOSTS=(
+ fedora-3-i386
+ fedora-4-i386
+ fedora-4-x86_64
+ fedora-5-i386
+ fedora-5-x86_64
+ nld-9-i586
+ nld-9-x86_64
+ redhat-9-i386
+ rhel-3-i386
+ rhel-4-i386
+ sles-9-i586
+ sles-9-ia64
+ sles-9-s390
+ sles-9-s390x
+ sles-9-x86_64
+ suse-92-i586
+ suse-93-i586
+ suse-93-x86_64
+ suse-100-i586
+ suse-100-x86_64
+ suse-101-i586
+ suse-101-x86_64
+ win-4-i386
+)
+
+# Should we build all this noarch stuff on the 1.1.13 bundle?
+#bundle="1.1.13"
+
+MONO_DEPS=(
+ mono
+)
+
+get_destroot () {
+ DEST_ROOT=noarch
+}
+
+BUILD_DIR="/tmp"
+
+make_dist () {
+ export filename="nant-$VERSION-src.tar.gz"
+ # wget doesn't work for some reason...
+ curl http://easynews.dl.sourceforge.net/sourceforge/nant/$filename >
$filename
+}
+
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
