* configure.in: Moved glue makefile

Added diacanvas-sharp.pc
          Added diacanvas-sharp-sample
          Added AssemblyInfo.cs
          Check for GAC
          Check for Mono or .NET
        * diacanvas-sharp.pc.in: Added
        * makefile.am: Removed glue dir
        * NEWS: Updated
        * dia/AssemblyInfo.cs.in: Added
        * dia/diacanvas-api.raw: Added
        * dia/diacanvas-api.xml: Removed
        * dia/makefile.am: Use the build method Gtk# uses
          Added glue dir
        * dia/.cvsignore: Ignore diacanvas-api.xml
        * dia/diacanvas-sharp.snk: Added
        * dia/glue/dia-canvas-item.c: Added
        * dia/glue/dia-canvas.c: Added
        * dia/glue/dia-canvas-line.c: Added
        * dia/glue/dia-canvas-line.c.new: Added
        * dia/glue/dia-canvas-view.c: Added
        * dia/glue/dia-event.c: Added
        * dia/glue/makefile.am: Added
        * glue: Removed, moved into dia
        * sample/makefile.am: Install sample
        * sample/diacanvas-sharp-sample.in: Runscript added
        * sample/.cvsignore: Added Runscript
        * sources/diacanvas-sharp-sources.xml: Target DiaCanvas-0.13.0
          Output to .raw instead of .xml
        * sources/makefile: Target DiaCanvas-0.13.0

svn path=/trunk/diacanvas-sharp/; revision=31140

.cvsignore

@@ -5,6 +5,7 @@ config.log
 config.status
 config.sub
 configure
+diacanvas-sharp.pc
 libtool
 ltmain.sh
 makefile

ChangeLog

@@ -1,3 +1,37 @@
+2004-07-14  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* configure.in: Moved glue makefile
+	  Added diacanvas-sharp.pc
+	  Added diacanvas-sharp-sample
+	  Added AssemblyInfo.cs
+	  Check for GAC
+	  Check for Mono or .NET
+	* diacanvas-sharp.pc.in: Added
+	* makefile.am: Removed glue dir
+	* NEWS: Updated
+	* dia/AssemblyInfo.cs.in: Added
+	* dia/diacanvas-api.raw: Added
+	* dia/diacanvas-api.xml: Removed
+	* dia/makefile.am: Use the build method Gtk# uses
+	  Added glue dir
+	* dia/.cvsignore: Ignore diacanvas-api.xml
+	* dia/diacanvas-sharp.snk: Added
+	* dia/glue/dia-canvas-item.c: Added
+	* dia/glue/dia-canvas.c: Added
+	* dia/glue/dia-canvas-line.c: Added
+	* dia/glue/dia-canvas-line.c.new: Added
+	* dia/glue/dia-canvas-view.c: Added
+	* dia/glue/dia-event.c: Added
+	* dia/glue/makefile.am: Added
+	* glue: Removed, moved into dia
+	* sample/makefile.am: Install sample
+	* sample/diacanvas-sharp-sample.in: Runscript added
+	* sample/.cvsignore: Added Runscript
+	* sources/diacanvas-sharp-sources.xml: Target DiaCanvas-0.13.0
+	  Output to .raw instead of .xml
+	* sources/makefile: Target DiaCanvas-0.13.0
+
+
 2004-07-10  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* dia/Dia.metadata: replaced disabledefaultconstructor 

NEWS

@@ -2,8 +2,15 @@
 =====
 
 * Bugfixes
-* API updated
-* Targets DiaCanvas2-0.12.0
+* Updated API
+* Targets DiaCanvas2-0.13.0
+* Targets Mono-1.0
+* Targets Gtk#-1.0
+* pkgconfig .pc file
+* Build system inline with Gtk#
+* Sample program
+* Assembly signed with a StrongName
+* cross-platform compilation
 
 0.3.0
 =====

configure.in

@@ -4,6 +4,9 @@ AM_INIT_AUTOMAKE(diacanvas-sharp, 0.4.0)
 AM_MAINTAINER_MODE
 AM_PROG_LIBTOOL
 
