unify java

packages/jpl/CMakeLists.txt

@@ -3,58 +3,17 @@
 set (JPL_SOURCES
   src/c/jpl.c)
 
-find_package(Java COMPONENTS Runtime Development)
-# find_package(Java COMPONENTS Development)
-# find_package(Java COMPONENTS Runtime)
-#find_package(JavaLibs)
-macro_log_feature (Java_Development_FOUND "Java"
-    "Use Java System"
-    "http://www.java.org" FALSE)
-
 if (Java_Development_FOUND)
-
-  find_package(JNI)
   
   if (JNI_FOUND)
-  
-  include(UseJava)
 
-  #
-  #   Java_JAVA_EXECUTABLE      = the full path to the Java runtime
-  #   Java_JAVAC_EXECUTABLE     = the full path to the Java compiler
-  #   Java_JAVAH_EXECUTABLE     = the full path to the Java header generator
-  #   Java_JAVADOC_EXECUTABLE   = the full path to the Java documention generator
-  #   Java_IDLJ_EXECUTABLE      = the full path to the Java idl compiler
-  #   Java_JAR_EXECUTABLE       = the full path to the Java archiver
-  #   Java_JARSIGNER_EXECUTABLE = the full path to the Java jar signer
-  #   Java_VERSION_STRING       = Version of java found, eg. 1.6.0_12
-  #   Java_VERSION_MAJOR        = The major version of the package found.
-  #   Java_VERSION_MINOR        = The minor version of the package found.
-  #   Java_VERSION_PATCH        = The patch version of the package found.
-  #   Java_VERSION_TWEAK        = The tweak version of the package found (after '_')
-  #   Java_VERSION              = This is set to: $major.$minor.$patch(.$tweak)
-  #
-  # The Java_ADDITIONAL_VERSIONS variable can be used to specify a list
-  # of version numbers that should be taken into account when searching
-  # for Java.  You need to set this variable before calling
-  # find_package(JavaLibs).
-  #
-  #macro_optional_find_package(JNI ON)
-  #   JNI_INCLUDE_DIRS      = the include dirs to use
-  #   JNI_LIBRARIES         = the libraries to use
-  #   JNI_FOUND             = TRUE if JNI headers and libraries were found.
-  #   JAVA_AWT_LIBRARY      = the path to the jawt library
-  #   JAVA_JVM_LIBRARY      = the path to the jvm library
-  #   JAVA_INCLUDE_PATH     = the include path to jni.h
-  #   JAVA_INCLUDE_PATH2    = the include path to jni_md.h
-  #   JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
 
-  add_subdirectory (src/c)  
-  
+  add_subdirectory (src/c)
+
   endif (JNI_FOUND)
-    
-  add_subdirectory (src/java)  
-  
+
+  add_subdirectory (src/java)
+
   install(FILES jpl.pl
     DESTINATION ${libpl}
     )

packages/myddas/sqlite3/Android/jni/sqlite/Android.mk

@@ -5,10 +5,16 @@ include $(CLEAR_VARS)
 # If using SEE, uncomment the following:
 # LOCAL_CFLAGS += -DSQLITE_HAS_CODEC
 
+# This is important - it causes SQLite to use memory for temp files. Since 
+# Android has no globally writable temp directory, if this is not defined the
+# application throws an exception when it tries to create a temp file.
+#
+LOCAL_CFLAGS += -DSQLITE_TEMP_STORE=3
+
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
 LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
-LOCAL_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
 LOCAL_CFLAGS += -U__APPLE__
+LOCAL_CFLAGS += -DHAVE_STRCHRNUL=0
 LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
 LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
 LOCAL_CPPFLAGS += -Wno-conversion-null
@@ -32,6 +38,7 @@ LOCAL_SRC_FILES += sqlite3.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/nativehelper/
 
 LOCAL_MODULE:= libsqliteX
-LOCAL_LDLIBS += -ldl -llog
+LOCAL_LDLIBS += -ldl -llog 
 
 include $(BUILD_SHARED_LIBRARY)
+

packages/swig/android/jni/Applicatio.mk

@@ -1,13 +0,0 @@
-# File: Android.mk
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-NDK_TOOLCHAIN_VERSION := 4.8
-LOCAL_SHARED_LIBRARIES := @abs_top_builddir@/libYap.a @abs_top_builddir@/yapi.o
-LOCAL_MODULE    := yap_example
-LOCAL_SRC_FILES := yap_wrap.cpp
-LOCAL_C_INCLUDES :=  ../../../.. $(srcdir)/../../../../H $(srcdir)/../../../../include  $(srcdir)/../../../../os $(srcdir)/../../../../OPTYap $(srcdir)/../../../../BEAM $(srcdir)/../../../../CXX
-LOCAL_CFLAGS := @DEFS@ -D_YAP_NOT_INSTALLED_=1
-LOCAL_CPP_FEATURES := rtti
-# LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
-include $(BUILD_SHARED_LIBRARY)

packages/swig/android/jni/Application.mk

@@ -1,4 +0,0 @@
-NDK_TOOLCHAIN_VERSION = 4.8
-APP_STL := gnustl_static
-APP_CPPFLAGS += -fexceptions
-APP_OPTIM := debug

packages/swig/android/jni/sqlite/Makefile.in

@@ -1,82 +0,0 @@
-#
-# This is used to generate a sqlite3 library for YAP bootstrap
-# (EROOT for architecture-dependent files)
-#
-abs_top_builddir = $( pwd )
-prefix = ../gmp-android
-exec_prefix = $(prefix)
-ROOTDIR = $(prefix)
-EROOTDIR = $(prefix)
-srcdir = $(abs_top_builddir)
-#
-# where the binary should be
-#
-BINDIR = $(EROOTDIR)/bin
-#
-# where YAP should look for libraries
-#
-LIBDIR=li
-YAPLIBDIR=@libdir@/Yap
-#
-#
-CC=cc
-CXX=c++
-
-CFLAGS= -shared -fPIC -O -g -Wall  -I. -Inativehelper
-CFLAGS = -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
-CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
-CFLAGS += -U__APPLE__
-CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
-CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
-
-CPPFLAGS += $(CFLAGS) -Wno-conversion-null
-
-LDFLAGS=@LDFLAGS@
-
-
-OBJS =                            \
-	android_database_SQLiteCommon.o     \
-	android_database_SQLiteConnection.o \
-	android_database_SQLiteGlobal.o     \
-	android_database_SQLiteDebug.o      \
-	JNIHelp.o JniConstants.o
-
-OBJS += sqlite3.o
-
-#
-#
-# You shouldn't need to change what follows.
-#
-INSTALL=install
-INSTALL_DATA=install_data
-INSTALL_PROGRAM=install
-SHELL=/bin/sh
-RANLIB=ranlib
-SO=so
-CXXFLAGS=  -shared -export-dynamic $(CFLAGS)
-#
-
-
-
-
-libsqliteX.so: $(OBJS)
-@DO_SECOND_LD@	g++ $(LDFLAGS) -o $< $@ -ldl -llog
-
-.o: $(srcdir)/%.c
-		$(CC) -c $(CFLAGS) $< -o $@
-
-.o: $(srcdir)/%.cpp
-		$(CXX) -c $(CXXFLAGS) $< -o $@
-
-
-
-install: all install-examples
-	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-
-install-examples:
-
-clean:
-	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
-
-distclean: clean
-	rm -f Makefile