r23743 - gnucash/trunk/src - Win32: don't apply swig patch on this platform
Geert Janssens
gjanssens at code.gnucash.org
Wed Jan 22 10:48:16 EST 2014
Author: gjanssens
Date: 2014-01-22 10:48:15 -0500 (Wed, 22 Jan 2014)
New Revision: 23743
Trac: http://svn.gnucash.org/trac/changeset/23743
Modified:
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/core-utils/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/html/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
gnucash/trunk/src/report/report-system/Makefile.am
gnucash/trunk/src/test-core/Makefile.am
Log:
Win32: don't apply swig patch on this platform
The current version of the patch tool in our build chain
can't handle this patch.
This is not a problem (for now) because
a. our windows build is still using guile 1.8
b. we're not creating release tarballs on windows
Hopefully swig itself is updated before we move to guile 2 on Windows
This reverts commit e48381ecf90b557b96f6b6a619e3c3e379cfc7a8.
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/app-utils/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -109,10 +109,11 @@
swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
-
+endif
swig-app-utils-python.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
-I${top_srcdir}/src -o $@ $<
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/core-utils/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -46,10 +46,11 @@
swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
-
+endif
swig-core-utils-python.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
-I${top_srcdir}/src -o $@ $<
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/engine/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -205,11 +205,12 @@
$(gncinclude_HEADERS) $(noinst_HEADERS)
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src/libqof/qof -I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
-
endif
+endif
iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
-chmod u+x ./iso-currencies-to-c
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -33,10 +33,12 @@
swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
EXTRA_DIST = \
${gncmod_DATA} \
Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -25,10 +25,12 @@
if BUILDING_FROM_SCM
swig-bar.c: bar.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
EXTRA_DIST = \
bar.i \
Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -29,10 +29,12 @@
if BUILDING_FROM_SCM
swig-baz.c: baz.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
EXTRA_DIST = \
baz.i \
Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -30,10 +30,12 @@
if BUILDING_FROM_SCM
swig-foo.c: foo.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
BUILT_SOURCES = swig-foo.c
MAINTAINERCLEANFILES = swig-foo.c
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/gnome/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -115,10 +115,12 @@
swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
EXTRA_DIST = \
gnome.i \
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -228,10 +228,12 @@
${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = gnome-utils.scm
Modified: gnucash/trunk/src/html/Makefile.am
===================================================================
--- gnucash/trunk/src/html/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/html/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -59,10 +59,12 @@
${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
EXTRA_DIST = \
gnc-html.i
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -53,10 +53,12 @@
swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
gncmod_DATA = report-gnome.scm
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -25,10 +25,12 @@
swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
endif
+endif
AM_CPPFLAGS = \
-I${top_srcdir}/src \
Modified: gnucash/trunk/src/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/test-core/Makefile.am 2014-01-22 14:40:19 UTC (rev 23742)
+++ gnucash/trunk/src/test-core/Makefile.am 2014-01-22 15:48:15 UTC (rev 23743)
@@ -28,9 +28,11 @@
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src \
${AM_CPPFLAGS} -o $@ $<
+if ! OS_WIN32
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/src/swig-utf8.patch; \
fi
+endif
swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
More information about the gnucash-changes
mailing list