Android version 0.11.11

Makefile.am

@@ -62,18 +62,12 @@ EXTRA_DIST =																		\
 deb:
 	fakeroot dpkg-buildpackage
 
-install-exec-hook:																	\
-	(mkdir -p $(pkgdatadir) &&												\
-	 mkdir -p $(pkgdatadir)/plugins &&								\
-	 mkdir -p $(pkgdatadir)/ide &&										\
-	 mkdir -p $(pkgdatadir)/samples &&								\
-	 cp documentation/sbasic_ref.csv $(pkgdatadir) &&	\
-	 cp plugins/*.* $(pkgdatadir)/plugins &&					\
-	 cp ide/*.* $(pkgdatadir)/ide)
-
 test:
 	(cd $(SUBDIRS) && make test)
 
+release:
+	(cd $(SUBDIRS) && make release)
+
 # produce a stack dump
 ndk-stack:
 	adb logcat | ${NDK}/ndk-stack -sym src/platform/android/obj/local/armeabi

README

@@ -30,13 +30,13 @@ Then use it to cross-compile the tools:
   make
   make install DESTDIR=$(pwd)
 
-3. Build common
+3. setup config.h
 
-./configure --enable-android --host=arm-linux-androideabi
+./configure --enable-android
 
 4. Build the native activity
 
-$ cd src/platform/andoid/jni && $NDK/ndk-build
+$ cd src/platform/andoid/jni && $NDK/ndk-build NDK_DEBUG=0
 
 $ cd - && cd ide/android/ && ant release install
 

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.11.8])
+AC_INIT([smallbasic], [0.11.11])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -123,14 +123,6 @@ function checkPCRE() {
    fi
 }
 
-function checkSearch() {
-   have_saerch="maybe"
-   AC_CHECK_HEADER(search.h, [have_search="yes"], [have_search="no"])
-   if test x$have_search = xyes ; then
-      AC_DEFINE(HAVE_SEARCH_H, 1, [Found GNU search.h])
-   fi
-}
-
 function defaultConditionals() {
    AM_CONDITIONAL(WITH_HILDON, false)
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
@@ -511,7 +503,7 @@ function buildTizen() {
 }
 
 function buildAndroid() {
-   TARGET="Building common library for Android."
+   TARGET="Building for Android."
 
    defaultConditionals
 
@@ -528,7 +520,7 @@ function buildAndroid() {
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
 
-   BUILD_SUBDIRS="src/platform/android/common"
+   BUILD_SUBDIRS="src/platform/android"
    AC_SUBST(BUILD_SUBDIRS)
 }
 
@@ -633,7 +625,6 @@ else
    buildConsole
 fi  
 
-checkSearch
 checkPCRE
 checkDebugMode
 checkForWindows
@@ -654,7 +645,7 @@ src/platform/mingw/Makefile
 src/platform/unix/Makefile
 src/platform/mosync/common/Makefile
 src/platform/tizen/common/Makefile
-src/platform/android/common/Makefile
+src/platform/android/Makefile
 ])
 AC_OUTPUT
 

debian/changelog

@@ -1,8 +1,18 @@
+smallbasic (0.11.11) unstable; urgency=low
+  * Built using common code from the android project and SDL
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 19 July 2014 09:45:25 +1000
+
+smallbasic (0.11.10) unstable; urgency=low
+  * Built using common code from the android project and SDL
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 19 July 2014 09:45:25 +1000
+
 smallbasic (0.10.8) unstable; urgency=low
   * Fix misc issues with const char* uncovered with new gcc
 
  -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 31 July 2010 09:45:25 +1000
-  
+
 smallbasic (0.10.7) unstable; urgency=low
   * Added defineKey and fixed delay problems with the inkey command
 

debian/control

@@ -13,6 +13,6 @@ Description: One more basic
  SmallBASIC is a fast and easy to learn BASIC language interpreter 
  ideal for everyday calculations, scripts and prototypes. 
  SmallBASIC includes trigonometric, matrices and algebra functions, 
- a built in IDE, a powerful string library, system, sound, and graphic
+ a powerful string library, system, sound, and graphic
  commands along with structured programming syntax. 
  SmallBASIC is licensed under the GPL. 

debian/rules

@@ -72,7 +72,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs 
 	dh_installexamples 
-	dh_install --exclude=".svn" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
+	dh_install --exclude=".git" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
 	dh_installman
 	dh_link
 	dh_strip

ide/android/AndroidManifest.xml

@@ -2,12 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
-          android:versionCode="10"
-          android:versionName="0.11.8">
+          android:versionCode="13"
+          android:versionName="0.11.11">
   <!-- This is the platform API where NativeActivity was introduced. -->
-  <uses-sdk android:minSdkVersion="9" />
+  <uses-sdk android:minSdkVersion="9"/>
 
-  <!-- This .apk has no Java code itself, so set hasCode to false. -->
+  <!-- support large + xlarge screens to avoid compatibility mode -->
+  <supports-screens android:largeScreens="true" />
+  <supports-screens android:xlargeScreens="true" />
+
+  <!-- This .apk has Java code, so set hasCode to true. -->
   <application android:label="@string/app_name"
                android:hasCode="true"
                android:hardwareAccelerated="true"
@@ -55,7 +59,9 @@
     </activity>
   </application>
   <!-- Permissions -->
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
 

ide/android/assets/main.bas

@@ -30,7 +30,7 @@ sub about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.11.8"
+  print "Version 0.11.11"
   print
   print "Copyright (c) 2002-2014 Chris Warren-Smith"
   print "Copyright (c) 2000-2006 Nic Christopoulos" + chr(10)

ide/android/build.xml

@@ -2,10 +2,10 @@
 <project name="SmallBASIC" default="help">
 
   <!-- Build requires the following setup:
-       ln -s jni -> ../../src/platform/android/jni
-       ln -s libs -> ../../src/platform/android/libs/
-       ln -s obj -> ../../src/platform/android/obj/
-       src -> ../../src/platform/android/src/
+       ln -s ../../src/platform/android/jni jni
+       ln -s ../../src/platform/android/libs libs
+       ln -s ../../src/platform/android/obj obj
+       ln -s ../../src/platform/android/src src
   -->
 
   <!-- The local.properties file is created and updated by the 'android' tool.

samples/distro-examples/examples/meminfo.bas

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

samples/distro-examples/tests/hash.bas

@@ -0,0 +1,10 @@
+dim foo
+
+key="blah"
+foo(key) = "something"
+foo("other") = 123
+
+? foo(key)
+? foo("other")
+? foo
+

src/common/Makefile.am

@@ -77,6 +77,7 @@ libsb_common_a_SOURCES =												\
     scan.c scan.h																\
     str.c str.h																	\
     tasks.c tasks.h															\
+    search.c search.h 													\
     var_uds.c var_uds.h													\
     var_hash.c var_hash.h												\
     keymap.c keymap.h														\