[Build] Add a patch to check whether we have .NET 4.6 at build time. #164

Therzok · 2016-09-15T07:30:34Z

No description provided.

Therzok · 2016-09-15T07:34:29Z

Let's see how jenkins copes with this.

knocte · 2016-09-15T07:43:11Z

configure.in.in

@@ -224,6 +230,9 @@ AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue")

 CSFLAGS="$DEBUG_FLAGS $CSDEFINES $WIN64DEFINES -unsafe"

+if text "x$missing_net_4_6" = "xno" ; then


Typo: s/text/test/

knocte · 2016-09-15T07:44:00Z

configure.in.in

 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 if test "x$has_mono" = "xfalse" ; then
 	PKG_CHECK_MODULES(MONO_DEPENDENCY, mono-2 >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+	if "x$has_mono" = "xtrue" ; then
+		PKG_CHECK_MODULES(MONO_DEPENDENCY, mono < $MONO_NET_4_6, missing_net_4_6=true, missing_net_4_6=false)


Rather use NET_4_6_SUPPORT (uppercase).

knocte · 2016-09-15T07:53:48Z

glib/Marshaller.cs

@@ -88,15 +88,19 @@ static string Utf8PtrToStringFast (IntPtr ptr, int len)
 			}
 		}

+#if HAVE_NET_4_6


If you're doing a check at buildtime then you don't need a reflection check at runtime.

knocte · 2016-09-15T07:55:11Z

configure.in.in

@@ -106,9 +106,19 @@ OFF_T_FLAGS="-define:OFF_T_$ac_cv_sizeof_off_t"
 AC_SUBST(OFF_T_FLAGS)

 MONO_REQUIRED_VERSION=1.0
+MONO_NET_4_6=4.4


How about "FIRST_MONO_VERSION_WITH_NET_4_6_SUPPORT"

knocte · 2016-09-15T08:00:54Z

glib/Marshaller.cs

-			if (hasFastGetStringOverload)
-				return Utf8PtrToStringFast (ptr, len);
-
+#if HAVE_NET_4_6


How about wrapping the old 3 lines with #if UTF8_SLOWPATH , and after them, return Utf8PtrToStringFast (ptr, len); this way removing this build check in the future will be easier and cause less diff noise

I don't see it done ;)

The diff is still here since you commented on the define, see below, the Utf8PtrStringFast is inlined now under the same HAVE_NET_4_6.

This way, you can use unifdef to remove the segments.

I meant this way: #165

knocte · 2016-09-15T08:03:12Z

configure.in.in

 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 if test "x$has_mono" = "xfalse" ; then
 	PKG_CHECK_MODULES(MONO_DEPENDENCY, mono-2 >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+	if test "x$has_mono" = "xtrue" ; then


Beware, you placed this if test "x$has_mono" = "xtrue" check inside a has_mono=xfalse block, so potentially this may always evaluate to false.

But the above pkg check resets the value.

Oh oops, disregard this.

Therzok force-pushed the configure-patch branch from 0558719 to addd03d Compare September 15, 2016 07:34

Therzok force-pushed the configure-patch branch from 6c76abb to 4afb5d7 Compare September 15, 2016 07:41

knocte reviewed Sep 15, 2016

View reviewed changes

Therzok force-pushed the configure-patch branch 2 times, most recently from 3a88086 to e7bd823 Compare September 15, 2016 07:47

knocte reviewed Sep 15, 2016

View reviewed changes

Therzok force-pushed the configure-patch branch from e7bd823 to 1ad5f63 Compare September 15, 2016 07:56

knocte reviewed Sep 15, 2016

View reviewed changes

[Build] Add a patch to check whether we have .NET 4.6 at build time.

4e6206d

Therzok force-pushed the configure-patch branch from 1ad5f63 to 4e6206d Compare September 15, 2016 08:06

Therzok merged commit 97ebfe8 into gtk-sharp-2-12-branch Sep 15, 2016

Therzok deleted the configure-patch branch September 15, 2016 08:28

		@@ -224,6 +230,9 @@ AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue")

		CSFLAGS="$DEBUG_FLAGS $CSDEFINES $WIN64DEFINES -unsafe"

		if text "x$missing_net_4_6" = "xno" ; then

[Build] Add a patch to check whether we have .NET 4.6 at build time. #164

[Build] Add a patch to check whether we have .NET 4.6 at build time. #164

Uh oh!

Conversation

Therzok commented Sep 15, 2016

Uh oh!

Therzok commented Sep 15, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Therzok Sep 15, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Therzok Sep 15, 2016 •

edited

Loading