jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preinst-swig script support for native windows paths

Browse source 
- SWIG_LIB support for testing on Windows
- Only in-source builds for now
This commit is contained in:
William S Fulton 2015-02-14 01:44:00 +00:00
commit af06a48430
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -2656,6 +2656,7 @@ AC_SUBST(SKIP_ANDROID)
# Miscellaneous # Miscellaneous
#---------------------------------------------------------------- #----------------------------------------------------------------
ABS_SRCDIR=`(cd ${srcdir} && pwd)`
# Root directory # Root directory
# Translate path for native Windows compilers for use with 'make check' # Translate path for native Windows compilers for use with 'make check'
@ -2689,6 +2690,14 @@ case $build in
esac esac
AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)]) AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)])
# For testing - Windows builds of SWIG do not need SWIG_LIB set
AC_EGREP_CPP([yes],
[#ifdef _WIN32
yes
#endif
], [SWIG_LIB_PREINST=], [SWIG_LIB_PREINST=$ABS_SRCDIR/Lib])
AC_SUBST(SWIG_LIB_PREINST)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
swig.spec swig.spec

4
preinst-swig.in
View file

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
builddir=`dirname $0` builddir=`dirname $0`
srcdir=`cd "$builddir" && cd '@srcdir@' && pwd` SWIG_LIB=@SWIG_LIB_PREINST@
SWIG_LIB=$srcdir/Lib
#SWIG_LIB=`cygpath -w $srcdir/Lib` # For native Windows version of SWIG
export SWIG_LIB export SWIG_LIB
exec "$builddir/swig" "$@" exec "$builddir/swig" "$@"