Author: cjcollier
Date: 2005-12-21 18:51:58 -0500 (Wed, 21 Dec 2005)
New Revision: 54711
Removed:
trunk/gtkglarea-sharp/examples/bin/
Modified:
trunk/gtkglarea-sharp/configure.ac
trunk/gtkglarea-sharp/examples/Makefile.am
trunk/gtkglarea-sharp/gtkglarea/Makefile.am
trunk/gtkglarea-sharp/sources/Makefile.am
trunk/gtkglarea-sharp/sources/gtkglarea-sharp.sources.xml
Log:
- cleaned up sources/Makefile.am so that make api will actually make the api
- added a TODO to sources/gtkglarea-sharp.sources.xml that will help get the
wrapper working on Win32
- more renaming of gtkgl to gtkglarea
- bumped release version to 0.0.3
- removed un-used examples/bin directory
Modified: trunk/gtkglarea-sharp/configure.ac
===================================================================
--- trunk/gtkglarea-sharp/configure.ac 2005-12-21 23:39:00 UTC (rev 54710)
+++ trunk/gtkglarea-sharp/configure.ac 2005-12-21 23:51:58 UTC (rev 54711)
@@ -1,8 +1,12 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gtkglarea-sharp, 0.0.2)
+
+## Bump this for every release
+AM_INIT_AUTOMAKE(gtkglarea-sharp, 0.0.3)
+
AM_MAINTAINER_MODE
+## Don't bump this unless the API changes.
API_VERSION=0.0.2.0
AC_SUBST(API_VERSION)
Modified: trunk/gtkglarea-sharp/examples/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/Makefile.am 2005-12-21 23:39:00 UTC (rev
54710)
+++ trunk/gtkglarea-sharp/examples/Makefile.am 2005-12-21 23:51:58 UTC (rev
54711)
@@ -1,9 +1,13 @@
SUBDIRS = NeHe
EXTRA_DIST = shapes.cs Teapot.cs Trackball.cs
-CLEANFILES = shapes.exe
+CLEANFILES = \
+ shapes.exe \
+ rotatebuttons.exe
-all: shapes.exe
+all: \
+ shapes.exe \
+ rotatebuttons.exe
shapes.exe: $(srcdir)/shapes.cs $(srcdir)/Teapot.cs $(srcdir)/Trackball.cs
$(MCS) \
@@ -13,3 +17,12 @@
-lib:$(GTKSHARP_PREFIX)/lib \
-pkg:gtk-sharp-2.0 \
-out:shapes.exe $(srcdir)/shapes.cs $(srcdir)/Teapot.cs
$(srcdir)/Trackball.cs
+
+rotatebuttons.exe: $(srcdir)/rotatebuttons.cs $(srcdir)/Teapot.cs
$(srcdir)/Trackball.cs
+ $(MCS) \
+ -lib:@top_builddir@/gtkglarea \
+ -r:gtkglarea-sharp.dll \
+ -pkg:tao-opengl-glu \
+ -lib:$(GTKSHARP_PREFIX)/lib \
+ -pkg:gtk-sharp-2.0 \
+ -out:rotatebuttons.exe $(srcdir)/rotatebuttons.cs $(srcdir)/Teapot.cs
$(srcdir)/Trackball.cs
Modified: trunk/gtkglarea-sharp/gtkglarea/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/gtkglarea/Makefile.am 2005-12-21 23:39:00 UTC (rev
54710)
+++ trunk/gtkglarea-sharp/gtkglarea/Makefile.am 2005-12-21 23:51:58 UTC (rev
54711)
@@ -1,7 +1,7 @@
MCS=mcs
RAW_API=gtkgl-api.raw
API=gtkgl-api.xml
-METADATA=gtkgl.metadata
+METADATA=gtkglarea-sharp.metadata
ASSEMBLY_NAME= gtkglarea-sharp
ASSEMBLY= $(ASSEMBLY_NAME).dll
Modified: trunk/gtkglarea-sharp/sources/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/sources/Makefile.am 2005-12-21 23:39:00 UTC (rev
54710)
+++ trunk/gtkglarea-sharp/sources/Makefile.am 2005-12-21 23:51:58 UTC (rev
54711)
@@ -1,11 +1,44 @@
+METADATA=$(top_builddir)/gtkglarea/gtkglarea-sharp.metadata
+RAW_API=$(top_builddir)/gtkglarea/gtkglarea-api.raw
+API=$(top_builddir)/gtkglarea/gtkglarea-api.xml
+
+SOURCES = gtkglarea-sharp.sources.xml
+
+SOURCEURL = ftp://ftp.gnome.org/pub/GNOME/sources/gtkglarea/1.99
+TARBALL = gtkglarea-1.99.0.tar.bz2
+
all:
echo "only needed by maintainer"
-get-source-code:
- wget
ftp://ftp.gnome.org/pub/GNOME/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
--output-document=- | tar -xj
+source.stamp:
+ ( test -f $(TARBALL) || \
+ wget $(SOURCEURL)/$(TARBALL) \
+ ) && \
+ tar xfvj $(TARBALL) && \
+ touch source.stamp
-api:
- PERLLIB=$(GTKSHARP_PREFIX)/share/perl5 \
+api-raw.stamp: source.stamp
PATH=$(GTKSHARP_PREFIX)/bin:$$PATH \
- gapi2-parser gtkglarea-sharp.sources.xml
+ gapi2-parser gtkglarea-sharp.sources.xml && \
+ touch api-raw.stamp
+pre-api.stamp: api-raw.stamp
+ cp $(RAW_API) $(API) && \
+ PATH=$(GTKSHARP_PREFIX)/bin:$$PATH \
+ gapi2-fixup --metadata=$(METADATA) --api=$(API) && \
+ touch pre-api.stamp
+
+api: pre-api.stamp
+ touch api.stamp
+
+CLEANFILES = \
+ api.stamp \
+ pre-api.stamp \
+ api-raw.stamp \
+ source.stamp \
+ $(RAW_API)
+
+
+DISTCLEANFILES = \
+ $(CLEANFILES)
+
Modified: trunk/gtkglarea-sharp/sources/gtkglarea-sharp.sources.xml
===================================================================
--- trunk/gtkglarea-sharp/sources/gtkglarea-sharp.sources.xml 2005-12-21
23:39:00 UTC (rev 54710)
+++ trunk/gtkglarea-sharp/sources/gtkglarea-sharp.sources.xml 2005-12-21
23:51:58 UTC (rev 54711)
@@ -1,7 +1,11 @@
<gapi-parser-input>
- <api filename="../gtkglarea/gtkgl-api.raw">
- <library name="libgtkgl-win32-2.0-0.dll">
+ <api filename="../gtkglarea/gtkglarea-api.raw">
+ <!--
+ TODO:
+ Find out what gtkglarea compiles to on windows and use that dll name
+ -->
+ <library name="libgtkglarea-win32-2.0-0.dll">
<namespace name="GtkGL">
<dir>gtkglarea-1.99.0/gtkgl</dir>
</namespace>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
