[Pkg-mono-svn-commits] rev 928 - mcs/trunk/debian
Eduard Bloch
blade@haydn.debian.org
Thu, 10 Jun 2004 02:50:21 -0600
Author: blade
Date: 2004-06-10 02:50:19 -0600 (Thu, 10 Jun 2004)
New Revision: 928
Added:
mcs/trunk/debian/mono-jay.install
Removed:
mcs/trunk/debian/mono-assemblies-arch.files
mcs/trunk/debian/mono-assemblies-base.files
mcs/trunk/debian/mono-jay.files
Modified:
mcs/trunk/debian/changelog
mcs/trunk/debian/mono-assemblies-base.install
mcs/trunk/debian/mono-assemblies-base.links
mcs/trunk/debian/mono-gac.install
mcs/trunk/debian/mono-jay.manpages
mcs/trunk/debian/mono-mcs.dirs
mcs/trunk/debian/mono-mcs.install
mcs/trunk/debian/mono-mcs.links
mcs/trunk/debian/rules
Log:
Installation system overhaul, threw away the mix of .files and .install,
installing net_1_0 and net_2_0 in different dirs first and then merging
them with dh_install to the correct locations
Modified: mcs/trunk/debian/changelog
===================================================================
--- mcs/trunk/debian/changelog 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/changelog 2004-06-10 08:50:19 UTC (rev 928)
@@ -5,7 +5,10 @@
+ debian/rules: added workaround patch for gacutil bug
* Eduard Bloch
+ Added the virtual dependency packages (mono-assemblies-base-0.95)
- + Building with net_2_0 profile to match the mono version
+ + Building additional net_2_0 profile, installed along with net_1_0.
+ mscorlib.dll will still be from net_1_0
+ + installation commands overhaul, away from dh_movefiles
+ + install gmcs.exe (closes: #244189)
-- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Fri, 04 Jun 2004 20:04:50 +0200
Deleted: mcs/trunk/debian/mono-assemblies-arch.files
===================================================================
Deleted: mcs/trunk/debian/mono-assemblies-base.files
===================================================================
--- mcs/trunk/debian/mono-assemblies-base.files 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-assemblies-base.files 2004-06-10 08:50:19 UTC (rev 928)
@@ -1 +0,0 @@
-usr/lib/mono
Modified: mcs/trunk/debian/mono-assemblies-base.install
===================================================================
--- mcs/trunk/debian/mono-assemblies-base.install 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-assemblies-base.install 2004-06-10 08:50:19 UTC (rev 928)
@@ -0,0 +1,2 @@
+debian/tmp1/usr/lib/*.dll /usr/lib
+debian/tmp2/usr/lib/mono/* debian/tmp1/usr/lib/mono/* /usr/share/dotnet/mono/
Modified: mcs/trunk/debian/mono-assemblies-base.links
===================================================================
--- mcs/trunk/debian/mono-assemblies-base.links 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-assemblies-base.links 2004-06-10 08:50:19 UTC (rev 928)
@@ -1,2 +1 @@
-usr/share/dotnet/mono/2.0/mscorlib.dll usr/lib/mscorlib.dll
-usr/share/dotnet/mono/2.0/mscorlib.dll usr/share/dotnet/lib/mscorlib.dll
+usr/share/dotnet/mono usr/lib/mono
Modified: mcs/trunk/debian/mono-gac.install
===================================================================
--- mcs/trunk/debian/mono-gac.install 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-gac.install 2004-06-10 08:50:19 UTC (rev 928)
@@ -1 +1 @@
-debian/tmp/usr/bin/gacutil.exe usr/share/dotnet/bin/
+debian/tmp2/usr/bin/gacutil.exe usr/share/dotnet/bin/
Deleted: mcs/trunk/debian/mono-jay.files
===================================================================
--- mcs/trunk/debian/mono-jay.files 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-jay.files 2004-06-10 08:50:19 UTC (rev 928)
@@ -1 +0,0 @@
-usr/bin/jay
Added: mcs/trunk/debian/mono-jay.install
===================================================================
--- mcs/trunk/debian/mono-jay.install 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-jay.install 2004-06-10 08:50:19 UTC (rev 928)
@@ -0,0 +1 @@
+debian/tmp2/usr/bin/jay
Modified: mcs/trunk/debian/mono-jay.manpages
===================================================================
--- mcs/trunk/debian/mono-jay.manpages 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-jay.manpages 2004-06-10 08:50:19 UTC (rev 928)
@@ -1 +1 @@
-debian/tmp/usr/man/man1/jay.1
+debian/tmp2/usr/man/man1/jay.1
Modified: mcs/trunk/debian/mono-mcs.dirs
===================================================================
--- mcs/trunk/debian/mono-mcs.dirs 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-mcs.dirs 2004-06-10 08:50:19 UTC (rev 928)
@@ -1,2 +1,3 @@
+usr/bin
usr/share/dotnet/bin
usr/share/dotnet/mono/1.0
Modified: mcs/trunk/debian/mono-mcs.install
===================================================================
--- mcs/trunk/debian/mono-mcs.install 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-mcs.install 2004-06-10 08:50:19 UTC (rev 928)
@@ -1,32 +1,3 @@
-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/
-debian/tmp/usr/bin/IFaceDisco.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/MakeCert.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/al.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/browsercaps-updater.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/cert2spc.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/certmgr.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/chktrust.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/cilc.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/disco.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/genxs.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/ictool.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/ilasm.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/mono-api-diff.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/mono-api-info.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/mono-find-provides.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/mono-find-requires.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/monop.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/monoresgen.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/monostyle.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/nunit-console.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/secutil.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/setreg.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/signcode.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/sn.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/soapsuds.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/sqlsharp.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/wsdl.exe usr/share/dotnet/bin/
-debian/tmp/usr/bin/xsd.exe usr/share/dotnet/bin/
+debian/tmp2/usr/bin/*.exe /usr/share/dotnet/bin/
+gmcs/gmcs.exe /usr/share/dotnet/bin/
+debian/tmp1/usr/lib/mono/1.0/*.exe /usr/share/dotnet/mono/1.0/
Modified: mcs/trunk/debian/mono-mcs.links
===================================================================
--- mcs/trunk/debian/mono-mcs.links 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/mono-mcs.links 2004-06-10 08:50:19 UTC (rev 928)
@@ -1,30 +1,2 @@
-usr/bin/cli-wrapper usr/bin/CorCompare
-usr/bin/cli-wrapper usr/bin/EnumCheck
-usr/bin/cli-wrapper usr/bin/GenerateDelegate
-usr/bin/cli-wrapper usr/bin/IFaceDisco
-usr/bin/cli-wrapper usr/bin/MakeCert
-usr/bin/cli-wrapper usr/bin/al
-usr/bin/cli-wrapper usr/bin/browsercaps-updater
-usr/bin/cli-wrapper usr/bin/cert2spc
-usr/bin/cli-wrapper usr/bin/certmgr
-usr/bin/cli-wrapper usr/bin/chktrust
-usr/bin/cli-wrapper usr/bin/cilc
-usr/bin/cli-wrapper usr/bin/disco
-usr/bin/cli-wrapper usr/bin/genxs
-usr/bin/cli-wrapper usr/bin/ictool
-usr/bin/cli-wrapper usr/bin/ilasm
-usr/bin/cli-wrapper usr/bin/mbas
-usr/bin/cli-wrapper usr/bin/mono-api-diff
-usr/bin/cli-wrapper usr/bin/mono-api-info
-usr/bin/cli-wrapper usr/bin/monop
-usr/bin/cli-wrapper usr/bin/monoresgen
-usr/bin/cli-wrapper usr/bin/monostyle
-usr/bin/cli-wrapper usr/bin/nunit-console
-usr/bin/cli-wrapper usr/bin/secutil
-usr/bin/cli-wrapper usr/bin/setreg
-usr/bin/cli-wrapper usr/bin/signcode
-usr/bin/cli-wrapper usr/bin/sn
-usr/bin/cli-wrapper usr/bin/soapsuds
-usr/bin/cli-wrapper usr/bin/sqlsharp
-usr/bin/cli-wrapper usr/bin/wsdl
-usr/bin/cli-wrapper usr/bin/xsd
+/usr/share/dotnet/mono/1.0/mcs.exe /usr/share/dotnet/bin/mcs.exe
+/usr/share/dotnet/mono/1.0/mbas.exe /usr/share/dotnet/bin/mbas.exe
Modified: mcs/trunk/debian/rules
===================================================================
--- mcs/trunk/debian/rules 2004-06-09 17:10:51 UTC (rev 927)
+++ mcs/trunk/debian/rules 2004-06-10 08:50:19 UTC (rev 928)
@@ -17,11 +17,15 @@
-i $(CURDIR)/build/library.make
./configure --prefix=/usr
$(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/install-tmp
+ # tmp1 for net_1_0 and tmp for 2_0
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp1
+ cd $(CURDIR)/debian/tmp1/usr/lib/mono/1.0 && ln -sf ../gac/*/*/*.dll .
make clean
./configure --prefix=/usr --profile=net_2_0
$(MAKE)
-# cd add-ons/* ; ./configure --prefix=/usr && make
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp2
+ cd $(CURDIR)/debian/tmp2/usr/lib/mono/2.0 && ln -sf ../gac/*/*/*.dll .
+ # both dirs are merged with dh_install for the each package later
touch build-stamp
clean:
@@ -29,46 +33,22 @@
dh_testroot
rm -f build-stamp
-$(MAKE) clean
- rm -rf $(CURDIR)/.wabi debian/install-tmp
+ rm -rf $(CURDIR)/.wabi debian/tmp?
dh_clean
-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
dh_install
- # all dh_* can't keep directory structures, have to use mv manually
- mv $(CURDIR)/debian/mono-assemblies-base/usr/lib/mono/gac \
- $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono
- rm -rf $(CURDIR)/debian/mono-assemblies-base/usr/lib/mono
- ln -sf ../share/dotnet/mono $(CURDIR)/debian/mono-assemblies-base/usr/lib/mono
- # this symlink is too complex for dh_link, doing it manually
- ln -sf ../../bin/mcs.exe $(CURDIR)/debian/mono-mcs/usr/share/dotnet/mono/1.0/mcs.exe
- # mcs.exe doesn't like to be started from anywhere except from
- # /usr/lib/mono/1.0/mcs.exe, so this special wrapper is needed
- 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
-# 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
-# cd $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono/gac; \
-# for x in ./*/*/*.dll; \
-# do \
-# 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); 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
+ dh_link
+ rm -f debian/mono-assemblies-base/usr/share/dotnet/mono/1.0/*.exe
+ rm -f debian/mono-mcs/usr/share/dotnet/bin/gacutil*
+ for x in $(CURDIR)/debian/*/usr/bin ; do cd $$x ; for y in `find ../share/dotnet -name '*.exe'` ; do ln -sf cli-wrapper `basename $$y .exe` ; done ; done
find $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono -type f -name "*.dll" -exec chmod -x {} \;
+ # /usr/lib/mono/1.0/mcs.exe, so this special wrapper is needed
+ # chmod +x $(CURDIR)/debian/mcs-wrapper
# Build architecture-independent files here.
binary-indep: build install
@@ -99,7 +79,8 @@
# dh_undocumented
dh_strip -s
a=`dpkg-architecture -qDEB_HOST_ARCH`; if [ $$a = i386 -o $$a = powerpc ] ; then echo "gdi:Depends=libgdiplus" >> $(CURDIR)/debian/mono-assemblies-arch.substvars ; fi
- if [ `dpkg-architecture -qDEB_HOST_ARCH` = i386 ] ; then echo "wine:Depends=libwine-cil" >> $(CURDIR)/debian/mono-assemblies-arch.substvars ; fi
+ # winelib not ready yet
+# if [ `dpkg-architecture -qDEB_HOST_ARCH` = i386 ] ; then echo "wine:Depends=libwine-cil" >> $(CURDIR)/debian/mono-assemblies-arch.substvars ; fi
dh_shlibdeps -s -Xlibgdiplus.dll.so
dh_compress -s -Xskeleton.cs
dh_fixperms -s