projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.9' into debian
[fw/altos]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 56bd70ce771489a5451171b88683994b1c62bed2..74a96a40aae1266dee98d5f3f3965bdf8fffe05c 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,15
+18,19
@@
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([altos], 1.9)
-ANDROID_VERSION=
18
+AC_INIT([altos], 1.9
.2
)
+ANDROID_VERSION=
27
AC_CONFIG_SRCDIR([src/kernel/ao.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([src/kernel/ao.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-RELEASE_DATE=20
18-12-31
+RELEASE_DATE=20
20-02-26
AC_SUBST(RELEASE_DATE)
AC_SUBST(RELEASE_DATE)
+DOC_DATE=`LC_ALL=C date -d $RELEASE_DATE +'%d %b %Y'`
+
+AC_SUBST(DOC_DATE)
+
VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
AC_SUBST(VERSION_DASH)
AC_SUBST(ANDROID_VERSION)
VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
AC_SUBST(VERSION_DASH)
AC_SUBST(ANDROID_VERSION)
@@
-34,8
+38,8
@@
AC_SUBST(ANDROID_VERSION)
dnl ==========================================================================
dnl Java library versions
dnl ==========================================================================
dnl Java library versions
-ALTOSUILIB_VERSION=1
3
-ALTOSLIB_VERSION=1
3
+ALTOSUILIB_VERSION=1
4
+ALTOSLIB_VERSION=1
4
AC_SUBST(ALTOSLIB_VERSION)
AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
AC_SUBST(ALTOSLIB_VERSION)
AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
@@
-166,9
+170,7
@@
fi
ANDROID_RELEASE=no
if test "x$ANDROID_SDK" != "xno"; then
HAVE_ANDROID_SDK="yes"
ANDROID_RELEASE=no
if test "x$ANDROID_SDK" != "xno"; then
HAVE_ANDROID_SDK="yes"
- if test -f "$HOME/altusmetrumllc/google-play-release.keystore" -a -f "$HOME/altusmetrumllc/google-play-passphrase"; then
- ANDROID_RELEASE=yes
- fi
+ ANDROID_RELEASE=yes
else
HAVE_ANDROID_SDK="no"
fi
else
HAVE_ANDROID_SDK="no"
fi
@@
-555,7
+557,8
@@
telegps/Info.plist
telegps/telegps-windows.nsi
altosdroid/Makefile
altosdroid/local.properties
telegps/telegps-windows.nsi
altosdroid/Makefile
altosdroid/local.properties
-altosdroid/AndroidManifest.xml
+altosdroid/app/src/main/AndroidManifest.xml
+altosdroid/app/build.gradle
ao-tools/Makefile
ao-tools/lib/Makefile
ao-tools/ao-rawload/Makefile
ao-tools/Makefile
ao-tools/lib/Makefile
ao-tools/ao-rawload/Makefile