Got rid of double-pythno build for win32
Yevgen Muntyan
parent
f4864abc7b
commit
21f59e4ef0
|
|
@ -19,7 +19,7 @@ m4files = \
|
|||
m4/moo-version.m4 \
|
||||
m4/moo-xdgmime.m4 \
|
||||
m4/moo-xml.m4 \
|
||||
m4/python-cross-mingw.m4
|
||||
m4/moo-python-cross-mingw.m4
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(m4files) \
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
##############################################################################
|
||||
# _MOO_AC_CHECK_PYGTK_REAL(python-version,action-if-found,action-if-not-found)
|
||||
# _MOO_AC_CHECK_PYGTK_REAL(action-if-found,action-if-not-found)
|
||||
# checks pygtk stuff
|
||||
#
|
||||
AC_DEFUN([_MOO_AC_CHECK_PYGTK_REAL],[
|
||||
PKG_CHECK_MODULES(PYGTK$1,pygtk-2.0 >= 2.6.0 pycairo,[
|
||||
PKG_CHECK_MODULES(PYGTK,pygtk-2.0 >= 2.6.0 pycairo,[
|
||||
AC_MSG_CHECKING([whether pygtk can be used])
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $PYGTK[]$1[]_CFLAGS $PYTHON[]$1[]_INCLUDES"
|
||||
CPPFLAGS="$CPPFLAGS $PYGTK_CFLAGS $PYTHON_INCLUDES"
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $PYGTK[]$1[]_CFLAGS $PYTHON[]$1[]_INCLUDES"
|
||||
CFLAGS="$CFLAGS $PYGTK_CFLAGS $PYTHON_INCLUDES"
|
||||
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <pygobject.h>
|
||||
|
|
@ -23,21 +23,17 @@ AC_DEFUN([_MOO_AC_CHECK_PYGTK_REAL],[
|
|||
AC_SUBST(PYGTK_DEFS_DIR)
|
||||
PYGTK_CODEGEN_DIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
|
||||
AC_SUBST(PYGTK_CODEGEN_DIR)
|
||||
m4_if([$1],,,[
|
||||
AC_SUBST(PYGTK[]$1[]_DEFS_DIR,[$PYGTK_DEFS_DIR])
|
||||
AC_SUBST(PYGTK[]$1[]_CODEGEN_DIR,[$PYGTK_CODEGEN_DIR])
|
||||
])
|
||||
AC_MSG_NOTICE([pygtk defs dir: $PYGTK_DEFS_DIR])
|
||||
m4_if([$2],[],[:],[$2])
|
||||
m4_if([$1],[],[:],[$1])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
m4_if([$3],[],[:],[$3])
|
||||
m4_if([$2],[],[:],[$2])
|
||||
])
|
||||
|
||||
CFLAGS="$save_CFLAGS"
|
||||
CPPFLAGS="$save_CPPFLAGS"
|
||||
],[
|
||||
m4_if([$3],[],[:],[$3])
|
||||
m4_if([$2],[],[:],[$2])
|
||||
])
|
||||
])
|
||||
|
||||
|
|
@ -49,12 +45,7 @@ AC_DEFUN([_MOO_AC_CHECK_PYGTK_REAL],[
|
|||
AC_DEFUN([_MOO_AC_CHECK_PYGTK],[
|
||||
AC_REQUIRE([MOO_AC_CHECK_OS])
|
||||
if test "x$MOO_OS_CYGWIN" != "xyes"; then
|
||||
if test "x$MOO_OS_MINGW" = "xyes"; then
|
||||
_MOO_AC_CHECK_PYGTK_REAL([24],[$1],[$2])
|
||||
_MOO_AC_CHECK_PYGTK_REAL([25],[$1],[$2])
|
||||
else
|
||||
_MOO_AC_CHECK_PYGTK_REAL(,[$1],[$2])
|
||||
fi
|
||||
_MOO_AC_CHECK_PYGTK_REAL([$1],[$2])
|
||||
fi
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,94 @@
|
|||
dnl ------------------------------------------------------------------------
|
||||
dnl MOO_AM_PYTHON_DEVEL_CROSS_MINGW([action-if-found[,action-if-not-found]])
|
||||
dnl
|
||||
AC_DEFUN([MOO_AM_PYTHON_DEVEL_CROSS_MINGW],[
|
||||
AC_REQUIRE([LT_AC_PROG_SED]) dnl to get $SED set
|
||||
|
||||
if test "x$PYTHON_HOME" = x; then
|
||||
AC_MSG_ERROR([PYTHON_HOME environment variable must be set dnl
|
||||
when cross-compiling with mingw])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(host system python version)
|
||||
if test "x$PYTHON_VERSION" = x; then
|
||||
# guess python version, very clever heuristics here
|
||||
for _ac_python_minor in 3 4 5 6 7 8 9; do
|
||||
if test -f "$PYTHON_HOME/libs/libpython2$_ac_python_minor.a" -o \
|
||||
-f "$PYTHON_HOME/libs/python2$_ac_python_minor.lib" ;
|
||||
then
|
||||
_ac_pyversion="2.$_ac_python_minor"
|
||||
break
|
||||
fi
|
||||
done
|
||||
else
|
||||
_ac_pyversion=$PYTHON_VERSION
|
||||
fi
|
||||
if test "x$_ac_pyversion" = x; then
|
||||
AC_MSG_ERROR([Could not determine Python version])
|
||||
fi
|
||||
AC_MSG_RESULT([$_ac_pyversion])
|
||||
_ac_pyversion_no_dot=`echo $_ac_pyversion | $SED 's/^2\.*\([[3-9]]\).*/2\1/'`
|
||||
|
||||
AC_MSG_CHECKING(installation directory for python modules)
|
||||
if test "x$PYTHON_PKG_DIR" != x; then
|
||||
_ac_pythondir=$PYTHON_PKG_DIR
|
||||
else
|
||||
_ac_pythondir="$PYTHON_HOME/Lib/site-packages"
|
||||
fi
|
||||
AC_MSG_RESULT([$_ac_pythondir])
|
||||
|
||||
if test "x$PYTHON_INCLUDES" != x; then
|
||||
_ac_pyincludes=$PYTHON_INCLUDES
|
||||
else
|
||||
_ac_pyincludes="-I$PYTHON_HOME/include"
|
||||
fi
|
||||
|
||||
if test "x$PYTHON_LIBS" != x; then
|
||||
_ac_pylibs=$PYTHON_LIBS
|
||||
else
|
||||
_ac_pylibs="-L$PYTHON_HOME/libs -lpython$_ac_pyversion_no_dot"
|
||||
fi
|
||||
|
||||
if test "x$PYTHON_LDFLAGS" != x; then
|
||||
_ac_pyldflags=$PYTHON_LDFLAGS
|
||||
else
|
||||
_ac_pyldflags=
|
||||
fi
|
||||
|
||||
_ac_have_pydev=false
|
||||
_ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
_ac_save_LDFLAGS="$LDFLAGS"
|
||||
_ac_save_LIBS="$LIBS"
|
||||
CPPFLAGS="$CPPFLAGS $_ac_pyincludes"
|
||||
LDFLAGS="$LDFLAGS $_ac_pyldflags"
|
||||
LIBS="$LIBS $_ac_pylibs"
|
||||
AC_MSG_CHECKING(python headers and linker flags)
|
||||
AC_TRY_LINK([#include <Python.h>],[Py_Initialize();],[
|
||||
AC_MSG_RESULT([$_ac_pyincludes $_ac_pyldflags $_ac_pylibs])
|
||||
_ac_have_pydev=true
|
||||
],[
|
||||
AC_MSG_RESULT(not found)
|
||||
])
|
||||
CPPFLAGS="$_ac_save_CPPFLAGS"
|
||||
LDFLAGS="$_ac_save_LDFLAGS"
|
||||
LIBS="$_ac_save_LIBS"
|
||||
|
||||
if $_ac_have_pydev; then
|
||||
AC_SUBST(PYTHON_PLATFORM, [nt])
|
||||
AC_SUBST(PYTHON_INCLUDES,[$_ac_pyincludes])
|
||||
AC_SUBST(PYTHON_LIBS,[$_ac_pylibs])
|
||||
AC_SUBST(PYTHON_EXTRA_LIBS,[])
|
||||
AC_SUBST(PYTHON_LDFLAGS,[$_ac_pyldflags])
|
||||
AC_SUBST(PYTHON_EXTRA_LDFLAGS,[])
|
||||
AC_SUBST(pythondir,[$_ac_pythondir])
|
||||
AC_SUBST(pyexecdir,[$_ac_pythondir])
|
||||
AC_SUBST(pkgpythondir,[\${pythondir}/$PACKAGE])
|
||||
AC_SUBST(pkgpyexecdir,[\${pythondir}/$PACKAGE])
|
||||
m4_if([$1],[],[:],[$1])
|
||||
else
|
||||
m4_if([$2],[],[:],[$2])
|
||||
fi
|
||||
])
|
||||
dnl
|
||||
dnl end of MOO_AM_PYTHON_DEVEL_CROSS_MINGW
|
||||
dnl --------------------------------------
|
||||
|
|
@ -131,8 +131,7 @@ AC_MSG_NOTICE([checking for headers and libs required to compile python extensio
|
|||
AC_REQUIRE([MOO_AC_CHECK_OS])
|
||||
if test x$MOO_OS_CYGWIN != xyes; then
|
||||
if test x$MOO_OS_MINGW = xyes; then
|
||||
AM_PYTHON_DEVEL_CROSS_MINGW([$2],[$3],[2.4])
|
||||
AM_PYTHON_DEVEL_CROSS_MINGW([$2],[$3],[2.5])
|
||||
MOO_AM_PYTHON_DEVEL_CROSS_MINGW([$2],[$3])
|
||||
else
|
||||
_MOO_AC_CHECK_PYTHON_UNIX([$1],[$2],[$3])
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,101 +0,0 @@
|
|||
dnl AM_PYTHON_DEVEL_CROSS_MINGW([action-if-found[,action-if-not-found[,version]]])
|
||||
AC_DEFUN([AM_PYTHON_DEVEL_CROSS_MINGW],[
|
||||
AC_REQUIRE([LT_AC_PROG_SED])
|
||||
m4_if([$3],[],[
|
||||
m4_define([_ac_m4_pyver],[])
|
||||
],[
|
||||
m4_define([_ac_m4_pyver],[m4_bpatsubst([$3],[\.])])
|
||||
])
|
||||
|
||||
if test "x$PYTHON[]_ac_m4_pyver[]_HOME" = x; then
|
||||
AC_MSG_ERROR([PYTHON[]_ac_m4_pyver[]_HOME environment variable must be set dnl
|
||||
when cross-compiling with mingw])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(host system python version)
|
||||
m4_if([$3],,[
|
||||
if test "x$PYTHON[]_ac_m4_pyver[]_VERSION" = x; then
|
||||
# guess python version, very clever heuristics here
|
||||
for _ac_python_minor in 3 4 5 6 7 8 9; do
|
||||
if test -f "$PYTHON[]_ac_m4_pyver[]_HOME/libs/libpython2$_ac_python_minor.a" -o \
|
||||
-f "$PYTHON[]_ac_m4_pyver[]_HOME/libs/python2$_ac_python_minor.lib" ;
|
||||
then
|
||||
_ac_pyversion="2.$_ac_python_minor"
|
||||
break
|
||||
fi
|
||||
done
|
||||
else
|
||||
_ac_pyversion=$PYTHON[]_ac_m4_pyver[]_VERSION
|
||||
fi
|
||||
|
||||
if test "x$_ac_pyversion" = x; then
|
||||
AC_MSG_ERROR([Could not determine Python version])
|
||||
fi
|
||||
],[
|
||||
_ac_pyversion=$3
|
||||
])
|
||||
AC_MSG_RESULT([$_ac_pyversion])
|
||||
_ac_pyversion_no_dot=`echo $_ac_pyversion | $SED 's/^2\.*\([[3-9]]\).*/2\1/'`
|
||||
|
||||
AC_MSG_CHECKING(installation directory for python modules)
|
||||
if test "x$PYTHON[]_ac_m4_pyver[]_PKG_DIR" != x; then
|
||||
_ac_pythondir=$PYTHON[]_ac_m4_pyver[]_PKG_DIR
|
||||
else
|
||||
_ac_pythondir="$PYTHON[]_ac_m4_pyver[]_HOME/Lib/site-packages"
|
||||
fi
|
||||
AC_MSG_RESULT([$_ac_pythondir])
|
||||
|
||||
if test "x$PYTHON[]_ac_m4_pyver[]_INCLUDES" != x; then
|
||||
_ac_pyincludes=$PYTHON[]_ac_m4_pyver[]_INCLUDES
|
||||
else
|
||||
_ac_pyincludes="-I$PYTHON[]_ac_m4_pyver[]_HOME/include"
|
||||
fi
|
||||
|
||||
if test "x$PYTHON[]_ac_m4_pyver[]_LIBS" != x; then
|
||||
_ac_pylibs=$PYTHON[]_ac_m4_pyver[]_LIBS
|
||||
else
|
||||
_ac_pylibs="-L$PYTHON[]_ac_m4_pyver[]_HOME/libs -lpython$_ac_pyversion_no_dot"
|
||||
fi
|
||||
|
||||
if test "x$PYTHON[]_ac_m4_pyver[]_LDFLAGS" != x; then
|
||||
_ac_pyldflags=$PYTHON[]_ac_m4_pyver[]_LDFLAGS
|
||||
else
|
||||
_ac_pyldflags=
|
||||
fi
|
||||
|
||||
_ac_have_pydev=false
|
||||
_ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
_ac_save_LDFLAGS="$LDFLAGS"
|
||||
_ac_save_LIBS="$LIBS"
|
||||
CPPFLAGS="$CPPFLAGS $_ac_pyincludes"
|
||||
LDFLAGS="$LDFLAGS $_ac_pyldflags"
|
||||
LIBS="$LIBS $_ac_pylibs"
|
||||
AC_MSG_CHECKING(python headers and linker flags)
|
||||
AC_TRY_LINK([#include <Python.h>],[Py_Initialize();],[
|
||||
AC_MSG_RESULT([$_ac_pyincludes $_ac_pyldflags $_ac_pylibs])
|
||||
_ac_have_pydev=true
|
||||
],[
|
||||
AC_MSG_RESULT(not found)
|
||||
])
|
||||
CPPFLAGS="$_ac_save_CPPFLAGS"
|
||||
LDFLAGS="$_ac_save_LDFLAGS"
|
||||
LIBS="$_ac_save_LIBS"
|
||||
|
||||
if $_ac_have_pydev; then
|
||||
AC_SUBST(PYTHON[]_ac_m4_pyver[]_PLATFORM, [nt])
|
||||
AC_SUBST(PYTHON[]_ac_m4_pyver[]_INCLUDES,[$_ac_pyincludes])
|
||||
AC_SUBST(PYTHON[]_ac_m4_pyver[]_LIBS,[$_ac_pylibs])
|
||||
AC_SUBST(PYTHON[]_ac_m4_pyver[]_EXTRA_LIBS,[])
|
||||
AC_SUBST(PYTHON[]_ac_m4_pyver[]_LDFLAGS,[$_ac_pyldflags])
|
||||
AC_SUBST(PYTHON[]_ac_m4_pyver[]_EXTRA_LDFLAGS,[])
|
||||
AC_SUBST(python[]_ac_m4_pyver[]dir,[$_ac_pythondir])
|
||||
AC_SUBST(pyexec[]_ac_m4_pyver[]dir,[$_ac_pythondir])
|
||||
AC_SUBST(pkgpython[]_ac_m4_pyver[]dir,[\${python[]_ac_m4_pyver[]dir}/$PACKAGE])
|
||||
AC_SUBST(pkgpyexec[]_ac_m4_pyver[]dir,[\${python[]_ac_m4_pyver[]dir}/$PACKAGE])
|
||||
m4_if([$1],[],[:],[$1])
|
||||
else
|
||||
m4_if([$2],[],[:],[$2])
|
||||
fi
|
||||
|
||||
m4_undefine([_ac_m4_pyver])
|
||||
])
|
||||
10
makewin
10
makewin
|
|
@ -120,13 +120,11 @@ def copy_files():
|
|||
|
||||
if pida:
|
||||
do_cmd("mkdir -p %s/lib/site-packages" % (moo_windir,))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/moo25.pyd %s/lib/site-packages/moo.pyd" % (installdir, moo_windir))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/moo.pyd %s/lib/site-packages/moo.pyd" % (installdir, moo_windir))
|
||||
else:
|
||||
do_cmd("mkdir -p %s/lib/moo/plugins/pymoo25 %s/lib/moo/plugins/pymoo24" % (moo_windir, moo_windir))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/pymoo25.dll %s/lib/moo/plugins/pymoo25/pymoo.dll" % (installdir, moo_windir))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/moo25.pyd %s/lib/moo/plugins/pymoo25/moo.pyd" % (installdir, moo_windir))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/pymoo24.dll %s/lib/moo/plugins/pymoo24/pymoo.dll" % (installdir, moo_windir))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/moo24.pyd %s/lib/moo/plugins/pymoo24/moo.pyd" % (installdir, moo_windir))
|
||||
do_cmd("mkdir -p %s/lib/moo/plugins/pymoo" % (moo_windir,))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/pymoo.dll %s/lib/moo/plugins/pymoo/pymoo.dll" % (installdir, moo_windir))
|
||||
do_cmd("cp %s/usr/local/win/gtk/lib/moo.pyd %s/lib/moo/plugins/pymoo/moo.pyd" % (installdir, moo_windir))
|
||||
|
||||
if do_strip:
|
||||
if not bin_only and not no_python:
|
||||
|
|
|
|||
|
|
@ -2,10 +2,16 @@
|
|||
|
||||
#
|
||||
# mignw-configure - configure for cross-compiling with mingw
|
||||
# Copyright (C) 2004-2007 Yevgen Muntyan <muntyan@math.tamu.edu>
|
||||
# by Yevgen Muntyan <muntyan@math.tamu.edu>
|
||||
# Ditributed under the terms of WTFL license
|
||||
#
|
||||
|
||||
#
|
||||
# If you are not using this script, do not forget to use --build.
|
||||
# If you think --build is not needed because blah blah blah, then
|
||||
# read docs. Or just use --build. Or just use this script damn it.
|
||||
#
|
||||
|
||||
write_pkg_config()
|
||||
{
|
||||
rm -f $1
|
||||
|
|
@ -19,6 +25,8 @@ export PKG_CONFIG_PATH=\$PKG_CONFIG_LIBDIR
|
|||
if [ "x\`echo "\$*" | grep -- --atleast-pkgconfig-version\`" != x -o \\
|
||||
"x\`echo "\$*" | grep -- --atleast-version\`" != x ]; then
|
||||
exec "$PKG_CONFIG_PROGRAM" \$*
|
||||
elif [ "x\`echo "\$*" | grep -- codegendir\`" != x ]; then
|
||||
exec "$PKG_CONFIG_PROGRAM" --define-variable=prefix="$PYTHON_PREFIX" \$*
|
||||
else
|
||||
exec "$PKG_CONFIG_PROGRAM" --define-variable=prefix="$GTK_PREFIX" \$*
|
||||
fi
|
||||
|
|
@ -36,17 +44,13 @@ MINGW_TOOL_PREFIX=${MINGW_TOOL_PREFIX:-/usr/bin/i586-mingw32msvc-}
|
|||
# Where gtk libraries are installed
|
||||
export GTK_PREFIX=${GTK_PREFIX:-/usr/local/win/gtk}
|
||||
|
||||
# These python variables are medit-only
|
||||
if [ "x$1" = "x--with-python=2.4" -o "x$2" = "x--with-python=2.4" ]; then
|
||||
export PYTHON_PREFIX=${PYTHON_PREFIX:-/usr/local/win/Python24}
|
||||
export PYTHON24_HOME=$PYTHON_PREFIX
|
||||
else
|
||||
export PYTHON_PREFIX=${PYTHON_PREFIX:-/usr/local/win/Python25}
|
||||
export PYTHON25_HOME=$PYTHON_PREFIX
|
||||
fi
|
||||
export PYTHON_HOME=$PYTHON_PREFIX
|
||||
export PYTHON24_HOME=${PYTHON24_HOME:-/usr/local/win/Python24}
|
||||
export PYTHON25_HOME=${PYTHON25_HOME:-/usr/local/win/Python25}
|
||||
export PYTHON=${PYTHON:-python}
|
||||
|
||||
# Find configure script to run
|
||||
if [ x$CONFIGURE = x ]; then
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
rc_in_files = libmoo.rc.in moo24.rc.in moo25.rc.in pymoo24.rc.in pymoo25.rc.in
|
||||
ini_in_files = moopython/pymoo.ini.in moopython/pymoo24.ini.in moopython/pymoo25.ini.in
|
||||
rc_in_files = libmoo.rc.in moo.rc.in pymoo.rc.in
|
||||
ini_in_files = moopython/pymoo.ini.in
|
||||
ini_files = $(ini_in_files:.ini.in=.ini)
|
||||
@MOO_INI_IN_RULE@
|
||||
CLEANFILES = $(ini_files)
|
||||
|
|
@ -143,31 +143,22 @@ endif MOO_BUILD_PYTHON_PLUGIN
|
|||
#
|
||||
else !MOO_OS_UNIX
|
||||
|
||||
CLEANFILES += pymoo25.res moo25.res pymoo24.res moo24.res
|
||||
BUILT_SOURCES += pymoo25.res moo25.res pymoo24.res moo24.res
|
||||
nodist_pymoo25_la_SOURCES = pymoo25.res
|
||||
nodist_moo25_la_SOURCES = moo25.res
|
||||
nodist_pymoo24_la_SOURCES = pymoo24.res
|
||||
nodist_moo24_la_SOURCES = moo24.res
|
||||
CLEANFILES += pymoo.res moo.res
|
||||
BUILT_SOURCES += pymoo.res moo.res
|
||||
nodist_pymoo_la_SOURCES = pymoo.res
|
||||
nodist_moo_la_SOURCES = moo.res
|
||||
|
||||
moo_la_ldflags += -shrext ".pyd"
|
||||
lib_LTLIBRARIES += pymoo25.la moo25.la pymoo24.la moo24.la
|
||||
lib_LTLIBRARIES += pymoo.la moo.la
|
||||
plugindir = $(MOO_LIB_DIR)/plugins
|
||||
plugin_DATA = moopython/pymoo25.ini moopython/pymoo24.ini
|
||||
plugin_DATA = moopython/pymoo.ini
|
||||
|
||||
pymoo25_la_SOURCES = moo.h
|
||||
pymoo25_la_LDFLAGS = $(pymoo_la_ldflags) $(PYTHON25_LDFLAGS) $(PYTHON25_EXTRA_LDFLAGS) -Wl,pymoo25.res
|
||||
pymoo25_la_LIBADD = moopython/libpymoo25.la libmoo.la $(MOO_LIBS) $(PYTHON25_LIBS) $(PYTHON25_EXTRA_LIBS)
|
||||
moo25_la_SOURCES = moo.h
|
||||
moo25_la_LDFLAGS = $(moo_la_ldflags) $(PYTHON25_LDFLAGS) -Wl,moo25.res
|
||||
moo25_la_LIBADD = moopython/libmoomod25.la libmoo.la $(MOO_LIBS) $(PYTHON25_LIBS)
|
||||
|
||||
pymoo24_la_SOURCES = moo.h
|
||||
pymoo24_la_LDFLAGS = $(pymoo_la_ldflags) $(PYTHON24_LDFLAGS) $(PYTHON24_EXTRA_LDFLAGS) -Wl,pymoo24.res
|
||||
pymoo24_la_LIBADD = moopython/libpymoo24.la libmoo.la $(MOO_LIBS) $(PYTHON24_LIBS) $(PYTHON24_EXTRA_LIBS)
|
||||
moo24_la_SOURCES = moo.h
|
||||
moo24_la_LDFLAGS = $(moo_la_ldflags) $(PYTHON24_LDFLAGS) -Wl,moo24.res
|
||||
moo24_la_LIBADD = moopython/libmoomod24.la libmoo.la $(MOO_LIBS) $(PYTHON24_LIBS)
|
||||
pymoo_la_SOURCES = moo.h
|
||||
pymoo_la_LDFLAGS = $(pymoo_la_ldflags) $(PYTHON_LDFLAGS) $(PYTHON_EXTRA_LDFLAGS) -Wl,pymoo.res
|
||||
pymoo_la_LIBADD = moopython/libpymoo.la libmoo.la $(MOO_LIBS) $(PYTHON_LIBS) $(PYTHON_EXTRA_LIBS)
|
||||
moo_la_SOURCES = moo.h
|
||||
moo_la_LDFLAGS = $(moo_la_ldflags) $(PYTHON_LDFLAGS) -Wl,moo.res
|
||||
moo_la_LIBADD = moopython/libmoomod.la libmoo.la $(MOO_LIBS) $(PYTHON_LIBS)
|
||||
|
||||
endif !MOO_OS_UNIX
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO
|
|||
VALUE "InternalName", "moo-mod-@MOO_VERSION_UNQUOTED@"
|
||||
VALUE "LegalCopyright", "(C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>"
|
||||
VALUE "OriginalFilename", "moo.pyd"
|
||||
VALUE "ProductName", "moo24.pyd"
|
||||
VALUE "ProductName", "moo.pyd"
|
||||
VALUE "ProductVersion", @MOO_VERSION@
|
||||
END
|
||||
END
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
#include <windows.h>
|
||||
#include <winver.h>
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
|
||||
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
|
||||
FILEFLAGSMASK 0
|
||||
FILEFLAGS 0
|
||||
FILEOS VOS__WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
FILESUBTYPE VFT2_UNKNOWN
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Yevgen Muntyan"
|
||||
VALUE "FileDescription", "libmoo bindings for python-2.5"
|
||||
VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
|
||||
VALUE "InternalName", "moo-mod-@MOO_VERSION_UNQUOTED@"
|
||||
VALUE "LegalCopyright", "(C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>"
|
||||
VALUE "OriginalFilename", "moo.pyd"
|
||||
VALUE "ProductName", "moo25.pyd"
|
||||
VALUE "ProductVersion", @MOO_VERSION@
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
|
@ -1043,7 +1043,7 @@ static char *
|
|||
get_size_string (struct stat *statbuf)
|
||||
{
|
||||
g_return_val_if_fail (statbuf != NULL, NULL);
|
||||
return g_strdup_printf ("%" G_GINT64_FORMAT, (MooFileSize) statbuf->st_size);
|
||||
return g_strdup_printf ("%" G_GINT64_FORMAT, (gint64) statbuf->st_size);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ libmoopython_la_sources = \
|
|||
moopython-loader.c \
|
||||
moopython-utils.h \
|
||||
moopython-utils.c
|
||||
|
||||
if !MOO_BUILD_MOO_MODULE
|
||||
libmoopython_la_libadd = \
|
||||
pygtk/libmoopygtk.la
|
||||
|
|
@ -53,8 +54,7 @@ endif
|
|||
|
||||
else !MOO_OS_UNIX
|
||||
|
||||
noinst_LTLIBRARIES += libmoomod25.la libmoomod24.la
|
||||
noinst_LTLIBRARIES += libpymoo25.la libpymoo24.la
|
||||
noinst_LTLIBRARIES += libmoomod.la libpymoo.la
|
||||
|
||||
endif !MOO_OS_UNIX
|
||||
|
||||
|
|
@ -67,40 +67,14 @@ AM_CFLAGS = \
|
|||
$(PYGTK_CFLAGS) \
|
||||
$(MOO_W_NO_WRITE_STRINGS)
|
||||
|
||||
py25_cflags = \
|
||||
-I.. \
|
||||
-I$(top_builddir) \
|
||||
$(MOO_CFLAGS) \
|
||||
$(MOO_DEBUG_CFLAGS) \
|
||||
$(PYTHON25_INCLUDES) \
|
||||
$(PYGTK25_CFLAGS) \
|
||||
$(MOO_W_NO_WRITE_STRINGS) \
|
||||
-DMOO_PYTHON_MODULE_DLL_NAME=\"pymoo.dll\"
|
||||
|
||||
py24_cflags = \
|
||||
-I.. \
|
||||
-I$(top_builddir) \
|
||||
$(MOO_CFLAGS) \
|
||||
$(MOO_DEBUG_CFLAGS) \
|
||||
$(PYTHON24_INCLUDES) \
|
||||
$(PYGTK24_CFLAGS) \
|
||||
$(MOO_W_NO_WRITE_STRINGS) \
|
||||
-DMOO_PYTHON_MODULE_DLL_NAME=\"pymoo.dll\"
|
||||
if MOO_OS_MINGW
|
||||
AM_CFLAGS += -DMOO_PYTHON_MODULE_DLL_NAME=\"pymoo.dll\"
|
||||
endif
|
||||
|
||||
libmoomod_la_SOURCES = $(libmoomod_la_sources)
|
||||
libmoomod_la_LIBADD = pygtk/libmoopygtk.la $(libmoomod_la_libadd)
|
||||
libmoomod25_la_SOURCES = $(libmoomod_la_sources)
|
||||
libmoomod25_la_LIBADD = pygtk/libmoopygtk25.la $(libmoomod_la_libadd)
|
||||
libmoomod25_la_CFLAGS = $(py25_cflags)
|
||||
libmoomod24_la_SOURCES = $(libmoomod_la_sources)
|
||||
libmoomod24_la_LIBADD = pygtk/libmoopygtk24.la $(libmoomod_la_libadd)
|
||||
libmoomod24_la_CFLAGS = $(py24_cflags)
|
||||
|
||||
libpymoo_la_SOURCES = $(libpymoo_la_sources)
|
||||
libpymoo25_la_SOURCES = $(libpymoo_la_sources)
|
||||
libpymoo25_la_CFLAGS = $(py25_cflags)
|
||||
libpymoo24_la_SOURCES = $(libpymoo_la_sources)
|
||||
libpymoo24_la_CFLAGS = $(py24_cflags)
|
||||
|
||||
libmoopython_la_SOURCES = $(libmoopython_la_sources)
|
||||
libmoopython_la_LIBADD = $(libmoopython_la_libadd)
|
||||
|
|
|
|||
|
|
@ -207,26 +207,14 @@ mooterm-mod.h: mooterm-mod.py $(PY2H)
|
|||
mv $@.tmp $@
|
||||
|
||||
|
||||
if MOO_OS_UNIX
|
||||
noinst_LTLIBRARIES = libmoopygtk.la
|
||||
else
|
||||
noinst_LTLIBRARIES = libmoopygtk25.la libmoopygtk24.la
|
||||
endif
|
||||
|
||||
libmoopygtk_la_SOURCES = $(moopygtk_sources)
|
||||
libmoopygtk25_la_SOURCES = $(moopygtk_sources)
|
||||
libmoopygtk24_la_SOURCES = $(moopygtk_sources)
|
||||
nodist_libmoopygtk_la_SOURCES = $(nodist_moopygtk_sources)
|
||||
nodist_libmoopygtk25_la_SOURCES = $(nodist_moopygtk_sources)
|
||||
nodist_libmoopygtk24_la_SOURCES = $(nodist_moopygtk_sources)
|
||||
libmoopygtk_la_LIBADD =
|
||||
libmoopygtk24_la_LIBADD =
|
||||
libmoopygtk25_la_LIBADD =
|
||||
|
||||
if MOO_BUILD_CANVAS
|
||||
libmoopygtk_la_LIBADD += goocanvas/libgoocanvas.la
|
||||
libmoopygtk24_la_LIBADD += goocanvas/libgoocanvas.la
|
||||
libmoopygtk25_la_LIBADD += goocanvas/libgoocanvas.la
|
||||
endif MOO_BUILD_CANVAS
|
||||
|
||||
canvas_cflags = \
|
||||
|
|
@ -253,13 +241,3 @@ AM_CFLAGS = \
|
|||
$(common_cflags) \
|
||||
$(PYTHON_INCLUDES) \
|
||||
$(PYGTK_CFLAGS)
|
||||
|
||||
libmoopygtk25_la_CFLAGS = \
|
||||
$(common_cflags) \
|
||||
$(PYTHON25_INCLUDES) \
|
||||
$(PYGTK25_CFLAGS)
|
||||
|
||||
libmoopygtk24_la_CFLAGS = \
|
||||
$(common_cflags) \
|
||||
$(PYTHON24_INCLUDES) \
|
||||
$(PYGTK24_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[module]
|
||||
type=C
|
||||
file=pymoo
|
||||
file=pymoo/pymoo
|
||||
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
[module]
|
||||
type=C
|
||||
file=pymoo24/pymoo
|
||||
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
[module]
|
||||
type=C
|
||||
file=pymoo25/pymoo
|
||||
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@
|
||||
|
|
@ -17,10 +17,10 @@ VS_VERSION_INFO VERSIONINFO
|
|||
VALUE "CompanyName", "Yevgen Muntyan"
|
||||
VALUE "FileDescription", "python-2.4 plugin for medit"
|
||||
VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
|
||||
VALUE "InternalName", "pymoo24-@MOO_VERSION_UNQUOTED@"
|
||||
VALUE "InternalName", "pymoo-@MOO_VERSION_UNQUOTED@"
|
||||
VALUE "LegalCopyright", "(C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>"
|
||||
VALUE "OriginalFilename", "pymoo.dll"
|
||||
VALUE "ProductName", "pymoo24.dll"
|
||||
VALUE "ProductName", "pymoo.dll"
|
||||
VALUE "ProductVersion", @MOO_VERSION@
|
||||
END
|
||||
END
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
#include <windows.h>
|
||||
#include <winver.h>
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
|
||||
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
|
||||
FILEFLAGSMASK 0
|
||||
FILEFLAGS 0
|
||||
FILEOS VOS__WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
FILESUBTYPE VFT2_UNKNOWN
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Yevgen Muntyan"
|
||||
VALUE "FileDescription", "python-2.5 plugin for medit"
|
||||
VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
|
||||
VALUE "InternalName", "pymoo25-@MOO_VERSION_UNQUOTED@"
|
||||
VALUE "LegalCopyright", "(C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>"
|
||||
VALUE "OriginalFilename", "pymoo.dll"
|
||||
VALUE "ProductName", "pymoo25.dll"
|
||||
VALUE "ProductVersion", @MOO_VERSION@
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
Loading…
Reference in New Issue