Author: benm Date: 2005-04-17 14:29:21 -0400 (Sun, 17 Apr 2005) New Revision: 43151
Added: trunk/release/conf/gecko-sharp-2.0/ trunk/release/conf/gecko-sharp-2.0/ximian-build.conf trunk/release/conf/gtksourceview-sharp-2.0/ trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf trunk/release/packaging/defs/gecko-sharp-2.0 trunk/release/packaging/defs/gtksourceview-sharp-2.0 trunk/release/packaging/shared-code.sh Removed: trunk/release/website/distro-info.sh trunk/release/website/sources/ Modified: trunk/release/conf/gtk-sharp/ximian-build.conf trunk/release/conf/libgdiplus-1.1/ximian-build.conf trunk/release/conf/mono-1.1/ximian-build.conf trunk/release/mono-snap/mono-1.1/mono/ximian-build.conf trunk/release/packaging/build trunk/release/packaging/defs/gtk-sharp trunk/release/packaging/defs/libgdiplus-1.1 trunk/release/packaging/defs/mod_mono trunk/release/packaging/defs/mono-1.1 trunk/release/packaging/defs/monodoc trunk/release/packaging/defs/xsp trunk/release/website/mk-index.sh trunk/release/website/mk-oc.sh Log: big update Added: trunk/release/conf/gecko-sharp-2.0/ximian-build.conf =================================================================== --- trunk/release/conf/gecko-sharp-2.0/ximian-build.conf 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/conf/gecko-sharp-2.0/ximian-build.conf 2005-04-17 18:29:21 UTC (rev 43151) @@ -0,0 +1,105 @@ +<?xml version="1.0" ?> + +<!DOCTYPE module SYSTEM "helix-build.dtd"> + +<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> + + <version>0.8</version> + <rev>1</rev> + <serial>1</serial> + + <psdata id="copyright">MPL/LGPL</psdata> + <psdata id="url">http://monodevelop.com</psdata> + + <source> + <i>gecko-sharp-2.0-0.8.tar.gz-1</i> + </source> + + <builddep id="buildrequires"> + <i>mono-core</i> + <i>pkgconfig</i> + <i>gtk2</i> + <i>gtk-sharp2-gapi</i> + <i>mozilla-devel</i> + </builddep> + + <build id="default"> + <prepare>[[usrconfigure]]</prepare> + <compile>${MAKE}</compile> + <install>[[usrinstall]]</install> + + <psdata id="buildarch">noarch</psdata> + + + <package id="default"> + <name>gecko-sharp-2.0</name> + + <psdata id="group">Development/Tools</psdata> + + <files> + <i>[[usrprefix]]/bin/webshot</i> + <i>[[usrprefix]]/lib/gecko-sharp/WebThumbnailer.exe</i> + <i>[[usrprefix]]/lib/mono/*/*.dll</i> + <i>[[usrprefix]]/lib/mono/gac/*/*/*</i> + <i>[[usrprefix]]/lib/mono/gac/*</i> + <i>[[usrprefix]]/lib/pkgconfig/*</i> + </files> + + <docs /> + + <dep id="requires"> + <i>mozilla</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>C# bindings for the Gecko engine</h> + <p>C# bindings for the Gecko engine</p> + </description> + </package> + </build> + </targetset> +</module> + + +<!-- + Local Variables: + mode: xml + End: + --> Modified: trunk/release/conf/gtk-sharp/ximian-build.conf =================================================================== --- trunk/release/conf/gtk-sharp/ximian-build.conf 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/conf/gtk-sharp/ximian-build.conf 2005-04-17 18:29:21 UTC (rev 43151) @@ -204,6 +204,26 @@ <targetset> <filter> + <i>redhat-9-i386</i> + </filter> + + <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-1-i386</i> </filter> @@ -320,7 +340,7 @@ <targetset> <filter> - <i>nld-9-i586</i> + <i>nld-9-*</i> </filter> <build id="default"> @@ -342,7 +362,7 @@ <targetset> <filter> - <i>sles-9-i586</i> + <i>sles-9-*</i> </filter> <build id="default"> <builddep id="buildrequires"> @@ -382,6 +402,29 @@ </package> </build> </targetset> + + <targetset> + <filter> + <i>suse-93-*</i> + </filter> + + <build id="default"> + <builddep id="buildrequires"> + <l>default build deps</l> + <l>SuSE build deps</l> + <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> + </module> <!-- Added: trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf =================================================================== --- trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/conf/gtksourceview-sharp-2.0/ximian-build.conf 2005-04-17 18:29:21 UTC (rev 43151) @@ -0,0 +1,147 @@ + <?xml version="1.0" ?> + +<!DOCTYPE module SYSTEM "helix-build.dtd"> + +<module> + + <decl> + <list id="build-dependencies"> + <i>atk-devel</i> + <i>glib2-devel</i> + <i>gtk2-devel</i> + <i>gtk-sharp2</i> + <i>gtk-sharp2-gapi</i> + <i>gtksourceview-devel >= 0.7</i> + <i>libart_lgpl-devel</i> + <i>libgnomecanvas-devel</i> + <i>libxml2-devel</i> + <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> + + </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> + <srcname>gtksourceview-sharp</srcname> + + <version>0.8</version> + <rev>1</rev> + <serial>1</serial> + + <psdata id="copyright">GPL</psdata> + <psdata id="url">http:/go-mono.com</psdata> + + <source> + <i>gtksourceview-sharp-[[version]].tar.gz-2</i> + </source> + + <build id="default"> + <prepare>[[usrconfigure]]</prepare> + <compile>${MAKE}</compile> + <!-- <install>[[usrinstall]]</install> --> + <install>${MAKE} install DESTDIR=${DESTDIR} GACUTIL_FLAGS="/package gtksourceview-sharp-2.0 /root ${DESTDIR}/usr/lib"</install> + + <psdata id="buildarch">noarch</psdata> + + <builddep id="buildrequires"> + <i>libgnomeprint22-devel</i> + <i>libgnomeprintui22-devel</i> + <l>build-dependencies</l> + </builddep> + + <package id="default"> + <name>gtksourceview-sharp-2.0</name> + + <psdata id="group">Development/Library</psdata> + + <files> + <l>file-list</l> + </files> + + <docs> + <i>AUTHORS</i> + <i>COPYING</i> + <i>INSTALL</i> + <i>NEWS</i> + <i>README</i> + </docs> + + <dep id="requires"> + <i>gtksourceview >= 1.0</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>C# wrapper for GtkSourceView</h> + <p>C# wrapper for GtkSourceView</p> + </description> + </package> + </build> + </targetset> + + <targetset> + <filter> + <i>suse-*</i> + <i>nld-*</i> + </filter> + <build id="default"> + <builddep id="buildrequires"> + <i>libgnomeprint-devel</i> + <i>libgnomeprintui-devel</i> + <l>build-dependencies</l> + </builddep> + </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-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/conf/libgdiplus-1.1/ximian-build.conf 2005-04-17 18:29:21 UTC (rev 43151) @@ -87,7 +87,7 @@ <targetset> <filter> - <i>nld-9-i586</i> + <i>nld-9-*</i> </filter> <build id="default"> <builddep id="buildrequires"> @@ -103,6 +103,22 @@ <targetset> <filter> + <i>suse-93-*</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>libpng</i> + </builddep> + </build> + </targetset> + + <targetset> + <filter> <i>suse-92-i586</i> </filter> <build id="default"> Modified: trunk/release/conf/mono-1.1/ximian-build.conf =================================================================== --- trunk/release/conf/mono-1.1/ximian-build.conf 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/conf/mono-1.1/ximian-build.conf 2005-04-17 18:29:21 UTC (rev 43151) @@ -28,7 +28,7 @@ </source> <build id="default"> - + <prepare> CFLAGS="-O2 [[march]]" [[usrconfigure]] [[tls]] --with-preview=yes --with-signaltstack=no </prepare> Modified: trunk/release/mono-snap/mono-1.1/mono/ximian-build.conf =================================================================== --- trunk/release/mono-snap/mono-1.1/mono/ximian-build.conf 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/mono-snap/mono-1.1/mono/ximian-build.conf 2005-04-17 18:29:21 UTC (rev 43151) @@ -24,7 +24,7 @@ <psdata id="url">http://www.go-mono.com</psdata> <source> - <i>SVN svn+ssh://[EMAIL PROTECTED]/source/trunk/mono</i> + <i>SVN svn+ssh://[EMAIL PROTECTED]/{{MONO_SVN_PATH}}/mono</i> </source> <build id="default"> Modified: trunk/release/packaging/build =================================================================== --- trunk/release/packaging/build 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/build 2005-04-17 18:29:21 UTC (rev 43151) @@ -17,6 +17,7 @@ LOGFILE=logs/$package-$distro rm -rf $LOGFILE +mkdir -p `dirname $LOGFILE` usage() { Added: trunk/release/packaging/defs/gecko-sharp-2.0 =================================================================== --- trunk/release/packaging/defs/gecko-sharp-2.0 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/gecko-sharp-2.0 2005-04-17 18:29:21 UTC (rev 43151) @@ -0,0 +1,22 @@ +BUILD_HOSTS=( + suse-93-i586 +) + + +USE_HOSTS=( + fedora-3-i386 + nld-9-i586 + suse-93-i586 +) + +get_destroot () { + DEST_ROOT=noarch +} + +MONO_DEPS=( + gtk-sharp2 + gtk-sharp2-gapi + mono-core + mono-devel + monodoc +) \ No newline at end of file Modified: trunk/release/packaging/defs/gtk-sharp =================================================================== --- trunk/release/packaging/defs/gtk-sharp 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/gtk-sharp 2005-04-17 18:29:21 UTC (rev 43151) @@ -9,6 +9,8 @@ suse-93-i586 ) +USE_HOSTS=BUILD_HOSTS + MONO_DEPS=( mono-core mono-devel Added: trunk/release/packaging/defs/gtksourceview-sharp-2.0 =================================================================== --- trunk/release/packaging/defs/gtksourceview-sharp-2.0 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/gtksourceview-sharp-2.0 2005-04-17 18:29:21 UTC (rev 43151) @@ -0,0 +1,21 @@ +BUILD_HOSTS=( + suse-93-i586 +) + +USE_HOSTS=( + fedora-3-i386 + nld-9-i586 + suse-93-i586 +) + +get_destroot () { + DEST_ROOT=noarch +} + +MONO_DEPS=( + gtk-sharp2 + gtk-sharp2-gapi + mono-core + mono-devel + monodoc +) \ No newline at end of file Modified: trunk/release/packaging/defs/libgdiplus-1.1 =================================================================== --- trunk/release/packaging/defs/libgdiplus-1.1 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/libgdiplus-1.1 2005-04-17 18:29:21 UTC (rev 43151) @@ -10,6 +10,8 @@ suse-93-i586 ) +USE_HOSTS=BUILD_HOSTS + get_destroot () { DEST_ROOT=$1 } \ No newline at end of file Modified: trunk/release/packaging/defs/mod_mono =================================================================== --- trunk/release/packaging/defs/mod_mono 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/mod_mono 2005-04-17 18:29:21 UTC (rev 43151) @@ -6,6 +6,19 @@ # need redhat x86 distro ) +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 +) + get_destroot () { case "$1" in *-i[35]86) ARCH=x86 ;; Modified: trunk/release/packaging/defs/mono-1.1 =================================================================== --- trunk/release/packaging/defs/mono-1.1 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/mono-1.1 2005-04-17 18:29:21 UTC (rev 43151) @@ -3,6 +3,19 @@ sles-9-x86_64 ) +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 +) + get_destroot () { case "$1" in *-i[35]86) DEST_ROOT=x86 ;; Modified: trunk/release/packaging/defs/monodoc =================================================================== --- trunk/release/packaging/defs/monodoc 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/monodoc 2005-04-17 18:29:21 UTC (rev 43151) @@ -2,6 +2,19 @@ nld-9-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 +) + get_destroot () { DEST_ROOT=noarch } Modified: trunk/release/packaging/defs/xsp =================================================================== --- trunk/release/packaging/defs/xsp 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/defs/xsp 2005-04-17 18:29:21 UTC (rev 43151) @@ -2,6 +2,19 @@ nld-9-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 +) + get_destroot () { DEST_ROOT=noarch } Added: trunk/release/packaging/shared-code.sh =================================================================== --- trunk/release/packaging/shared-code.sh 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/packaging/shared-code.sh 2005-04-17 18:29:21 UTC (rev 43151) @@ -0,0 +1,44 @@ +function distro_info () { + DISTRO=$1 + + case "$DISTRO" in + *-i[35]86) ARCH=x86 ;; + *-x86_64) ARCH=x86_64 ;; + esac + + case "$DISTRO" in + fedora-* | redhat-* ) DISTRO_TYPE=redhat;; + suse-* | nld-* | sles-* ) DISTRO_TYPE=suse;; + esac + + case "$DISTRO" in + rhel-3-i386 ) + DISTRO_ALIASES=( + rhel-3as-i386 + rhel-3ws-i386 + rhel-3es-i386 + ) + ;; + + rhel-4-i386 ) + DISTRO_ALIASES=( + rhel-4as-i386 + rhel-4ws-i386 + rhel-4es-i386 + ) + ;; + + * ) + DISTRO_ALIASES=() + ;; + esac +} + +function ships_package () +{ + for i in USE_HOSTS; do + [[ $i == $DISTRO]] && exit 1 + done + + exit 0 +} \ No newline at end of file Deleted: trunk/release/website/distro-info.sh =================================================================== --- trunk/release/website/distro-info.sh 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/website/distro-info.sh 2005-04-17 18:29:21 UTC (rev 43151) @@ -1,35 +0,0 @@ -function distro_info () { - DISTRO=$1 - - case "$DISTRO" in - *-i[35]86) ARCH=x86 ;; - *-x86_64) ARCH=x86_64 ;; - esac - - case "$DISTRO" in - fedora-* | redhat-* ) DISTRO_TYPE=redhat;; - suse-* | nld-* | sles-* ) DISTRO_TYPE=suse;; - esac - - case "$DISTRO" in - rhel-3-i386 ) - DISTRO_ALIASES=( - rhel-3as-i386 - rhel-3ws-i386 - rhel-3es-i386 - ) - ;; - - rhel-4-i386 ) - DISTRO_ALIASES=( - rhel-4as-i386 - rhel-4ws-i386 - rhel-4es-i386 - ) - ;; - - * ) - DISTRO_ALIASES=() - ;; - esac -} \ No newline at end of file Modified: trunk/release/website/mk-index.sh =================================================================== --- trunk/release/website/mk-index.sh 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/website/mk-index.sh 2005-04-17 18:29:21 UTC (rev 43151) @@ -1,7 +1,8 @@ #!/bin/sh confdir=$(dirname $(pwd)/$0) -. $confdir/distro-info.sh +packagingdir= $confdir/../packaging +. $packagingdir/shared-code.sh @@ -9,7 +10,7 @@ cd $WEB_DIR -for distro_conf in $confdir/sources/*; do +for distro_conf in $packagingdir/conf/*-*-*; do distro_info `basename $distro_conf` @@ -23,31 +24,25 @@ cat $confdir/groups | while read line do if [ "x${line:0:1}" == "x#" ]; then - line=$(echo ${line:1}) + package=$(echo ${line:1}) + . $packagingdir/defs/$package + - grep -v "^#" $distro_conf | while read mod mloc - do - if [[ x$line = x$mod ]]; then + distro_info `basename $distro_conf` + ships_package || continue + get_destroot + + [ -d $DEST_ROOT/$mod/*/ ] || continue - eval mloc=$mloc - if [ ! -d $mloc/$mod/*/ ]; then - continue - fi - - VERSION=`ls -d $mloc/$mod/*/ -t -1 | head -n1` - VERSION=`dirname $VERSION`/`basename $VERSION` - - for i in $VERSION/*.rpm; do - - if [[ $i == *.src.rpm ]]; then - continue; - fi - - base=`basename $i` - - echo "<ul><a href='../$i'>$base</a></ul>" >> $OUT - done - fi + VERSION=`ls -d $DEST_ROOT/$mod/*/ -t -1 | head -n1` + + for i in $VERSION/*.rpm; do + + [[ $i == *.src.rpm ]] && continue + + base=`basename $i` + + echo "<ul><a href='../$i'>$base</a></ul>" >> $OUT done elif [ "x${line:0:1}" == "x!" ]; then line=$(echo ${line:1}) Modified: trunk/release/website/mk-oc.sh =================================================================== --- trunk/release/website/mk-oc.sh 2005-04-17 18:20:47 UTC (rev 43150) +++ trunk/release/website/mk-oc.sh 2005-04-17 18:29:21 UTC (rev 43151) @@ -1,7 +1,8 @@ #!/bin/bash confdir=$(dirname $(pwd)/$0) -. $confdir/distro-info.sh +packagingdir= $confdir/../packaging +. $packagingdir/shared-code.sh WEB_DIR=$1 serverconf=$2 @@ -9,10 +10,8 @@ rm -rf server.conf - cp $confdir/oc-config/distributions.xml . - cat $confdir/oc-config/$serverconf.conf | while read line; do if [ "x${line:0:1}" != "x!" ]; then echo $line >> server.conf @@ -31,25 +30,22 @@ continue fi + package=$(echo ${lline:1}) - for distro_conf in $confdir/sources/*; do + . $packagingdir/defs/$package + + for distro_conf in $packagingdir/conf/*-*-*; do distro_info `basename $distro_conf` - - grep -v "^#" $distro_conf | while read mod mloc - do - if [ "x$package" = "x$mod" ]; then - eval mloc=$mloc - if [ ! -d $mloc/$mod/*/ ]; then - continue - fi + ships_package || continue + get_destroot + + [ -d $DEST_ROOT/$mod/*/ ] || continue - VERSION=`ls -d $mloc/$mod/*/ -t -1 | head -n1` + VERSION=`ls -d $DEST_ROOT/$mod/*/ -t -1 | head -n1` - mkdir -p $chan/$DISTRO - ln $VERSION/*.rpm $chan/$DISTRO - fi - done + mkdir -p $chan/$DISTRO + ln $VERSION/*.rpm $chan/$DISTRO done done _______________________________________________ Mono-patches maillist - [email protected] http://lists.ximian.com/mailman/listinfo/mono-patches
