Merge pull request #13 from chrisws/android

Android

Author: chrisws

ChangeLog

@@ -1,3 +1,10 @@
+2014-08-09
+	Renamed command "#UNIT-PATH:" to "UNITPATH"
+	Renamed command "#INC:" to "INCLUDE"
+	Fixed/implemented INCLUDE command
+	Refactored comp_pass_1 function is scan.c breaking into
+	smaller helper functions
+
 2014-07-07
 	Update SDL to use SDL2 and common widget
 

Makefile.am

@@ -63,7 +63,7 @@ deb:
 	fakeroot dpkg-buildpackage
 
 test:
-	(cd $(SUBDIRS) && make test)
+	(cd @TEST_DIR@ && make test)
 
 release:
 	(cd $(SUBDIRS) && make release)

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.11])
+AC_INIT([smallbasic], [0.11.12])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -88,12 +88,12 @@ function checkDebugMode() {
    AC_MSG_RESULT([$with_debug])
    if test "$with_debug" = "yes" || test "$with_debug" = "full"
    then
-     CFLAGS="-g -O0"
-     CXXFLAGS="-g -O0"
+     CFLAGS="${CFLAGS} -g -O0"
+     CXXFLAGS="${CXXFLAGS} -g -O0"
      AC_DEFINE(_DEBUG, 1, [debugging build enabled])
    else
-     CFLAGS="-O3 -Os"
-     CXXFLAGS="-O3 -Os"
+     CFLAGS="${CFLAGS} -O3 -Os"
+     CXXFLAGS="${CXXFLAGS} -O3 -Os"
    fi
    AC_SUBST(CFLAGS)
 }
@@ -522,6 +522,9 @@ function buildAndroid() {
 
    BUILD_SUBDIRS="src/platform/android"
    AC_SUBST(BUILD_SUBDIRS)
+
+   TEST_DIR="src/platform/android"
+   AC_SUBST(TEST_DIR)
 }
 
 function buildConsole() {
@@ -582,6 +585,8 @@ function buildConsole() {
       AC_CHECK_HEADER(readline/readline.h, [], [AC_MSG_ERROR("install libreadline-dev")])
       PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread -lncurses -lreadline"
       BUILD_SUBDIRS="src/common src/platform/unix"
+      TEST_DIR="src/platform/unix"
+      AC_SUBST(TEST_DIR)
    fi
 
    AC_SUBST(BUILD_SUBDIRS)

ide/android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
-          android:versionCode="13"
-          android:versionName="0.11.11">
+          android:versionCode="14"
+          android:versionName="0.11.12">
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9"/>
 

ide/android/assets/main.bas

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

ide/android/project.properties

@@ -8,7 +8,7 @@
 # project structure.
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
 target=android-15

samples/unit-tests/call_tau.bas renamed to samples/distro-examples/tests/call_tau.bas

@@ -1,5 +1,3 @@
-#!/usr/bin/sbasic
-#inc:"metac.bas"
-
+INCLUDE "metac.bas"
 ? "Module: Meta-A"
 

samples/distro-examples/tests/metaa.bas

@@ -1,4 +1,3 @@
-
 ? "Module: Meta-B"
 
 

samples/distro-examples/tests/metac.bas

@@ -0,0 +1 @@
+TEST: Arrays, unound, lbound