Skip to content

Commit 155bedc

Browse files
chriswschrisws
committed
Merge pull request #12 from chrisws/android
Android version 0.11.11
2 parents 1b13303 + 0f707c4 commit 155bedc

File tree

37 files changed

+607
-453
lines changed

37 files changed

+607
-453
lines changed

‎Makefile.am‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,12 @@ EXTRA_DIST = \
6262
deb:
6363
fakeroot dpkg-buildpackage
6464

65-
install-exec-hook: \
66-
(mkdir -p $(pkgdatadir) && \
67-
mkdir -p $(pkgdatadir)/plugins && \
68-
mkdir -p $(pkgdatadir)/ide && \
69-
mkdir -p $(pkgdatadir)/samples && \
70-
cp documentation/sbasic_ref.csv $(pkgdatadir) && \
71-
cp plugins/*.* $(pkgdatadir)/plugins && \
72-
cp ide/*.* $(pkgdatadir)/ide)
73-
7465
test:
7566
(cd $(SUBDIRS) && make test)
7667

68+
release:
69+
(cd $(SUBDIRS) && make release)
70+
7771
# produce a stack dump
7872
ndk-stack:
7973
adb logcat | ${NDK}/ndk-stack -sym src/platform/android/obj/local/armeabi

‎README‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ Then use it to cross-compile the tools:
3030
make
3131
make install DESTDIR=$(pwd)
3232

33-
3. Build common
33+
3. setup config.h
3434

35-
./configure --enable-android --host=arm-linux-androideabi
35+
./configure --enable-android
3636

3737
4. Build the native activity
3838

39-
$ cd src/platform/andoid/jni && $NDK/ndk-build
39+
$ cd src/platform/andoid/jni && $NDK/ndk-build NDK_DEBUG=0
4040

4141
$ cd - && cd ide/android/ && ant release install
4242

‎configure.ac‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
77
dnl Download the GNU Public License (GPL) from www.gnu.org
88
dnl
99

10-
AC_INIT([smallbasic], [0.11.8])
10+
AC_INIT([smallbasic], [0.11.11])
1111
AC_CONFIG_SRCDIR([configure.ac])
1212

1313
AC_CANONICAL_TARGET
@@ -123,14 +123,6 @@ function checkPCRE() {
123123
fi
124124
}
125125

126-
function checkSearch() {
127-
have_saerch="maybe"
128-
AC_CHECK_HEADER(search.h, [have_search="yes"], [have_search="no"])
129-
if test x$have_search = xyes ; then
130-
AC_DEFINE(HAVE_SEARCH_H, 1, [Found GNU search.h])
131-
fi
132-
}
133-
134126
function defaultConditionals() {
135127
AM_CONDITIONAL(WITH_HILDON, false)
136128
AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
@@ -511,7 +503,7 @@ function buildTizen() {
511503
}
512504

513505
function buildAndroid() {
514-
TARGET="Building common library for Android."
506+
TARGET="Building for Android."
515507

516508
defaultConditionals
517509

@@ -528,7 +520,7 @@ function buildAndroid() {
528520
AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
529521
AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
530522

531-
BUILD_SUBDIRS="src/platform/android/common"
523+
BUILD_SUBDIRS="src/platform/android"
532524
AC_SUBST(BUILD_SUBDIRS)
533525
}
534526

@@ -633,7 +625,6 @@ else
633625
buildConsole
634626
fi
635627

636-
checkSearch
637628
checkPCRE
638629
checkDebugMode
639630
checkForWindows
@@ -654,7 +645,7 @@ src/platform/mingw/Makefile
654645
src/platform/unix/Makefile
655646
src/platform/mosync/common/Makefile
656647
src/platform/tizen/common/Makefile
657-
src/platform/android/common/Makefile
648+
src/platform/android/Makefile
658649
])
659650
AC_OUTPUT
660651

‎debian/changelog‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
smallbasic (0.11.11) unstable; urgency=low
2+
* Built using common code from the android project and SDL
3+
4+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 19 July 2014 09:45:25 +1000
5+
6+
smallbasic (0.11.10) unstable; urgency=low
7+
* Built using common code from the android project and SDL
8+
9+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 19 July 2014 09:45:25 +1000
10+
111
smallbasic (0.10.8) unstable; urgency=low
212
* Fix misc issues with const char* uncovered with new gcc
313

414
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 31 July 2010 09:45:25 +1000
5-
15+
616
smallbasic (0.10.7) unstable; urgency=low
717
* Added defineKey and fixed delay problems with the inkey command
818

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ Description: One more basic
1313
SmallBASIC is a fast and easy to learn BASIC language interpreter
1414
ideal for everyday calculations, scripts and prototypes.
1515
SmallBASIC includes trigonometric, matrices and algebra functions,
16-
a built in IDE, a powerful string library, system, sound, and graphic
16+
a powerful string library, system, sound, and graphic
1717
commands along with structured programming syntax.
1818
SmallBASIC is licensed under the GPL.

‎debian/rules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ binary-arch: build install
7272
dh_installchangelogs ChangeLog
7373
dh_installdocs
7474
dh_installexamples
75-
dh_install --exclude=".svn" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
75+
dh_install --exclude=".git" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
7676
dh_installman
7777
dh_link
7878
dh_strip

‎ide/android/AndroidManifest.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="net.sourceforge.smallbasic"
44
android:installLocation="preferExternal"
5-
android:versionCode="10"
6-
android:versionName="0.11.8">
5+
android:versionCode="13"
6+
android:versionName="0.11.11">
77
<!-- This is the platform API where NativeActivity was introduced. -->
8-
<uses-sdk android:minSdkVersion="9" />
8+
<uses-sdk android:minSdkVersion="9"/>
99

10-
<!-- This .apk has no Java code itself, so set hasCode to false. -->
10+
<!-- support large + xlarge screens to avoid compatibility mode -->
11+
<supports-screens android:largeScreens="true" />
12+
<supports-screens android:xlargeScreens="true" />
13+
14+
<!-- This .apk has Java code, so set hasCode to true. -->
1115
<application android:label="@string/app_name"
1216
android:hasCode="true"
1317
android:hardwareAccelerated="true"
@@ -55,7 +59,9 @@
5559
</activity>
5660
</application>
5761
<!-- Permissions -->
58-
<uses-permission android:name="android.permission.INTERNET" />
59-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
62+
<uses-permission android:name="android.permission.INTERNET" />
63+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
64+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
65+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
6066
</manifest>
6167

‎ide/android/assets/main.bas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ sub about()
3030
print "(_ ._ _ _.|||_) /\ (_ |/ "
3131
print "__)| | |(_||||_)/--\__)|\_"
3232
print
33-
print "Version 0.11.8"
33+
print "Version 0.11.11"
3434
print
3535
print "Copyright (c) 2002-2014 Chris Warren-Smith"
3636
print "Copyright (c) 2000-2006 Nic Christopoulos" + chr(10)

‎ide/android/build.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<project name="SmallBASIC" default="help">
33

44
<!-- Build requires the following setup:
5-
ln -s jni -> ../../src/platform/android/jni
6-
ln -s libs -> ../../src/platform/android/libs/
7-
ln -s obj -> ../../src/platform/android/obj/
8-
src -> ../../src/platform/android/src/
5+
ln -s ../../src/platform/android/jni jni
6+
ln -s ../../src/platform/android/libs libs
7+
ln -s ../../src/platform/android/obj obj
8+
ln -s ../../src/platform/android/src src
99
-->
1010

1111
<!-- The local.properties file is created and updated by the 'android' tool.

‎samples/distro-examples/examples/meminfo.bas‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
? "MemTotal: "; fre(0)
2+
? "MemFree: "; fre(1)
3+
? "Buffers: "; fre(2)
4+
? "Cached: "; fre(3)
5+
? "SwapCached: "; fre(4)
6+
? "Active: "; fre(5)
7+
? "Inactive: "; fre(6)
8+
? "Active(anon): "; fre(7)
9+
? "Inactive(anon): "; fre(8)
10+
? "Active(file): "; fre(9)
11+
? "Inactive(file): "; fre(10)
12+
? "Unevictable: "; fre(11)
13+
? "Mlocked: "; fre(12)
14+
? "SwapTotal: "; fre(13)
15+
? "SwapFree: "; fre(14)
16+
? "Dirty: "; fre(15)
17+
? "Writeback: "; fre(16)
18+
? "AnonPages: "; fre(17)
19+
? "Mapped: "; fre(18)
20+
? "Shmem: "; fre(19)
21+
? "Slab: "; fre(20)
22+
? "SReclaimable: "; fre(21)
23+
? "SUnreclaim: "; fre(22)
24+
? "KernelStack: "; fre(23)
25+
? "PageTables: "; fre(24)
26+
? "NFS_Unstable: "; fre(25)
27+
? "Bounce: "; fre(26)
28+
? "WritebackTmp: "; fre(27)
29+
? "CommitLimit: "; fre(28)
30+
? "Committed_AS: "; fre(29)
31+
? "VmallocTotal: "; fre(30)
32+
? "VmallocUsed: "; fre(31)
33+
? "VmallocChunk: "; fre(32)
34+
? "HardwareCorrupted: "; fre(33)
35+
? "AnonHugePages: "; fre(34)
36+
? "HugePages_Total: "; fre(35)
37+
? "HugePages_Free: "; fre(36)
38+
? "HugePages_Rsvd: "; fre(37)
39+
? "HugePages_Surp: "; fre(38)
40+
? "Hugepagesize: "; fre(39)
41+
? "DirectMap4k: "; fre(40)
42+
? "DirectMap2M: "; fre(41)

0 commit comments

Comments
 (0)