Permalink
Browse files

2006-07-04 Michael Hutchinson <m.j.hutchinson@gmail.com>

	* 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).


svn path=/trunk/aspeditor/; revision=62252
  • Loading branch information...
1 parent 586bfa5 commit bbf9987756786860a3b64fc2d225308ae3c6f97f @mhutch mhutch committed Jul 4, 2006
Showing with 53 additions and 16 deletions.
  1. +9 −0 ChangeLog
  2. +12 −9 configure.in
  3. +1 −1 src/Makefile.am
  4. +26 −2 src/aspnetedit/Makefile.am
  5. +4 −3 src/chrome/Makefile.am
  6. +1 −1 src/editor/Makefile.am
View
@@ -1,3 +1,12 @@
+2006-07-04 Michael Hutchinson <m.j.hutchinson@gmail.com>
+
+ * 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 <m.j.hutchinson@gmail.com>
* configure.in: Allow choice of either Firefox or Mozilla
View
@@ -4,15 +4,14 @@ AM_INIT_AUTOMAKE(aspnetedit, 0.0.1.0)
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,6 +56,17 @@ AC_SUBST(MCS_OPTIONS)
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(
@@ -85,10 +95,6 @@ case $mozpackage in
*) 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
@@ -134,9 +140,6 @@ Makefile
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
View
@@ -1 +1 @@
-SUBDIRS = propertygrid jscall editor aspnetedit chrome
+SUBDIRS = propertygrid editor aspnetedit chrome
View
@@ -3,13 +3,14 @@ ASSEMBLY = $(top_builddir)/build/lib/$(ASSEMBLY_NAME).exe
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): $(ASPNETEDIT_CSFILES)
$(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;
View
@@ -26,7 +26,7 @@ all: $(packagename).xpi
$(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 @@ chrome/$(packagename).jar: $(jar_files)
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 @@ EXTRA_DIST = $(jar_files) $(xpi_files)
CLEANFILES = \
chrome/$(packagename).jar \
- $(packagename).xpi
+ $(packagename).xpi \
+ content/JSCall.js
View
@@ -9,7 +9,7 @@ editor_DATA = $(ASSEMBLY).mdb
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 \

0 comments on commit bbf9987

Please sign in to comment.