Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
7f7671cf
Commit
7f7671cf
authored
Jan 20, 2015
by
Ghislain MARY
Browse files
Include the git revision in the Windows setup.exe and Mac bundle file names.
parent
b4dc7b38
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
Makefile.am
Makefile.am
+7
-5
No files found.
Makefile.am
View file @
7f7671cf
...
...
@@ -7,6 +7,8 @@ SUBDIRS = build m4 pixmaps po @ORTP_DIR@ @MS2_DIR@ \
coreapi console gtk share scripts tools tester include
GITVERSION
=
`
cd
$(top_srcdir)
&&
git describe
--always
||
echo
$(VERSION)
`
ACLOCAL_FLAGS
=
-I
$(top_srcdir)
/m4
...
...
@@ -20,11 +22,11 @@ OPTIONAL_SOUNDS=\
INSTALLDIR
=
$(abs_top_builddir)
/linphone-install
INSTALLDIR_WITH_PREFIX
=
$(INSTALLDIR)
/
$(prefix)
ZIPFILE
=
$(abs_top_builddir)
/
$(PACKAGE)
-
win32-
$(
VERSION)
.zip
ZIPFILE
=
$(abs_top_builddir)
/
$(PACKAGE)
-
$(GIT
VERSION)
-win32
.zip
ZIP_EXCLUDED
=
include lib
\
$(OPTIONAL_SOUNDS)
SDK_ZIPFILE
=
$(abs_top_builddir)
/lib
$(PACKAGE)
-
win32-
$(
VERSION)
.zip
SDK_ZIPFILE
=
$(abs_top_builddir)
/lib
$(PACKAGE)
-
$(GIT
VERSION)
-win32
.zip
SDK_EXCLUDED
=
\
bin/linphone.exe
\
lib/
*
.la
\
...
...
@@ -173,7 +175,7 @@ setup.exe: filelist
cp
$(ISS_SCRIPT)
$(INSTALLDIR_WITH_PREFIX)
/.
cd
$(INSTALLDIR_WITH_PREFIX)
&&
\
$(ISCC)
$(ISS_SCRIPT)
mv
$(INSTALLDIR_WITH_PREFIX)
/Output/setup.exe
$(PACKAGE)
-
$(VERSION)
-setup
.exe
mv
$(INSTALLDIR_WITH_PREFIX)
/Output/setup.exe
$(PACKAGE)
-
$(
GIT
VERSION)
-setup
.exe
rm
-rf
$(INSTALLDIR_WITH_PREFIX)
/Output
rm
-f
$(INSTALLDIR_WITH_PREFIX)
/
$(PACKAGE_WIN32_FILELIST)
rm
-f
$(INSTALLDIR_WITH_PREFIX)
/
$(ISS_SCRIPT)
...
...
@@ -201,8 +203,8 @@ Portfile-devel: $(top_srcdir)/scripts/Portfile-devel.tmpl dist
### MAC
MACAPPNAME
=
Linphone.app
MACAPPZIP
=
$(PACKAGE)
-
$(VERSION)
.app.zip
MACAPPDMG
=
$(PACKAGE)
-
$(VERSION)
.dmg
MACAPPZIP
=
$(PACKAGE)
-
$(
GIT
VERSION)
.app.zip
MACAPPDMG
=
$(PACKAGE)
-
$(
GIT
VERSION)
.dmg
BUNDLEPREFIX
=
./
BUNDLEDIR
=
$(BUNDLEPREFIX)$(MACAPPNAME)
#a path prefix where additional libs can be cherry-picked by the bundler.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment