diff options
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 2 | ||||
| -rw-r--r-- | profiles/mac | 1 |
3 files changed, 17 insertions, 3 deletions
@@ -154,6 +154,15 @@ configure_packages () else enable_tests=" " fi + + builddir=`pwd`/$path/build + for p in $ops ; do + arg=`echo $p | cut -d '=' -f 1` + if [ $arg == "--addins-dir" ] ; then + builddir=`pwd`/$path/`echo $p | cut -d '=' -f 2` + fi + done + title="Configuring package: $path" nc=`echo $title | wc -m` echo $title @@ -164,6 +173,8 @@ configure_packages () sct="./autogen.sh $enable_tests" elif test -a $path/configure; then sct=./configure + elif test -a $path/configure.sh; then + sct=./configure.sh else echo Configuration script not found in directory: $p exit 1 @@ -171,7 +182,7 @@ configure_packages () pushd $path > /dev/null PKG_CONFIG_PATH=$localconf:$PKG_CONFIG_PATH $sct --prefix=$prefix $ops || handle_config_error popd > /dev/null - create_local_config $path + create_local_config $path $builddir packages="$packages $path" done rm -f local-config/main.addins @@ -191,14 +202,14 @@ create_local_config () # Copy the .pc file to local-config, and set the base lib directory mkdir -p local-config - builddir=`pwd`/$path/build + builddir=$2 for f in `ls $1/*.pc.in 2>/dev/null`; do pcfile=`echo $f | sed s,.*/,, | sed s/\.in$//` sed -e s,libdir=.*,libdir=$builddir, -e s/@VERSION@/$ver/g $f> local-config/$pcfile done # Generate the .addins file for the package - addins=local-config/`echo $path | sed s,/,_,`.addins + addins=local-config/`echo $path | sed s,/,_,g`.addins echo "<Addins>" > $addins echo " <Directory include-subdirs=\"true\">$builddir</Directory>" >> $addins echo "</Addins>" >> $addins diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index 1434668a5c..04e3af182a 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -61,8 +61,10 @@ app: monostub @echo "Copying MonoDevelop into app bundle" @echo "" cp -pR ../AddIns $(MAC_APP_LIB_DIR) + cp -pR ../../external/fsharpbinding/monodevelop/bin/local/Debug $(MAC_APP_LIB_DIR)/AddIns/fsharpbinding cp -pR ../data $(MAC_APP_LIB_DIR) cp -pR ../bin $(MAC_APP_LIB_DIR) + cp -pR ../bin $(MAC_APP_LIB_DIR) cp -pR ../locale $(MAC_APP_DIR)/Contents/MacOS/share mkdir -p $(MAC_APP_DIR)/Contents/MacOS/share/monodevelop cp ../../COPYING $(MAC_APP_DIR)/Contents/MacOS/share/monodevelop/COPYING.LGPL2.1 diff --git a/profiles/mac b/profiles/mac index 0b7086ba67..bd7752a93d 100644 --- a/profiles/mac +++ b/profiles/mac @@ -1,2 +1,3 @@ main --disable-update-mimedb --disable-update-desktopdb --disable-gnomeplatform --enable-macplatform --enable-tests extras/MonoDevelop.Database +main/external/fsharpbinding/monodevelop --addins-dir=bin/local/Debug |