[Pkg-mono-svn-commits] rev 927 - mcs/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-06-09 11:10:51 -0600 (Wed, 09 Jun 2004)
New Revision: 927

Modified:
   mcs/trunk/debian/mono-assemblies-base.files
   mcs/trunk/debian/mono-assemblies-base.install
   mcs/trunk/debian/mono-mcs.install
   mcs/trunk/debian/rules
Log:
First successfull efforts to install both, net_1_0 and net_2_0
assemblies


Modified: mcs/trunk/debian/mono-assemblies-base.files
===================================================================
--- mcs/trunk/debian/mono-assemblies-base.files	2004-06-08 08:50:59 UTC (rev 926)
+++ mcs/trunk/debian/mono-assemblies-base.files	2004-06-09 17:10:51 UTC (rev 927)
@@ -1 +1 @@
-usr/lib/mono/gac
+usr/lib/mono

Modified: mcs/trunk/debian/mono-assemblies-base.install
===================================================================
--- mcs/trunk/debian/mono-assemblies-base.install	2004-06-08 08:50:59 UTC (rev 926)
+++ mcs/trunk/debian/mono-assemblies-base.install	2004-06-09 17:10:51 UTC (rev 927)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/mono/2.0/mscorlib.dll usr/share/dotnet/mono/2.0/

Modified: mcs/trunk/debian/mono-mcs.install
===================================================================
--- mcs/trunk/debian/mono-mcs.install	2004-06-08 08:50:59 UTC (rev 926)
+++ mcs/trunk/debian/mono-mcs.install	2004-06-09 17:10:51 UTC (rev 927)
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/mono/1.0/mcs.exe		usr/share/dotnet/bin/
+debian/tmp/usr/bin/mcs.exe		usr/share/dotnet/bin/
 debian/tmp/usr/bin/CorCompare.exe		usr/share/dotnet/bin/
 debian/tmp/usr/bin/EnumCheck.exe		usr/share/dotnet/bin/
 debian/tmp/usr/bin/GenerateDelegate.exe		usr/share/dotnet/bin/

Modified: mcs/trunk/debian/rules
===================================================================
--- mcs/trunk/debian/rules	2004-06-08 08:50:59 UTC (rev 926)
+++ mcs/trunk/debian/rules	2004-06-09 17:10:51 UTC (rev 927)
@@ -15,6 +15,10 @@
 	# gacutil bug, he ignores the /root parameter
 	perl -pe 's,/root \$$\(DESTDIR\)\$$\(prefix\)/lib /package \$$\(PACKAGE\),/package \$$\(PACKAGE\) /root \$$\(DESTDIR\)\$$\(prefix\)/lib,' \
 	  -i $(CURDIR)/build/library.make
+	./configure --prefix=/usr
+	$(MAKE)
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/install-tmp
+	make clean
 	./configure --prefix=/usr --profile=net_2_0
 	$(MAKE)
 #	cd add-ons/* ; ./configure --prefix=/usr && make
@@ -25,16 +29,18 @@
 	dh_testroot
 	rm -f build-stamp
 	-$(MAKE) clean
-	rm -rf $(CURDIR)/.wabi
+	rm -rf $(CURDIR)/.wabi debian/install-tmp
 	dh_clean
 
-MONO_LIB_PATH = usr/share/dotnet/mono/1.0
+MONO_LIB_PATH = usr/share/dotnet/mono
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
+	cp -laf debian/install-tmp debian/tmp
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	mv debian/tmp/usr/lib/mono/1.0/mcs.exe debian/tmp/usr/bin
 #	cp add-ons/*/*/*.so debian/mono-assemblies-arch/usr/lib/
 	dh_movefiles
 	dh_link
@@ -51,7 +57,7 @@
 	chmod +x $(CURDIR)/debian/mcs-wrapper
 	cp $(CURDIR)/debian/mcs-wrapper \
 	  $(CURDIR)/debian/mono-mcs/usr/bin/mcs
-	-chmod -x $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/lib/mscorlib.dll $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono/*/mscorlib.dll
+#	-chmod -x $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/lib/mscorlib.dll $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono/*/mscorlib.dll
 #	gacutil always copies the dll into /root and sets the symlinks
 #	to /usr/local/... (because the boostrap system has it here),
 #	hopefully the patch comes soon for this
@@ -61,7 +67,7 @@
 #	      cd $(CURDIR)/debian/mono-mcs/usr/share/dotnet/mono/1.0; \
 #	      ln -sf ../gac/$${x#??}; \
 #	  done
-	cd $(CURDIR)/debian/mono-assemblies-base/$(MONO_LIB_PATH); ln -sf `find ../gac -name "*.dll"` $(CURDIR)/debian/mono-mcs/$(MONO_LIB_PATH);
+	cd $(CURDIR)/debian/mono-assemblies-base/$(MONO_LIB_PATH); for x in 1.0 2.0 ; do mkdir $$x && cd $$x && ln -sf `find ../gac -name "*.dll" | grep /$$x` $(CURDIR)/debian/mono-mcs/$(MONO_LIB_PATH) && cd .. ; done
 	find $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono -type f -name "*.dll" -exec chmod -x {} \;
 
 # Build architecture-independent files here.