Unverified Commit c3d99593 authored by Tiago Grego's avatar Tiago Grego Committed by GitHub

Merge pull request #45 from thibauthourlier/feature/osx_dmg

Updates to make the creation of a dmg for OS X possible
parents 5cff1958 b1c8685b
......@@ -96,6 +96,7 @@ sub result_url {
sub widg {
my ($self, $name) = @_;
if (!exists $self->{_widg}->{$name}) {
confess "No widg($name)";
}
......
......@@ -148,12 +148,11 @@ case "$osname" in
Darwin)
anasoft_distro=
otter_perl=
PERL5LIB="${PERL5LIB}:\
$anasoft/lib/site_perl:\
$anasoft/lib/perl5/site_perl:\
$anasoft/lib/perl5/vendor_perl:\
$anasoft/lib/perl5\
"
# If Perl has been compiled on a Mac, we need to make sure we have the correct libraries
# I used '=' for the substitution but anything can be used except '/'
# It expects Perl to be 5.14+
perl_inc=$($anasoft/bin/perl -e "print join(':', map {s=/Users[^:]*\.app/Contents/Resources=$anasoft=gr} @INC)")
PERL5LIB="${PERL5LIB}:${perl_inc}"
if [ -z "$OTTER_MACOS" ]
then
source "$ensembl_otter_home/scripts/client/_otter_macos_env.sh"
......
......@@ -51,20 +51,6 @@ export GDK_PIXBUF_MODULE_FILE="$dot_otter_etc/gdk-pixbuf.loaders"
GDK_PIXBUF_MODULEDIR="${lib_path}/gdk-pixbuf-2.0/2.10.0/loaders" \
gdk-pixbuf-query-loaders > "$GDK_PIXBUF_MODULE_FILE"
# Create config files for pango font handling library
pango_module_file="$dot_otter_etc/pango.modules"
export PANGO_RC_FILE="$dot_otter_etc/pangorc"
cat > $PANGO_RC_FILE << PANGO_RC
[Pango]
ModuleFiles = $pango_module_file
PANGO_RC
find "${lib_path}" -name 'libpango*.dylib' -print0 \
| xargs -0 pango-querymodules > "$pango_module_file"
# Need the X11 locale directory
export XLOCALEDIR="${OTTER_SWAC}/share/X11/locale"
......
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