[Pkg-mono-svn-commits] rev 3541 - mono/trunk/debian

Mirco Bauer meebey at alioth.debian.org
Sat Dec 22 23:20:10 UTC 2007 

Author: meebey
Date: 2007-12-22 23:20:10 +0000 (Sat, 22 Dec 2007)
New Revision: 3541

Added:
   mono/trunk/debian/mono-aot-bootstrap
   mono/trunk/debian/mono-aot-wrapper
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/libmono-system1.0-cil.clideps-override
   mono/trunk/debian/libmono-system2.0-cil.clideps-override
   mono/trunk/debian/mono-2.0-devel.install
   mono/trunk/debian/mono-2.0-devel.manpages
   mono/trunk/debian/rules
Log:
mono (1.2.6+dfsg-2) release



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-12-22 19:02:33 UTC (rev 3540)
+++ mono/trunk/debian/changelog	2007-12-22 23:20:10 UTC (rev 3541)
@@ -1,3 +1,22 @@
+mono (1.2.6+dfsg-2) unstable; urgency=low
+
+  * The "Welcome SPARC and S390 Users!" release
+  * debian/mono-2.0-devel.install
+    debian/mono-2.0-devel.manpages:
+    + Added mconfig
+  * debian/control:
+    + Added sparc and s390 to Architecture fields. (Closes: #332511, #377584)
+      (as the last 3 feature-releases of Mono were able to build on sparc, and
+       upstream is getting sparc port contributions again, it should be safe
+       to enable sparc now)
+    + Added Replaces << mono-common 1.2.6+dfsg-2 to mono-2.0-devel, as
+      /etc/mono/mconfig/ was moved to mono-2.0-devel.
+  * debian/libmono-system{1,2}.0-cil.clideps-override:
+    + Added suggests libmono-winforms{1,2}.0-cil, doesn't make sense to pull in
+      System.Windows.Forms for designer classes (which are only used by VS.NET)
+        
+ -- Mirco Bauer <meebey at debian.org>  Fri, 21 Dec 2007 01:35:40 +0100
+
 mono (1.2.6+dfsg-1) unstable; urgency=low
 
   * DFSG version of Mono 1.2.6

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2007-12-22 19:02:33 UTC (rev 3540)
+++ mono/trunk/debian/control	2007-12-22 23:20:10 UTC (rev 3541)
@@ -8,7 +8,7 @@
 Standards-Version: 3.7.2
 
 Package: mono-common
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: binfmt-support (>= 1.1.2)
 Description: common files for Mono
@@ -23,7 +23,7 @@
 
 Package: mono-runtime
 Provides: cli-runtime
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: mono-jit (= ${binary:Version}), mono-gac (= ${source:Version})
 Description: Mono runtime
  Mono is a platform for running and developing applications based on the
@@ -36,7 +36,7 @@
 
 Package: mono-jit
 Provides: cli-virtual-machine
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: ${shlibs:Depends}, ${misc:Depends}, mono-common (= ${binary:Version})
 Description: fast CLI JIT/AOT compiler for Mono
  Mono is a platform for running and developing applications based on the
@@ -52,7 +52,7 @@
 
 Package: mono-jit-dbg
 Priority: extra
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: mono-jit (= ${binary:Version})
 Recommends: gdb
 Description: fast CLI JIT/AOT compiler for Mono, debugging symbols
@@ -67,7 +67,7 @@
 Package: mono-utils
 Provides: cil-disassembler
 Section: devel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Replaces: mono-mcs (<= 1.1.6-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmono0 (<< ${mono:next-upversion}), libmono-corlib1.0-cil
 Suggests: libmono-corlib2.0-cil
@@ -83,7 +83,7 @@
 
 Package: libmono0
 Section: libs
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Replaces: libmono-dev (<= 1.1.6-4)
 Conflicts: mono-utils (<< 1.2.3.1-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -100,7 +100,7 @@
 Package: libmono0-dbg
 Priority: extra
 Section: libdevel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: libmono0 (= ${binary:Version})
 Recommends: gdb
 Description: libraries for the Mono JIT, debugging symbols
@@ -114,7 +114,7 @@
 
 Package: libmono-dev
 Section: devel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: libmono0 (= ${binary:Version}), libglib2.0-dev
 Description: libraries for the Mono JIT - Development files
  Header files and static libraries for libmono and libmono-profiler-conv.
@@ -1116,7 +1116,7 @@
 Architecture: all
 Depends: ${cli:Depends}
 Recommends: mono-gmcs
-Replaces: mono-gmcs (<< 1.2.6-1)
+Replaces: mono-gmcs (<< 1.2.6-1), mono-common (<< 1.2.6-2)
 Description: Mono development tools for CLI 2.0
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -1195,7 +1195,7 @@
 
 Package: mono-jay
 Section: devel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LALR(1) parser generator oriented to Java/CLI
  Mono is a platform for running and developing applications based on the

Modified: mono/trunk/debian/libmono-system1.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system1.0-cil.clideps-override	2007-12-22 19:02:33 UTC (rev 3540)
+++ mono/trunk/debian/libmono-system1.0-cil.clideps-override	2007-12-22 23:20:10 UTC (rev 3541)
@@ -3,3 +3,4 @@
 suggests libx11-6
 suggests libcupsys2
 suggests libgdiplus
+suggests libmono-winforms1.0-cil

Modified: mono/trunk/debian/libmono-system2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system2.0-cil.clideps-override	2007-12-22 19:02:33 UTC (rev 3540)
+++ mono/trunk/debian/libmono-system2.0-cil.clideps-override	2007-12-22 23:20:10 UTC (rev 3541)
@@ -4,3 +4,4 @@
 suggests libasound2
 suggests libcupsys2
 suggests libgdiplus
+suggests libmono-winforms2.0-cil

Modified: mono/trunk/debian/mono-2.0-devel.install
===================================================================
--- mono/trunk/debian/mono-2.0-devel.install	2007-12-22 19:02:33 UTC (rev 3540)
+++ mono/trunk/debian/mono-2.0-devel.install	2007-12-22 23:20:10 UTC (rev 3541)
@@ -1,6 +1,8 @@
+debian/tmp/etc/mono/mconfig
 debian/tmp/usr/bin/al2
 debian/tmp/usr/bin/httpcfg
 debian/tmp/usr/bin/ilasm2 
+debian/tmp/usr/bin/mconfig
 debian/tmp/usr/bin/mkbundle2
 debian/tmp/usr/bin/mono-api-info2
 debian/tmp/usr/bin/monop2
@@ -10,6 +12,7 @@
 debian/tmp/usr/lib/mono/2.0/al.exe
 debian/tmp/usr/lib/mono/2.0/httpcfg.exe
 debian/tmp/usr/lib/mono/2.0/ilasm.exe
+debian/tmp/usr/lib/mono/2.0/mconfig.exe
 debian/tmp/usr/lib/mono/2.0/mkbundle.exe
 debian/tmp/usr/lib/mono/2.0/mono-api-info.exe
 debian/tmp/usr/lib/mono/2.0/monop.exe

Modified: mono/trunk/debian/mono-2.0-devel.manpages
===================================================================
--- mono/trunk/debian/mono-2.0-devel.manpages	2007-12-22 19:02:33 UTC (rev 3540)
+++ mono/trunk/debian/mono-2.0-devel.manpages	2007-12-22 23:20:10 UTC (rev 3541)
@@ -1,6 +1,7 @@
 debian/tmp/usr/share/man/man1/al2.1
 debian/tmp/usr/share/man/man1/wsdl2.1
 debian/tmp/usr/share/man/man1/monop2.1
+debian/tmp/usr/share/man/man1/mconfig.1
 debian/tmp/usr/share/man/man1/mkbundle2.1
 debian/tmp/usr/share/man/man1/ilasm2.1
 debian/tmp/usr/share/man/man1/resgen2.1

Added: mono/trunk/debian/mono-aot-bootstrap
===================================================================
--- mono/trunk/debian/mono-aot-bootstrap	                        (rev 0)
+++ mono/trunk/debian/mono-aot-bootstrap	2007-12-22 23:20:10 UTC (rev 3541)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+MCS_DIR=mcs/class/lib
+
+find $MCS_DIR -name "*.exe" -or -name "*.dll" -exec runtime/mono-wrapper --aot {} \;


Property changes on: mono/trunk/debian/mono-aot-bootstrap
___________________________________________________________________
Name: svn:executable
   + *

Added: mono/trunk/debian/mono-aot-wrapper
===================================================================
--- mono/trunk/debian/mono-aot-wrapper	                        (rev 0)
+++ mono/trunk/debian/mono-aot-wrapper	2007-12-22 23:20:10 UTC (rev 3541)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Description: This wrapper script pre-compiles (AOT) the passed assembly
+#              before executing it, and AOTs new assemblies in build output
+#              directory.
+
+export MONO_PATH
+
+DEBIAN_DIR=$(dirname $0)
+#MONO_DIR=$DEBIAN_DIR/..
+MONO_DIR=${DEBIAN_DIR/%\/debian}
+ASSEMBLY=$1
+
+#case $ASSEMBLY in
+#	*.dll | *.exe)
+#		if [ -f $ASSEMBLY -a ! -f "$ASSEMBLY.so" ]; then
+#			$MONO_DIR/runtime/mono-wrapper --aot $ASSEMBLY
+#		fi
+#	;;
+#esac
+           
+$MONO_DIR/runtime/mono-wrapper "$@"
+
+ASSEMBLIES_DIR=$MONO_DIR/mcs/class/lib
+ASSEMBLIES=$(find $ASSEMBLIES_DIR -name "*.dll" -or -name "*.exe")
+for ASSEMBLY in $ASSEMBLIES; do
+	ASSEMBLY_DIR=$(dirname $ASSEMBLY)
+	ASSEMBLY_NAME=$(basename $ASSEMBLY)
+	if [ ! -f "$ASSEMBLY.so" ]; then
+		#if [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_2_0" ] ||
+		#   [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_2_1" ] ||
+		#   [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_2_1_tuned" ]; then
+		#   	# AOT for 2.0/2.1 is buggy and likes to crash
+		#	true
+		#elif [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_2_0_bootstrap" ]; then
+		#	# AOT for 2.0 runtime libs seems to work though
+		#	$MONO_DIR/runtime/mono-wrapper --aot -O=all $ASSEMBLY
+		#else
+		#	$MONO_DIR/runtime/mono-wrapper --aot -O=all $ASSEMBLY
+		#fi
+		
+		# only AOT basic / 1.0 bootstrap / 2.0 bootstrap
+		if [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/basic" ] ||
+		   [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_1_1_bootstrap" ] ||
+		   [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_2_0_bootstrap" ]; then
+			$MONO_DIR/runtime/mono-wrapper --aot -O=all $ASSEMBLY
+		fi
+		
+		# always AOT libs used by the compilers
+		if [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/default" ]; then
+			if [ "$ASSEMBLY_NAME" = "mscorlib.dll" ] ||
+			   [ "$ASSEMBLY_NAME" = "System.dll" ] ||
+			   [ "$ASSEMBLY_NAME" = "System.Xml.dll" ]; then
+				$MONO_DIR/runtime/mono-wrapper --aot -O=all $ASSEMBLY
+			fi
+		fi
+		#elif [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_2_0" ] ||
+		#     [ "$ASSEMBLY_DIR" = "$ASSEMBLIES_DIR/net_2_1" ]; then
+		#	if [ "$ASSEMBLY_NAME" = "mscorlib.dll" ] ||
+		#	   [ "$ASSEMBLY_NAME" = "System.dll" ] ||
+		#	   [ "$ASSEMBLY_NAME" = "System.Xml.dll" ]; then
+		#		MONO_PATH=$MONO_DIR/class/lib/net_2_0:$MONO_PATH $MONO_DIR/runtime/mono-wrapper --aot -O=all $ASSEMBLY
+		#	fi
+		#fi
+	fi
+done


Property changes on: mono/trunk/debian/mono-aot-wrapper
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-12-22 19:02:33 UTC (rev 3540)
+++ mono/trunk/debian/rules	2007-12-22 23:20:10 UTC (rev 3541)
@@ -27,6 +27,7 @@
 endif
 
 ifeq ($(DEB_BUILD_ARCH), i386)
+#	MAKE_FLAGS += RUNTIME=$(CURDIR)/debian/mono-aot-wrapper
 	CONF_FLAGS += --with-sigaltstack=yes
 else ifeq ($(DEB_BUILD_ARCH), amd64)
 	CONF_FLAGS += --with-sigaltstack=yes
@@ -86,12 +87,13 @@
 	  $(MAKE)
 	cd debian/detector && \
 	  $(MAKE)
+	#debian/mono-aot-bootstrap
 	touch build-arch-stamp
 
 build-indep: configure-indep build-indep-stamp
 build-indep-stamp:
 	dh_testdir
-	LC_ALL=C $(MAKE) EXTERNAL_MCS=false EXTERNAL_MONO=false
+	LC_ALL=C $(MAKE) $(MAKE_FLAGS) EXTERNAL_MCS=false EXTERNAL_MONO=false
 	chmod +x debian/dh_makeclilibs debian/dh_clideps debian/dh_clistrip debian/dh_clifixperms debian/dh_monoaot
 	touch build-indep-stamp
 
@@ -110,7 +112,9 @@
 	rm -f install-*-stamp
 	-$(MAKE) distclean
 	# distclean misses stuff
-	find -name "*.mdb" | xargs -r rm -f
+	find -name "*.mdb" -delete
+	# AOT stuff we created using mono-aot-wrapper/mono-aot-bootstrap
+	find mcs/class/lib -name "*.so" -delete
 	-cd debian/detector && $(MAKE) clean
 	rm -f cli-wrapper debian/MonoGetAssemblyName.exe
 	rm -rf $(MONO_SHARED_DIR)/.wapi

More information about the Pkg-mono-svn-commits mailing list