From 89e7bbdf340345cf32e131f1f9a3434f3c5b6715 Mon Sep 17 00:00:00 2001 From: Thanh Tung Nguyen Date: Sat, 2 Nov 2013 00:00:00 +0000 Subject: [PATCH 01/12] Use the local macro directory correctly --- Makefile.am | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 190f01f..33ebcd2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = sources sources/glue doc pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 355bdff..fd4f7a5 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ ASSEMBLY_PC="webkitgtk-sharp-3.0" ASSEMBLY_SHORTNAME="webkitgtk" ASSEMBLY_TITLE="WebKit#" ASSEMBLY_VERSION="2.0.0" -AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"]) +AC_CONFIG_MACRO_DIR([m4]) AC_SUBST(ASSEMBLY_NAME) AC_SUBST(ASSEMBLY_VERSION) From ff7f2ee40f20fdfbc03286c2575c14786c8d48fb Mon Sep 17 00:00:00 2001 From: Thanh Tung Nguyen Date: Sat, 12 Apr 2014 18:00:02 +0200 Subject: [PATCH 02/12] Use AM_CPPFLAGS for the includes INCLUDES is deprecated, and AM_C(PP)FLAGS is the proper way to specify the compiler and preprocessor options. Signed-off-by: Andrew Shadura --- sources/glue/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/glue/Makefile.am b/sources/glue/Makefile.am index 0e0bc6c..ad8289c 100644 --- a/sources/glue/Makefile.am +++ b/sources/glue/Makefile.am @@ -8,7 +8,7 @@ libwebkitgtksharpglue_1_10_2_la_LDFLAGS = -module -avoid-version -no-undefined libwebkitgtksharpglue_1_10_2_la_LIBADD = $(WEBKIT_LIBS) -INCLUDES = $(WEBKIT_CFLAGS) -I$(top_srcdir) +AM_CPPFLAGS = $(WEBKIT_CFLAGS) -I$(top_srcdir) libwebkitgtksharpglue.dll: $(libwebkitgtksharpglue_1_10_2_la_OBJECTS) libwebkitgtksharpglue.rc libwebkitgtksharpglue.def ./build-dll libwebkitgtksharpglue $(VERSION) From 8fd6ffc0015974fd4cbd475c74b9d8eebb23be2a Mon Sep 17 00:00:00 2001 From: Thanh Tung Nguyen Date: Thu, 1 Jan 2015 14:21:32 +0200 Subject: [PATCH 03/12] Do not remove the DLL map on distclean The DLL map isn't being generated, so it needs to be preserved when distcleaning. Signed-off-by: Andrew Shadura --- sources/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/Makefile.am b/sources/Makefile.am index aca6456..0e7462b 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -15,7 +15,7 @@ build_sources = AssemblyInfo.cs $(sources) CLEANFILES = $(DLL) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP) +DISTCLEANFILES = AssemblyInfo.cs noinst_DATA = $(DLL) From 138c4db3095ee3954c5835d230d71ee63b0d590b Mon Sep 17 00:00:00 2001 From: Thanh Tung Nguyen Date: Sun, 18 Jan 2015 18:15:09 +0100 Subject: [PATCH 04/12] Fix pkgconfig file. Add GAPI XML to the CFLAGS. Signed-off-by: Andrew Shadura --- webkitgtk-sharp-3.0.pc.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkitgtk-sharp-3.0.pc.in b/webkitgtk-sharp-3.0.pc.in index 84e5e2c..163b7a9 100644 --- a/webkitgtk-sharp-3.0.pc.in +++ b/webkitgtk-sharp-3.0.pc.in @@ -2,9 +2,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=@libdir@ pkglibdir=${exec_prefix}/lib/mono/@ASSEMBLY_NAME@ +gapidir=@GAPIXMLDIR@ Name: @ASSEMBLY_TITLE@ Description: @ASSEMBLY_DESCRIPTION@ Version: @VERSION@ Requires: Libs: -r:${pkglibdir}/@ASSEMBLY_NAME@.dll +Cflags: -I:${gapidir}/webkitgtk-sharp-api.xml From 721684758a1ae6494a278b6d0e92708a13d0af82 Mon Sep 17 00:00:00 2001 From: Thanh Tung Nguyen Date: Sat, 17 Jan 2015 12:06:08 +0100 Subject: [PATCH 05/12] Fix the configuration summary for documentation --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fd4f7a5..1e2d1a7 100644 --- a/configure.ac +++ b/configure.ac @@ -164,5 +164,5 @@ echo "---------------------" echo "" echo " * Installation prefix: $prefix" echo " * compiler: $CSC" -echo " * Documentation: ($MONODOC)" +echo " * Documentation: ($enable_monodoc)" echo "" From 587304ee955f0f7b7b4f677ffdbaeeb50a8b1972 Mon Sep 17 00:00:00 2001 From: Thanh Tung Nguyen Date: Sun, 18 Jan 2015 18:18:59 +0100 Subject: [PATCH 06/12] Update the paths to the generated files. Signed-off-by: Andrew Shadura --- sources/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/Makefile.am b/sources/Makefile.am index 0e7462b..b502a6b 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -13,7 +13,7 @@ sources = build_sources = AssemblyInfo.cs $(sources) -CLEANFILES = $(DLL) generated-stamp generated/*.cs $(API) +CLEANFILES = $(DLL) generated-stamp generated/*/*.cs $(API) DISTCLEANFILES = AssemblyInfo.cs @@ -42,7 +42,7 @@ generated-stamp: $(API) $(DLL): $(build_sources) generated-stamp $(CSC) -nowarn:169 -unsafe -target:library $(GTK_SHARP_LIBS) \ - $(build_sources) $(MONOCAIRO_LIBS) $(SOUPSHARP_LIBS) generated/*.cs generated/*/*.cs -out:$(DLL) + $(build_sources) $(MONOCAIRO_LIBS) $(SOUPSHARP_LIBS) generated/*/*.cs -out:$(DLL) install-data-local: echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)"; \ From d4d75478ecef6f9b001ee0c25fbe7f7dcfe05da4 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Mon, 14 Dec 2015 13:06:48 +0100 Subject: [PATCH 07/12] Use mdoc, not the obsolete monodocer. Signed-off-by: Andrew Shadura --- configure.ac | 7 ++++--- doc/Makefile.am | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 1e2d1a7..0cb8658 100644 --- a/configure.ac +++ b/configure.ac @@ -123,8 +123,9 @@ AC_SUBST(GAPI_CODEGEN) dnl Check for monodoc AC_PATH_PROG(MDASSEMBLER, mdassembler, no) -AC_PATH_PROG(MONODOCER, monodocer, no) -if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then +AC_PATH_PROG(MDOC, mdoc, no) +if test "$MDOC" = "no" -o "$MDASSEMBLER" = "no" +then enable_monodoc=no doc_sources_dir= else @@ -132,7 +133,7 @@ else doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`" fi AC_SUBST(MDASSEMBLER) -AC_SUBST(MONODOCER) +AC_SUBST(MDOC) AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") dnl Check for WebKit diff --git a/doc/Makefile.am b/doc/Makefile.am index 6f9fc80..bdc79fe 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,15 +10,13 @@ endif ASSEMBLIES = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll -UPDATE_ASSEMBLIES = $(addprefix -assembly:, $(ASSEMBLIES)) - all: $(TARGETS) update: - $(MONODOCER) $(UPDATE_ASSEMBLIES) -path:en + $(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES) $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml: - $(MONODOCER) $(UPDATE_ASSEMBLIES) -path:en + $(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES) $(ASSEMBLY_NAME)-docs.source: @echo "Generating $@" From 1544bcbd5b3c56825982f992777f26281cdf550c Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sat, 19 Dec 2015 21:24:33 +0100 Subject: [PATCH 08/12] Remove generated C source on distclean. Signed-off-by: Andrew Shadura --- sources/glue/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/glue/Makefile.am b/sources/glue/Makefile.am index ad8289c..aeeab48 100644 --- a/sources/glue/Makefile.am +++ b/sources/glue/Makefile.am @@ -15,4 +15,6 @@ libwebkitgtksharpglue.dll: $(libwebkitgtksharpglue_1_10_2_la_OBJECTS) libwebkitg CLEANFILES = lib*.a lib*.dll +DISTCLEANFILES = $(nodist_libwebkitgtksharpglue_1_10_2_la_SOURCES) + EXTRA_DIST = From df6d7988a8b86b2dbc941ac21d20c343f8a8fd37 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sat, 19 Dec 2015 21:26:17 +0100 Subject: [PATCH 09/12] Remove generated documentation XML files on distclean. Signed-off-by: Andrew Shadura --- doc/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Makefile.am b/doc/Makefile.am index bdc79fe..a9730d3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -29,6 +29,7 @@ $(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree: $(srcdir)/en/*/*.xml $(src $(MDASSEMBLER) --ecma $(srcdir)/en -o $(ASSEMBLY_NAME)-docs CLEANFILES = $(TARGETS) +DISTCLEANFILES = $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml NAMESPACES=$(ASSEMBLY_NAMESPACE) From 8ec996805e753063e611220da4fae9f6fa7147dd Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sat, 19 Dec 2015 21:32:46 +0100 Subject: [PATCH 10/12] Fix syntax error in configure.ac Signed-off-by: Andrew Shadura --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0cb8658..3946e9d 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ dnl Check for Mono PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= 1.0, has_mono=true, has_mono=false) if test "x$has_mono" = "xtrue"; then -1 AC_PATH_PROG(RUNTIME, mono, no) + AC_PATH_PROG(RUNTIME, mono, no) AC_PATH_PROG(CSC, mcs, no) LIB_PREFIX=.so LIB_SUFFIX= From f387a68c0f264547306e99ab6782f2b68eb2f1e9 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sat, 19 Dec 2015 21:33:14 +0100 Subject: [PATCH 11/12] Simplify string comparisons The shell syntax doesn't require strings in comparisons to be non-empty, it's enough to have them quoted. Signed-off-by: Andrew Shadura --- configure.ac | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 3946e9d..ae9f3d2 100644 --- a/configure.ac +++ b/configure.ac @@ -30,21 +30,21 @@ AC_SUBST(ASSEMBLY_PC) dnl Check for pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test "x$PKG_CONFIG" = "xno"; then +if test "$PKG_CONFIG" = "no"; then AC_MSG_ERROR(['pkg-config' is not in your PATH.]) fi dnl Check for Mono PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= 1.0, has_mono=true, has_mono=false) -if test "x$has_mono" = "xtrue"; then +if test "$has_mono" = "true"; then AC_PATH_PROG(RUNTIME, mono, no) AC_PATH_PROG(CSC, mcs, no) LIB_PREFIX=.so LIB_SUFFIX= else AC_PATH_PROG(CSC, csc.exe, no) - if test x$CSC = "xno"; then + if test "$CSC" = "no"; then AC_MSG_ERROR([You need to install either mono or .Net]) else RUNTIME= @@ -54,17 +54,17 @@ else fi CS="C#" -if test "x$CSC" = "xno" ; then +if test "$CSC" = "no" ; then AC_MSG_ERROR([No $CS compiler found]) fi AC_PATH_PROG(GACUTIL, gacutil, no) -if test "x$GACUTIL" = "xno" ; then +if test "$GACUTIL" = "no" ; then AC_MSG_ERROR([No gacutil tool found]) fi GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(prefix)/lib' - + AC_SUBST(RUNTIME) AC_SUBST(CSC) AC_SUBST(GACUTIL) @@ -86,10 +86,10 @@ PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.2) dnl Check for gapi AC_PATH_PROG(GAPI_PARSER, gapi3-parser, no) -if test "x$GAPI_PARSER" = "xno"; then +if test "$GAPI_PARSER" = "no"; then AC_MSG_CHECKING(for gapi3-parser.exe) GAPI_PARSER=`which gapi3-parser.exe 2> /dev/null` - if test "x$GAPI_PARSER" = "xno" ; then + if test "$GAPI_PARSER" = "no" ; then AC_MSG_ERROR(['gapi3_parser'/'gapi3-parser.exe' not found.]) fi AC_MSG_RESULT($GAPI_PARSER) @@ -98,10 +98,10 @@ fi AC_SUBST(GAPI_PARSER) AC_PATH_PROG(GAPI_FIXUP, gapi3-fixup, no) -if test "x$GAPI_FIXUP" = "xno"; then +if test "$GAPI_FIXUP" = "no"; then AC_MSG_CHECKING(for gapi3-fixup.exe) GAPI_FIXUP=`which gapi3-fixup.exe 2> /dev/null` - if test "x$GAPI_FIXUP" = "xno" ; then + if test "$GAPI_FIXUP" = "no" ; then AC_MSG_ERROR(['gapi3_fixup'/'gapi3-fixup.exe' not found.]) fi AC_MSG_RESULT($GAPI_FIXUP) @@ -110,10 +110,10 @@ fi AC_SUBST(GAPI_FIXUP) AC_PATH_PROG(GAPI_CODEGEN, gapi3-codegen, no) -if test "x$GAPI_CODEGEN" = "xno"; then +if test "$GAPI_CODEGEN" = "no"; then AC_MSG_CHECKING(for gapi3_codegen.exe) GAPI_CODEGEN=`which gapi3_codegen.exe 2> /dev/null` - if test "x$GAPI_CODEGEN" = "xno" ; then + if test "$GAPI_CODEGEN" = "no" ; then AC_MSG_ERROR(['gapi3-codegen'/'gapi3_codegen.exe' not found.]) fi AC_MSG_RESULT([$GAPI_CODEGEN]) @@ -135,7 +135,7 @@ fi AC_SUBST(MDASSEMBLER) AC_SUBST(MDOC) -AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") +AM_CONDITIONAL(ENABLE_MONODOC, test "$enable_monodoc" = "yes") dnl Check for WebKit PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0 >= 2.0) webkitgtk_prefix=/usr From 2dda4ac613842ba6f6c889de93e589b89d24557b Mon Sep 17 00:00:00 2001 From: Thanh Tung Nguyen Date: Sun, 25 Jan 2015 17:02:50 +0100 Subject: [PATCH 12/12] Add missing module references --- out/webkitgtk-sharp.dll.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/out/webkitgtk-sharp.dll.config b/out/webkitgtk-sharp.dll.config index f067feb..9765959 100644 --- a/out/webkitgtk-sharp.dll.config +++ b/out/webkitgtk-sharp.dll.config @@ -1,3 +1,5 @@ + +