From 672b8336659c1b03cb185e39bbacc522c8636494 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 23 Oct 2014 10:53:11 +0200 Subject: [PATCH] Ignore macos bundle geenrated files --- .gitignore | 3 +++ README.macos | 22 +++++++++++----------- java/common/org/.DS_Store | Bin 6148 -> 0 bytes java/common/org/linphone/.DS_Store | Bin 6148 -> 0 bytes mediastreamer2 | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 java/common/org/.DS_Store delete mode 100644 java/common/org/linphone/.DS_Store diff --git a/.gitignore b/.gitignore index 6a94843fa..d5a842ef1 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,6 @@ tools/xml2lpc_test coreapi/help/filetransfer tester/receive_file.dump tester/tmp.db +.DS_Store +Linphone.app +*.dmg diff --git a/README.macos b/README.macos index e3ffb72d5..722bdc939 100644 --- a/README.macos +++ b/README.macos @@ -27,7 +27,7 @@ You need: $ sudo port install hicolor-icon-theme The next pieces need to be compiled manually. To ensure compatibility with multiple mac os version it is recommended to do: - $ export MACOSX_DEPLOYMENT_TARGET=10.6 + $ export MACOSX_DEPLOYMENT_TARGET=10.6 $ export CFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" $ export OBJCFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" $ export CXXFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" @@ -41,7 +41,7 @@ The next pieces need to be compiled manually. To ensure compatibility with multi $ git clone -b linphone git://git.linphone.org/antlr3.git $ cd antlr3/runtime/C $ ./autogen.sh - $ ./configure --disable-static --prefix=/opt/local && make + $ ./configure --disable-static --prefix=/opt/local && make $ sudo make install - Install polarssl (encryption library used by belle-sip) @@ -65,7 +65,7 @@ The next pieces need to be compiled manually. To ensure compatibility with multi $ sudo port install cmake $ git clone https://github.com/wernerd/ZRTPCPP.git $ cd ZRTPCPP - $ cmake -DCORE_LIB=true -DSDES=false CMAKE_INSTALL_NAME_DIR=/usr/local/lib/ -DCMAKE_C_FLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" -DCMAKE_CXX_FLAGS="-arch i386 -arch x86_64 --stdlib=libstdc++ -std=c++11 -lstdc++ -mmacosx-version-min=10.5" -DCMAKE_C_COMPILER=`xcrun --find clang` -DCMAKE_CXX_COMPILER=`xcrun --find clang` . + $ cmake -DCORE_LIB=true -DSDES=false CMAKE_INSTALL_NAME_DIR=/usr/local/lib/ -DCMAKE_C_FLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" -DCMAKE_CXX_FLAGS="-arch i386 -arch x86_64 --stdlib=libstdc++ -std=c++11 -lstdc++ -mmacosx-version-min=10.5" -DCMAKE_C_COMPILER=`xcrun --find clang` -DCMAKE_CXX_COMPILER=`xcrun --find clang` . $ sudo make install @@ -87,22 +87,22 @@ $ sudo make install If you got the source code from git, run ./autogen.sh first. Then or otherwise, do: - + $ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --with-readline=/opt/local --disable-x11 --with-srtp=/opt/local --with-gsm=/opt/local --enable-zrtp --disable-strict && make Install to /opt/local - $ sudo make install + $ sudo make install Done. If you want to generate a portable bundle, then install gtk-mac-bundler. Use git: - $ git clone https://github.com/jralls/gtk-mac-bundler.git + $ git clone https://github.com/jralls/gtk-mac-bundler.git $ cd gtk-mac-bundler && make install $ export PATH=$PATH:~/.local/bin #make this dummy charset.alias file for the bundler to be happy: - $ sudo touch touch /opt/local/lib/charset.alias + $ sudo touch /opt/local/lib/charset.alias The bundler file in build/macos/linphone.bundle expects some plugins to be installed in /opt/local/lib/mediastreamer/plugins . If you don't need plugins, remove or comment out this line from the bundler file: @@ -121,13 +121,13 @@ For a better appearance, you can install the gtk-quartz-engine (a gtk theme) tha $ git clone https://github.com/jralls/gtk-quartz-engine.git $ cd gtk-quartz-engine - $ autoreconf -i - $ ./configure --prefix=/opt/local CFLAGS="$CFLAGS -Wno-error" && make + $ autoreconf -i + $ ./configure --prefix=/opt/local CFLAGS="$CFLAGS -Wno-error" && make $ sudo make install Generate a new bundle to have it included. -libiconv hack +libiconv hack ************* The Makefile.am rules used to generate the bundle fetch a libiconv.2.dylib from a linphone download page. @@ -141,6 +141,6 @@ In case this library needs to generated, here are the commands: The resulted library can be found in /tmp/opt/local/lib - + diff --git a/java/common/org/.DS_Store b/java/common/org/.DS_Store deleted file mode 100644 index 2d8977d32c09ad774315cd4189e97f8691d52aef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8r`;3?*9+2D*6cs4L_KLXe&y7YI@ZXaJ)wP;~dybMW_g#>`1v|D*?$L&+shaZ zmjD(E0BhnBhzLxB3Jj`di=jbBykuTYTmpkGn$3si&6*vG`t3Nsc)Dl}RF zSPoYIU*K2z|22s#DnJG9N&)S5``s2#%G%mI&T4IeAK;er12@CmDHyyQ1HBw$VdePQ clOnI!9Q!qK33NK*P6zU5z;vNef&W(E7lsNImH+?% diff --git a/java/common/org/linphone/.DS_Store b/java/common/org/linphone/.DS_Store deleted file mode 100644 index f0988f2021b965fa11efdf8712fc62f3d2a44de7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~J&MCX427RIE&|)QOgYUSAU7C7a)MkS*I1iPt)Ctw2uyWN*^)X&uu{pNC7Dz1*Cu! zSdapFjITcz^h|mbDIf)wp@4rM3f)FOW6aI$5DvP7ju? z7GsFlqn#{yT}`&m-VV#*!}8ANQw+^|JFGCFSq&&i0Vyz3VAb={&;JAculax0qEre< zfj3jYhW&BB<4fh)`to{SKV{X|jZVhp3{O7+O#CR`(8IW2d_mS^>tuzdAAyiTK??k< F0>7ec60QIM diff --git a/mediastreamer2 b/mediastreamer2 index d051490ff..055690a69 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit d051490ff070aece407149baa9a477d97031c1c6 +Subproject commit 055690a69eea4758f7aa265862992aca1f2cb982