Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

add SDK installation, and abstract out our target runtime versions to…

… configure.ac so we can subst them everywhere.

svn path=/trunk/moon/; revision=147872
  • Loading branch information...
commit a755817870a3525dd03f69f14acf6503acdeb844 1 parent be631e4
authored December 08, 2009
5  ChangeLog
... ...
@@ -1,3 +1,8 @@
  1
+2009-12-08  Chris Toshok  <toshok@ximian.com>
  2
+
  3
+	* configure.ac: keep all the most recent target runtime versions
  4
+	here and we'll subst them around.
  5
+
1 6
 2009-12-08  Alan McGovern  <amcgovern@novell.com>
2 7
 
3 8
 	* demo-status.txt: Update demo status.
3  Makefile.am
@@ -41,7 +41,8 @@ SUBDIRS = $(subdirs) \
41 41
 	$(TEST_SUBDIR) \
42 42
 	$(PERF_SUBDIR) \
43 43
 	$(MONO_EXAMPLES) \
44  
-	scripts
  44
+	scripts \
  45
+	sdk
45 46
 
46 47
 pkgconfigdir = $(libdir)/pkgconfig
47 48
 pkgconfig_DATA=moon.pc
13  configure.ac
@@ -71,6 +71,16 @@ MOONLIGHT_CHECK_FIREFOX_XPI
71 71
 MOONLIGHT_CHECK_UNWIND
72 72
 
73 73
 dnl
  74
+dnl The silverlight TargetRuntime versions we claim to support
  75
+
  76
+SILVERLIGHT_1_0_TARGETRUNTIME="1.0.30401.0"
  77
+SILVERLIGHT_2_0_TARGETRUNTIME="2.0.31005.0"
  78
+SILVERLIGHT_3_0_TARGETRUNTIME="3.0.40818.0"
  79
+AC_SUBST(SILVERLIGHT_1_0_TARGETRUNTIME)
  80
+AC_SUBST(SILVERLIGHT_2_0_TARGETRUNTIME)
  81
+AC_SUBST(SILVERLIGHT_3_0_TARGETRUNTIME)
  82
+
  83
+dnl
74 84
 dnl Export Variables
75 85
 dnl
76 86
 
@@ -197,6 +207,7 @@ examples/desklet/glassyslides/Makefile
197 207
 examples/desklet/ruler/Makefile
198 208
 examples/desklet/simpleclock/Makefile
199 209
 plugin/Makefile
  210
+plugin/silverlight-versions.h
200 211
 plugin/firefox/Makefile
201 212
 plugin/firefox/ff2/Makefile
202 213
 plugin/firefox/ff3/Makefile
@@ -205,6 +216,7 @@ plugin/install/install.rdf
205 216
 plugin/test/Makefile
206 217
 plugin/samples/Makefile
207 218
 perf/Makefile
  219
+sdk/Makefile
208 220
 ])
209 221
 
210 222
 # general configuration info
@@ -216,6 +228,7 @@ Moonlight configuration
216 228
 	Using cairo: $with_cairo
217 229
 	Test Harness: $with_testing $testing_reason
218 230
 	Performance Suite: $with_performance $performance_reason
  231
+	MonoDevelop SDK: $enable_sdk
219 232
 EOF
220 233
 
221 234
 dnl debug info
5  m4/ChangeLog
... ...
@@ -1,3 +1,8 @@
  1
+2009-12-08  Chris Toshok  <toshok@ximian.com>
  2
+
  3
+	* build-configuration.m4: add --enable-sdk (defaults to yes) so
  4
+	people can disable the monodevelop sdk installation.
  5
+
1 6
 2009-10-07  Rusty Howell  <rhowell@novell.com>
2 7
 
3 8
 	 * mozilla.m4: Reverting MAX_FIREFOX_VERSION back to 3.5.* due to FF 3.6
8  m4/build-configuration.m4
@@ -56,5 +56,13 @@ AC_DEFUN([MOONLIGHT_CHECK_BUILD_CONFIGURATION],
56 56
 	if test x$with_logging = xyes; then
57 57
 		AC_DEFINE([LOGGING], [1], [Include support for logging with MOONLIGHT_DEBUG])
58 58
 	fi
  59
+
  60
+	dnl
  61
+	dnl monodevelop sdk installation
  62
+	dnl
  63
+
  64
+	MOON_ARG_ENABLED_BY_DEFAULT([sdk], [Disable installation of the monodevelop sdk])
  65
+	enable_sdk=$enableval
  66
+	AM_CONDITIONAL([INSTALL_MONODEVELOP_SDK],test x$enable_sdk = xyes)
59 67
 ])
