projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cortexelf-v1: Bump SPI pin speed to 40MHz to for sdcard. Fix VGA DMA.
[fw/altos]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 9f2cb0d7db00ed220b612d8b374d315b7f73e106..a125033ed43070cde25904db631ca1683b5d528e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,19
+18,24
@@
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.4.9.3)
+AC_INIT([altos], 1.6.8)
+ANDROID_VERSION=13
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=2017-01-10
+AC_SUBST(RELEASE_DATE)
+
VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
AC_SUBST(VERSION_DASH)
VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
AC_SUBST(VERSION_DASH)
+AC_SUBST(ANDROID_VERSION)
dnl ==========================================================================
dnl Java library versions
dnl ==========================================================================
dnl Java library versions
-ALTOSUILIB_VERSION=
3
-ALTOSLIB_VERSION=
5
+ALTOSUILIB_VERSION=
11
+ALTOSLIB_VERSION=
11
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])
@@
-144,13
+149,18
@@
if test "x$ANDROID_SDK" != "xno"; then
fi
fi
fi
fi
+ANDROID_RELEASE=no
if test "x$ANDROID_SDK" != "xno"; then
HAVE_ANDROID_SDK="yes"
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
else
HAVE_ANDROID_SDK="no"
fi
AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
else
HAVE_ANDROID_SDK="no"
fi
AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
+AM_CONDITIONAL([ANDROID_RELEASE], [test x$ANDROID_RELEASE = xyes])
AC_SUBST(ANDROID_SDK)
AC_SUBST(ANDROID_SDK)
@@
-167,7
+177,7
@@
AC_ARG_WITH(google-key, AS_HELP_STRING([--with-google-key=PATH],
[GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-maps-api-key])
if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
[GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-maps-api-key])
if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
- GOOGLEKEY=
'"'`cat "$GOOGLEKEYFILE"`'"'
+ GOOGLEKEY=
`cat "$GOOGLEKEYFILE"`
HAVE_GOOGLE_KEY="yes"
else
GOOGLEKEY='null'
HAVE_GOOGLE_KEY="yes"
else
GOOGLEKEY='null'
@@
-508,10
+518,11
@@
AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xy
AC_OUTPUT([
Makefile
src/Makedefs
AC_OUTPUT([
Makefile
src/Makedefs
+src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml
altoslib/Makefile
altoslib/Makefile
+altoslib/AltosVersion.java
icon/Makefile
altosuilib/Makefile
icon/Makefile
altosuilib/Makefile
-altosuilib/AltosUIVersion.java
altosui/Makefile
altosui/Info.plist
altosui/altos-windows.nsi
altosui/Makefile
altosui/Info.plist
altosui/altos-windows.nsi
@@
-524,6
+535,7
@@
telegps/Info.plist
telegps/telegps-windows.nsi
altosdroid/Makefile
altosdroid/local.properties
telegps/telegps-windows.nsi
altosdroid/Makefile
altosdroid/local.properties
+altosdroid/AndroidManifest.xml
ao-tools/Makefile
ao-tools/lib/Makefile
ao-tools/ao-rawload/Makefile
ao-tools/Makefile
ao-tools/lib/Makefile
ao-tools/ao-rawload/Makefile
@@
-546,6
+558,11
@@
ao-tools/ao-test-igniter/Makefile
ao-tools/ao-test-baro/Makefile
ao-tools/ao-test-flash/Makefile
ao-tools/ao-cal-accel/Makefile
ao-tools/ao-test-baro/Makefile
ao-tools/ao-test-flash/Makefile
ao-tools/ao-cal-accel/Makefile
+ao-tools/ao-cal-freq/Makefile
+ao-tools/ao-test-gps/Makefile
+ao-tools/ao-usbtrng/Makefile
+ao-tools/ao-chaosread/Makefile
+ao-tools/ao-makebin/Makefile
ao-utils/Makefile
src/Version
])
ao-utils/Makefile
src/Version
])
@@
-562,6
+579,7
@@
echo " CC1111 support..............: ${HAVE_SDCC}"
echo " AVR compiler................: ${AVR_CC} ${AVR_OBJCOPY}"
echo " AVR support.................: ${HAVE_AVR_CC}"
echo " Android support.............: ${HAVE_ANDROID_SDK}"
echo " AVR compiler................: ${AVR_CC} ${AVR_OBJCOPY}"
echo " AVR support.................: ${HAVE_AVR_CC}"
echo " Android support.............: ${HAVE_ANDROID_SDK}"
+echo " Android release support.....: ${ANDROID_RELEASE}"
echo " STlink support..............: ${HAVE_STLINK}"
echo " Local pdclib................: ${HAVE_PDCLIB}"
echo " i386 and amd64 libaltos.....: ${MULTI_ARCH}"
echo " STlink support..............: ${HAVE_STLINK}"
echo " Local pdclib................: ${HAVE_PDCLIB}"
echo " i386 and amd64 libaltos.....: ${MULTI_ARCH}"