2006-07-26 Michael Hutchinson <m.j.hutchinson@gmail.com>
* configure.ac: * src/Makefile.am: * src/jscallglue/Makefile.am: * jscall-sharp.pc.in: Use libtool to install the glue library properly. Install the assembly to the GAC. * src/jscall.dll.config.in: Use versioned name for glue library. * src/AssemblyInfo.cs.in: * jscall.key: Set key for strong name so we can install to the GAC. svn path=/trunk/jscall-sharp/; revision=63019
This commit is contained in:
Michael Hutchinson
Родитель
ab528ab22e
Коммит
d776e457ae
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
2006-07-26 Michael Hutchinson <m.j.hutchinson@gmail.com>
|
||||
|
||||
* configure.ac:
|
||||
* src/Makefile.am:
|
||||
* src/jscallglue/Makefile.am:
|
||||
* jscall-sharp.pc.in:
|
||||
Use libtool to install the glue library properly.
|
||||
Install the assembly to the GAC.
|
||||
|
||||
* src/jscall.dll.config.in: Use versioned name for glue library.
|
||||
|
||||
* src/AssemblyInfo.cs.in:
|
||||
* jscall.key: Set key for strong name so we can install to the GAC.
|
||||
|
||||
2006-07-14 Michael Hutchinson <m.j.hutchinson@gmail.com>
|
||||
|
||||
* jscall-sharp.pc.in: Add MozillaHome variable, so that consumers can
|
||||
|
|
|
|||
15
configure.ac
15
configure.ac
|
|
@ -1,8 +1,9 @@
|
|||
AC_INIT(README)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AM_INIT_AUTOMAKE(jscall-sharp, 0.0.2.0)
|
||||
AM_INIT_AUTOMAKE(jscall-sharp, 0.0.2)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_CXX
|
||||
|
||||
|
|
@ -16,7 +17,6 @@ m4_define(gtk_required_version, 2.6.0)
|
|||
m4_define(mozilla_required_version, 1.6)
|
||||
m4_define(firefox_required_version, 1.0)
|
||||
|
||||
|
||||
### Check for pkg-config
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
if test "x$PKG_CONFIG" = "xno"; then
|
||||
|
|
@ -52,6 +52,15 @@ AC_SUBST(MCS)
|
|||
MCS_OPTIONS="-d:TRACE"
|
||||
AC_SUBST(MCS_OPTIONS)
|
||||
|
||||
### The GAC tool
|
||||
|
||||
AC_PATH_PROG(GACUTIL, gacutil, no)
|
||||
if test "x$GACUTIL" = "xno" ; then
|
||||
AC_MSG_ERROR([No gacutil tool found])
|
||||
fi
|
||||
|
||||
AC_SUBST(GACUTIL)
|
||||
|
||||
|
||||
### Check c# dependencies
|
||||
|
||||
|
|
@ -96,7 +105,9 @@ AC_OUTPUT([
|
|||
Makefile
|
||||
jscall-sharp.pc
|
||||
src/Makefile
|
||||
src/jscallglue/Makefile
|
||||
src/AssemblyInfo.cs
|
||||
src/jscall.dll.config
|
||||
])
|
||||
|
||||
echo ""
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ prefix=@prefix@
|
|||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
Libraries=@libdir@/jscall-sharp/jscall.dll @libdir@/jscall-sharp/libjscallglue.dll.so
|
||||
Libraries=@libdir@/jscall-sharp/jscall.dll
|
||||
Script=@libdir@/jscall-sharp/JSCall.js
|
||||
MozillaHome=@MOZILLA_HOME@
|
||||
|
||||
|
|
|
|||
Двоичный файл не отображается.
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// AssemblyInfo.cs.in for jscall.dll in aspnetedit
|
||||
// AssemblyInfo.cs.in for jscall.dll
|
||||
//
|
||||
// Authors:
|
||||
// Michael Hutchinson <m.j.hutchinson@gmail.com>
|
||||
|
|
@ -7,15 +7,17 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
[assembly: AssemblyTitle ("AspNetEdit JSCall")]
|
||||
[assembly: AssemblyDescription ("JSCall library for AspNetEdit Graphical ASP.NET Editor ")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("AspNetEdit")]
|
||||
[assembly: AssemblyCopyright ("Copyright © 2005 Michael Hutchinson")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyTitle ("JSCall")]
|
||||
[assembly: AssemblyDescription ("JSCall library for .NET/JS interop with Gecko#")]
|
||||
//[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("JSCall")]
|
||||
[assembly: AssemblyCopyright ("Copyright © 2005-2006 Michael Hutchinson")]
|
||||
//[assembly: AssemblyTrademark("")]
|
||||
|
||||
[assembly: AssemblyCulture("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
//[assembly: AssemblyCulture("")]
|
||||
//[assembly: AssemblyConfiguration("")]
|
||||
|
||||
[assembly: AssemblyVersion("@VERSION@")]
|
||||
[assembly: AssemblyFileVersion("@VERSION@")]
|
||||
|
||||
[assembly: AssemblyKeyFile ("jscall.key")]
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
SUBDIRS = jscallglue
|
||||
|
||||
### Names ###
|
||||
|
||||
ASSEMBLY_NAME = jscall
|
||||
ASSEMBLY = $(ASSEMBLY_NAME).dll
|
||||
GLUELIB = lib$(ASSEMBLY_NAME)glue.dll.so
|
||||
ASSEMBLY_NAME=jscall
|
||||
ASSEMBLY=$(ASSEMBLY_NAME).dll
|
||||
ASSEMBLY_CONFIG=$(ASSEMBLY_NAME).dll.config
|
||||
SNK=$(ASSEMBLY_NAME).key
|
||||
|
||||
|
||||
### Source files and refs ###
|
||||
|
|
@ -16,12 +19,6 @@ ASSEMBLY_REFERENCES = \
|
|||
$(GTKSHARP_LIBS) \
|
||||
$(GECKOSHARP_LIBS)
|
||||
|
||||
GLUELIB_CPPFILES = \
|
||||
jscallglue/jscallglue.cpp
|
||||
|
||||
CXXFLAGS = -shared -g -fPIC -fno-rtti $(JSGLUEDEPS_CFLAGS)
|
||||
LDFLAGS = $(JSGLUEDEPS_CFLAGS)
|
||||
|
||||
JS_FILES = \
|
||||
Resources/JSCall.js
|
||||
|
||||
|
|
@ -32,7 +29,7 @@ DOC_FILES = \
|
|||
### Install locations, files ###
|
||||
|
||||
jscalldir=$(pkglibdir)
|
||||
jscall_SCRIPTS = $(ASSEMBLY) $(GLUELIB) $(JS_FILES)
|
||||
jscall_SCRIPTS = $(ASSEMBLY) $(JS_FILES) $(ASSEMBLY_CONFIG)
|
||||
jscall_DATA = $(ASSEMBLY).mdb
|
||||
|
||||
|
||||
|
|
@ -40,18 +37,25 @@ jscall_DATA = $(ASSEMBLY).mdb
|
|||
|
||||
all: $(ASSEMBLY)
|
||||
|
||||
|
||||
$(ASSEMBLY): $(ASSEMBLY_CSFILES)
|
||||
$(MCS) $(MCS_OPTIONS) $(ASSEMBLY_REFERENCES) -debug -target:library -out:$@ $^
|
||||
$(ASSEMBLY): $(ASSEMBLY_CSFILES) $(SNK)
|
||||
$(MCS) $(MCS_OPTIONS) $(ASSEMBLY_REFERENCES) -debug -target:library -out:$@ $(ASSEMBLY_CSFILES)
|
||||
|
||||
$(ASSEMBLY).mdb: $(ASSEMBLY)
|
||||
|
||||
|
||||
$(GLUELIB): $(GLUELIB_CPPFILES)
|
||||
$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
|
||||
|
||||
$(SNK): $(top_srcdir)/$(SNK)
|
||||
cp $(top_srcdir)/$(SNK) .
|
||||
|
||||
### Extra dist and clean info ###
|
||||
|
||||
EXTRA_DIST = $(ASSEMBLY_CSFILES) $(GLUELIB_CPPFILES) $(JS_FILES) $(DOC_FILES)
|
||||
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(GLUELIB)
|
||||
EXTRA_DIST = $(ASSEMBLY_CSFILES) $(JS_FILES) $(DOC_FILES)
|
||||
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(GLUELIB) $(SNK)
|
||||
|
||||
### GAC install rules ###
|
||||
|
||||
install-data-local:
|
||||
echo "$(GACUTIL) /i $(ASSEMBLY)"; \
|
||||
$(GACUTIL) /i $(ASSEMBLY) || exit 1;
|
||||
|
||||
uninstall-local:
|
||||
echo "$(GACUTIL) /u $(ASSEMBLY_NAME)"; \
|
||||
$(GACUTIL) /u $(ASSEMBLY_NAME) || exit 1;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
<configuration>
|
||||
<dllmap dll="jscallglue.dll" target="libjscallglue-@VERSION@.so"/>
|
||||
</configuration>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
ASSEMBLY_NAME=jscall
|
||||
GLUELIB=libjscallglue.la
|
||||
|
||||
libjscallglue_la_LDFLAGS = -module -no-undefined -avoid-version -release $(VERSION)
|
||||
libjscallglue_la_LIBADD = $(JSGLUEDEPS_LIBS)
|
||||
libjscallglue_la_CXXFLAGS = -fno-rtti
|
||||
INCLUDES=$(JSGLUEDEPS_CFLAGS)
|
||||
|
||||
libjscallglue_la_SOURCES = \
|
||||
jscallglue.cpp
|
||||
|
||||
lib_LTLIBRARIES=$(GLUELIB)
|
||||
|
||||
EXTRA_DIST = $(ASSEMBLY_CSFILES) $(glue_CPPFILES)
|
||||
CLEANFILES = lib*.a lib*.o lib*.lo lib*.la
|
||||
Загрузка…
Ссылка в новой задаче