Commit bbf52051 authored by Yves Combe's avatar Yves Combe

add python modules in bundle

svn path=/trunk/; revision=2542
parent 2998a77e
2007-03-23 Yves Combe <yves@ycombe.net>
add python modules in bundle.
TODO: install_tool_name as to be ru on lib/lib* too.
* Makefile.am:
* macosx/build-gtk.sh:
* src/gcompris/gcompris-nsbundle.m:
2007-03-23 Yves Combe <yves@ycombe.net>
segfault fixed.
......
......@@ -109,6 +109,8 @@ PANGO_CONF_FILES=pango.modules
FONTCONFIG_PATH=etc/fonts
GTK_MODULES_PATH=lib/gtk-2.0
EXTERN_BIN= gnuchess gnucap
PYTHON_MODULES_PATH_ORIG=lib/python$(PYTHON_VERSION)
PYTHON_MODULES_PATH_DEST=lib/python
nsbundle:
$(INSTALL) -d $(BUNDLE_RESOURCES_DIR)
......@@ -145,7 +147,9 @@ endif
$(INSTALL) -d $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/$(FONTCONFIG_PATH)
(cd $(prefix)/$(FONTCONFIG_PATH) ; tar cf - * )| ( cd $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/$(FONTCONFIG_PATH); tar xf -)
$(INSTALL) -d $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/$(GTK_MODULES_PATH)
$(INSTALL) -d $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/$(PYTHON_MODULES_PATH_DEST)
(cd $(prefix)/$(GTK_MODULES_PATH) ; tar cf - --exclude include * )| ( cd $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/$(GTK_MODULES_PATH); tar xf -)
(cd $(prefix)/$(PYTHON_MODULES_PATH_ORIG) ; tar cf - --exclude include * )| ( cd $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/$(PYTHON_MODULES_PATH_DEST); tar xf -)
$(INSTALL) -d $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/bin
for f in $(EXTERN_BIN); do \
cp -v $(prefix)/bin/$$f $(BUNDLE_EXEC_DIR)/$(NSBUNDLE_GTK_DIR)/bin/$$f; \
......
......@@ -79,7 +79,7 @@ if [ "x$UNIVERSAL_BUILD" = "xYes" ]; then
export CFLAGS="-isysroot ${SDK} -arch ppc -arch i386"
export CXXFLAGS="-isysroot ${SDK} -arch ppc -arch i386"
CONFIGURE_pkg_config="--with-pc-path=$PREFIX/lib/pkgconfig:/usr/lib/pkgconfig --enable-indirect-deps --disable-dependency-tracking"
CONFIGURE_pkg_config="--with-pc-path=$PREFIX/lib/pkgconfig --enable-indirect-deps --disable-dependency-tracking"
CONFIGURE_libpng="--disable-dependency-tracking"
PRECONFIGURE_libpng="eval CPPFLAGS='$CPPFLAGS -DPNG_NO_ASSEMBLER_CODE'"
......@@ -103,6 +103,9 @@ if [ "x$UNIVERSAL_BUILD" = "xYes" ]; then
POSTCONFIGURE_gnuchess="eval perl -pi~ -e 's|static pthread_t input_thread;|pthread_t input_thread;|g' src/input.c"
POSTCONFIGURE_sqlite="patch_libtool_dylib"
CONFIGURE_sqlite="--disable-tcl"
elif [ "x$STABLE_BUILD" = "xYes" ]; then
COMMON_OPTIONS="$COMMON_OPTIONS --disable-dependency-tracking"
......@@ -176,7 +179,7 @@ CORE_MODULES="cairo glib pango atk gtk+"
EXTRA_MODULES="libxml2 libxslt loudmouth libglade gossip gtk-engines"
PYGTK_MODULES=" pycairo pygobject pygtk"
INKSCAPE_MODULES="$CORE_MODULES libxml2 libxslt gc lcms libsigc++ doxygen glibmm cairomm gtkmm popt inkscape"
GCOMPRIS_DEPS_MODULES="libart_lgpl libglade libgnomecanvas pysqlite gnuchess gnucap"
GCOMPRIS_DEPS_MODULES="libart_lgpl libxml2 libglade libgnomecanvas sqlite pysqlite gnuchess gnucap"
# Could add those (orbit requires popt though)
MORE_MODULES="libIDL ORBit2 gconf"
......@@ -632,6 +635,8 @@ function process_modules()
tarball_get_and_build http://www.geda.seul.org/dist/gnucap-0.35.tar.gz || exit 1
tarball_get_and_build http://ftp.gnu.org/pub/gnu/chess/gnuchess-5.07.tar.gz || exit 1
tarball_get_and_build http://www.sqlite.org/sqlite-3.3.13.tar.gz || exit 1
python_tarball_get_and_build http://initd.org/pub/software/pysqlite/releases/2.3/2.3.3/pysqlite-2.3.3.tar.gz || exit 1
#svn_get_and_build $GNOMESVNURL gimp || exit 1
......
......@@ -44,6 +44,8 @@ void gcompris_fix_gtk_etc (void)
NSString *gdk_pixbuf_loaders = @"/gdk-pixbuf.loaders";
NSString *pango_modules = @"/pango.modules";
NSString *pangorc = @"/pangorc";
NSString *pythonpath1 = @"/lib/python/site-packages:";
NSString *pythonpath2 = @"/lib/python/site-packages/gtk-2.0";
printf("NSBundle executablePath %s\n\n", [gtk_path UTF8String]);
......@@ -111,6 +113,13 @@ void gcompris_fix_gtk_etc (void)
[fontconfig_path appendString: @"/etc/fonts"];
setenv ("FONTCONFIG_PATH", g_strdup([fontconfig_path UTF8String]), TRUE);
printf ("FONTCONFIG_PATH environnemnt set %s\n", getenv("FONTCONFIG_PATH"));
NSMutableString *python_modules_path = [[gtk_path mutableCopy] autorelease];
[python_modules_path appendString: pythonpath1];
[python_modules_path appendString: gtk_path];
[python_modules_path appendString: pythonpath2];
setenv ("PYTHONPATH", g_strdup([python_modules_path UTF8String]), TRUE);
printf ("PYTHONPATH environnemnt set %s\n", getenv("PYTHONPATH"));
}
......@@ -171,7 +180,7 @@ void set_prefix( NSString *source_dir,
// this is to make +[NSString pathWithComponents:] construct
// an absolute path if necessary
if ([super isAbsolutePath] == YES)
if ([self isAbsolutePath] == YES)
{
[tmpPath replaceObjectAtIndex: 0 withObject: @""];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment