2005-12-14 Geoff Norton <gnorton@customerdna.com>
* Various autotools changes to allow 0.9.0 distribution svn path=/trunk/cocoa-sharp/; revision=54422
This commit is contained in:
Geoff Norton
Родитель
698ef1f691
Коммит
1e3bd359ad
|
|
@ -1,3 +1,7 @@
|
|||
2005-12-14 Geoff Norton <gnorton@customerdna.com>
|
||||
|
||||
* Various autotools changes to allow 0.9.0 distribution
|
||||
|
||||
2005-12-12 Geoff Norton <gnorton@customerdna.com>
|
||||
|
||||
* autogen.sh: Lower the required autoconf version to 2.57.
|
||||
|
|
|
|||
|
|
@ -1 +1,6 @@
|
|||
SUBDIRS=src doc samples
|
||||
|
||||
EXTRA_DIST= \
|
||||
cocoa-sharp.snk \
|
||||
ChangeLog \
|
||||
CONTRIBUTING
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
SNK=cocoa-sharp.snk
|
||||
|
||||
CLEANFILES=$(ASSEMBLY) $(ASSEMBLY).mdb $(SNK)
|
||||
|
||||
$(SNK): $(top_srcdir)/$(SNK)
|
||||
cp $(top_srcdir)/$(SNK) .
|
||||
|
||||
install-data-local:
|
||||
$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;
|
||||
|
||||
uninstall-local:
|
||||
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;
|
||||
|
|
@ -5,6 +5,9 @@ AM_CONFIG_HEADER(config.h)
|
|||
AM_INIT_AUTOMAKE(cocoa-sharp, 0.9.0)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
PACKAGE_VERSION=cocoa-sharp
|
||||
AC_SUBST(PACKAGE_VERSION)
|
||||
|
||||
API_VERSION=1.9.0.0
|
||||
AC_SUBST(API_VERSION)
|
||||
|
||||
|
|
@ -60,7 +63,9 @@ AC_OUTPUT([
|
|||
Makefile
|
||||
src/Makefile
|
||||
src/Cocoa/Makefile
|
||||
src/Cocoa/cocoa-sharp.pc
|
||||
src/WebKit/Makefile
|
||||
src/WebKit/webkit-sharp.pc
|
||||
doc/Makefile
|
||||
samples/Makefile
|
||||
])
|
||||
|
|
|
|||
|
|
@ -17,7 +17,13 @@ endif
|
|||
monodocdir=$(SOURCESDIR)
|
||||
monodocDATA=$(TARGETS)
|
||||
|
||||
cocoa-sharp.source: assemble
|
||||
|
||||
if ENABLE_MONODOC
|
||||
assemble: cocoa-sharp.zip cocoa-sharp.tree
|
||||
else
|
||||
assemble:
|
||||
endif
|
||||
|
||||
cocoa-sharp.zip cocoa-sharp.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
|
||||
$(MDASSEMBLER) --ecma $(srcdir)/en -o cocoa-sharp
|
||||
|
|
@ -35,8 +41,12 @@ update-delete: get-assemblies
|
|||
|
||||
CLEANFILES=cocoa-sharp.zip cocoa-sharp.tree lib
|
||||
|
||||
if ENABLE_MONODOC
|
||||
EXTRA_DIST= \
|
||||
cocoa-sharp.source
|
||||
else
|
||||
EXTRA_DIST=
|
||||
endif
|
||||
|
||||
NAMESPACES=Cocoa WebKit
|
||||
|
||||
|
|
@ -47,6 +57,6 @@ dist-hook:
|
|||
mkdir -p $(distdir)/en/$$i; \
|
||||
cp $(srcdir)/en/$$i/*.xml $(distdir)/en/$$i; \
|
||||
done
|
||||
#all:
|
||||
|
||||
all: assemble
|
||||
# mono /Library/Frameworks/Mono.framework/Versions/Current/lib/monodoc/monodocer.exe -assembly:../src/Cocoa/cocoa-sharp.dll -assembly:../src/WebKit/webkit-sharp.dll -path:. -name:"Cocoa#"
|
||||
# mono /Library/Frameworks/Mono.framework/Versions/Current/lib/monodoc/assembler.exe --ecma . --out cocoa-sharp
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ SHELL = /bin/sh
|
|||
srcdir = .
|
||||
top_srcdir = ..
|
||||
|
||||
prefix = /usr/local
|
||||
prefix = /Library/Frameworks/Mono.framework/Versions/Current/
|
||||
exec_prefix = ${prefix}
|
||||
|
||||
bindir = ${exec_prefix}/bin
|
||||
|
|
@ -99,6 +99,7 @@ OBJC =
|
|||
OBJCFLAGS =
|
||||
OBJDUMP = @OBJDUMP@
|
||||
PACKAGE = cocoa-sharp
|
||||
PACKAGE_VERSION = cocoa-sharp
|
||||
PKG_CONFIG = /Library/Frameworks/PkgConfig.framework/Commands/pkg-config
|
||||
RANLIB = ranlib
|
||||
RC = @RC@
|
||||
|
|
@ -127,7 +128,7 @@ EXTRA_DIST = \
|
|||
HelloWorld.cs \
|
||||
HelloWorld.nib \
|
||||
CocoaDoc.cs \
|
||||
CocoaDoc.nib \
|
||||
MonoDoc.nib \
|
||||
OpenGLViewSample.cs \
|
||||
OpenGLView.nib \
|
||||
ViewSample.cs \
|
||||
|
|
@ -307,8 +308,8 @@ ViewSysDraw.app: ViewSysDraw.exe View.nib
|
|||
#CocoaDoc.exe: CocoaDoc.cs
|
||||
# $(MCS) $(top_srcdir)/samples/CocoaDoc.cs -d:SYSD -out:$(top_builddir)/samples/CocoaDoc.exe -pkg:monodoc -r:System.Web.Services -r:$(top_builddir)/src/WebKit/webkit-sharp.dll -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
|
||||
|
||||
#CocoaDoc.app: CocoaDoc.exe CocoaDoc.nib
|
||||
# macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll -r:$(top_builddir)/src/WebKit/webkit-sharp.dll -r:$(top_srcdir)/samples/monodoc.xml -r:$(MONODOCDIR)/sources -r:$(top_srcdir)/samples/CocoaDoc.nib -r:$(top_srcdir)/samples/mono.png -i:$(top_srcdir)/samples/applemono.icns -n:CocoaDoc -o:$(top_builddir)/samples -a:$(top_builddir)/samples/CocoaDoc.exe
|
||||
#CocoaDoc.app: CocoaDoc.exe MonoDoc.nib
|
||||
# macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll -r:$(top_builddir)/src/WebKit/webkit-sharp.dll -r:$(top_srcdir)/samples/monodoc.xml -r:$(MONODOCDIR)/sources -r:$(top_srcdir)/samples/MonoDoc.nib -r:$(top_srcdir)/samples/mono.png -i:$(top_srcdir)/samples/applemono.icns -n:CocoaDoc -o:$(top_builddir)/samples -a:$(top_builddir)/samples/CocoaDoc.exe
|
||||
# cp $(top_builddir)/doc/cocoa-sharp.source $(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
|
||||
# cp $(top_builddir)/doc/cocoa-sharp.tree $(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
|
||||
# cp $(top_builddir)/doc/cocoa-sharp.zip $(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ if ENABLE_MONODOC
|
|||
CocoaDoc.exe: CocoaDoc.cs
|
||||
$(MCS) $(top_srcdir)/samples/CocoaDoc.cs -d:SYSD -out:$(top_builddir)/samples/CocoaDoc.exe -pkg:monodoc -r:System.Web.Services -r:$(top_builddir)/src/WebKit/webkit-sharp.dll -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll
|
||||
|
||||
CocoaDoc.app: CocoaDoc.exe CocoaDoc.nib
|
||||
macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll -r:$(top_builddir)/src/WebKit/webkit-sharp.dll -r:$(top_srcdir)/samples/monodoc.xml -r:$(MONODOCDIR)/sources -r:$(top_srcdir)/samples/CocoaDoc.nib -r:$(top_srcdir)/samples/mono.png -i:$(top_srcdir)/samples/applemono.icns -n:CocoaDoc -o:$(top_builddir)/samples -a:$(top_builddir)/samples/CocoaDoc.exe
|
||||
CocoaDoc.app: CocoaDoc.exe MonoDoc.nib
|
||||
macpack -m:2 -r:$(top_builddir)/src/Cocoa/cocoa-sharp.dll -r:$(top_builddir)/src/WebKit/webkit-sharp.dll -r:$(top_srcdir)/samples/monodoc.xml -r:$(MONODOCDIR)/sources -r:$(top_srcdir)/samples/MonoDoc.nib -r:$(top_srcdir)/samples/mono.png -i:$(top_srcdir)/samples/applemono.icns -n:CocoaDoc -o:$(top_builddir)/samples -a:$(top_builddir)/samples/CocoaDoc.exe
|
||||
cp $(top_builddir)/doc/cocoa-sharp.source $(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
|
||||
cp $(top_builddir)/doc/cocoa-sharp.tree $(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
|
||||
cp $(top_builddir)/doc/cocoa-sharp.zip $(top_builddir)/samples/CocoaDoc.app/Contents/Resources/sources
|
||||
|
|
@ -70,7 +70,7 @@ EXTRA_DIST= \
|
|||
HelloWorld.cs \
|
||||
HelloWorld.nib \
|
||||
CocoaDoc.cs \
|
||||
CocoaDoc.nib \
|
||||
MonoDoc.nib \
|
||||
OpenGLViewSample.cs \
|
||||
OpenGLView.nib \
|
||||
ViewSample.cs \
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ using System.Runtime.CompilerServices;
|
|||
|
||||
[assembly:AssemblyVersion("1.9.0.0")]
|
||||
[assembly:AssemblyDelaySign(false)]
|
||||
[assembly:AssemblyKeyFile("../../cocoa-sharp.snk")]
|
||||
[assembly:AssemblyKeyFile("cocoa-sharp.snk")]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ ASSEMBLY=$(ASSEMBLY_NAME).dll
|
|||
TARGET=$(ASSEMBLY)
|
||||
noinst_DATA=$(ASSEMBLY)
|
||||
|
||||
CLEANFILES=$(ASSEMBLY)
|
||||
pkg=cocoa
|
||||
pkgconfigdir=$(libdir)/pkgconfig
|
||||
pkgconfig_DATA=cocoa-sharp.pc
|
||||
|
||||
sources= \
|
||||
./ActionHandler.cs \
|
||||
|
|
@ -75,9 +77,11 @@ sources= \
|
|||
./View.cs \
|
||||
./Window.cs
|
||||
|
||||
EXTRA_DIST=$(sources)
|
||||
EXTRA_DIST=$(sources) cocoa-sharp.pc.in
|
||||
|
||||
build_sources = $(addprefix $(srcdir)/, $(sources))
|
||||
|
||||
$(ASSEMBLY): $(build_sources)
|
||||
$(ASSEMBLY): $(SNK) $(build_sources)
|
||||
$(MCS) /nowarn:0169 /unsafe /out:$(ASSEMBLY) /target:library $(build_sources)
|
||||
|
||||
include ../../Makefile.include
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
prefix=${pcfiledir}/../..
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
|
||||
Name: Cocoa#
|
||||
Description: Cocoa# - Cocoa .NET Binding
|
||||
Version: @VERSION@
|
||||
Cflags:
|
||||
Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/cocoa-sharp.dll
|
||||
Requires:
|
||||
|
|
@ -3,4 +3,4 @@ using System.Runtime.CompilerServices;
|
|||
|
||||
[assembly:AssemblyVersion("1.9.0.0")]
|
||||
[assembly:AssemblyDelaySign(false)]
|
||||
[assembly:AssemblyKeyFile("../../cocoa-sharp.snk")]
|
||||
[assembly:AssemblyKeyFile("cocoa-sharp.snk")]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ ASSEMBLY=$(ASSEMBLY_NAME).dll
|
|||
TARGET=$(ASSEMBLY)
|
||||
noinst_DATA=$(ASSEMBLY)
|
||||
|
||||
CLEANFILES=$(ASSEMBLY)
|
||||
pkg=webkit
|
||||
pkgconfigdir=$(libdir)/pkgconfig
|
||||
pkgconfig_DATA=webkit-sharp.pc
|
||||
|
||||
sources= \
|
||||
./AssemblyInfo.cs \
|
||||
|
|
@ -13,9 +15,11 @@ sources= \
|
|||
./WebHistoryItem.cs \
|
||||
./WebView.cs
|
||||
|
||||
EXTRA_DIST=$(sources)
|
||||
EXTRA_DIST=$(sources) webkit-sharp.pc.in
|
||||
|
||||
build_sources = $(addprefix $(srcdir)/, $(sources))
|
||||
|
||||
$(ASSEMBLY): $(build_soruces)
|
||||
$(ASSEMBLY): $(SNK) $(build_soruces)
|
||||
$(MCS) /nowarn:0169 /out:$(ASSEMBLY) /r:../Cocoa/cocoa-sharp.dll /target:library $(build_sources)
|
||||
|
||||
include ../../Makefile.include
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
prefix=${pcfiledir}/../..
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
|
||||
Name: WebKit#
|
||||
Description: WebKit# - WebKit .NET Binding
|
||||
Version: @VERSION@
|
||||
Cflags:
|
||||
Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/cocoa-sharp.dll
|
||||
Requires: cocoa-sharp
|
||||
Загрузка…
Ссылка в новой задаче