Author: benm
Date: 2005-05-04 15:23:05 -0400 (Wed, 04 May 2005)
New Revision: 44041
Modified:
trunk/release/conf/mono-1.1/ximian-build.conf
trunk/release/packaging/defs/gtk-sharp
trunk/release/packaging/defs/gtk-sharp-2.0
trunk/release/packaging/defs/libgdiplus-1.1
trunk/release/packaging/defs/mod_mono
trunk/release/packaging/do-build
trunk/release/packaging/do-msvn-tar
trunk/release/packaging/mktarball
Log:
misc packaging fixes
Modified: trunk/release/conf/mono-1.1/ximian-build.conf
===================================================================
--- trunk/release/conf/mono-1.1/ximian-build.conf 2005-05-04 19:12:21 UTC
(rev 44040)
+++ trunk/release/conf/mono-1.1/ximian-build.conf 2005-05-04 19:23:05 UTC
(rev 44041)
@@ -24,7 +24,6 @@
</source>
<build id="default">
- <unstripped />
<prepare>
CFLAGS="-O2 [[march]]" [[usrconfigure]] [[tls]] --with-preview=yes
--with-signaltstack=no
</prepare>
@@ -105,6 +104,7 @@
<i>[[usrprefix]]/bin/mono-find-provides</i>
<i>[[usrprefix]]/bin/mono-find-requires</i>
<i>[[usrprefix]]/bin/setreg</i>
+ <i>[[usrprefix]]/bin/mono-service</i>
<i>[[usrprefix]]/bin/sn</i>
<!-- exes -->
@@ -119,6 +119,7 @@
<i>[[usrprefix]]/lib/mono/1.0/mono-find-requires.exe</i>
<i>[[usrprefix]]/lib/mono/1.0/setreg.exe</i>
<i>[[usrprefix]]/lib/mono/1.0/sn.exe</i>
+ <i>[[usrprefix]]/lib/mono/1.0/mono-service.exe</i>
<!-- mdb files -->
<i>[[usrprefix]]/lib/mono/1.0/*.mdb</i>
@@ -362,6 +363,7 @@
<i>[[usrprefix]]/lib/mono/1.0/resgen.exe</i>
<i>[[usrprefix]]/lib/mono/1.0/secutil.exe</i>
<i>[[usrprefix]]/lib/mono/1.0/signcode.exe</i>
+ <i>[[usrprefix]]/lib/mono/1.0/prj2make.exe</i>
<!-- man pages-->
<i>[[usrmandir]]/man1/cert2spc.1*</i>
@@ -374,6 +376,8 @@
<i>[[usrmandir]]/man1/permview.1*</i>
<i>[[usrmandir]]/man1/secutil.1*</i>
<i>[[usrmandir]]/man1/signcode.1*</i>
+ <i>[[usrmandir]]/man1/dtd2xsd.1*</i>
+ <i>[[usrmandir]]/man1/prj2make.1*</i>
<!-- shell wrappers -->
<i>[[usrprefix]]/bin/al</i>
@@ -390,6 +394,7 @@
<i>[[usrprefix]]/bin/resgen</i>
<i>[[usrprefix]]/bin/secutil</i>
<i>[[usrprefix]]/bin/signcode</i>
+ <i>[[usrprefix]]/bin/prj2make</i>
<i>[[usrprefix]]/bin/pedump</i>
<i>[[usrprefix]]/bin/monodiet</i>
@@ -402,8 +407,9 @@
<i>[[usrprefix]]/include/mono/*/*.h</i>
<i>[[usrprefix]]/include/mono/cil/opcode.def</i>
<i>[[usrlibdir]]/libmono-profiler-cov.*</i>
- <i>[[usrlibdir]]/pkgconfig/*</i>
+ <i>[[usrlibdir]]/pkgconfig/mono.pc</i>
<i>[[usrlibdir]]/libmono.a</i>
+ <i>[[usrlibdir]]/libmono.la</i>
<i>[[usrmandir]]/man1/monoburg.*</i>
<i>[[usrprefix]]/share/mono/cil/cil-opcodes.xml</i>
</files>
@@ -632,7 +638,11 @@
<i>[[usrprefix]]/lib/mono/gac/System.ServiceProcess/*/*</i>
<i>[[usrprefix]]/lib/mono/1.0/System.ServiceProcess.dll</i>
<i>[[usrprefix]]/lib/mono/2.0/System.ServiceProcess.dll</i>
-
+
+ <i>[[usrprefix]]/bin/mono-service</i>
+ <i>[[usrprefix]]/lib/mono/1.0/mono-service.exe</i>
+ <i>[[usrmandir]]/man1/mono-service.1*</i>
+
<i>[[usrprefix]]/lib/mono/gac/System.Configuration.Install/*/*</i>
<i>[[usrprefix]]/lib/mono/1.0/System.Configuration.Install.dll</i>
<i>[[usrprefix]]/lib/mono/2.0/System.Configuration.Install.dll</i>
@@ -653,8 +663,8 @@
<docs />
<description>
- <h>Extra packages</h>
- <p>Extra packages</p>
+ <h>Create services with Mono and ensure binary compatibility with
stub assemblies</h>
+ <p />
</description>
</package>
Modified: trunk/release/packaging/defs/gtk-sharp
===================================================================
--- trunk/release/packaging/defs/gtk-sharp 2005-05-04 19:12:21 UTC (rev
44040)
+++ trunk/release/packaging/defs/gtk-sharp 2005-05-04 19:23:05 UTC (rev
44041)
@@ -23,7 +23,7 @@
HEAD_PATH="branches/gtk-sharp-1-0-branch/gtk-sharp"
-RELEASE_PATH="tags/gtk-sharp/[[versiondot]]"
+RELEASE_PATH="tags/gtk-sharp/[[versiondot]]/gtk-sharp"
get_tarball () {
msvn_tar $1
Modified: trunk/release/packaging/defs/gtk-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gtk-sharp-2.0 2005-05-04 19:12:21 UTC (rev
44040)
+++ trunk/release/packaging/defs/gtk-sharp-2.0 2005-05-04 19:23:05 UTC (rev
44041)
@@ -17,7 +17,7 @@
#HEAD_PATH="trunk/gtk-sharp"
HEAD_PATH="branches/gtk-sharp-1-9-branch/gtk-sharp"
-RELEASE_PATH="tags/gtk-sharp/[[versiondot]]"
+RELEASE_PATH="tags/gtk-sharp/[[versiondot]]/gtk-sharp"
get_tarball () {
msvn_tar $1
Modified: trunk/release/packaging/defs/libgdiplus-1.1
===================================================================
--- trunk/release/packaging/defs/libgdiplus-1.1 2005-05-04 19:12:21 UTC (rev
44040)
+++ trunk/release/packaging/defs/libgdiplus-1.1 2005-05-04 19:23:05 UTC (rev
44041)
@@ -1,5 +1,6 @@
BUILD_HOSTS=(
fedora-3-i386
+ nld-9-i586
nld-9-x86_64
redhat-9-i386
rhel-3-i386
Modified: trunk/release/packaging/defs/mod_mono
===================================================================
--- trunk/release/packaging/defs/mod_mono 2005-05-04 19:12:21 UTC (rev
44040)
+++ trunk/release/packaging/defs/mod_mono 2005-05-04 19:23:05 UTC (rev
44041)
@@ -1,12 +1,4 @@
BUILD_HOSTS=(
- sles-9-i586
- redhat-9-i386
-
- sles-9-x86_64
- # need redhat x86 distro
-)
-
-USE_HOSTS=(
fedora-3-i386
nld-9-i586
nld-9-x86_64
@@ -20,13 +12,15 @@
suse-93-x86_64
)
+USE_HOSTS=([EMAIL PROTECTED])
+
MONO_DEPS=(
mono-1.1
xsp
)
get_destroot () {
- DEST_ROOT=$DISTRO_TYPE-$ARCH
+ DEST_ROOT=$DISTRO
}
HEAD_PATH="trunk/mod_mono"
Modified: trunk/release/packaging/do-build
===================================================================
--- trunk/release/packaging/do-build 2005-05-04 19:12:21 UTC (rev 44040)
+++ trunk/release/packaging/do-build 2005-05-04 19:23:05 UTC (rev 44041)
@@ -1,5 +1,7 @@
#!/bin/sh
+mount /proc &> /dev/null
+
version=$1
rev=$2
rm -rf /tmp/root/built-packages || exit 1
Modified: trunk/release/packaging/do-msvn-tar
===================================================================
--- trunk/release/packaging/do-msvn-tar 2005-05-04 19:12:21 UTC (rev 44040)
+++ trunk/release/packaging/do-msvn-tar 2005-05-04 19:23:05 UTC (rev 44041)
@@ -7,6 +7,8 @@
svn_path=$2
snapshot_rev=$3
+mount /proc &> /dev/null
+
cd /tmp
rm -rf package-builder
mkdir package-builder
Modified: trunk/release/packaging/mktarball
===================================================================
--- trunk/release/packaging/mktarball 2005-05-04 19:12:21 UTC (rev 44040)
+++ trunk/release/packaging/mktarball 2005-05-04 19:23:05 UTC (rev 44041)
@@ -10,7 +10,7 @@
get_svn_path () {
case "$version" in
snap )
- if [ x$snapshot_rev == x ] then;
+ if [ x$snapshot_rev == x ]; then
echo "You need to specify a revision"
exit 1
fi
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
