From 12500c3de541b14dee5057d0ab98a15dbe44ffca Mon Sep 17 00:00:00 2001 From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637> Date: Wed, 19 Aug 2009 19:14:55 +0000 Subject: [PATCH] update scripts. git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@584 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/Makefile.am | 4 +- linphone/configure.in | 3 +- linphone/linphone.iss.in | 2 +- linphone/scripts/Makefile.am | 1 + linphone/scripts/builder-mingw.mk | 86 +++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 linphone/scripts/Makefile.am create mode 100644 linphone/scripts/builder-mingw.mk diff --git a/linphone/Makefile.am b/linphone/Makefile.am index caf7de77a6..2e60090ace 100644 --- a/linphone/Makefile.am +++ b/linphone/Makefile.am @@ -9,8 +9,8 @@ else ORTP_DIR = oRTP endif -SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) mediastreamer2\ - coreapi console gtk-glade share +SUBDIRS = m4 pixmaps po $(ORTP_DIR) mediastreamer2\ + coreapi console gtk-glade share scripts diff --git a/linphone/configure.in b/linphone/configure.in index bf3557ab16..d091255cae 100644 --- a/linphone/configure.in +++ b/linphone/configure.in @@ -366,8 +366,6 @@ Makefile m4/Makefile po/Makefile.in pixmaps/Makefile -ipkg/Makefile -ipkg/linphone.control coreapi/Makefile gtk-glade/Makefile console/Makefile @@ -378,6 +376,7 @@ share/it/Makefile share/ja/Makefile share/cs/Makefile share/linphone.pc +scripts/Makefile linphone.spec linphone.iss ]) diff --git a/linphone/linphone.iss.in b/linphone/linphone.iss.in index b29659d4ff..3de3fd3336 100644 --- a/linphone/linphone.iss.in +++ b/linphone/linphone.iss.in @@ -18,7 +18,7 @@ ShowLanguageDialog=yes Name: "english"; MessagesFile: "compiler:Default.isl" Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"; Name: "french"; MessagesFile: "compiler:Languages\French.isl" -Name; "czech"; MessagesFile: "compiler:Languages\czech.isl" +Name: "czech"; MessagesFile: "compiler:Languages\czech.isl" [Tasks] diff --git a/linphone/scripts/Makefile.am b/linphone/scripts/Makefile.am new file mode 100644 index 0000000000..7dfd0ed0dc --- /dev/null +++ b/linphone/scripts/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST=builder-mingw.mk diff --git a/linphone/scripts/builder-mingw.mk b/linphone/scripts/builder-mingw.mk new file mode 100644 index 0000000000..78c8804dc4 --- /dev/null +++ b/linphone/scripts/builder-mingw.mk @@ -0,0 +1,86 @@ +prefix=/opt/linphone + + +MSX264_SRC_DIR=$(LINPHONE_SRC_DIR)/mediastreamer2/plugins/msx264 +LOCALDIR=$(shell pwd) +WORKDIR=$(LOCALDIR)/build +LINPHONE_ZIP=$(WORKDIR)/linphone.zip +MSX264_ZIP=$(WORKDIR)/msx264.zip +INSTALL_ROOT=$(WORKDIR)/root +FILELIST=$(WORKDIR)/linphone-bundle.filelist + +LINPHONE_VERSION=strings $(INSTALL_ROOT)/bin/linphone-3.exe |grep linphone_ident | sed 's/linphone_ident_string=//' + +$(WORKDIR): + mkdir -p $(WORKDIR) + +$(INSTALL_ROOT): $(WORKDIR) + mkdir -p $(INSTALL_ROOT) + + + +#path to Inno Setup 5 compiler +ISCC=/c/Program\ Files/Inno\ Setup\ 5/ISCC.exe + +$(LINPHONE_SRC_DIR)/configure: + cd $(LINPHONE_SRC_DIR) && ./autogen.sh + +$(LINPHONE_SRC_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure + cd $(LINPHONE_SRC_DIR) && \ + ./configure --prefix=$(prefix) --enable-shared --disable-static + +build-linphone: $(LINPHONE_SRC_DIR)/Makefile + cd $(LINPHONE_SRC_DIR) && make && make install + +$(LINPHONE_ZIP): build-linphone + cd $(LINPHONE_SRC_DIR) && make zip ZIPFILE=$(LINPHONE_ZIP) + +install-linphone: $(LINPHONE_ZIP) $(INSTALL_ROOT) + cd $(INSTALL_ROOT) && unzip -o $(LINPHONE_ZIP) + +clean-linphone: + - cd $(LINPHONE_SRC_DIR) && make clean + +veryclean-linphone: + - cd $(LINPHONE_SRC_DIR) && make distclean + - cd $(LINPHONE_SRC_DIR) && rm configure + +##### msx264 rules + +$(MSX264_SRC_DIR)/configure: + cd $(MSX264_SRC_DIR) && ./autogen.sh + + +$(MSX264_SRC_DIR)/Makefile: $(MSX264_SRC_DIR)/configure + cd $(MSX264_SRC_DIR) && \ + PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig ./configure --prefix=$(prefix) --enable-shared --disable-static --enable-hacked-x264 + + +build-msx264: build-linphone $(MSX264_SRC_DIR)/Makefile + cd $(MSX264_SRC_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig make + +$(MSX264_ZIP): build-msx264 + cd $(MSX264_SRC_DIR) && make zip ZIPFILE=$(MSX264_ZIP) + +install-msx264: $(MSX264_ZIP) $(INSTALL_ROOT) + cd $(INSTALL_ROOT) && unzip -o $(MSX264_ZIP) + +clean-msx264: + - cd $(MSX264_SRC_DIR) && make clean + +veryclean-msx264: + - cd $(MSX264_SRC_DIR) && make distclean + - cd $(MSX264_SRC_DIR) && rm configure + +$(FILELIST): + cd $(INSTALL_ROOT) && \ + rm -f $(FILELIST) && \ + for file in `find` ; do \ + if ! test -d $$file ; then \ + echo "Source: $$file; Destdir: {app}\\`dirname $$file`; Flags: ignoreversion" \ + >> $(FILELIST) ;\ + fi \ + done + +clean-install: + rm -rf $(INSTALL_ROOT) -- GitLab