+API_VERSION=0.4.0.0
+AC_SUBST(API_VERSION)
+
 dnl Defines CC to avoid warnings
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -13,15 +16,71 @@ if test "x$PKG_CONFIG" = "xno"; then
 	AC_MSG_ERROR(['pkg-config' is not in your PATH.])
 fi
 
-AC_PATH_PROG(MONO, mono, no)
-if test "x$PKG_CONFIG" = "xno"; then
-	AC_MSG_ERROR(['mono' is not in your PATH.])
-fi
-AC_SUBST(MONO)
+dnl for use on the build system
+BUILD_GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+BUILD_GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
+AC_SUBST(BUILD_GTK_CFLAGS)
+AC_SUBST(BUILD_GTK_LIBS)
 
-PKG_CHECK_MODULES(MONO, mono >= 1.0)
-AC_SUBST(MONO_CFLAGS)
-AC_SUBST(MONO_LIBS)
+PKG_PATH=
+AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir],
+        if test x$with_crosspkgdir = "x"; then
+                if test -s $PKG_CONFIG_PATH; then
+                        PKG_PATH=$PKG_CONFIG_PATH
+                fi
+        else
+                PKG_PATH=$with_crosspkgdir
+                PKG_CONFIG_PATH=$PKG_PATH
+                export PKG_CONFIG_PATH
+        fi
+)
+
+MONO_REQUIRED_VERSION=1.0
+PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+
+if test "x$has_mono" = "xtrue"; then
+GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir)'
+GENERATED_SOURCES=generated/*.cs
+AC_PATH_PROG(RUNTIME, mono, no)
+AC_PATH_PROG(CSC, mcs, no)
+if test `uname -s` = "Darwin"; then
+        LIB_PREFIX=
+        LIB_SUFFIX=.dylib
+else
+        LIB_PREFIX=.so
+        LIB_SUFFIX=
+fi
+else
+AC_PATH_PROG(CSC, csc.exe, no)
+GACUTIL_FLAGS=
+GENERATED_SOURCES=generated\\\\*.cs
+
+if test x$CSC = "xno"; then
+        AC_MSG_ERROR([You need to install either mono or .Net])
+else
+RUNTIME=
+LIB_PREFIX=
+LIB_SUFFIX=.dylib
+fi
+fi
+
+CS="C#"
+if test "x$CSC" = "xno" ; then
+        AC_MSG_ERROR([No $CS compiler found])
+fi
+
+AC_PATH_PROG(GACUTIL, gacutil, no)
+if test "x$GACUTIL" = "xno" ; then
+        AC_MSG_ERROR([No gacutil tool found])
+fi
+
+AC_SUBST(RUNTIME)
+AC_SUBST(CSC)
+AC_SUBST(GACUTIL)
+AC_SUBST(GACUTIL_FLAGS)
+AC_SUBST(LIB_PREFIX)
+AC_SUBST(LIB_SUFFIX)
+AC_SUBST(GENERATED_SOURCES)
 
 PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp >= 1.0)
 AC_SUBST(GTK_SHARP_CFLAGS)
@@ -31,18 +90,6 @@ PKG_CHECK_MODULES(DIACANVAS2, diacanvas2 >= 0.13.0)
 AC_SUBST(DIACANVAS2_CFLAGS)
 AC_SUBST(DIACANVAS2_LIBS)
 
-AC_PATH_PROG(MCS, mcs, no)
-if test "x$MCS" = "xno"; then
-	AC_MSG_CHECKING(for mcs.exe)
-	MCS=`which mcs.exe 2> /dev/null`
-	if test "x$MCS" = "xno" ; then
-		AC_MSG_ERROR(['mcs'/'mcs.exe' not found.])
-	fi
-	AC_MSG_RESULT($MCS)
-	MCS="$MONO $MCS"
-fi
-AC_SUBST(MCS)
-
 AC_PATH_PROG(GAPI_FIXUP, gapi-fixup, no)
 if test "x$GAPI_FIXUP" = "xno"; then
 	AC_MSG_CHECKING(for gapi-fixup.exe)
@@ -79,12 +126,23 @@ AC_SUBST(MONODOC_SOURCESDIR)
 
 AC_OUTPUT([
 makefile
+diacanvas-sharp.pc
+dia/AssemblyInfo.cs
 dia/makefile
+dia/glue/makefile
 doc/makefile
 doc/en/makefile
 doc/en/Dia/makefile
-glue/makefile
+sample/diacanvas-sharp-sample
 sample/makefile
 sample/pixmaps/makefile
 sample/glade/makefile
 ])
+
+echo "---"
+echo "Configuration summary"
+echo ""
+echo "   * Installation prefix = $prefix"
+echo "   * $CS compiler: $CSC"
+echo ""
+echo "---"

dia/.cvsignore

@@ -1,3 +1,4 @@
+diacanvas-api.xml
 diacanvas-sharp.dll
 generated
 generated-stamp

dia/AssemblyInfo.cs.in

@@ -0,0 +1,6 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly:AssemblyVersion("@API_VERSION@")]
+[assembly:AssemblyDelaySign(false)]
+[assembly:AssemblyKeyFile("diacanvas-sharp.snk")]

dia/makefile.am

@@ -1,7 +1,14 @@
-LIBRARY=	diacanvas-sharp.dll
-APIS=		diacanvas-api.xml diacanvas-symbols.xml
+SUBDIRS=	. glue
 
-INCLUDE_APIS=	@prefix@/share/gapi/art-api.xml		\
+API=		diacanvas-api.xml
+RAW_API=	diacanvas-api.raw
+ADDITIONAL_API=	diacanvas-symbols.xml
+METADATA=	Dia.metadata
+ASSEMBLY_NAME=	diacanvas-sharp
+
+references= 	-pkg:gnome-sharp
+
+INCLUDE_API=	@prefix@/share/gapi/art-api.xml		\
 		@prefix@/share/gapi/pango-api.xml	\
 		@prefix@/share/gapi/atk-api.xml		\
 		@prefix@/share/gapi/gnome-api.xml	\
@@ -9,26 +16,63 @@ INCLUDE_APIS=	@prefix@/share/gapi/art-api.xml		\
 		@prefix@/share/gapi/gdk-api.xml		\
 		@prefix@/share/gapi/gdk-symbols.xml
 
-EXTRA_DIST= 	*.cs *.custom *.metadata *.xml
+ASSEMBLY= 	$(ASSEMBLY_NAME).dll
+TARGET= 	$(ASSEMBLY)
 
-diacanvassharpdir = $(libdir)
-diacanvassharp_DATA = $(LIBRARY)
+gapidir= 	$(datadir)/gapi
+noinst_DATA = 	$(ASSEMBLY)
+gapi_DATA= 	$(API) $(ADDITIONAL_API)
+CLEANFILES = 	$(ASSEMBLY) generated-stamp generated/*.cs $(API)
+DISTCLEANFILES= AssemblyInfo.cs
 
-all: $(LIBRARY)
+sources=	DashStyle.cs	\
+		DiaCanvas.cs	\
+		Event.cs	\
+		PlacementTool.cs
 
-generated-stamp: $(APIS) *.custom *.metadata
-	$(GAPI_FIXUP) --api=diacanvas-api.xml --metadata=Dia.metadata && \
-	$(GAPI_CODEGEN) --include $(INCLUDE_APIS) --generate $(APIS) \
-	--outdir=generated --customdir=. --assembly-name=diacanvas-sharp && touch generated-stamp
+build_sources=	$(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
 
-$(LIBRARY): generated-stamp *.cs
-	$(MCS) --unsafe --target library -pkg:gnome-sharp --recurse '*.cs' -o $(LIBRARY)
+customs=	Canvas.custom		\
+		CanvasBox.custom	\
+		CanvasImage.custom	\
+		CanvasItem.custom	\
+		CanvasLine.custom	\
+		CanvasText.custom	\
+		CanvasView.custom	\
+		Point.custom
 
-install:
-	for i in $(APIS); do						\
-		$(INSTALL) -m 644 $$i @prefix@/share/gapi || true;	\
-	done &&								\
-	$(INSTALL) -m 644 $(LIBRARY) $(libdir)
+build_customs = $(addprefix $(srcdir)/, $(customs))
 
-clean:
-	rm -rf $(LIBRARY) generated-stamp generated
+EXTRA_DIST=	AssemblyInfo.cs.in	\
+		$(RAW_API)		\
+		$(ADDITIONAL_API)	\
+		$(METADATA)		\
+		$(customs)		\
+		$(sources)		\
+		diacanvas-sharp.snk
+
+$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
+	cp $(srcdir)/$(RAW_API) $(API)
+	chmod u+w $(API)
+	$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA)
+
+generated-stamp: $(API) $(ADDITIONAL_API) *.custom
+	$(GAPI_CODEGEN) --include $(INCLUDE_API) --generate $(API)	\
+	 $(ADDITIONAL_API) --outdir=generated --customdir=. 		\
+	--assembly-name=diacanvas-sharp && touch generated-stamp
+
+$(ASSEMBLY): generated-stamp *.cs
+	$(CSC) /unsafe /out:$(ASSEMBLY) /target:library			\
+	$(references) $(build_sources) $(GENERATED_SOURCES)
+
+install-data-local:
+	@if test -n '$(TARGET)'; then					\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; 	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;      \
+	fi
+
+uninstall-local:
+	@if test -n '$(TARGET)'; then					\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)";	\
+	$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;	\
+	fi

diacanvas-sharp.pc.in

@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+
+Name: DiaCanvas#
+Description: DiaCanvas# - DiaCanvas .NET Binding
+Version: @VERSION@
+Libs: -r:${libdir}/mono/@PACKAGE@/diacanvas-sharp.dll

makefile.am

@@ -1 +1,8 @@
-SUBDIRS=glue dia sample doc
+SUBDIRS=dia sample doc
+
+pkgconfigdir= 	$(libdir)/pkgconfig
+pkgconfig_DATA= diacanvas-sharp.pc
+
+EXTRA_DIST= 	diacanvas-sharp.pc
+
+DISTCLEANFILES=	diacanvas-sharp.pc

sample/.cvsignore

@@ -1,4 +1,5 @@
-sample.exe
+diacanvas-sharp-sample
 makefile
 makefile.in
-test.svg
+*.exe
+*.svg

sample/diacanvas-sharp-sample.in

@@ -0,0 +1,2 @@
+#!/bin/sh
+@RUNTIME@ @prefix@/bin/diacanvas-sharp-sample.exe "$@"

sample/makefile.am

@@ -10,12 +10,17 @@ RESOURCES=	-resource:glade/gui.glade,gui.glade			\
 		-resource:pixmaps/glade-image.png,glade-image.png 	\
 		-resource:pixmaps/text.png,text.png
 
-SAMPLE=		sample.exe
+SAMPLE=		diacanvas-sharp-sample.exe
+SCRIPT=		diacanvas-sharp-sample
 
 all: $(SAMPLE)
 
 $(SAMPLE): *.cs ../dia/diacanvas-sharp.dll
 	mcs -pkg:gnome-sharp,glade-sharp -r ../dia/diacanvas-sharp $(RESOURCES) *.cs -o $(SAMPLE)
 
+install:
+	$(INSTALL) -m 644 $(SAMPLE) $(bindir)
+	$(INSTALL) -m 755 $(SCRIPT) $(bindir)
+
 clean:
 	rm -f $(SAMPLE)

sources/diacanvas-sharp-sources.xml

@@ -1,8 +1,8 @@
 <gapi-parser-input>
-  <api filename="../dia/diacanvas-api.xml">
+  <api filename="../dia/diacanvas-api.raw">
     <library name="diacanvas2">
       <namespace name="Dia">
-        <dir>diacanvas2-0.12.0/diacanvas</dir>
+        <dir>diacanvas2-0.13.0/diacanvas</dir>
       </namespace>
     </library>
   </api>

sources/makefile

@@ -1,4 +1,4 @@
-PACKAGE=diacanvas2-0.12.0
+PACKAGE=diacanvas2-0.13.0
 
 all:
 	gapi-parser diacanvas-sharp-sources.xml