Author: benm
Date: 2005-04-26 16:21:24 -0400 (Tue, 26 Apr 2005)
New Revision: 43620
Modified:
trunk/release/packaging/build
trunk/release/packaging/do-build
trunk/release/packaging/do-msvn-tar
trunk/release/packaging/mktarball
Log:
new code
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2005-04-26 19:54:31 UTC (rev 43619)
+++ trunk/release/packaging/build 2005-04-26 20:21:24 UTC (rev 43620)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Usage: build [os-target] [package]
+# Usage: build [os-target] [package] [version]
#
# Where:
# os-target is the OS target that we are building for
@@ -13,6 +13,7 @@
distro=$1
package=$2
+version=$3
. shared-code.sh
@@ -47,9 +48,9 @@
fi
fi
-scp do-build ../conf/$package/ximian-build.conf $target_host:$jaildir/tmp
+scp do-build ../conf/$package/ximian-build.conf
sources/$package/*-$version.tar.gz $target_host:$jaildir/tmp
-(echo > status/$distro; ./jail-do $distro sh -x /tmp/do-build $package >>
$LOGFILE 2>&1; rm status/$distro)
+(echo > status/$distro; ./jail-do $distro sh -x /tmp/do-build $version >>
$LOGFILE 2>&1; rm status/$distro)
scp $target_host:$jaildir/tmp/status /tmp/status-$distro-$package
if grep -q failure /tmp/status-$distro-$package; then
Modified: trunk/release/packaging/do-build
===================================================================
--- trunk/release/packaging/do-build 2005-04-26 19:54:31 UTC (rev 43619)
+++ trunk/release/packaging/do-build 2005-04-26 20:21:24 UTC (rev 43620)
@@ -1,13 +1,6 @@
#!/bin/sh
[EMAIL PROTECTED]
-BB_REPODIR=/srv/source-repository
-BB_REPOPORT=22
-
-CVSROOT=":ext:[EMAIL PROTECTED]:/cvs/helix-gnome"
-CVS_RSH=/usr/bin/bb_ssh
-
-export BB_REPODIR BB_REPOUSER BB_REPOPORT CVSROOT CVS_RSH
+version=$1
echo failure > /tmp/status
@@ -15,9 +8,17 @@
cd /tmp && rm -rf scratch && mkdir scratch && cd scratch || exit 1
mv ../ximian-build.conf .
+mv ../*.tar.gz .
+# rpm needs this to be happy
+chown root:root *.tar.gz
-bb_redo || exit 1
+VERSION_STRING="-V $version"
-rpm -rf /tmp/root/built-packages/*.src.rpm
+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
+rm -rf /tmp/root/built-packages/*.src.rpm
+
echo success > /tmp/status
\ No newline at end of file
Modified: trunk/release/packaging/do-msvn-tar
===================================================================
--- trunk/release/packaging/do-msvn-tar 2005-04-26 19:54:31 UTC (rev 43619)
+++ trunk/release/packaging/do-msvn-tar 2005-04-26 20:21:24 UTC (rev 43620)
@@ -2,7 +2,7 @@
package=$1
svn_path=$2
-snapshot_version=$3
+snapshot_rev=$3
cd /tmp
rm -rf package-builder
@@ -11,37 +11,68 @@
export SVN_SSH=/usr/bin/bb_ssh
+if [ ! x$snapshot_rev == x ]; then
+ rev_arg="-r $snapshot_rev"
+fi
+
+SVNEXPORT="svn export -q $ref_arg"
+MONO_ROOT="svn+ssh://[EMAIL PROTECTED]/source"
+MD_ROOT="svn+ssh://[EMAIL PROTECTED]/svn/monodevelop"
+
+normal_change_ver ()
+{
+ sed -i "s/\(AM_INIT_AUTOMAKE.*\))/\1.$snapshot_rev)/" configure.in
+}
+
+md_change_ver ()
+{
+ sed -i "s/\(AC_INIT.*\)\(0\.[0-9]*\)/\1\2.$snapshot_rev/" configure.in
+}
+
+DO_CHANGE_AUTOMAKE='normal_change_ver'
case $package in
mono-1.1 )
# we need to check out both mono and mcs in this case. The svn path we
# get is just below where the modules live.
- svn export -q svn+ssh://[EMAIL PROTECTED]/source/$svn_path/mono
- svn export -q svn+ssh://[EMAIL PROTECTED]/source/$svn_path/mcs
+ $SVNEXPORT $MONO_ROOT/$svn_path/mono
+ $SVNEXPORT $MONO_ROOT/$svn_path/mcs
BUILD_DIR=mono
+
+ DIST_FLAGS="MCS=mcs RESGEN=resgen"
+
+ ;;
+ monodevelop )
+
+ $SVNEXPORT $MD_ROOT/$svn_path
+
+ BUILD_DIR=$(basename $svn_path)
+
+ DO_CHANGE_AUTOMAKE='md_change_ver'
+
;;
* )
+ $SVNEXPORT $MONO_ROOT/$svn_path
- svn export -q svn+ssh://[EMAIL PROTECTED]/source/$svn_path
+ BUILD_DIR=$(basename $svn_path)
- BUILD_DIR=$(basename $svn_path)
;;
esac
cd $BUILD_DIR
-if [ ! x$snapshot_version == x ]; then
- sed -i "s/\(AM_INIT_AUTOMAKE.*\))/\1.$snapshot_version)/" configure.in
+if [ ! x$snapshot_rev == x ]; then
+ $DO_CHANGE_AUTOMAKE
fi
./autogen.sh || exit 1
-make dist || exit 1
+make dist $DIST_FLAGS || exit 1
rm -rf /tmp/built-tarball
mkdir -p /tmp/built-tarball
mv *.tar.gz /tmp/built-tarball
cd /tmp
-rm -rf package-builder
\ No newline at end of file
+rm -rf package-builder
\ No newline at end of file
Modified: trunk/release/packaging/mktarball
===================================================================
--- trunk/release/packaging/mktarball 2005-04-26 19:54:31 UTC (rev 43619)
+++ trunk/release/packaging/mktarball 2005-04-26 20:21:24 UTC (rev 43620)
@@ -3,13 +3,13 @@
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_version
+ ./jail-do $distro sh -x /tmp/do-msvn-tar $package $svn_path $snapshot_rev
}
get_svn_path () {
case "$version" in
snap )
- snapshot_version=$(date +'%Y%m%d')
+ [ x$snapshot_rev == x ] && ( echo "You need to specify a revision";
exit 1 )
svn_path=$HEAD_PATH
;;
*)
@@ -26,6 +26,7 @@
distro=$1
package=$2
version=$3
+snapshot_rev=$4
. shared-code.sh
. conf/$distro
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
