From 8ec4b6b131d74ec89a87c24a076bfa491a8650d2 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 29 Jun 2016 17:06:26 +0200 Subject: [PATCH] tester: do not install on IOS and update README --- Makefile.am | 4 ++-- README => README.md | 9 +++++++-- linphone.iss.in | 2 +- linphone.spec.in | 10 +++++----- mediastreamer2 | 2 +- tester/CMakeLists.txt | 14 +++++++------- 6 files changed, 23 insertions(+), 18 deletions(-) rename README => README.md (92%) diff --git a/Makefile.am b/Makefile.am index 7960711f0..55fc17617 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,7 +161,7 @@ zip: make gtk-cherrypick make other-cherrypick cp -f $(top_srcdir)/gtk/gtkrc $(INSTALLDIR_WITH_PREFIX)/. - cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/. + cp -f $(top_srcdir)/README.md $(INSTALLDIR_WITH_PREFIX)/. cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/. cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(ZIPFILE) * @@ -173,7 +173,7 @@ sdk: # remove unwanted stuff (gtk interface) cd $(INSTALLDIR_WITH_PREFIX) && rm -rf $(SDK_EXCLUDED) make other-cherrypick - cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/. + cp -f $(top_srcdir)/README.md $(INSTALLDIR_WITH_PREFIX)/. cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/. cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(SDK_ZIPFILE) * diff --git a/README b/README.md similarity index 92% rename from README rename to README.md index 7b54bdd42..e6c2679ea 100644 --- a/README +++ b/README.md @@ -1,7 +1,12 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol. +# Warning -******************Building linphone *********************************** +Unless you exactly know what you are doing, you should take at look at [linphone-desktop](https://github.com/BelledonneCommunications/linphone-desktop). + +# Otherwise… + +## Building Linphone - Install build time dependencies - libtool @@ -59,7 +64,7 @@ For windows compilation see README.mingw. For macOS X, see README.macos -******************************** Notes for developers ***************************** +## Notes for developers Here is a short description of the content of the source tree. diff --git a/linphone.iss.in b/linphone.iss.in index aa700200c..c065c2b52 100644 --- a/linphone.iss.in +++ b/linphone.iss.in @@ -8,7 +8,7 @@ AppUpdatesURL=http://www.linphone.org DefaultDirName={pf}\Linphone DefaultGroupName=Linphone LicenseFile=COPYING -;InfoBeforeFile=README +;InfoBeforeFile=README.md OutputBaseFilename=setup Compression=lzma SolidCompression=yes diff --git a/linphone.spec.in b/linphone.spec.in index ca4d43a62..f18bf0cbe 100644 --- a/linphone.spec.in +++ b/linphone.spec.in @@ -23,15 +23,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: i686 %endif -BuildRequires: gtk2-devel -BuildRequires: belle-sip-devel speex-devel gettext -BuildRequires: intltool gettext-devel +BuildRequires: gtk2-devel +BuildRequires: belle-sip-devel speex-devel gettext +BuildRequires: intltool gettext-devel %if %{video} BuildRequires: ffmpeg-devel SDL-devel %endif %description -Linphone is a SIP compliant audio & video phone. It can be used to run calls +Linphone is a SIP compliant audio & video phone. It can be used to run calls over the internet. It has a gtk+ and console interface. %package devel @@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING NEWS README.md TODO %{_bindir}/linphone %{_bindir}/linphonec %{_bindir}/linphonecsh diff --git a/mediastreamer2 b/mediastreamer2 index f95252625..ea379434c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f9525262522972f598a6bb1eaad18104b0a7e712 +Subproject commit ea379434c6c725a734b418449b799d5ef8a030c2 diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt index 75aee8e7b..447383b10 100644 --- a/tester/CMakeLists.txt +++ b/tester/CMakeLists.txt @@ -246,7 +246,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") endif() endif() -# on iOS though, we also build the exectuable so that one can compile it from Xcode and run it directly +# on iOS though, we also build the executable so that one can compile it from Xcode and run it directly if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(IOS) set_source_files_properties(${IOS_RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) @@ -268,13 +268,13 @@ if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") endif() endif() - install(TARGETS liblinphone_tester - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) if(NOT IOS) + install(TARGETS liblinphone_tester + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) install(FILES ${OTHER_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester") install(FILES ${SOUND_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/sounds") install(FILES ${SIPP_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/sipp")