Author: wade
Date: 2007-07-18 18:43:09 -0400 (Wed, 18 Jul 2007)
New Revision: 82251
Modified:
trunk/release/jailbuilder/
trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec
trunk/release/pyutils/packaging.py
Log:
packaging.py:
-extra env info needed for determining destroot for mono-basic
packaging/rpm_defs/mono-basic:
-merge code from buildbuddy to inject ms.net built binaries
Property changes on: trunk/release/jailbuilder
___________________________________________________________________
Name: svn:ignore
- isos
rpms
rpm_cache
jails
+ isos
rpms
rpm_cache
jails
*.pyc
Modified: trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec 2007-07-18
22:39:11 UTC (rev 82250)
+++ trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec 2007-07-18
22:43:09 UTC (rev 82251)
@@ -43,8 +43,7 @@
%_prefix/bin/vbnc
%_prefix/lib/mono/2.0/vbnc*
%_prefix/lib/mono/gac/Microsoft.VisualBasic
-%_prefix/lib/mono/1.0/Microsoft.VisualBasic.dll
-%_prefix/lib/mono/2.0/Microsoft.VisualBasic.dll
+%_prefix/lib/mono/*/Microsoft.VisualBasic.dll
%debug_package
%prep
@@ -61,15 +60,58 @@
%{?env_options}
make install DESTDIR=${RPM_BUILD_ROOT}
-## Get ms.net runtime out of noarch rpm
-rpm2cpio %{S:1} | cpio -idv
-# Remove vbnc built runtime
-rm -Rf ${RPM_BUILD_ROOT}/usr/lib/mono/gac/Microsoft.VisualBasic
-rm -Rf ${RPM_BUILD_ROOT}/usr/lib/mono/2.0/Microsoft.VisualBasic.dll
-## Install runtime from noarch.rpm into new gac
-gacutil -package 1.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
usr/lib/mono/1.0/Microsoft.VisualBasic.dll
-gacutil -package 2.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
usr/lib/mono/2.0/Microsoft.VisualBasic.dll
+### Get ms.net runtime out of noarch rpm
+#rpm2cpio %{S:1} | cpio -idv
+## Remove vbnc built runtime
+#rm -Rf ${RPM_BUILD_ROOT}/usr/lib/mono/gac/Microsoft.VisualBasic
+#rm -Rf ${RPM_BUILD_ROOT}/usr/lib/mono/2.0/Microsoft.VisualBasic.dll
+### Install runtime from noarch.rpm into new gac
+#gacutil -package 1.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
usr/lib/mono/1.0/Microsoft.VisualBasic.dll
+#gacutil -package 2.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
usr/lib/mono/2.0/Microsoft.VisualBasic.dll
+## Get ms.net runtime out of noarch rpm (building in buildservice or autobuild)
+if [ -e %{S:1} ] ; then
+ rpm2cpio %{S:1} | cpio -idv
+ # Remove vbnc built runtime
+ rm -Rf ${RPM_BUILD_ROOT}/usr/lib/mono/gac/Microsoft.VisualBasic
+ rm -Rf ${RPM_BUILD_ROOT}/usr/lib/mono/2.0/Microsoft.VisualBasic.dll
+ ## Install runtime from noarch.rpm into new gac
+ gacutil -package 1.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
usr/lib/mono/1.0/Microsoft.VisualBasic.dll
+ gacutil -package 2.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
usr/lib/mono/2.0/Microsoft.VisualBasic.dll
+else
+ # Check for binaries built on windows (for building on monobuild)
+ f="mono-basic-%{version}-0.win4.novell.x86.zip"
+ p="win-4-i386/mono-basic/%{version}/$f"
+ wget http://monobuild2.boston.ximian.com/~wberrier/zip_packages/$p ||
true
+ wget
http://monobuild2.boston.ximian.com/~wberrier/snapshot_zip_packages/$p || true
+
+ # If we have windows built binaries, inject them into the package (to
provide the 1.0 runtime)
+ if [ -e "$f" ] ; then
+ unzip mono-basic-%{version}-0.win4.novell.x86.zip
+ # Remove vbnc built runtime
+ rm -Rf
${RPM_BUILD_ROOT}/%_prefix/lib/mono/gac/Microsoft.VisualBasic
+ rm -Rf
${RPM_BUILD_ROOT}/%_prefix/lib/mono/2.0/Microsoft.VisualBasic.dll
+
+ # Fix permissions on files so they are readable
+ chmod 755 lib/mono/1.0/Microsoft.VisualBasic.dll
lib/mono/2.0/Microsoft.VisualBasic.dll
+
+ ## Install into new gac
+
+ gacutil -package 1.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
lib/mono/1.0/Microsoft.VisualBasic.dll
+ gacutil -package 2.0 -root ${RPM_BUILD_ROOT}/usr/lib -i
lib/mono/2.0/Microsoft.VisualBasic.dll
+ else
+ # If we're building from HEAD, print warning (HEAD doesn't
have a version with periods)
+ if test `echo "%{version}" | sed -e 's/\.//g'` == "%{version}"
; then
+ echo ""
+ echo "*** vbnc DEBUG BUILD! Don't ship this RPM! ***"
+ echo ""
+ # Otherwise RELEASE, fail build, because we don't want to ship
an rpm without the 1.0 runtime
+ else
+ false
+ fi
+ fi
+fi
+
# Not needed in 1.2.4, since we can bootstrap vbnc
# ship prebuilt vbnc for now...
#mkdir -p ${RPM_BUILD_ROOT}/usr/bin
Modified: trunk/release/pyutils/packaging.py
===================================================================
--- trunk/release/pyutils/packaging.py 2007-07-18 22:39:11 UTC (rev 82250)
+++ trunk/release/pyutils/packaging.py 2007-07-18 22:43:09 UTC (rev 82251)
@@ -274,6 +274,7 @@
my_script.write("DISTRO=%s\n" % self.package_env.info['distro'])
my_script.write("ARCH=%s\n" % self.package_env.info['arch'])
my_script.write("USE_ZIP_PKG=%s\n" %
self.package_env.get_info_var('USE_ZIP_PKG') )
+ my_script.write("HEAD_or_RELEASE=%s\n" % self.HEAD_or_RELEASE )
my_script.write(self.info[func_name])
if var_to_echo: my_script.write("echo ${%s}\n" % var_to_echo)
my_script.close()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches