Author: jbevain
Date: 2007-08-23 06:55:40 -0400 (Thu, 23 Aug 2007)
New Revision: 84687

Added:
   trunk/olive/data/agmonosilver.pc.in
Modified:
   trunk/olive/ChangeLog
   trunk/olive/Makefile
   trunk/olive/build/ChangeLog
   trunk/olive/build/library.make
   trunk/olive/build/profiles/net_2_1.make
   trunk/olive/data/ChangeLog
   trunk/olive/data/Makefile
   trunk/olive/data/silver.pc.in
Log:
in .:
2007-08-23  Jb Evain  <[EMAIL PROTECTED]>

        * Makefile: also visit folder `data` on profile net_2_1.

in build:
2007-08-23  Jb Evain  <[EMAIL PROTECTED]>

        * library.make: if LIBRARY_PACKAGE = none, install in the GAC,
        but don't create a symlink to $(prefix)/lib/mono/$(package)
    * profiles/net_2_1.make: use LIBRARY_PACKAGE = none

in data:
2007-08-23  Jb Evain  <[EMAIL PROTECTED]>

        * Makefile, silver.pc.in: for 2.1 assemblies, locate them directly in 
the GAC.
        * agmonosilver.pc.in: new file, to reference agmono.dll on 2.1.


Modified: trunk/olive/ChangeLog
===================================================================
--- trunk/olive/ChangeLog       2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/ChangeLog       2007-08-23 10:55:40 UTC (rev 84687)
@@ -1,3 +1,7 @@
+2007-08-23  Jb Evain  <[EMAIL PROTECTED]>
+
+       * Makefile: also visit folder `data` on profile net_2_1.
+
 2007-08-13  Jb Evain  <[EMAIL PROTECTED]>
 
        * Makefile: revert temporarly to old behavior: only build net_3_0

Modified: trunk/olive/Makefile
===================================================================
--- trunk/olive/Makefile        2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/Makefile        2007-08-23 10:55:40 UTC (rev 84687)
@@ -3,7 +3,7 @@
 SUBDIRS := build class tools data scripts
 
 net_3_0_SUBDIRS := build class tools data scripts
-net_2_1_SUBDIRS := build class
+net_2_1_SUBDIRS := build class data
 
 PROFILES = net_3_0 net_2_1
 

Modified: trunk/olive/build/ChangeLog
===================================================================
--- trunk/olive/build/ChangeLog 2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/build/ChangeLog 2007-08-23 10:55:40 UTC (rev 84687)
@@ -1,3 +1,9 @@
+2007-08-23  Jb Evain  <[EMAIL PROTECTED]>
+
+       * library.make: if LIBRARY_PACKAGE = none, install in the GAC,
+       but don't create a symlink to $(prefix)/lib/mono/$(package)
+    * profiles/net_2_1.make: use LIBRARY_PACKAGE = none
+
 2007-02-27  Wade Berrier  <[EMAIL PROTECTED]>
 
        * Makefile: Include net_2_1.make in tarball

Modified: trunk/olive/build/library.make
===================================================================
--- trunk/olive/build/library.make      2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/build/library.make      2007-08-23 10:55:40 UTC (rev 84687)
@@ -152,8 +152,20 @@
 gacdir_flag = /gacdir $(GACDIR)
 endif
 
+ifndef LIBRARY_PACKAGE
+ifdef LIBRARY_COMPAT
+LIBRARY_PACKAGE = compat-$(FRAMEWORK_VERSION)
+else
+LIBRARY_PACKAGE = $(FRAMEWORK_VERSION)
+endif
+endif
+
+ifneq (none, $(LIBRARY_PACKAGE))
+package_flag = /package $(LIBRARY_PACKAGE)
+endif
+
 install-local:
-       $(GACUTIL) /i $(the_lib) /f $(gacdir_flag) /root $(GACROOT) /package 
$(FRAMEWORK_VERSION)
+       $(GACUTIL) /i $(the_lib) /f $(gacdir_flag) /root $(GACROOT) 
$(package_flag)
 
 uninstall-local:
        -$(GACUTIL) /u $(LIBRARY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) 
/package $(FRAMEWORK_VERSION)

Modified: trunk/olive/build/profiles/net_2_1.make
===================================================================
--- trunk/olive/build/profiles/net_2_1.make     2007-08-23 10:54:09 UTC (rev 
84686)
+++ trunk/olive/build/profiles/net_2_1.make     2007-08-23 10:55:40 UTC (rev 
84687)
@@ -8,3 +8,4 @@
 
 PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1
 FRAMEWORK_VERSION = 2.1
+LIBRARY_PACKAGE = none

Modified: trunk/olive/data/ChangeLog
===================================================================
--- trunk/olive/data/ChangeLog  2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/data/ChangeLog  2007-08-23 10:55:40 UTC (rev 84687)
@@ -1,3 +1,8 @@
+2007-08-23  Jb Evain  <[EMAIL PROTECTED]>
+
+       * Makefile, silver.pc.in: for 2.1 assemblies, locate them directly in 
the GAC.
+       * agmonosilver.pc.in: new file, to reference agmono.dll on 2.1.
+
 2007-08-17  Jb Evain  <[EMAIL PROTECTED]>
 
        * Makefile: silverdir is now in prefix/lib/2.1

