diff --git a/COPYING b/COPYING index ffa6f53..88461a4 100644 --- a/COPYING +++ b/COPYING @@ -1,3 +1,5 @@ +This software is licensed under the terms of the MIT/X11 Licence: + Copyright (c) 2006-2007 the individuals listed on the ChangeLog entries. Permission is hereby granted, free of charge, to any person obtaining diff --git a/ChangeLog b/ChangeLog index 6f691d9..fcdd429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-04-02 Michael Hutchinson + + * COPYING: Explicitly name the MIT/X11 license. + +2007-04-02 Boyd Timothy + + * Makefile.am: Fix "make distcheck". + 2007-03-13 C.J. Adams-Collier Overview: Installing assemblies into gacutil of $prefix rather than /usr diff --git a/Makefile.am b/Makefile.am index ea3a5c7..3304c99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = src -EXTRA_DIST = jscall-sharp.pc.in +EXTRA_DIST = jscall-sharp.pc.in jscall.key pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = jscall-sharp.pc diff --git a/src/ChangeLog b/src/ChangeLog index fcd551d..11bd342 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2007-04-02 Michael Hutchinson + + * jscallglue/Makefile.am: More dist fixes. + + * Resources/JSCall.js: Fix a couple of JS warnings. + +2007-04-02 Boyd Timothy + + * Makefile.am: Fix "make distcheck". + 2006-09-07 Chris Howie * Resources/JSCall.js: Restore the old document title after diff --git a/src/Makefile.am b/src/Makefile.am index d3db2ce..b2d3047 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,9 +11,9 @@ SNK=$(ASSEMBLY_NAME).key ### Source files and refs ### ASSEMBLY_CSFILES = \ - AssemblyInfo.cs \ - AspNetEdit.JSCall/CommandManager.cs \ - AspNetEdit.JSCall/InvalidJSArgumentException.cs + $(srcdir)/AssemblyInfo.cs \ + $(srcdir)/AspNetEdit.JSCall/CommandManager.cs \ + $(srcdir)/AspNetEdit.JSCall/InvalidJSArgumentException.cs ASSEMBLY_REFERENCES = \ $(GTKSHARP_LIBS) \ diff --git a/src/Resources/JSCall.js b/src/Resources/JSCall.js index 6f8b284..e21409d 100644 --- a/src/Resources/JSCall.js +++ b/src/Resources/JSCall.js @@ -44,7 +44,7 @@ function JSCallInit() throw "Error: the document already contains a element"; } - el = document.getElementsByTagName("jscall")[0]; + var el = document.getElementsByTagName("jscall")[0]; el.addEventListener( "DOMNodeInserted", JSCallHandler, false ); //JSCallRegisterClrHandler("Redo", Redo); @@ -88,7 +88,7 @@ function JSCallHandler(e) function JSCallPlaceClrCall(fn, returnTo, args) { - str = "JSCall" + delimiter + fn + delimiter + returnTo + delimiter; + var str = "JSCall" + delimiter + fn + delimiter + returnTo + delimiter; if (args && args.length > 0) { diff --git a/src/jscallglue/Makefile.am b/src/jscallglue/Makefile.am index 805e288..437fb4a 100644 --- a/src/jscallglue/Makefile.am +++ b/src/jscallglue/Makefile.am @@ -7,9 +7,9 @@ libjscallglue_la_CXXFLAGS = -fno-rtti INCLUDES=$(JSGLUEDEPS_CFLAGS) libjscallglue_la_SOURCES = \ - jscallglue.cpp + $(srcdir)/jscallglue.cpp lib_LTLIBRARIES=$(GLUELIB) -EXTRA_DIST = $(ASSEMBLY_CSFILES) $(glue_CPPFILES) +EXTRA_DIST = $(libjscallglue_la_SOURCES) README CLEANFILES = lib*.a lib*.o lib*.lo lib*.la