Permalink
Browse files

[build] lots of general build cleanup

- Configure now computes a release version and an assembly version
- Fixed .pc files to include the list of files that applications
  should bundle (variable=bundlefiles)
- DLL map now maps the windows DLL name to the native target
- Generated a new strong name key for assembly signing since the
  old key signed old versions for the GAC, which we are not doing
  until the API is stable
  • Loading branch information...
1 parent 4ae7126 commit 26f4c2ea71e0e4565de1bb2e3f0bef59c1a12dca @abock committed May 28, 2009
View
7 build/assembly.mk
@@ -16,13 +16,6 @@ $(ASSEMBLY): $(GAPI_FIXED_API) $(SOURCES_BUILD)
$(ASSEMBLY).mdb: $(ASSEMBLY)
-# not GACing until API is stable
-#install-data-local:
-# $(GACUTIL) /i $(ASSEMBLY) /f /package clutter-sharp /gacdir $(DESTDIR)$(prefix)/lib
-#
-#uninstall-local:
-# $(GACUTIL) /u $(ASSEMBLY_NAME) /package clutter-sharp /gacdir $(DESTDIR)$(prefix)/lib
-
EXTRA_DIST += \
$(ASSEMBLY_NAME).pc.in \
$(ASSEMBLY).config.in \
View
7 clutter-gtk/AssemblyInfo.cs.in
@@ -1,7 +1,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly:AssemblyVersion("@VERSION@")]
-[assembly:AssemblyDelaySign(false)]
-[assembly:AssemblyKeyFile("@top_srcdir@/clutter-sharp.snk")]
-
+[assembly:AssemblyVersion ("@ASSEMBLY_VERSION@")]
+[assembly:AssemblyDelaySign (false)]
+[assembly:AssemblyKeyFile ("@top_srcdir@/clutter-sharp.snk")]
View
2 clutter-gtk/clutter-gtk-api.raw
@@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
- <namespace name="Clutter" library="clutter-gtk">
+ <namespace name="Clutter" library="libclutter-gtk-win32-0.9-0.dll">
<enum name="GtkInitError" cname="ClutterGtkInitError" type="enum">
<member cname="CLUTTER_INIT_ERROR_LAST" name="Last" value="Internal" />
<member cname="CLUTTER_INIT_ERROR_GTK" name="Gtk" value="CLUTTER_INIT_ERROR_LAST - 1" />
View
10 clutter-gtk/clutter-gtk-sharp.dll.config.in
@@ -1,7 +1,7 @@
<configuration>
- <dllmap dll="clutter-gtk" target="libclutter-gtk-@CLUTTER_APIVERSION@.so.0" />
-
- <!-- For the GTypeExtensions -->
- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" />
+ <dllmap
+ dll="libclutter-gtk-win32-@CLUTTER_API_VERSION@-0.dll"
+ target="libclutter-gtk-@CLUTTER_API_VERSION@.so.0"
+ />
+ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
</configuration>
-
View
2 clutter-gtk/clutter-gtk-sharp.pc.in
@@ -1,9 +1,9 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
+bundlefiles: ${libdir}/clutter-sharp/clutter-sharp.dll ${libdir}/clutter-sharp/clutter-gtk-sharp.dll.mdb ${libdir}/clutter-sharp/clutter-gtk-sharp.dll.config
Name: clutter-gtk-sharp
Description: clutter-sharp - Clutter-Gtk C#/Mono Bindings
Version: @VERSION@
Libs: -r:${libdir}/clutter-sharp/clutter-gtk-sharp.dll
-
View
2 clutter-gtk/clutter-gtk-sources.xml
@@ -1,6 +1,6 @@
<gapi-parser-input>
<api filename="clutter-gtk-api.raw">
- <library name="clutter-gtk">
+ <library name="libclutter-gtk-win32-0.9-0.dll">
<namespace name="Clutter">
<dir>../../clutter-gtk/clutter-gtk</dir>
</namespace>
View
BIN clutter-sharp.snk
Binary file not shown.
View
7 clutter/AssemblyInfo.cs.in
@@ -1,7 +1,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly:AssemblyVersion("@VERSION@")]
-[assembly:AssemblyDelaySign(false)]
-[assembly:AssemblyKeyFile("@top_srcdir@/clutter-sharp.snk")]
-
+[assembly:AssemblyVersion ("@ASSEMBLY_VERSION@")]
+[assembly:AssemblyDelaySign (false)]
+[assembly:AssemblyKeyFile ("@top_srcdir@/clutter-sharp.snk")]
View
2 clutter/Clutter/clutter-api.raw
@@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
- <namespace name="Clutter" library="clutter">
+ <namespace name="Clutter" library="libclutter-win32-0.9-0.dll">
<enum name="ActorFlags" cname="ClutterActorFlags" gtype="clutter_actor_flags_get_type" type="flags">
<member cname="CLUTTER_ACTOR_MAPPED" name="Mapped" value="1 &lt;&lt; 1" />
<member cname="CLUTTER_ACTOR_REALIZED" name="Realized" value="1 &lt;&lt; 2" />
View
2 clutter/Clutter/clutter-sources.xml
@@ -1,6 +1,6 @@
<gapi-parser-input>
<api filename="clutter-api.raw">
- <library name="clutter">
+ <library name="libclutter-win32-0.9-0.dll">
<namespace name="Clutter">
<dir>../../../clutter/clutter</dir>
</namespace>
View
2 clutter/Cogl/cogl-api.raw
@@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
- <namespace name="Cogl" library="clutter">
+ <namespace name="Cogl" library="libclutter-win32-0.9-0.dll">
<enum name="BufferBit" cname="CoglBufferBit" type="flags">
<member cname="COGL_BUFFER_BIT_COLOR" name="Color" value="1L&lt;&lt;0" />
<member cname="COGL_BUFFER_BIT_DEPTH" name="Depth" value="1L&lt;&lt;1" />
View
2 clutter/Cogl/cogl-sources.xml
@@ -1,6 +1,6 @@
<gapi-parser-input>
<api filename="cogl-api.raw">
- <library name="clutter">
+ <library name="libclutter-win32-0.9-0.dll">
<namespace name="Cogl">
<dir>../../../clutter/clutter/cogl</dir>
</namespace>
View
13 clutter/clutter-sharp.dll.config.in
@@ -1,9 +1,8 @@
<configuration>
- <dllmap dll="clutter" target="libclutter-@CLUTTER_BACKEND@-@CLUTTER_APIVERSION@.so.0" />
- <dllmap dll="glib" target="libglib-2.0.so.0" />
- <dllmap dll="gdk-x11" target="libgdk-x11-2.0.so.0"/>
-
- <!-- For the GTypeExtensions -->
- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" />
+ <dllmap
+ dll="libclutter-win32-@CLUTTER_API_VERSION@-0.dll"
+ target="libclutter-@CLUTTER_BACKEND@-@CLUTTER_API_VERSION@.so.0"
+ />
+ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
+ <dllmap dll="gdk-x11" target="libgdk-x11-2.0.so.0"/>
</configuration>
-
View
1 clutter/clutter-sharp.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
+bundlefiles=${libdir}/clutter-sharp/clutter-sharp.dll ${libdir}/clutter-sharp/clutter-sharp.dll.mdb ${libdir}/clutter-sharp/clutter-sharp.dll.config ${libdir}/clutter-sharp/glib-sharp.dll ${libdir}/clutter-sharp/glib-sharp.dll.config
Name: clutter-sharp
Description: clutter-sharp - clutter C#/Mono Bindings
View
73 configure.ac
@@ -1,11 +1,34 @@
AC_PREREQ(2.52)
-m4_define(clutter_sharp_version_major, 0)
-m4_define(clutter_sharp_version_minor, 9)
-m4_define(clutter_sharp_version_micro, 0)
+dnl major.minor follows Clutter API version
+m4_define([clutter_sharp_version_major], [0])
+m4_define([clutter_sharp_version_minor], [9])
-AC_INIT([clutter-sharp],
- [clutter_sharp_version_major.clutter_sharp_version_minor.clutter_sharp_version_micro])
+dnl micro is specific to clutter-sharp
+m4_define([clutter_sharp_version_micro], [0])
+
+dnl set to 0 when doing a stable/supported release
+m4_define([clutter_sharp_version_pre_release], [alpha1])
+
+m4_define([concat], $1$2$3$4)
+
+dnl create base version string
+m4_define([clutter_sharp_version], concat(
+ clutter_sharp_version_major.,
+ clutter_sharp_version_minor.,
+ clutter_sharp_version_micro))
+
+dnl create the assembly version
+m4_define([clutter_sharp_assembly_version], concat(
+ clutter_sharp_version, [.0]))
+
+dnl create the release version
+m4_define([clutter_sharp_version],
+ m4_if(clutter_sharp_version_pre_release, [0],
+ clutter_sharp_version,
+ concat(clutter_sharp_version, clutter_sharp_version_pre_release)))
+
+AC_INIT([clutter-sharp], clutter_sharp_version)
AC_CONFIG_SRCDIR([README])
AC_CANONICAL_SYSTEM
@@ -18,6 +41,9 @@ PKG_PROG_PKG_CONFIG
DISTCHECK_CONFIGURE_FLAGS="--disable-docs"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+ASSEMBLY_VERSION=clutter_sharp_assembly_version
+AC_SUBST(ASSEMBLY_VERSION)
+
dnl check for Mono
dnl 2.4 is required for non-signal VMs that we
dnl get with the in-tree GAPI and GType extensions
@@ -32,20 +58,12 @@ AC_PATH_PROG(MCS, gmcs, no)
if test "x$MCS" = "xno"; then
AC_MSG_ERROR([Cannot find the "gmcs" compiler in your PATH])
fi
-CSC=$MCS
-AC_SUBST(CSC)
-
-dnl not GACing until stable API
-#AC_PATH_PROG(GACUTIL, gacutil, no)
-#if test "x$GACUTIL" = "xno"; then
-# AC_MSG_ERROR([Cannot find the "gacutil" program in your PATH])
-#fi
dnl check for GAPI
dnl GAPI from gtk-sharp trunk is now required,
dnl so we are bundling it. Necessary for generating
dnl VM support for non-signal methods
-#PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.1)
+#PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.9)
#AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no)
#AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
#AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
@@ -57,18 +75,18 @@ AC_SUBST(GAPI_PARSER)
AC_SUBST(GAPI_CODEGEN)
dnl check for Gtk#
-PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 > 2.12)
+PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= 2.12.1)
AC_SUBST(GTKSHARP_LIBS)
dnl check for clutter
-PKG_CHECK_MODULES(CLUTTER, clutter-0.9 >= 0.9.0)
-PKG_CHECK_MODULES(CLUTTER_GTK, clutter-gtk-0.9 >= 0.9.0, enable_gtk=yes, enable_gtk=no)
+PKG_CHECK_MODULES(CLUTTER, clutter-0.9 >= 0.9.3)
+PKG_CHECK_MODULES(CLUTTER_GTK, clutter-gtk-0.9 >= 0.9.1, enable_gtk=yes, enable_gtk=no)
AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes")
-CLUTTER_APIVERSION=$(pkg-config --variable apiversion clutter-0.9)
+CLUTTER_API_VERSION=$(pkg-config --variable apiversion clutter-0.9)
CLUTTER_BACKEND=$(pkg-config --variable backend clutter-0.9)
-AC_SUBST(CLUTTER_APIVERSION)
+AC_SUBST(CLUTTER_API_VERSION)
AC_SUBST(CLUTTER_BACKEND)
dnl check for monodoc
@@ -96,24 +114,31 @@ fi
AC_OUTPUT([
Makefile
+
build/Makefile
+
docs/Makefile
docs/clutter-sharp/Makefile
docs/clutter-gtk-sharp/Makefile
+
gapi/Makefile
gapi/parser/Makefile
gapi/generator/Makefile
+
glib/Makefile
- clutter/clutter-sharp.pc
+
clutter/Makefile
- clutter/Clutter/Makefile
- clutter/Cogl/Makefile
clutter/AssemblyInfo.cs
+ clutter/clutter-sharp.pc
clutter/clutter-sharp.dll.config
- clutter-gtk/clutter-gtk-sharp.pc
+ clutter/Clutter/Makefile
+ clutter/Cogl/Makefile
+
clutter-gtk/Makefile
- clutter-gtk/AssemblyInfo.cs
+ clutter-gtk/clutter-gtk-sharp.pc
clutter-gtk/clutter-gtk-sharp.dll.config
+ clutter-gtk/AssemblyInfo.cs
+
examples/Makefile
])
View
13 examples/Makefile.am
@@ -10,7 +10,7 @@ SAMPLES = \
test-scroll-actor.cs \
test-threads.cs
-ASSEMBLIES = clutter-sharp.dll glib-sharp.dll pango-sharp.dll
+ASSEMBLIES = clutter-sharp.dll glib-sharp.dll
if ENABLE_GTK
SAMPLES += \
@@ -28,16 +28,13 @@ noinst_SCRIPTS = $(SAMPLES:.cs=.exe)
$(MCS) $(MCSFLAGS) -out:$@ $<
clutter-sharp.dll: $(top_builddir)/clutter/clutter-sharp.dll
- cp $(top_builddir)/clutter/clutter-sharp.dll* .
+ cp $(top_builddir)/clutter/clutter-sharp.dll{,.config,.mdb} .
clutter-gtk-sharp.dll: $(top_builddir)/clutter-gtk/clutter-gtk-sharp.dll
- cp $(top_builddir)/clutter-gtk/clutter-gtk-sharp.dll* .
+ cp $(top_builddir)/clutter-gtk/clutter-gtk-sharp.dll{,.config,.mdb} .
glib-sharp.dll: $(top_builddir)/glib/glib-sharp.dll
- cp $(top_builddir)/glib/glib-sharp.dll* .
-
-pango-sharp.dll: $(top_builddir)/glib/pango-sharp.dll
- cp $(top_builddir)/glib/pango-sharp.dll* .
+ cp $(top_builddir)/glib/glib-sharp.dll{,.config} .
EXTRA_DIST = $(wildcard *.cs)
-CLEANFILES = *.exe *.mdb *.pdb *.dll
+CLEANFILES = *.exe *.mdb *.dll *.config
View
110 gapi/generator/Makefile.am
@@ -3,68 +3,66 @@ noinst_SCRIPTS = gapi_codegen.exe
CLEANFILES = gapi_codegen.exe
MAINTAINERCLEANFILES = Makefile.in
-references =
-
-sources = \
- AliasGen.cs \
- BoxedGen.cs \
- ByRefGen.cs \
- CallbackGen.cs \
- ChildProperty.cs \
- ClassBase.cs \
- ClassField.cs \
- ClassGen.cs \
- CodeGenerator.cs \
- ConstFilenameGen.cs \
- ConstStringGen.cs \
- Ctor.cs \
- DefaultSignalHandler.cs \
- EnumGen.cs \
- FieldBase.cs \
- GenBase.cs \
- GenerationInfo.cs \
- GObjectVM.cs \
- HandleBase.cs \
- IAccessor.cs \
- IGeneratable.cs \
- IManualMarshaler.cs \
- InterfaceGen.cs \
- InterfaceVM.cs \
- LPGen.cs \
- LPUGen.cs \
- ManagedCallString.cs \
- ManualGen.cs \
- MarshalGen.cs \
- MethodBase.cs \
- MethodBody.cs \
- Method.cs \
- ObjectField.cs \
- ObjectBase.cs \
- ObjectGen.cs \
- OpaqueGen.cs \
- Parameters.cs \
- Parser.cs \
- Property.cs \
- PropertyBase.cs \
- ReturnValue.cs \
- Signal.cs \
- Signature.cs \
- SimpleBase.cs \
- SimpleGen.cs \
- Statistics.cs \
- StructBase.cs \
- StructField.cs \
- StructGen.cs \
- SymbolTable.cs \
- VirtualMethod.cs \
+sources = \
+ AliasGen.cs \
+ BoxedGen.cs \
+ ByRefGen.cs \
+ CallbackGen.cs \
+ ChildProperty.cs \
+ ClassBase.cs \
+ ClassField.cs \
+ ClassGen.cs \
+ CodeGenerator.cs \
+ ConstFilenameGen.cs \
+ ConstStringGen.cs \
+ Ctor.cs \
+ DefaultSignalHandler.cs \
+ EnumGen.cs \
+ FieldBase.cs \
+ GenBase.cs \
+ GenerationInfo.cs \
+ GObjectVM.cs \
+ HandleBase.cs \
+ IAccessor.cs \
+ IGeneratable.cs \
+ IManualMarshaler.cs \
+ InterfaceGen.cs \
+ InterfaceVM.cs \
+ LPGen.cs \
+ LPUGen.cs \
+ ManagedCallString.cs \
+ ManualGen.cs \
+ MarshalGen.cs \
+ MethodBase.cs \
+ MethodBody.cs \
+ Method.cs \
+ ObjectField.cs \
+ ObjectBase.cs \
+ ObjectGen.cs \
+ OpaqueGen.cs \
+ Parameters.cs \
+ Parser.cs \
+ Property.cs \
+ PropertyBase.cs \
+ ReturnValue.cs \
+ Signal.cs \
+ Signature.cs \
+ SimpleBase.cs \
+ SimpleGen.cs \
+ Statistics.cs \
+ StructBase.cs \
+ StructField.cs \
+ StructGen.cs \
+ SymbolTable.cs \
+ VirtualMethod.cs \
VMSignature.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
dist_sources = $(sources)
-EXTRA_DIST = \
+EXTRA_DIST = \
$(dist_sources)
gapi_codegen.exe: $(build_sources)
- $(CSC) /out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)
+ $(MCS) -out:gapi_codegen.exe $(build_sources)
View
14 gapi/parser/Makefile.am
@@ -1,19 +1,19 @@
noinst_SCRIPTS = gapi-fixup.exe gapi-parser.exe
-sources = \
- gapi-fixup.cs \
+sources = \
+ gapi-fixup.cs \
gapi-parser.cs
-EXTRA_DIST = \
- $(sources) \
- gapi_pp.pl \
+EXTRA_DIST = \
+ $(sources) \
+ gapi_pp.pl \
gapi2xml.pl
gapi-fixup.exe: $(srcdir)/gapi-fixup.cs
- $(CSC) /out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
+ $(MCS) -out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
gapi-parser.exe: $(srcdir)/gapi-parser.cs
- $(CSC) /out:gapi-parser.exe $(srcdir)/gapi-parser.cs
+ $(MCS) -out:gapi-parser.exe $(srcdir)/gapi-parser.cs
CLEANFILES = gapi-fixup.exe gapi-parser.exe
MAINTAINERCLEANFILES = Makefile.in

0 comments on commit 26f4c2e

Please sign in to comment.