Modified: trunk/olive/data/Makefile
===================================================================
--- trunk/olive/data/Makefile   2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/data/Makefile   2007-08-23 10:55:40 UTC (rev 84687)
@@ -5,13 +5,15 @@
 ifeq ($(PLATFORM), win32)
        olivedir := $(shell cygpath -m '$(prefix)/lib/mono/3.0')
 else
-       olivedir = $(prefix)/lib/mono/3.0
-       silverdir = $(prefix)/lib/mono/2.1
+       olivedir  = $(prefix)/lib/mono/3.0
+       agmonodir = $(prefix)/lib/mono/gac/agmono/2.1.0.0__31bf3856ad364e35/
+       agclrdir  = $(prefix)/lib/mono/gac/agclr/0.0.0.0__b03f5f7f11d50a3a/
+       syssldir  = 
$(prefix)/lib/mono/gac/System.SilverLight/1.0.0.0__b03f5f7f11d50a3a/
 endif
 
-all-local: olive.pc silver.pc silverdesktop.pc agmono.pc
+all-local: olive.pc silver.pc silverdesktop.pc agmono.pc agmonosilver.pc
 
-DISTFILES = olive.pc.in silver.pc.in silverdesktop.pc.in agmono.pc.in
+DISTFILES = olive.pc.in silver.pc.in silverdesktop.pc.in agmono.pc.in 
agmonosilver.pc.in
 
 REWRITE=
 olive.pc: olive.pc.in Makefile
@@ -19,9 +21,13 @@
        mv [EMAIL PROTECTED] $@
 
 silver.pc: silver.pc.in Makefile
-       sed -e "s,@silverdir@,$(silverdir),g" -e 
"s,@VERSION@,$(MONO_VERSION),g" < silver.pc.in > [EMAIL PROTECTED]
+       sed -e "s,@agclrdir@,$(agclrdir),g" -e "s,@syssldir@,$(syssldir),g" -e 
"s,@VERSION@,$(MONO_VERSION),g" < silver.pc.in > [EMAIL PROTECTED]
        mv [EMAIL PROTECTED] $@
 
+agmonosilver.pc: agmonosilver.pc.in Makefile
+       sed -e "s,@agmonodir@,$(agmonodir),g" -e 
"s,@VERSION@,$(MONO_VERSION),g" < agmonosilver.pc.in > [EMAIL PROTECTED]
+       mv [EMAIL PROTECTED] $@
+
 silverdesktop.pc: silverdesktop.pc.in Makefile
        sed -e "s,@olivedir@,$(olivedir),g" -e "s,@VERSION@,$(MONO_VERSION),g" 
< silverdesktop.pc.in > [EMAIL PROTECTED]
        mv [EMAIL PROTECTED] $@
@@ -30,12 +36,12 @@
        sed -e "s,@olivedir@,$(olivedir),g" -e "s,@VERSION@,$(MONO_VERSION),g" 
< agmono.pc.in > [EMAIL PROTECTED]
        mv [EMAIL PROTECTED] $@
 
-install-local: olive.pc silver.pc silverdesktop.pc agmono.pc
+install-local: olive.pc silver.pc silverdesktop.pc agmono.pc agmonosilver.pc
        $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib/pkgconfig
-       $(INSTALL_DATA) olive.pc silver.pc silverdesktop.pc agmono.pc 
$(DESTDIR)$(prefix)/lib/pkgconfig
+       $(INSTALL_DATA) olive.pc silver.pc silverdesktop.pc agmono.pc 
agmonosilver.pc $(DESTDIR)$(prefix)/lib/pkgconfig
 
 clean-local:
-       rm -rf olive.pc silver.pc
+       rm -rf olive.pc silver.pc silverdesktop.pc agmono.pc agmonosilver.pc
 
 test-local:
 

Added: trunk/olive/data/agmonosilver.pc.in
===================================================================
--- trunk/olive/data/agmonosilver.pc.in 2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/data/agmonosilver.pc.in 2007-08-23 10:55:40 UTC (rev 84687)
@@ -0,0 +1,4 @@
+Name: agmono, internal routines from Silverlight.
+Description: Internal routines to control Silvelright.
+Version: @VERSION@
+Libs: -r:@agmonodir@/agmono.dll

Modified: trunk/olive/data/silver.pc.in
===================================================================
--- trunk/olive/data/silver.pc.in       2007-08-23 10:54:09 UTC (rev 84686)
+++ trunk/olive/data/silver.pc.in       2007-08-23 10:55:40 UTC (rev 84687)
@@ -1,4 +1,4 @@
 Name: Silverlight Libraries
 Description: Silverlight Libraries for Mono, only the new ones.
 Version: @VERSION@
-Libs: -r:@silverdir@/agclr.dll -r:@silverdir@/System.SilverLight.dll
+Libs: -r:@agclrdir@/agclr.dll -r:@syssldir@/System.SilverLight.dll

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to