Permalink
Browse files

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...
1 parent be631e4 commit a755817870a3525dd03f69f14acf6503acdeb844 Chris Toshok committed Dec 8, 2009
Showing with 108 additions and 4 deletions.
  1. +5 −0 ChangeLog
  2. +2 −1 Makefile.am
  3. +13 −0 configure.ac
  4. +5 −0 m4/ChangeLog
  5. +8 −0 m4/build-configuration.m4
  6. +1 −0 plugin/.gitignore
  7. +9 −0 plugin/ChangeLog
  8. +3 −1 plugin/Makefile.am
  9. +3 −2 plugin/moonlight.h
  10. +4 −0 plugin/silverlight-versions.h.in
  11. +3 −0 sdk/.gitignore
  12. +5 −0 sdk/ChangeLog
  13. +47 −0 sdk/Makefile.am
View
@@ -1,3 +1,8 @@
+2009-12-08 Chris Toshok <toshok@ximian.com>
+
+ * configure.ac: keep all the most recent target runtime versions
+ here and we'll subst them around.
+
2009-12-08 Alan McGovern <amcgovern@novell.com>
* demo-status.txt: Update demo status.
View
@@ -41,7 +41,8 @@ SUBDIRS = $(subdirs) \
$(TEST_SUBDIR) \
$(PERF_SUBDIR) \
$(MONO_EXAMPLES) \
- scripts
+ scripts \
+ sdk
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA=moon.pc
View
@@ -71,6 +71,16 @@ MOONLIGHT_CHECK_FIREFOX_XPI
MOONLIGHT_CHECK_UNWIND
dnl
+dnl The silverlight TargetRuntime versions we claim to support
+
+SILVERLIGHT_1_0_TARGETRUNTIME="1.0.30401.0"
+SILVERLIGHT_2_0_TARGETRUNTIME="2.0.31005.0"
+SILVERLIGHT_3_0_TARGETRUNTIME="3.0.40818.0"
+AC_SUBST(SILVERLIGHT_1_0_TARGETRUNTIME)
+AC_SUBST(SILVERLIGHT_2_0_TARGETRUNTIME)
+AC_SUBST(SILVERLIGHT_3_0_TARGETRUNTIME)
+
+dnl
dnl Export Variables
dnl
@@ -197,6 +207,7 @@ examples/desklet/glassyslides/Makefile
examples/desklet/ruler/Makefile
examples/desklet/simpleclock/Makefile
plugin/Makefile
+plugin/silverlight-versions.h
plugin/firefox/Makefile
plugin/firefox/ff2/Makefile
plugin/firefox/ff3/Makefile
@@ -205,6 +216,7 @@ plugin/install/install.rdf
plugin/test/Makefile
plugin/samples/Makefile
perf/Makefile
+sdk/Makefile
])
# general configuration info
@@ -216,6 +228,7 @@ Moonlight configuration
Using cairo: $with_cairo
Test Harness: $with_testing $testing_reason
Performance Suite: $with_performance $performance_reason
+ MonoDevelop SDK: $enable_sdk
EOF
dnl debug info
View
@@ -1,3 +1,8 @@
+2009-12-08 Chris Toshok <toshok@ximian.com>
+
+ * build-configuration.m4: add --enable-sdk (defaults to yes) so
+ people can disable the monodevelop sdk installation.
+
2009-10-07 Rusty Howell <rhowell@novell.com>
* mozilla.m4: Reverting MAX_FIREFOX_VERSION back to 3.5.* due to FF 3.6
@@ -56,5 +56,13 @@ AC_DEFUN([MOONLIGHT_CHECK_BUILD_CONFIGURATION],
if test x$with_logging = xyes; then
AC_DEFINE([LOGGING], [1], [Include support for logging with MOONLIGHT_DEBUG])
fi
+
+ dnl
+ dnl monodevelop sdk installation
+ dnl
+
+ MOON_ARG_ENABLED_BY_DEFAULT([sdk], [Disable installation of the monodevelop sdk])
+ enable_sdk=$enableval
+ AM_CONDITIONAL([INSTALL_MONODEVELOP_SDK],test x$enable_sdk = xyes)
])
View
@@ -15,3 +15,4 @@
/*.la
/*.pidb
/*.pc
+/silverlight-versions.h
View
@@ -1,3 +1,12 @@
+2009-12-08 Chris Toshok <toshok@ximian.com>
+
+ * silverlight-versions.h.in: new file.
+
+ * moonlight.h: include silverlight-versions.h and use those
+ #defines instead of the strings for the TargetRuntime versions.
+
+ * Makefile.am (EXTRA_DIST): add silverlight-versions.h.in
+
2009-12-07 Rolf Bjarne Kvinge <RKvinge@novell.com>
* plugin.cpp: Put the "Reinstall media pack" into an DEBUG #ifdef.
View
@@ -91,7 +91,9 @@ untest-plugin:
-rm -rf ~/.mozilla/plugins/libmoonplugin.so
-rm -rf ~/.mozilla/plugins/libmoonloader.so
-EXTRA_DIST = moon.config
+EXTRA_DIST=moon.config silverlight-versions.h.in
+
+DISTCLEANFILES= silverlight-version.h
dist-hook:
mkdir $(distdir)/moz-sdk
View
@@ -38,6 +38,7 @@
#include <gtk/gtk.h>
#include "libmoon.h"
+#include "silverlight-versions.h"
// Plugin information
#define MIME_SILVERLIGHT_1 "application/x-silverlight"
@@ -47,10 +48,10 @@
#define PLUGIN_OURNAME "Novell Moonlight"
#define PLUGIN_SUFFIX "Novell <a href=\"http://www.mono-project.com/Moonlight\">Moonlight</a> " VERSION " is Mono's Free/Open Source implementation of Silverlight."
#if PLUGIN_SL_2_0
-# define PLUGIN_DESCRIPTION "3.0.40818.0"
+# define PLUGIN_DESCRIPTION SILVERLIGHT_3_0_TARGETRUNTIME
# define MIME_TYPES_HANDLED MIME_SILVERLIGHT_1 ":xaml:Novell Moonlight;" MIME_SILVERLIGHT_2 "::Novell Moonlight"
#else
-# define PLUGIN_DESCRIPTION "1.0.30401.0"
+# define PLUGIN_DESCRIPTION SILVERLIGHT_1_0_TARGETRUNTIME
# define MIME_TYPES_HANDLED MIME_SILVERLIGHT_1 ":scr:Novell Moonlight"
#endif
@@ -0,0 +1,4 @@
+
+#define SILVERLIGHT_1_0_TARGETRUNTIME "@SILVERLIGHT_1_0_TARGETRUNTIME@"
+#define SILVERLIGHT_2_0_TARGETRUNTIME "@SILVERLIGHT_2_0_TARGETRUNTIME@"
+#define SILVERLIGHT_3_0_TARGETRUNTIME "@SILVERLIGHT_3_0_TARGETRUNTIME@"
View
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/buildversion
View
@@ -0,0 +1,5 @@
+2009-12-08 Chris Toshok <toshok@ximian.com>
+
+ * Makefile.am: initial hacky way to build up the directory tree
+ according to monodevelop sdk needs.
+
View
@@ -0,0 +1,47 @@
+if INSTALL_MONODEVELOP_SDK
+SDK2_DIR=$(DISTDIR)$(pkglibdir)/2.0
+SDK2_REDIST_DIR=$(DISTDIR)$(pkglibdir)/2.0-redist
+
+CLASS_DIR=$(top_builddir)/class/lib/2.1
+TOOLS_DIR=$(top_builddir)/tools
+
+install-data-local:
+ @mkdir -p $(SDK2_DIR)
+ @mkdir -p $(SDK2_REDIST_DIR)
+ @echo $(SILVERLIGHT_2_0_TARGETRUNTIME) > buildversion
+ $(INSTALL) -c -m 644 buildversion $(SDK2_DIR)/buildversion
+ @rm buildversion
+ $(INSTALL) -c $(CLASS_DIR)/mscorlib.dll $(SDK2_DIR)/mscorlib.dll
+ $(INSTALL) -c $(CLASS_DIR)/mscorlib.dll.mdb $(SDK2_DIR)/mscorlib.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.dll $(SDK2_DIR)/System.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.dll.mdb $(SDK2_DIR)/System.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Core.dll $(SDK2_DIR)/System.Core.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Core.dll.mdb $(SDK2_DIR)/System.Core.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Net.dll $(SDK2_DIR)/System.Net.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Net.dll.mdb $(SDK2_DIR)/System.Net.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Runtime.Serialization.dll $(SDK2_DIR)/System.Runtime.Serialization.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Runtime.Serialization.dll.mdb $(SDK2_DIR)/System.Runtime.Serialization.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.dll $(SDK2_DIR)/System.ServiceModel.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.dll.mdb $(SDK2_DIR)/System.ServiceModel.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.Web.dll $(SDK2_DIR)/System.ServiceModel.Web.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.ServiceModel.Web.dll.mdb $(SDK2_DIR)/System.ServiceModel.Web.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.dll $(SDK2_DIR)/System.Windows.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.dll.mdb $(SDK2_DIR)/System.Windows.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.Browser.dll $(SDK2_DIR)/System.Windows.Browser.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.Browser.dll.mdb $(SDK2_DIR)/System.Windows.Browser.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Xml.dll $(SDK2_DIR)/System.Xml.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Xml.dll.mdb $(SDK2_DIR)/System.Xml.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/smcs.exe $(SDK2_DIR)/smcs.exe
+ $(INSTALL) -c $(CLASS_DIR)/smcs.exe.mdb $(SDK2_DIR)/smcs.exe.mdb
+ $(INSTALL) -c $(TOOLS_DIR)/respack/respack.exe $(SDK2_DIR)/respack.exe
+ $(INSTALL) -c $(TOOLS_DIR)/respack/respack.exe.mdb $(SDK2_DIR)/respack.exe.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.dll $(SDK2_REDIST_DIR)/System.Windows.Controls.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.dll.mdb $(SDK2_REDIST_DIR)/System.Windows.Controls.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.Data.dll $(SDK2_REDIST_DIR)/System.Windows.Controls.Data.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Windows.Controls.Data.dll.mdb $(SDK2_REDIST_DIR)/System.Windows.Controls.Data.dll.mdb
+ $(INSTALL) -c $(CLASS_DIR)/System.Xml.Linq.dll $(SDK2_REDIST_DIR)/System.Xml.Linq.dll
+ $(INSTALL) -c $(CLASS_DIR)/System.Xml.Linq.dll.mdb $(SDK2_REDIST_DIR)/System.Xml.Linq.dll.mdb
+
+clean-local:
+ -rm -rf buildversion
+endif

0 comments on commit a755817

Please sign in to comment.