60 68
 
1  plugin/.gitignore
@@ -15,3 +15,4 @@
15 15
 /*.la
16 16
 /*.pidb
17 17
 /*.pc
  18
+/silverlight-versions.h
9  plugin/ChangeLog
... ...
@@ -1,3 +1,12 @@
  1
+2009-12-08  Chris Toshok  <toshok@ximian.com>
  2
+
  3
+	* silverlight-versions.h.in: new file.
  4
+
  5
+	* moonlight.h: include silverlight-versions.h and use those
  6
+	#defines instead of the strings for the TargetRuntime versions.
  7
+
  8
+	* Makefile.am (EXTRA_DIST): add silverlight-versions.h.in
  9
+
1 10
 2009-12-07  Rolf Bjarne Kvinge  <RKvinge@novell.com>
2 11
 
3 12
 	* plugin.cpp: Put the "Reinstall media pack" into an DEBUG #ifdef.
4  plugin/Makefile.am
@@ -91,7 +91,9 @@ untest-plugin:
91 91
 	-rm -rf ~/.mozilla/plugins/libmoonplugin.so
92 92
 	-rm -rf ~/.mozilla/plugins/libmoonloader.so
93 93
 
94  
-EXTRA_DIST = moon.config
  94
+EXTRA_DIST=moon.config silverlight-versions.h.in
  95
+
  96
+DISTCLEANFILES= silverlight-version.h
95 97
 
96 98
 dist-hook:
97 99
 	mkdir $(distdir)/moz-sdk
5  plugin/moonlight.h
@@ -38,6 +38,7 @@
38 38
 #include <gtk/gtk.h>
39 39
 
40 40
 #include "libmoon.h"
  41
+#include "silverlight-versions.h"
41 42
 
42 43
 // Plugin information
43 44
 #define MIME_SILVERLIGHT_1  "application/x-silverlight"
@@ -47,10 +48,10 @@
47 48
 #define PLUGIN_OURNAME      "Novell Moonlight"
48 49
 #define PLUGIN_SUFFIX       "Novell <a href=\"http://www.mono-project.com/Moonlight\">Moonlight</a> " VERSION " is Mono's Free/Open Source implementation of Silverlight."
49 50
 #if PLUGIN_SL_2_0
50  
-#    define PLUGIN_DESCRIPTION "3.0.40818.0"
  51
+#    define PLUGIN_DESCRIPTION SILVERLIGHT_3_0_TARGETRUNTIME
51 52
 #    define MIME_TYPES_HANDLED  MIME_SILVERLIGHT_1 ":xaml:Novell Moonlight;" MIME_SILVERLIGHT_2 "::Novell Moonlight"
52 53
 #else
53  
-#    define PLUGIN_DESCRIPTION  "1.0.30401.0"
  54
+#    define PLUGIN_DESCRIPTION  SILVERLIGHT_1_0_TARGETRUNTIME
54 55
 #    define MIME_TYPES_HANDLED  MIME_SILVERLIGHT_1 ":scr:Novell Moonlight" 
55 56
 #endif
56 57
 
4  plugin/silverlight-versions.h.in
... ...
@@ -0,0 +1,4 @@
  1
+
  2
+#define SILVERLIGHT_1_0_TARGETRUNTIME "@SILVERLIGHT_1_0_TARGETRUNTIME@"
  3
+#define SILVERLIGHT_2_0_TARGETRUNTIME "@SILVERLIGHT_2_0_TARGETRUNTIME@"
  4
+#define SILVERLIGHT_3_0_TARGETRUNTIME "@SILVERLIGHT_3_0_TARGETRUNTIME@"
3  sdk/.gitignore
... ...
@@ -0,0 +1,3 @@
  1
+/Makefile
  2
+/Makefile.in
  3
+/buildversion
5  sdk/ChangeLog
... ...
@@ -0,0 +1,5 @@
  1
+2009-12-08  Chris Toshok  <toshok@ximian.com>
  2
+
  3
+	* Makefile.am: initial hacky way to build up the directory tree
  4
+	according to monodevelop sdk needs.
  5
+
47  sdk/Makefile.am
... ...
@@ -0,0 +1,47 @@
  1
+if INSTALL_MONODEVELOP_SDK
  2
+SDK2_DIR=$(DISTDIR)$(pkglibdir)/2.0
  3
+SDK2_REDIST_DIR=$(DISTDIR)$(pkglibdir)/2.0-redist
  4
+
  5
+CLASS_DIR=$(top_builddir)/class/lib/2.1
  6
+TOOLS_DIR=$(top_builddir)/tools
  7
+
  8
+install-data-local:
  9
+	@mkdir -p $(SDK2_DIR)
  10
+	@mkdir -p $(SDK2_REDIST_DIR)
  11
+	@echo $(SILVERLIGHT_2_0_TARGETRUNTIME) > buildversion
  12
+	$(INSTALL) -c -m 644 buildversion $(SDK2_DIR)/buildversion
  13
+	@rm buildversion
  14
+	$(INSTALL) -c $(CLASS_DIR)/mscorlib.dll $(SDK2_DIR)/mscorlib.dll
  15
+	$(INSTALL) -c $(CLASS_DIR)/mscorlib.dll.mdb $(SDK2_DIR)/mscorlib.dll.mdb
  16
+	$(INSTALL) -c $(CLASS_DIR)/System.dll $(SDK2_DIR)/System.dll
  17
+	$(INSTALL) -c $(CLASS_DIR)/System.dll.mdb $(SDK2_DIR)/System.dll.mdb
  18
+	$(INSTALL) -c $(CLASS_DIR)/System.Core.dll $(SDK2_DIR)/System.Core.dll
  19
+	$(INSTALL) -c $(CLASS_DIR)/System.Core.dll.mdb $(SDK2_DIR)/System.Core.dll.mdb
  20
+	$(INSTALL) -c $(CLASS_DIR)/System.Net.dll $(SDK2_DIR)/System.Net.dll
  21
+	$(INSTALL) -c $(CLASS_DIR)/System.Net.dll.mdb $(SDK2_DIR)/System.Net.dll.mdb
  22
+	$(INSTALL) -c $(CLASS_DIR)/System.Runtime.Serialization.dll $(SDK2_DIR)/System.Runtime.Serialization.dll
  23
+	$(INSTALL) -c $(CLASS_DIR)/System.Runtime.Serialization.dll.mdb $(SDK2_DIR)/System.Runtime.Serialization.dll.mdb
  24
+	$(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.dll $(SDK2_DIR)/System.ServiceModel.dll
  25
+	$(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.dll.mdb $(SDK2_DIR)/System.ServiceModel.dll.mdb
  26
+	$(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.Web.dll $(SDK2_DIR)/System.ServiceModel.Web.dll
  27
+	$(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.Web.dll.mdb $(SDK2_DIR)/System.ServiceModel.Web.dll.mdb
  28
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.dll $(SDK2_DIR)/System.Windows.dll
  29
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.dll.mdb $(SDK2_DIR)/System.Windows.dll.mdb
  30
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.Browser.dll $(SDK2_DIR)/System.Windows.Browser.dll
  31
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.Browser.dll.mdb $(SDK2_DIR)/System.Windows.Browser.dll.mdb
  32
+	$(INSTALL) -c $(CLASS_DIR)/System.Xml.dll $(SDK2_DIR)/System.Xml.dll
  33
+	$(INSTALL) -c $(CLASS_DIR)/System.Xml.dll.mdb $(SDK2_DIR)/System.Xml.dll.mdb
  34
+	$(INSTALL) -c $(CLASS_DIR)/smcs.exe $(SDK2_DIR)/smcs.exe
  35
+	$(INSTALL) -c $(CLASS_DIR)/smcs.exe.mdb $(SDK2_DIR)/smcs.exe.mdb
  36
+	$(INSTALL) -c $(TOOLS_DIR)/respack/respack.exe $(SDK2_DIR)/respack.exe
  37
+	$(INSTALL) -c $(TOOLS_DIR)/respack/respack.exe.mdb $(SDK2_DIR)/respack.exe.mdb
  38
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.dll $(SDK2_REDIST_DIR)/System.Windows.Controls.dll
  39
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.dll.mdb $(SDK2_REDIST_DIR)/System.Windows.Controls.dll.mdb
  40
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.Data.dll $(SDK2_REDIST_DIR)/System.Windows.Controls.Data.dll
  41
+	$(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.Data.dll.mdb $(SDK2_REDIST_DIR)/System.Windows.Controls.Data.dll.mdb
  42
+	$(INSTALL) -c $(CLASS_DIR)/System.Xml.Linq.dll $(SDK2_REDIST_DIR)/System.Xml.Linq.dll
  43
+	$(INSTALL) -c $(CLASS_DIR)/System.Xml.Linq.dll.mdb $(SDK2_REDIST_DIR)/System.Xml.Linq.dll.mdb
  44
+
  45
+clean-local:
  46
+	-rm -rf buildversion
  47
+endif

0 notes on commit a755817

Please sign in to comment.
Something went wrong with that request. Please try again.