Author: mhutch
Date: 2006-07-04 18:32:07 -0400 (Tue, 04 Jul 2006)
New Revision: 62252
Modified:
trunk/aspeditor/ChangeLog
trunk/aspeditor/configure.in
trunk/aspeditor/src/Makefile.am
trunk/aspeditor/src/aspnetedit/Makefile.am
trunk/aspeditor/src/chrome/Makefile.am
trunk/aspeditor/src/editor/Makefile.am
Log:
2006-07-04 Michael Hutchinson <[EMAIL PROTECTED]>
* configure.in:
* src/aspnetedit/Makefile.am:
* src/editor/Makefile.am:
* src/Makefile.am:
* src/chrome/Makefile.am: Remove the JSCall library. Now locate it
through pkg-config and take local copy (because it's unstable).
Modified: trunk/aspeditor/ChangeLog
===================================================================
--- trunk/aspeditor/ChangeLog 2006-07-04 22:23:16 UTC (rev 62251)
+++ trunk/aspeditor/ChangeLog 2006-07-04 22:32:07 UTC (rev 62252)
@@ -1,3 +1,12 @@
+2006-07-04 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * configure.in:
+ * src/aspnetedit/Makefile.am:
+ * src/editor/Makefile.am:
+ * src/Makefile.am:
+ * src/chrome/Makefile.am: Remove the JSCall library. Now locate it
+ through pkg-config and take local copy (because it's unstable).
+
2006-06-24 Michael Hutchinson <[EMAIL PROTECTED]>
* configure.in: Allow choice of either Firefox or Mozilla
Modified: trunk/aspeditor/configure.in
===================================================================
--- trunk/aspeditor/configure.in 2006-07-04 22:23:16 UTC (rev 62251)
+++ trunk/aspeditor/configure.in 2006-07-04 22:32:07 UTC (rev 62252)
@@ -4,15 +4,14 @@
AM_MAINTAINER_MODE
AC_PROG_INSTALL
-AC_PROG_CXX
### Dependency version numbers
MONO_REQUIRED_VERSION=1.1.9
GTKSHARP_REQUIRED_VERSION=2.5.5.99
GECKOSHARP_REQUIRED_VERSION=0.10
+JSCALL_REQUIRED_VERSION=0.0.2
-m4_define(gtk_required_version, 2.6.0)
m4_define(mozilla_required_version, 1.6)
m4_define(firefox_required_version, 1.0)
@@ -57,7 +56,18 @@
PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
PKG_CHECK_MODULES(GECKOSHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(JSCALL, jscall-sharp >= $JSCALL_REQUIRED_VERSION)
+### Get javascript file supplied by JSCall
+JSCALL_SCRIPT="`$PKG_CONFIG --variable=Script jscall-sharp`"
+AC_SUBST(JSCALL_SCRIPT)
+
+### find assembly paths for unstable installed assemblies that will be
+### copied into the installation directory for local usage with the app
+UNSTABLE_INSTALL_ASSEMBLIES="jscall-sharp"
+INSTALLED_ASSEMBLIES="`$PKG_CONFIG --variable=Libraries
$UNSTABLE_INSTALL_ASSEMBLIES`"
+AC_SUBST(INSTALLED_ASSEMBLIES)
+
### Check for C++/Mozilla dependencies (inspired by gnome-python-extras)
AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
[--with-gtkmozembed=mozilla|firefox],
@@ -85,11 +95,7 @@
*) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla' or
'firefox'])
esac
-PKG_CHECK_MODULES(JSGLUEDEPS, [$mozpackage-gtkmozembed >=
$mozpackage_required_version,
- $mozpackage-xpcom >=
$mozpackage_required_version
- gtk+-2.0 >=
gtk_required_version])
-
### Find the Mozilla directory to install chrome, and how we need to install
the
### chrome -- the installation mechanism changed from FF 1.0 to FF 1.5
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
@@ -134,9 +140,6 @@
src/Makefile
src/propertygrid/Makefile
src/propertygrid/AssemblyInfo.cs
-src/jscall/Makefile
-src/jscall/AssemblyInfo.cs
-src/jscall/jscallglue/Makefile
src/editor/Makefile
src/editor/AssemblyInfo.cs
src/aspnetedit/Makefile
Modified: trunk/aspeditor/src/Makefile.am
===================================================================
--- trunk/aspeditor/src/Makefile.am 2006-07-04 22:23:16 UTC (rev 62251)
+++ trunk/aspeditor/src/Makefile.am 2006-07-04 22:32:07 UTC (rev 62252)
@@ -1 +1 @@
-SUBDIRS = propertygrid jscall editor aspnetedit chrome
+SUBDIRS = propertygrid editor aspnetedit chrome
Modified: trunk/aspeditor/src/aspnetedit/Makefile.am
===================================================================
--- trunk/aspeditor/src/aspnetedit/Makefile.am 2006-07-04 22:23:16 UTC (rev
62251)
+++ trunk/aspeditor/src/aspnetedit/Makefile.am 2006-07-04 22:32:07 UTC (rev
62252)
@@ -3,13 +3,14 @@
TARGET = $(ASSEMBLY)
aspneteditdir=$(pkglibdir)
+# INSTALLED_ASSEMBLIES is unstable Mono libraries (see configure.in)
aspnetedit_SCRIPTS = $(ASSEMBLY)
aspnetedit_DATA = $(ASSEMBLY).mdb
ASPNETEDIT_REFERENCES = \
$(GTKSHARP_LIBS) \
$(GECKOSHARP_LIBS) \
- -r:$(top_builddir)/build/lib/jscall.dll \
+ $(JSCALL_LIBS) \
-r:$(top_builddir)/build/lib/propertygrid.dll \
-r:$(top_builddir)/build/lib/editor.dll \
-r:System.Web \
@@ -25,7 +26,30 @@
$(ASSEMBLY).mdb: $(ASSEMBLY)
-all: $(ASSEMBLY)
+all: $(ASSEMBLY) copy-unstable-libs
+clean-hook: clean-unstable-libs
+install-data-hook: install-unstable-libs
+uninstall-hook: uninstall-unstable-libs
EXTRA_DIST = $(ASPNETEDIT_CSFILES)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+
+# Unstable Mono libraries (see configure.in)
+
+copy-unstable-libs: $(INSTALLED_ASSEMBLIES)
+ cp $(INSTALLED_ASSEMBLIES) $(top_builddir)/build/lib/
+
+clean-unstable-libs:
+ for ASM in $(INSTALLED_ASSEMBLIES); do \
+ rm -f $(top_builddir)/build/lib/`basename $$ASM`; \
+ done;
+
+install-unstable-libs:
+ for ASM in $(INSTALLED_ASSEMBLIES); do \
+ $(INSTALL) -c -m 0755 $$ASM $(DESTDIR)$(pkglibdir); \
+ done;
+
+uninstall-unstable-libs:
+ for ASM in $(INSTALLED_ASSEMBLIES); do \
+ rm -f $(DESTDIR)$(pkglibdir)/`basename $$ASM`; \
+ done;
Modified: trunk/aspeditor/src/chrome/Makefile.am
===================================================================
--- trunk/aspeditor/src/chrome/Makefile.am 2006-07-04 22:23:16 UTC (rev
62251)
+++ trunk/aspeditor/src/chrome/Makefile.am 2006-07-04 22:32:07 UTC (rev
62252)
@@ -26,7 +26,7 @@
$(packagename).xpi: $(xpi_files)
$(ZIP) -q9 $@ $^
-content/JSCall.js: ../jscall/Resources/JSCall.js
+content/JSCall.js: $(JSCALL_SCRIPT)
cp $^ $@
chrome/$(packagename).jar: $(jar_files)
@@ -35,7 +35,7 @@
install-data-hook: install-files install-text
-uninstall-hook: uninstall_files uninstall-text
+uninstall-hook: uninstall-files uninstall-text
install-files:
mkdir -p $(chromedir)/chrome; \
@@ -68,4 +68,5 @@
CLEANFILES = \
chrome/$(packagename).jar \
- $(packagename).xpi
+ $(packagename).xpi \
+ content/JSCall.js
Modified: trunk/aspeditor/src/editor/Makefile.am
===================================================================
--- trunk/aspeditor/src/editor/Makefile.am 2006-07-04 22:23:16 UTC (rev
62251)
+++ trunk/aspeditor/src/editor/Makefile.am 2006-07-04 22:32:07 UTC (rev
62252)
@@ -9,7 +9,7 @@
EDITOR_REFERENCES = \
$(GTKSHARP_LIBS) \
$(GECKOSHARP_LIBS) \
- -r:$(top_builddir)/build/lib/jscall.dll \
+ $(JSCALL_LIBS) \
-r:$(top_builddir)/build/lib/propertygrid.dll \
-r:System.Web \
-r:System.Design \
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
