Author: benm
Date: 2005-04-26 19:54:33 -0400 (Tue, 26 Apr 2005)
New Revision: 43633
Removed:
trunk/release/packaging/march-30
Modified:
trunk/release/packaging/build
trunk/release/packaging/defs/monodevelop
trunk/release/packaging/do-msvn-tar
trunk/release/packaging/install-deps
trunk/release/packaging/jail-do
Log:
cleanups
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2005-04-26 23:15:53 UTC (rev 43632)
+++ trunk/release/packaging/build 2005-04-26 23:54:33 UTC (rev 43633)
@@ -5,11 +5,11 @@
# 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
#
# Example:
-# build suse-92-i386 mono-1.1
+# build suse-92-i386 mono-1.1 1.1.6
#
-#
distro=$1
package=$2
@@ -17,17 +17,17 @@
. shared-code.sh
-LOGFILE=logs/$package-$distro
+LOGFILE=logs/$package-$version-$distro
rm -rf $LOGFILE
mkdir -p `dirname $LOGFILE`
usage()
{
- echo "Usage is: build configuration package"
+ echo "Usage is: build configuration package version"
}
-if test x$package = x; then
+if test x$version = x; then
usage
exit 1;
fi
Modified: trunk/release/packaging/defs/monodevelop
===================================================================
--- trunk/release/packaging/defs/monodevelop 2005-04-26 23:15:53 UTC (rev
43632)
+++ trunk/release/packaging/defs/monodevelop 2005-04-26 23:54:33 UTC (rev
43633)
@@ -1,7 +1,6 @@
BUILD_HOSTS=(
+ # needs to be an rh system for packaging sanity
fedora-3-i386
- nld-9-i586
- suse-93-i586
)
USE_HOSTS=([EMAIL PROTECTED])
Modified: trunk/release/packaging/do-msvn-tar
===================================================================
--- trunk/release/packaging/do-msvn-tar 2005-04-26 23:15:53 UTC (rev 43632)
+++ trunk/release/packaging/do-msvn-tar 2005-04-26 23:54:33 UTC (rev 43633)
@@ -1,4 +1,7 @@
#!/bin/sh
+#
+# The driver script to make a tarball
+#
package=$1
svn_path=$2
@@ -9,6 +12,7 @@
mkdir package-builder
cd package-builder
+# use the key in /usr/share/ximian-build-system/conf/ssh
export SVN_SSH=/usr/bin/bb_ssh
if [ ! x$snapshot_rev == x ]; then
@@ -19,6 +23,10 @@
MONO_ROOT="svn+ssh://[EMAIL PROTECTED]/source"
MD_ROOT="svn+ssh://[EMAIL PROTECTED]/svn/monodevelop"
+#
+# These scripts change the version in configure.in to have the svn
+# rev number after it.
+#
normal_change_ver ()
{
sed -i "s/\(AM_INIT_AUTOMAKE.*\))/\1.$snapshot_rev)/" configure.in
@@ -30,6 +38,8 @@
}
DO_CHANGE_AUTOMAKE='normal_change_ver'
+
+# Special case package configurations
case $package in
mono-1.1 )
# we need to check out both mono and mcs in this case. The svn path we
@@ -40,27 +50,25 @@
BUILD_DIR=mono
+ # needed so that we don't need to build the mono in the tarball
DIST_FLAGS="MCS=mcs RESGEN=resgen"
;;
monodevelop )
-
+ # md has its own svn repo
$SVNEXPORT $MD_ROOT/$svn_path
- BUILD_DIR=$(basename $svn_path)
-
DO_CHANGE_AUTOMAKE='md_change_ver'
;;
* )
$SVNEXPORT $MONO_ROOT/$svn_path
-
- BUILD_DIR=$(basename $svn_path)
-
;;
esac
+: ${BUILD_DIR=$(basename $svn_path)}
+
cd $BUILD_DIR
if [ ! x$snapshot_rev == x ]; then
Modified: trunk/release/packaging/install-deps
===================================================================
--- trunk/release/packaging/install-deps 2005-04-26 23:15:53 UTC (rev
43632)
+++ trunk/release/packaging/install-deps 2005-04-26 23:54:33 UTC (rev
43633)
@@ -1,16 +1,18 @@
#!/bin/sh
+#
+# Usage: install-deps TARGET monopackages
+# ex: install-deps suse-93-i586 mono-1.1 gtk-sharp-2.0
+#
. shared-code.sh
TARGET=$1
shift
+DEPS=$*
. conf/$TARGET
distro_info $TARGET
-DEPS=$*
-
-
RPMS=()
for i in $DEPS; do
Modified: trunk/release/packaging/jail-do
===================================================================
--- trunk/release/packaging/jail-do 2005-04-26 23:15:53 UTC (rev 43632)
+++ trunk/release/packaging/jail-do 2005-04-26 23:54:33 UTC (rev 43633)
@@ -1,11 +1,22 @@
#!/bin/sh
+#
+# Executes either a command or an interactive shell on a jail
+# ./jail-do suse-93-i586
+# ./jail-do suse-93-i586 rug in my-package
+#
TARGET=$1
-
shift
. conf/$TARGET
+#
+# FIXME
+#
+# There are weird things happening with quoting here. You can't
+# pass a command with single quotes. We need to fix this somewhow
+#
+
if [ "x$*" == x ] ; then
CMD="bash -l"
else
Deleted: trunk/release/packaging/march-30
===================================================================
--- trunk/release/packaging/march-30 2005-04-26 23:15:53 UTC (rev 43632)
+++ trunk/release/packaging/march-30 2005-04-26 23:54:33 UTC (rev 43633)
@@ -1,18 +0,0 @@
-#/bin/sh
-
-build nld-9-x86_64 mono-1.1 &
-build fedora-3-i386 mono-1.1 &
-build sles-8-i386 mono-1.1
-
-build sles-9-x86_64 mono-1.1 &
-build redhat-9-i386 mono-1.1 &
-build sles-9-i586 mono-1.1
-
-build rhel-3-i386 mono-1.1 &
-build suse-90-i586 mono-1.1
-
-build rhel-4-i386 mono-1.1 &
-build suse-91-i586 mono-1.1
-
-build suse-92-i586 mono-1.1
-
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
