ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2009-07-23 Christian Hoff <christian_hoff@gmx.net>

Browse source 
* configure.in.in, Makefile.include: Bump up GAPI version to 3.0.
	* bootstrap-2.14: Renamed to bootstrap-for-the-insane, added message
	of doom.	[Fixes #521449]

svn path=/trunk/gtk-sharp/; revision=138572
This commit is contained in:
Christian Hoff 2009-07-23 17:18:03 +00:00
parent d515eea592
commit a4331a40ed
11 changed files with 70 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2009-07-23 Christian Hoff <christian_hoff@gmx.net>
* configure.in.in, Makefile.include: Bump up GAPI version to 3.0.
* bootstrap-2.14: Renamed to bootstrap-for-the-insane, added message
of doom. [Fixes #521449]
2009-07-21 Christian Hoff <christian_hoff@gmx.net>
* glib/GInterfaceAdapter.cs: Fix a leak related to GCHandles not being freed.

2
Makefile.include
View file

@ -8,7 +8,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll
TARGET = $(pkg:=-sharp.dll) $(pkg:=-sharp.dll.config) $(POLICY_ASSEMBLIES)
noinst_DATA = $(TARGET)
TARGET_API = $(pkg:=-api.xml)
gapidir = $(datadir)/gapi-2.0
gapidir = $(datadir)/gapi-3.0
gapi_DATA = $(TARGET_API)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) AssemblyInfo.cs $(POLICY_CONFIGS)
DISTCLEANFILES = $(ASSEMBLY).config

14
bootstrap-2.14
View file

@ -1,14 +0,0 @@
#!/bin/sh
# Run this to set configure.in up for an API version.
GTK_SHARP_VERSION=2.13.90
ASSEMBLY_VERSION=2.14.0.0
POLICY_VERSIONS="2.4 2.6 2.8 2.10 2.12"
GTK_REQUIRED_VERSION=2.14.3
GLIB_REQUIRED_VERSION=2.18.1
MONO_REQUIRED_VERSION=2.2
VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12 -define:GTK_SHARP_2_14"
VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12 -DGTK_SHARP_2_14"
GTK_API_TAG=2.14
. ./bootstrap-generic "$@"

48
bootstrap-for-the-insane Executable file
View file

@ -0,0 +1,48 @@
#!/bin/sh
# Run this to set configure.in up for an API version.
GTK_SHARP_VERSION=2.13.90
ASSEMBLY_VERSION=2.14.0.0
POLICY_VERSIONS="2.4 2.6 2.8 2.10 2.12"
GTK_REQUIRED_VERSION=2.14.3
GLIB_REQUIRED_VERSION=2.18.1
MONO_REQUIRED_VERSION=2.2
VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12 -define:GTK_SHARP_2_14"
VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12 -DGTK_SHARP_2_14"
GTK_API_TAG=2.14
. ./bootstrap-generic "$@"
echo ""
echo " uuuuuuu"
echo " uu\$\$\$\$\$\$\$\$\$\$\$uu"
echo " uu\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$uu"
echo " u\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$u"
echo " u\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$u"
echo " u\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$u"
echo " u\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$u"
echo " u\$\$\$\$\$\$\" \"\$\$\$\" \"\$\$\$\$\$\$u"
echo " \"\$\$\$\$\" u\$u \$\$\$\$\""
echo " \$\$\$u u\$u u\$\$\$"
echo " \$\$\$u u\$\$\$u u\$\$\$"
echo " \"\$\$\$\$uu\$\$\$ \$\$\$uu\$\$\$\$\""
echo " \"\$\$\$\$\$\$\$\" \"\$\$\$\$\$\$\$\""
echo " u\$\$\$\$\$\$\$u\$\$\$\$\$\$\$u"
echo " u\$\"\$\"\$\"\$\"\$\"\$\"\$u"
echo " uuu \$\$u\$ \$ \$ \$ \$u\$\$ uuu"
echo " u\$\$\$\$ \$\$\$\$\$u\$u\$u\$\$\$ u\$\$\$\$"
echo " \$\$\$\$\$uu \"\$\$\$\$\$\$\$\$\$\" uu\$\$\$\$\$\$ "
echo " u\$\$\$\$\$\$\$\$\$\$\$uu \"\"\"\"\" uuuu\$\$\$\$\$\$\$\$\$\$"
echo " \$\$\$\$\"\"\"\$\$\$\$\$\$\$\$\$\$uuu uu\$\$\$\$\$\$\$\$\$\"\"\"\$\$\$\""
echo " \"\"\" \"\"\$\$\$\$\$\$\$\$\$\$\$uu \"\"\$\"\"\""
echo " uuuu \"\"\$\$\$\$\$\$\$\$\$\$uuu\""
echo " u\$\$\$uuu\$\$\$\$\$\$\$\$\$uu \"\"\$\$\$\$\$\$\$\$\$\$\$uuu\$\$\$"
echo " \$\$\$\$\$\$\$\$\$\$\"\"\"\" \"\"\$\$\$\$\$\$\$\$\$\$\$\""
echo " \"\$\$\$\$\$\" \"\"\$\$\$\$\"\""
echo " \$\$\$\" \$\$\$\$\""
echo ""
echo "*** WARNING *** ***WARNING ***"
echo "This bootstrap is UNSUPPORTED and may be UNSTABLE"
echo "with NO SCHEDULED RELEASE DATE!"
echo "Unless you're completly insane, you should use the Gtk# 2.12 branch"
echo "(do not blame Novell if it busts your machine)"

8
configure.in.in
View file

@ -225,11 +225,11 @@ gtk-sharp-2.0-lib.wxs
gtk-sharp-2.0-dev.wxs
sources/Makefile
parser/Makefile
parser/gapi-2.0.pc
parser/gapi2-fixup
parser/gapi2-parser
parser/gapi-3.0.pc
parser/gapi3-fixup
parser/gapi3-parser
generator/Makefile
generator/gapi2-codegen
generator/gapi3-codegen
glib/Makefile
glib/glib-sharp-2.0.pc
glib/glib-sharp.dll.config

6
generator/Makefile.am
View file

@ -1,8 +1,8 @@
assemblydir = $(prefix)/lib/gtk-sharp-2.0
assemblydir = $(prefix)/lib/gapi-3.0
assembly_DATA = gapi_codegen.exe
bin_SCRIPTS = gapi2-codegen
bin_SCRIPTS = gapi3-codegen
CLEANFILES = gapi_codegen.exe
DISTCLEANFILES = gapi2-codegen
DISTCLEANFILES = gapi3-codegen
references =

2
generator/gapi2-codegen.in
View file

@ -1,2 +0,0 @@
#!/bin/sh
@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi_codegen.exe "$@"

16
parser/Makefile.am
View file

@ -1,11 +1,11 @@
assemblydir = $(prefix)/lib/gtk-sharp-2.0
assemblydir = $(prefix)/lib/gapi-3.0
pkgconfigdir = $(libdir)/pkgconfig
assembly_DATA = gapi-fixup.exe gapi-parser.exe
pkgconfig_DATA = gapi-2.0.pc
bin_SCRIPTS = gapi2-fixup gapi2-parser
pkgconfig_DATA = gapi-3.0.pc
bin_SCRIPTS = gapi3-fixup gapi3-parser
assembly_SCRIPTS = gapi_pp.pl gapi2xml.pl
CLEANFILES = gapi-fixup.exe gapi-parser.exe
DISTCLEANFILES = gapi2-fixup gapi2-parser gapi-2.0.pc
DISTCLEANFILES = gapi3-fixup gapi3-parser gapi-3.0.pc
sources = \
gapi-fixup.cs \
@ -13,14 +13,14 @@ sources = \
EXTRA_DIST = \
$(sources) \
gapi2-parser.in \
gapi3-parser.in \
gapi_pp.pl \
gapi2xml.pl \
gapi-2.0.pc.in
gapi-3.0.pc.in
gapi-fixup.exe: $(srcdir)/gapi-fixup.cs
gapi3-fixup.exe: $(srcdir)/gapi-fixup.cs
$(CSC) /out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
gapi-parser.exe: $(srcdir)/gapi-parser.cs
gapi3-parser.exe: $(srcdir)/gapi-parser.cs
$(CSC) /out:gapi-parser.exe $(srcdir)/gapi-parser.cs

0
parser/gapi-2.0.pc.in → parser/gapi-3.0.pc.in
View file

2
parser/gapi2-fixup.in
View file

@ -1,2 +0,0 @@
#!/bin/sh
@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-fixup.exe "$@"

3
parser/gapi2-parser.in
View file

@ -1,3 +0,0 @@
#!/bin/sh
export PATH=@prefix@/lib/gtk-sharp-2.0:$PATH
@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-parser.exe "$@"