Author: benm
Date: 2005-05-02 19:34:27 -0400 (Mon, 02 May 2005)
New Revision: 43909
Added:
trunk/release/conf/ikvm/
trunk/release/conf/ikvm/ximian-build.conf
trunk/release/packaging/defs/ikvm
Modified:
trunk/release/buildbot/scripts/build
trunk/release/conf/gecko-sharp-2.0/ximian-build.conf
trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
trunk/release/conf/gtk-sharp/ximian-build.conf
trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf
trunk/release/conf/libgdiplus-1.1/ximian-build.conf
trunk/release/conf/mod_mono/ximian-build.conf
trunk/release/conf/mono-1.1/ximian-build.conf
trunk/release/conf/monodevelop/ximian-build.conf
trunk/release/conf/monodoc/ximian-build.conf
trunk/release/conf/xsp/ximian-build.conf
trunk/release/packaging/build
trunk/release/packaging/defs/gtk-sharp
trunk/release/packaging/do-build
trunk/release/packaging/install-deps
trunk/release/packaging/mktarball
trunk/release/packaging/shared-code.sh
trunk/release/website/mk-index.sh
trunk/release/website/mk-oc.sh
Log:
massive update
Modified: trunk/release/buildbot/scripts/build
===================================================================
--- trunk/release/buildbot/scripts/build 2005-05-02 23:27:55 UTC (rev
43908)
+++ trunk/release/buildbot/scripts/build 2005-05-02 23:34:27 UTC (rev
43909)
@@ -8,7 +8,7 @@
if uname | grep CYGWIN; then
echo Windows Build.
- bash mono-build-w32.sh || echo error; exit 1
+ bash mono-build-w32.sh || exit 1
else
echo "Calling autogen.sh --with-preview=yes --prefix=/mono"
sh autogen.sh --with-preview=yes --prefix=$prefix || { echo "errors"; exit
1; }
Modified: trunk/release/conf/gecko-sharp-2.0/ximian-build.conf
===================================================================
--- trunk/release/conf/gecko-sharp-2.0/ximian-build.conf 2005-05-02
23:27:55 UTC (rev 43908)
+++ trunk/release/conf/gecko-sharp-2.0/ximian-build.conf 2005-05-02
23:34:27 UTC (rev 43909)
@@ -4,15 +4,11 @@
<module>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.14 2004/10/30 00:28:32 duncan Exp
$</rcsid>
<filter>
<i>.*</i>
</filter>
<name>gecko-sharp-2.0</name>
- <rev>1</rev>
- <serial>1</serial>
-
<psdata id="copyright">MPL/LGPL</psdata>
<psdata id="url">http://monodevelop.com</psdata>
Modified: trunk/release/conf/gtk-sharp/ximian-build.conf
===================================================================
--- trunk/release/conf/gtk-sharp/ximian-build.conf 2005-05-02 23:27:55 UTC
(rev 43908)
+++ trunk/release/conf/gtk-sharp/ximian-build.conf 2005-05-02 23:34:27 UTC
(rev 43909)
@@ -12,8 +12,8 @@
<i>libgnomecanvas-devel</i>
<i>libgsf-devel</i>
<i>libgnomeui-devel</i>
- <i>mono-core >= 1.0.5</i>
- <i>mono-devel >= 1.0.5</i>
+ <i>mono-core</i>
+ <i>mono-devel</i>
<i>pkgconfig</i>
<i>vte-devel</i>
</list>
@@ -32,15 +32,11 @@
</decl>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.133 2005/04/06 22:20:00 distro Exp
$</rcsid>
<filter>
<i>.*</i>
</filter>
<name>gtk-sharp</name>
- <rev>0</rev>
- <serial>1</serial>
-
<psdata id="copyright">LGPL</psdata>
<psdata id="url">http://gtk-sharp.sf.net</psdata>
<source>
@@ -49,16 +45,12 @@
</source>
<build id="default">
- <prepare>autoconf; [[usrconfigure]]</prepare>
+ <prepare>[[usrconfigure]]</prepare>
<compile>${MAKE}</compile>
<install>${MAKE} install DESTDIR=${DESTDIR}</install>
<builddep id="buildrequires">
- <l>default build deps</l>
- <i>libgnomeprint22-devel</i>
- <i>libgnomeprintui22-devel</i>
- <i>gtkhtml3-devel</i>
- <i>librsvg2-devel</i>
+
</builddep>
<package id="default">
@@ -70,39 +62,14 @@
<i>[[usrlibdir]]/*.so</i>
<i>[[usrprefix]]/bin/gconfsharp-schemagen.exe</i>
<i>[[usrprefix]]/bin/gconfsharp-schemagen</i>
- <i>[[usrprefix]]/lib/mono/gac/art-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/atk-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/gconf-sharp-peditors/*</i>
- <i>[[usrprefix]]/lib/mono/gac/gconf-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/gdk-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/glade-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/glib-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/gnome-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/gtk-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/pango-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/rsvg-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/vte-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gac/gtkhtml-sharp/*</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/art-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/atk-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/gconf-sharp-peditors.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/gconf-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/gdk-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/glade-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/glib-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/gnome-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/gtk-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/pango-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/rsvg-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/vte-sharp.dll</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/gtkhtml-sharp.dll</i>
- <i>[[usrlibdir]]/pkgconfig/*.pc</i>
+ <i>[[usrprefix]]/lib/mono/gac/*/*</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp</i>
+ <i>[[usrlibdir]]/pkgconfig/*-sharp.pc</i>
</files>
<dep id="requires">
- <i>mono-core >= 0.96</i>
- <i>librsvg2</i>
- <i>libgtkhtml-3.1.so.11</i>
+ <i>librsvg-2.so.2[[libmark]]</i>
+ <i>libgtkhtml-[[gtkhtmlver]][[libmark]]</i>
</dep>
<docs>
@@ -195,29 +162,63 @@
<targetset>
<filter>
- <i>redhat-9-i386</i>
+ <i>redhat-9-</i>
</filter>
-
+ <decl>
+ <macro id="gtkhtmlver">3.0.so.4</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
<i>librsvg2-devel</i>
<i>gtkhtml3.0-devel</i>
</builddep>
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.0.so.4</i>
- <i>librsvg2</i>
- </dep>
- </package>
</build>
</targetset>
-
+
<targetset>
<filter>
- <i>fedora-3-i386</i>
+ <i>rhel-3..-</i>
</filter>
+ <decl>
+ <macro id="gtkhtmlver">3.0.so.2</macro>
+ </decl>
+ <build id="default">
+ <builddep id="buildrequires">
+ <l>default build deps</l>
+ <i>libgnomeprint22-devel</i>
+ <i>libgnomeprintui22-devel</i>
+ <i>gtkhtml3-devel</i>
+ <i>librsvg2-devel</i>
+ </builddep>
+ </build>
+ </targetset>
+
+ <targetset>
+ <filter>
+ <i>rhel-4..-</i>
+ </filter>
+ <decl>
+ <macro id="gtkhtmlver">3.1.so.11</macro>
+ </decl>
+ <build id="default">
+ <builddep id="buildrequires">
+ <l>default build deps</l>
+ <i>libgnomeprint22-devel</i>
+ <i>libgnomeprintui22-devel</i>
+ <i>gtkhtml3-devel</i>
+ <i>librsvg2-devel</i>
+ </builddep>
+ </build>
+ </targetset>
+ <targetset>
+ <filter>
+ <i>fedora-3-</i>
+ </filter>
+ <decl>
+ <macro id="gtkhtmlver">3.1.so.11</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
@@ -225,21 +226,16 @@
<i>gtkhtml3-devel</i>
<i>libcroco-devel</i>
</builddep>
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.1.so.11</i>
- <i>librsvg2</i>
- <i>libcroco</i>
- </dep>
- </package>
</build>
</targetset>
<targetset>
<filter>
- <i>nld-9-*</i>
+ <i>nld-9-</i>
</filter>
-
+ <decl>
+ <macro id="gtkhtmlver">3.1.so.11</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
@@ -247,41 +243,32 @@
<i>gtkhtml2-devel < 3.3</i>
<i>gnome-keyring-devel</i>
</builddep>
-
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.1.so.11</i>
- <i>librsvg-2.so.2</i>
- </dep>
- </package>
</build>
</targetset>
<targetset>
<filter>
- <i>sles-9-*</i>
+ <i>sles-9-</i>
</filter>
+ <decl>
+ <macro id="gtkhtmlver">3.1.so.11</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
<i>gtkhtml2-devel < 3.3</i>
<l>SuSE build deps</l>
</builddep>
-
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.1.so.11</i>
- <i>librsvg-2.so.2</i>
- </dep>
- </package>
</build>
</targetset>
<targetset>
<filter>
- <i>suse-92-i586</i>
+ <i>suse-92-</i>
</filter>
-
+ <decl>
+ <macro id="gtkhtmlver">3.1.so.11</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
@@ -290,21 +277,18 @@
<i>gnome-keyring-devel</i>
<i>libjpeg-devel</i>
</builddep>
-
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.1.so.11</i>
- <i>librsvg-2.so.2</i>
- </dep>
- </package>
</build>
</targetset>
<targetset>
<filter>
- <i>suse-93-*</i>
+ <i>suse-93-</i>
</filter>
-
+
+ <decl>
+ <macro id="gtkhtmlver">3.6.so.18</macro>
+ </decl>
+
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
@@ -312,16 +296,18 @@
<i>gtkhtml2-devel</i>
<i>gnome-keyring-devel</i>
</builddep>
-
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.6.so.18</i>
- <i>librsvg-2.so.2</i>
- </dep>
- </package>
</build>
</targetset>
-
+
+ <targetset>
+ <filter>
+ <i>x86_64</i>
+ </filter>
+
+ <decl>
+ <macro id="libmark">(64bit)</macro>
+ </decl>
+ </targetset>
</module>
<!--
Modified: trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
===================================================================
--- trunk/release/conf/gtk-sharp-2.0/ximian-build.conf 2005-05-02 23:27:55 UTC
(rev 43908)
+++ trunk/release/conf/gtk-sharp-2.0/ximian-build.conf 2005-05-02 23:34:27 UTC
(rev 43909)
@@ -14,8 +14,8 @@
<i>libgnomeui-devel</i>
<i>libgda-devel</i>
<i>libgnomedb-devel</i>
- <i>mono-core >= 1.0.4</i>
- <i>mono-devel >= 1.0.4</i>
+ <i>mono-core</i>
+ <i>mono-devel</i>
<i>pkgconfig</i>
<i>vte-devel</i>
<i>gnome-panel-devel</i>
@@ -37,16 +37,12 @@
</decl>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.16 2005/01/13 22:33:35 joe Exp $</rcsid>
<filter>
<i>.*</i>
</filter>
<name>gtk-sharp2</name>
<srcname>gtk-sharp</srcname>
- <rev>1</rev>
- <serial>1</serial>
-
<psdata id="copyright">LGPL</psdata>
<psdata id="url">http://gtk-sharp.sf.net</psdata>
@@ -79,24 +75,13 @@
<i>[[usrprefix]]/bin/gconfsharp2-schemagen</i>
<i>[[usrprefix]]/lib/mono/gac/*/*</i>
<i>[[usrprefix]]/lib/mono/gtk-sharp-2.0</i>
- <i>[[usrlibdir]]/pkgconfig/glade-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/art-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gnome-vfs-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gnome-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gtkhtml-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gconf-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/rsvg-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/vte-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gtk-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gda-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gnomedb-sharp-2.0.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/*-sharp-2.0.pc</i>
<i>[[usrlibdir]]/pkgconfig/gtk-dotnet-2.0.pc</i>
</files>
<dep id="requires">
- <i>mono-core >= 0.96</i>
- <i>librsvg2</i>
- <i>libgtkhtml-3.0.so.4</i>
+ <i>librsvg-2.so.2[[libmark]]</i>
+ <i>libgtkhtml-[[gtkhtmlver]][[libmark]]</i>
</dep>
<docs>
@@ -190,21 +175,15 @@
<filter>
<i>fedora-3-i386</i>
</filter>
-
+ <decl>
+ <macro id="gtkhtmlver">3.1.so.11</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
<i>librsvg2-devel</i>
<i>gtkhtml3-devel</i>
- <i>libcroco-devel</i>
</builddep>
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.1.so.11</i>
- <i>librsvg2</i>
- <i>libcroco</i>
- </dep>
- </package>
</build>
</targetset>
@@ -212,7 +191,9 @@
<filter>
<i>nld-9-*</i>
</filter>
-
+ <decl>
+ <macro id="gtkhtmlver">3.1.so.11</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
<l>default build deps</l>
@@ -220,13 +201,6 @@
<i>gtkhtml2-devel < 3.3</i>
<i>gnome-keyring-devel</i>
</builddep>
-
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.1.so.11</i>
- <i>librsvg-2.so.2</i>
- </dep>
- </package>
</build>
</targetset>
@@ -234,6 +208,9 @@
<filter>
<i>suse-93-*</i>
</filter>
+ <decl>
+ <macro id="gtkhtmlver">3.6.so.18</macro>
+ </decl>
<build id="default">
<builddep id="buildrequires">
@@ -242,15 +219,18 @@
<i>gtkhtml2-devel</i>
<i>gnome-keyring-devel</i>
</builddep>
-
- <package id="default">
- <dep id="requires">
- <i>libgtkhtml-3.6.so.18</i>
- <i>librsvg-2.so.2</i>
- </dep>
- </package>
</build>
</targetset>
+
+ <targetset>
+ <filter>
+ <i>x86_64</i>
+ </filter>
+
+ <decl>
+ <macro id="libmark">(64bit)</macro>
+ </decl>
+ </targetset>
</module>
<!--
Modified: trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf
===================================================================
--- trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf
2005-05-02 23:27:55 UTC (rev 43908)
+++ trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf
2005-05-02 23:34:27 UTC (rev 43909)
@@ -19,29 +19,15 @@
<i>mono-devel</i>
<i>pango-devel</i>
<i>pkgconfig</i>
- </list>
-
- <list id="file-list">
- <!-- <i>[[usrprefix]]/lib/monodoc/sources/gtksourceview-sharp-docs.*</i>
-->
-
- <i>[[usrprefix]]/lib/mono/gac/gtksourceview-sharp/*</i>
-
<i>[[usrprefix]]/lib/mono/gtksourceview-sharp-2.0/gtksourceview-sharp.dll</i>
- <i>[[usrprefix]]/lib/pkgconfig/*</i>
- <i>[[usrprefix]]/share/gapi-2.0/*</i>
- </list>
-
+ </list>
</decl>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.51 2005/02/10 18:14:28 gerardo Exp
$</rcsid>
<filter>
<i>.*</i>
</filter>
<name>gtksourceview-sharp-2.0</name>
- <rev>1</rev>
- <serial>1</serial>
-
<psdata id="copyright">GPL</psdata>
<psdata id="url">http:/go-mono.com</psdata>
@@ -69,7 +55,10 @@
<psdata id="group">Development/Library</psdata>
<files>
- <l>file-list</l>
+ <i>[[usrprefix]]/lib/mono/gac/gtksourceview-sharp/*</i>
+
<i>[[usrprefix]]/lib/mono/gtksourceview-sharp-2.0/gtksourceview-sharp.dll</i>
+ <i>[[usrprefix]]/lib/pkgconfig/*</i>
+ <i>[[usrprefix]]/share/gapi-2.0/*</i>
</files>
<docs>
Added: trunk/release/conf/ikvm/ximian-build.conf
===================================================================
--- trunk/release/conf/ikvm/ximian-build.conf 2005-05-02 23:27:55 UTC (rev
43908)
+++ trunk/release/conf/ikvm/ximian-build.conf 2005-05-02 23:34:27 UTC (rev
43909)
@@ -0,0 +1,92 @@
+<?xml version="1.0" ?>
+
+<!DOCTYPE module SYSTEM "helix-build.dtd">
+
+<module>
+ <targetset>
+ <filter>
+ <i>.*</i>
+ </filter>
+ <name>ikvm</name>
+
+ <epoch>1</epoch>
+
+ <psdata id="copyright">BSD</psdata>
+ <psdata id="url">http://www.ikvm.net</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>[[usrconfigure]]</prepare>
+ <compile>${MAKE}</compile>
+ <install>[[usrinstall]]</install>
+
+ <psdata id="buildarch">noarch</psdata>
+
+ <package id="default">
+ <name>ikvm</name>
+
+ <psdata id="group">Development/Tools</psdata>
+
+ <files>
+ <i>[[usrprefix]]/bin/*</i>
+ <i>[[usrprefix]]/lib/ikvm/*.dll</i>
+ <i>[[usrprefix]]/lib/ikvm/*.exe</i>
+ </files>
+
+ <docs>
+ <i>LICENSE</i>
+ </docs>
+
+ <dep id="requires">
+ <i>mono-ikvm</i>
+ </dep>
+
+<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_GAC_PREFIX=dest/usr
/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 | MONO_GAC_PREFIX=dest/usr
/usr/bin/mono-find-requires
+} | sort | uniq
+]]>
+ </i>
+</script>
+
+ <description>
+ <h>IKVM.NET is a JVM for Mono and the Microsoft .NET framework.</h>
+ <p>IKVM.NET is a JVM for Mono and the Microsoft .NET framework.</p>
+ </description>
+ </package>
+ </build>
+ </targetset>
+</module>
+
+<!--
+ Local Variables:
+ mode: xml
+ End:
+ -->
Modified: trunk/release/conf/libgdiplus-1.1/ximian-build.conf
===================================================================
--- trunk/release/conf/libgdiplus-1.1/ximian-build.conf 2005-05-02 23:27:55 UTC
(rev 43908)
+++ trunk/release/conf/libgdiplus-1.1/ximian-build.conf 2005-05-02 23:34:27 UTC
(rev 43909)
@@ -3,24 +3,20 @@
<!DOCTYPE module SYSTEM "helix-build.dtd">
<module>
- <decl>
- <list id="build dependencies">
- <i>glib2-devel >= 2.2.3</i>
- <i>pkgconfig</i>
- <i>zlib-devel</i>
- </list>
- </decl>/
+ <decl>
+ <list id="build dependencies">
+ <i>glib2-devel >= 2.2.3</i>
+ <i>pkgconfig</i>
+ <i>zlib-devel</i>
+ </list>
+ </decl>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.10 2005/03/19 01:00:22 duncan Exp
$</rcsid>
<filter>
<i>.*</i>
</filter>
<name>libgdiplus</name>
- <rev>1</rev>
- <serial>1</serial>
-
<psdata id="copyright">MIT X11</psdata>
<psdata id="url">http:/www.go-mono.com</psdata>
@@ -48,12 +44,8 @@
<psdata id="group">Development/Libraries</psdata>
<files>
- <i>[[usrprefix]]/lib/libgdiplus.so.0.0.0</i>
- <i>[[usrprefix]]/lib/libgdiplus.so.0</i>
- <i>[[usrprefix]]/lib/libgdiplus.so</i>
- <i>[[usrprefix]]/lib/libgdiplus.la</i>
- <i>[[usrprefix]]/lib/libgdiplus.a</i>
- <i>[[usrprefix]]/lib/pkgconfig/libgdiplus.pc</i>
+ <i>[[usrlibdir]]/libgdiplus.*</i>
+ <i>[[usrlibdir]]/pkgconfig/libgdiplus.pc</i>
</files>
<docs />
@@ -69,9 +61,9 @@
<targetset>
<filter>
- <i>suse-90-i586</i>
- <i>suse-91-i586</i>
- <i>sles-9-i586</i>
+ <i>suse-90-*</i>
+ <i>suse-91-*</i>
+ <i>sles-9-*</i>
</filter>
<build id="default">
<builddep id="buildrequires">
@@ -110,25 +102,25 @@
<l>build dependencies</l>
<i>freetype2-devel</i>
<i>giflib-devel</i>
- <i>libjpeg</i>
- <i>libtiff</i>
- <i>libpng</i>
+ <i>libjpeg-devel</i>
+ <i>libtiff-devel</i>
+ <i>libpng-devel</i>
</builddep>
</build>
</targetset>
<targetset>
<filter>
- <i>suse-92-i586</i>
+ <i>suse-92-*</i>
</filter>
<build id="default">
<builddep id="buildrequires">
<l>build dependencies</l>
<i>freetype2-devel</i>
<i>giflib-devel</i>
- <i>libjpeg</i>
- <i>libtiff</i>
- <i>libpng12</i>
+ <i>libjpeg-devel</i>
+ <i>libtiff-devel</i>
+ <i>libpng-devel</i>
</builddep>
</build>
</targetset>
Modified: trunk/release/conf/mod_mono/ximian-build.conf
===================================================================
--- trunk/release/conf/mod_mono/ximian-build.conf 2005-05-02 23:27:55 UTC
(rev 43908)
+++ trunk/release/conf/mod_mono/ximian-build.conf 2005-05-02 23:34:27 UTC
(rev 43909)
@@ -10,15 +10,11 @@
</decl>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.33 2005/03/19 01:04:22 duncan Exp
$</rcsid>
<filter>
<i>.*</i>
</filter>
<name>mod_mono</name>
- <rev>1</rev>
- <serial>1</serial>
-
<psdata id="copyright">GPL</psdata>
<psdata id="url">http://www.apacheworld.org/modmono</psdata>
Modified: trunk/release/conf/mono-1.1/ximian-build.conf
===================================================================
--- trunk/release/conf/mono-1.1/ximian-build.conf 2005-05-02 23:27:55 UTC
(rev 43908)
+++ trunk/release/conf/mono-1.1/ximian-build.conf 2005-05-02 23:34:27 UTC
(rev 43909)
@@ -14,8 +14,6 @@
<i>.*</i>
</filter>
<name>mono</name>
- <rev>1</rev>:
- <serial>3</serial>
<psdata id="copyright">LGPL</psdata>
<psdata id="url">http://www.go-mono.com</psdata>
Modified: trunk/release/conf/monodevelop/ximian-build.conf
===================================================================
--- trunk/release/conf/monodevelop/ximian-build.conf 2005-05-02 23:27:55 UTC
(rev 43908)
+++ trunk/release/conf/monodevelop/ximian-build.conf 2005-05-02 23:34:27 UTC
(rev 43909)
@@ -9,9 +9,6 @@
</filter>
<name>monodevelop</name>
- <rev>1</rev>
- <serial>1</serial>
-
<psdata id="copyright">GPL</psdata>
<psdata id="url">http://www.monodevelop.com</psdata>
@@ -71,7 +68,7 @@
{
echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-provides
- echo $filelist | tr [:blank:] \\n | MONO_GAC_PREFIX=dest/usr
/usr/bin/mono-find-provides
+ echo $filelist | tr [:blank:] \\n |
MONO_PATH=dest/usr/lib/monodevelop/bin:$MONO_PATH MONO_GAC_PREFIX=dest/usr
/usr/bin/mono-find-provides
} | sort | uniq
]]>
@@ -87,7 +84,7 @@
{
echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires
- echo $filelist | tr [:blank:] \\n | MONO_GAC_PREFIX=dest/usr
/usr/bin/mono-find-requires
+ echo $filelist | tr [:blank:] \\n |
MONO_PATH=dest/usr/lib/monodevelop/bin:$MONO_PATH MONO_GAC_PREFIX=dest/usr
/usr/bin/mono-find-requires
} | sort | uniq
]]>
</i>
Modified: trunk/release/conf/monodoc/ximian-build.conf
===================================================================
--- trunk/release/conf/monodoc/ximian-build.conf 2005-05-02 23:27:55 UTC
(rev 43908)
+++ trunk/release/conf/monodoc/ximian-build.conf 2005-05-02 23:34:27 UTC
(rev 43909)
@@ -5,14 +5,11 @@
<module>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.64 2004/12/07 23:43:24 duncan Exp
$</rcsid>
<filter>
<i>.*</i>
</filter>
<name>monodoc</name>
- <rev>1</rev>
- <serial>1</serial>
<psdata id="copyright">GPL</psdata>
<psdata id="url">http://go-mono.com</psdata>
@@ -42,52 +39,20 @@
<files>
<i>[[usrprefix]]/lib/mono/gac/monodoc/1.0.0.0*/*</i>
-
- <i>[[usrprefix]]/bin/monodoc</i>
- <i>[[usrprefix]]/bin/mod</i>
-
- <i>[[usrprefix]]/lib/monodoc/assembler.exe</i>
- <i>[[usrprefix]]/lib/monodoc/browser.exe</i>
- <i>[[usrprefix]]/lib/monodoc/cs2ecma.exe</i>
- <i>[[usrprefix]]/lib/monodoc/mod.exe</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/monodoc.dll</i>
+
+ <i>[[usrprefix]]/bin/*</i>
+
+ <i>[[usrprefix]]/lib/monodoc/*.exe</i>
<i>[[usrprefix]]/lib/monodoc/monodoc.xml</i>
- <i>[[usrprefix]]/lib/monodoc/normalize.exe</i>
- <i>[[usrprefix]]/lib/monodoc/validate.exe</i>
- <!-- <i>[[usrprefix]]/lib/monodoc/monodoc.index</i> -->
+ <i>[[usrprefix]]/lib/monodoc/sources/*.source</i>
+ <i>[[usrprefix]]/lib/monodoc/sources/*.tree</i>
+ <i>[[usrprefix]]/lib/monodoc/sources/*.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/cs-errors.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/cs-errors.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/cs-errors.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/ecma334.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/ecma334.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/ecma334.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/gecko-sharp-docs.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/gecko-sharp-docs.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/gecko-sharp-docs.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/gtk-sharp-docs.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/gtk-sharp-docs.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/gtk-sharp-docs.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/monohb.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/monohb.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/monohb.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/Mono.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/Mono.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/Mono.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/netdocs.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/netdocs.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/netdocs.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/Novell.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/Novell.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/Novell.zip</i>
- <i>[[usrprefix]]/lib/monodoc/sources/nunit-docs.source</i>
- <i>[[usrprefix]]/lib/monodoc/sources/nunit-docs.tree</i>
- <i>[[usrprefix]]/lib/monodoc/sources/nunit-docs.zip</i>
-
- <i>[[usrprefix]]/lib/monodoc/updater.exe</i>
<i>[[usrprefix]]/share/applications/monodoc.desktop</i>
<i>[[usrprefix]]/share/pixmaps/monodoc.png</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp/monodoc.dll</i>
+
<i>[[usrprefix]]/lib/pkgconfig/monodoc.pc</i>
</files>
Modified: trunk/release/conf/xsp/ximian-build.conf
===================================================================
--- trunk/release/conf/xsp/ximian-build.conf 2005-05-02 23:27:55 UTC (rev
43908)
+++ trunk/release/conf/xsp/ximian-build.conf 2005-05-02 23:34:27 UTC (rev
43909)
@@ -4,15 +4,11 @@
<module>
<targetset>
- <rcsid>$Id: ximian-build.conf,v 1.45 2005/03/19 01:13:35 duncan Exp
$</rcsid>
<filter>
<i>.*</i>
</filter>
<name>xsp</name>
- <rev>1</rev>
- <serial>1</serial>
-
<psdata id="copyright">GPL</psdata>
<psdata id="url">http://www.go-mono.com</psdata>
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2005-05-02 23:27:55 UTC (rev 43908)
+++ trunk/release/packaging/build 2005-05-02 23:34:27 UTC (rev 43909)
@@ -1,11 +1,13 @@
#!/bin/sh
#
-# Usage: build [os-target] [package] [version]
+# Usage: build os-target package version [serial]
#
# Where:
# os-target is the OS target that we are building for
# package is the name of the BB XML configuration file on the repository
# version is the version you want to build
+# serial is optionally the build number. If it is not present, it is assumed
+# to be zero.
#
# Example:
# build suse-92-i386 mono-1.1 1.1.6
@@ -14,6 +16,7 @@
distro=$1
package=$2
version=$3
+serial=${4-0}
. shared-code.sh
@@ -40,7 +43,21 @@
. conf/$distro
. defs/$package
+distro_info $distro
+get_destroot $distro
+get_revision
+if [ $serial -eq 0 ]; then
+ VER_PATH="$version"
+else
+ VER_PATH="$version-$serial"
+fi
+
+if [ -d packages/$DEST_ROOT/$package/$VER_PATH ]; then
+ echo "The path for this package
(packages/$DEST_ROOT/$package/$VER_PATH) already exists. You probably need to
bump the revision number"
+ exit 1;
+fi
+
if [ ! [EMAIL PROTECTED] -eq 0 ]; then
if ! ./install-deps $distro [EMAIL PROTECTED] >> $LOGFILE 2>&1; then
echo Dependency installation failed, see log in $LOGFILE for
details
@@ -51,7 +68,7 @@
scp do-build ../conf/$package/ximian-build.conf
sources/$package/*-$version.tar.gz $target_host:$jaildir/tmp
echo > status/$distro;
-if ! ./jail-do $distro sh -x /tmp/do-build $version >> $LOGFILE 2>&1; then
+if ! ./jail-do $distro sh -x /tmp/do-build $version $REVISION >> $LOGFILE
2>&1; then
rm status/$distro
echo Build failed, see log in $LOGFILE for details
exit 1;
@@ -59,13 +76,5 @@
rm status/$distro
-distro_info $distro
-get_destroot $distro
-
-mkdir -p packages/$DEST_ROOT/$package
-scp $target_host:$jaildir/tmp/root/built-packages/*
packages/$DEST_ROOT/$package
-
-one_rpm=`ls -1 packages/$DEST_ROOT/$package/*.rpm | head -n1`
-ver=`rpm_query VERSION $one_rpm`
-mkdir -p packages/$DEST_ROOT/$package/$ver
-mv packages/$DEST_ROOT/$package/*.rpm packages/$DEST_ROOT/$package/$ver
\ No newline at end of file
+mkdir -p packages/$DEST_ROOT/$package/$VER_PATH
+scp $target_host:$jaildir/tmp/root/built-packages/*
packages/$DEST_ROOT/$package/$VER_PATH
Modified: trunk/release/packaging/defs/gtk-sharp
===================================================================
--- trunk/release/packaging/defs/gtk-sharp 2005-05-02 23:27:55 UTC (rev
43908)
+++ trunk/release/packaging/defs/gtk-sharp 2005-05-02 23:34:27 UTC (rev
43909)
@@ -6,6 +6,7 @@
rhel-4-i386
sles-9-i586
sles-9-x86_64
+ suse-92-i586
suse-93-i586
suse-93-x86_64
)
Added: trunk/release/packaging/defs/ikvm
===================================================================
--- trunk/release/packaging/defs/ikvm 2005-05-02 23:27:55 UTC (rev 43908)
+++ trunk/release/packaging/defs/ikvm 2005-05-02 23:34:27 UTC (rev 43909)
@@ -0,0 +1,29 @@
+BUILD_HOSTS=(
+ suse-93-i586
+)
+
+USE_HOSTS=(
+ fedora-3-i386
+ nld-9-i586
+ nld-9-x86_64
+ redhat-9-i386
+ rhel-3-i386
+ rhel-4-i386
+ sles-9-i586
+ sles-9-x86_64
+ suse-92-i586
+ suse-93-i586
+ suse-93-x86_64
+)
+
+MONO_DEPS=(
+ mono-1.1
+)
+
+get_destroot () {
+ DEST_ROOT=noarch
+}
+
+get_tarball () {
+ wget http://primates.ximian.com/~bmaurer/ikvm-$version.tar.gz -O
sources/ikvm/ikvm-$version.tar.gz
+}
\ No newline at end of file
Modified: trunk/release/packaging/do-build
===================================================================
--- trunk/release/packaging/do-build 2005-05-02 23:27:55 UTC (rev 43908)
+++ trunk/release/packaging/do-build 2005-05-02 23:34:27 UTC (rev 43909)
@@ -1,7 +1,7 @@
#!/bin/sh
version=$1
-
+rev=$2
rm -rf /tmp/root/built-packages || exit 1
cd /tmp && rm -rf scratch && mkdir scratch && cd scratch || exit 1
@@ -10,11 +10,11 @@
# rpm needs this to be happy
chown root:root *.tar.gz
-VERSION_STRING="-V $version"
-bb_lint -g prebuild $VERSION_STRING || exit 1
-bb_unpack apply || exit 1
-bb_do $VERSION_STRING || exit 1
-bb_lint $VERSION_STRING || exit 1
+bb_lint -g prebuild -V $version -R $rev -S '' || exit 1
+bb_unpack apply || exit 1
+bb_do -V $version -R $rev -S '' || exit 1
+bb_lint -V $version -R $rev -S '' || exit 1
+
rm -rf /tmp/root/built-packages/*.src.rpm
\ No newline at end of file
Modified: trunk/release/packaging/install-deps
===================================================================
--- trunk/release/packaging/install-deps 2005-05-02 23:27:55 UTC (rev
43908)
+++ trunk/release/packaging/install-deps 2005-05-02 23:34:27 UTC (rev
43909)
@@ -20,10 +20,10 @@
get_destroot
- latest_version packages/$DEST_ROOT/$i/*/ || (
+ if ! latest_version packages/$DEST_ROOT/$i; then
echo "Could not find $i for $DISTRO (looking in $DEST_ROOT)"
exit 1;
- )
+ fi
for i in $LATEST_VERSION/*.rpm; do
[[ $i == *.src.rpm ]] && continue
@@ -39,5 +39,5 @@
scp [EMAIL PROTECTED] $target_host:$jaildir/tmp/install-packages
-./jail-do $TARGET "sh -x -c \"rpm -Uhv /tmp/install-packages/*.rpm\""
+./jail-do $TARGET "sh -x -c \"rpm --replacepkgs -Uhv
/tmp/install-packages/*.rpm\""
./jail-do $TARGET "sh -x -c \"rm -rf /tmp/install-packages\""
Modified: trunk/release/packaging/mktarball
===================================================================
--- trunk/release/packaging/mktarball 2005-05-02 23:27:55 UTC (rev 43908)
+++ trunk/release/packaging/mktarball 2005-05-02 23:34:27 UTC (rev 43909)
@@ -3,13 +3,17 @@
msvn_tar () {
get_svn_path
scp do-msvn-tar $target_host:$jaildir/tmp
- ./jail-do $distro sh -x /tmp/do-msvn-tar $package $svn_path $snapshot_rev
+ ./jail-do $distro sh -x /tmp/do-msvn-tar $package $svn_path $snapshot_rev
|| exit 1
+ scp $target_host:$jaildir/tmp/built-tarball/*.tar.gz sources/$package
}
get_svn_path () {
case "$version" in
snap )
- [ x$snapshot_rev == x ] && ( echo "You need to specify a revision";
exit 1 )
+ if [ x$snapshot_rev == x ] then;
+ echo "You need to specify a revision"
+ exit 1
+ fi
svn_path=$HEAD_PATH
;;
*)
@@ -32,6 +36,9 @@
. conf/$distro
. defs/$package
+mkdir -p sources/$package
+
+
if [ ! [EMAIL PROTECTED] -eq 0 ]; then
if ! ./install-deps $distro [EMAIL PROTECTED]; then
echo Dependency installation failed, see log in $LOGFILE for
details
@@ -39,8 +46,7 @@
fi
fi
-get_tarball
-
-mkdir -p sources/$package
-
-scp $target_host:$jaildir/tmp/built-tarball/*.tar.gz sources/$package
\ No newline at end of file
+if ! get_tarball ; then
+ echo Tarball creation failed
+ exit 1
+fi
Modified: trunk/release/packaging/shared-code.sh
===================================================================
--- trunk/release/packaging/shared-code.sh 2005-05-02 23:27:55 UTC (rev
43908)
+++ trunk/release/packaging/shared-code.sh 2005-05-02 23:34:27 UTC (rev
43909)
@@ -49,7 +49,8 @@
function latest_version ()
{
- LATEST_VERSION=`ls -d -t -1 $* | head -n1 2> /dev/null`
+ FILES=$(find $1 -type d -maxdepth 1)
+ LATEST_VERSION=`(ls -vrd1 $FILES | head -n1) 2> /dev/null`
[ ! "x$LATEST_VERSION" == x ]
}
@@ -57,3 +58,18 @@
{
rpm -qp --queryformat "%{$1}" $2 2>/dev/null
}
+
+
+function get_revision ()
+{
+ if [ $DEST_ROOT == $DISTRO ]; then
+
+ # remove the -ARCH from the end
+ oscode=${DISTRO%-*}
+ # remove the "-" from the middle
+ oscode=${oscode//-/}
+ REVISION="$serial.$oscode.novell"
+ else
+ REVISION="$serial.novell"
+ fi
+}
\ No newline at end of file
Modified: trunk/release/website/mk-index.sh
===================================================================
--- trunk/release/website/mk-index.sh 2005-05-02 23:27:55 UTC (rev 43908)
+++ trunk/release/website/mk-index.sh 2005-05-02 23:34:27 UTC (rev 43909)
@@ -32,7 +32,7 @@
ships_package || continue
get_destroot
- latest_version $DEST_ROOT/$package/*/ ||
continue
+ latest_version $DEST_ROOT/$package || continue
for i in $LATEST_VERSION/*.rpm; do
[[ $i == *.src.rpm ]] && continue
Modified: trunk/release/website/mk-oc.sh
===================================================================
--- trunk/release/website/mk-oc.sh 2005-05-02 23:27:55 UTC (rev 43908)
+++ trunk/release/website/mk-oc.sh 2005-05-02 23:34:27 UTC (rev 43909)
@@ -40,7 +40,7 @@
ships_package || continue
get_destroot
- latest_version $DEST_ROOT/$package/*/ || continue
+ latest_version $DEST_ROOT/$package || continue
mkdir -p $chan/$DISTRO
ln $LATEST_VERSION/*.rpm $chan/$DISTRO
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
