Remove unused armv7 scripts and gluegen piece

3 files changed, 0 insertions, 246 deletions

diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml
deleted file mode 100644
index d13c190..0000000
--- a/make/lib/gluegen-cpptasks-android-armv7.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    This is an example of how to add custom compiler/linker 
-    arguments for a crosscompiler.
-
-    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
-
-        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
-
-    In case you want to compile for 32bit on a 64bit machine,
-    you might also need to set the 'os.arch' to 'x86'.
-    Example: gluegen/make/make.gluegen.all.linux-x86.sh
-      -->
-
-<project name="GlueGen-cpptasks-android-armv7" basedir="." >
-
-<!-- Set OS and ARCH for crosscompilation compiler configuration -->
-<target name="gluegen.cpptasks.detect.os.custom">
-    <property name="gluegen.cpptasks.detected.os"     value="true" /> 
-    <property name="isUnix"                           value="true" /> 
-    <property name="isAndroid"                        value="true" /> 
-    <property name="isAndroidARMv6"                   value="true" /> 
-    <property name="jvmDataModel.arg"                 value="-Djnlp.no.jvm.data.model.set=true" /> 
-    <property name="isCrosscompilation"               value="true" />
-    <property name="android.abi"                      value="armeabi-v7a" />
-    <property name="isAbiEabiGnuArmel"                value="true" />
-    <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-android-armv7' done"/>
-</target>
-
-<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" />
-
-<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
-    <echo message="Custom forced compiler Android NDK, linker.cfg.android" />
-    <compiler id="compiler.cfg.android" name="gcc">
-      <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
-      <!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin will not find
-        subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK
-        or not. Need to explicitly indicate where subprograms are with -B.
-        NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN_ROOT/bin. -->
-      <compilerarg value="-B${env.NDK_TOOLCHAIN_ROOT}/libexec/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" />
-
-      <compilerarg value="-ffunction-sections" />
-      <compilerarg value="-funwind-tables" />
-      <compilerarg value="-fstack-protector" />
-      <compilerarg value="-fpic" /> 
-
-      <compilerarg value="-march=armv7-a" />
-      <compilerarg value="-mfloat-abi=softfp" />
-      <compilerarg value="-marm" /> 
-
-      <compilerarg value="-g" if="c.compiler.use-debug" />
-      <compilerarg value="-O0" if="c.compiler.use-debug" />
-      <compilerarg value="-Os" unless="c.compiler.use-debug" /> 
-      <!--<compilerarg value="-O2" /> -->
-
-      <compilerarg value="-fomit-frame-pointer" /> 
-      <compilerarg value="-fno-strict-aliasing" /> 
-      <compilerarg value="-finline-limit=64" /> 
-      <compilerarg value="-Wa,--noexecstack" /> 
-      <includepath path="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/include" /> <!-- for stdarg.h -->
-      <defineset>
-        <define name="__unix__" />
-        <define name="__ARM_ARCH_5__" />
-        <define name="__ARM_ARCH_5T__" />
-        <define name="__ARM_ARCH_5E__" />
-        <define name="__ARM_ARCH_5TE__" />
-        <define name="ANDROID" />
-        <define name="_DEBUG"   if="c.compiler.use-debug"/>        
-        <define name="DEBUG"    if="c.compiler.use-debug"/>        
-        <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
-      </defineset>
-    </compiler>
-
-    <linker id="linker.cfg.android" name="gcc">
-         <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
-         <linkerarg value="-fpic" /> 
-         <linkerarg value="-fno-use-linker-plugin" /> 
-
-         <linkerarg value="-march=armv7-a" />
-         <linkerarg value="-mfloat-abi=softfp" />
-         <linkerarg value="-marm" /> 
-
-         <linkerarg value="-nostdlib" />
-         <linkerarg value="-Bdynamic" />
-         <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" />
-         <linkerarg value="-Wl,-z,nocopyreloc" />
-
-         <linkerarg value="--demangle" /> 
-         <linkerarg value="--gc-sections" /> 
-         <linkerarg value="--no-undefined" /> 
-         <linkerarg value="-static-libgcc"/>
-         <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told
-           where to find libgcc as the default location (gcc -print-search-dirs)
-           is not correct. Not sure if this is a bug in the NDK or not. We also
-           enforce that libgcc is linked after source files but before other shared
-           libraries. -->
-         <libset dir="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/armv7-a" libs="gcc" />
-         <!-- libset libs="c,m,dl,log" / -->
-         <libset libs="c,m,dl" />
-    </linker>
-
-</target>
-
-<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir">
-  <echo message="Custom forced Linux.x86 cross compile android" />
-  <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
-  <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
-  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
-  <property name="java.includes.dir.platform"    value="${java.includes.dir}/linux" />
-</target>
-
-<target name="declare.linux.android">
-      <echo message="android.arm" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
-      <property name="linker.cfg.id"                        value="linker.cfg.android" />
-</target>
-
-</project>
-
-
diff --git a/make/scripts/crosstest-junit-android-armv7-rel.sh b/make/scripts/crosstest-junit-android-armv7-rel.sh
deleted file mode 100644
index 3d5ada1..0000000
--- a/make/scripts/crosstest-junit-android-armv7-rel.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/bash
-
-export HOST_UID=sven
-export HOST_IP=192.168.0.52
-export HOST_RSYNC_ROOT=PROJECTS/JOGL
-
-export TARGET_UID=jogamp
-export TARGET_IP=beagle02
-export TARGET_ROOT=/projects
-
-export BUILD_DIR=../build-android-armv7
-
-if [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then
-    export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
-    export PATH=$ANDROID_HOME/platform-tools:$PATH
-fi 
-
-#
-# orig android:
-#   export LD_LIBRARY_PATH /system/lib
-#   export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar
-#
-
-#TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter
-TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
-
-LOGFILE=`basename $0 .sh`.log
-
-#  -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
-#  -Djava.class.path=lib/ant-junit-all.apk:$BUILD_DIR/gluegen-rt.apk \
-#  -Djava.library.path=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
-
-RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
-                --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \
-                --delete-excluded"
-
-echo "#! /system/bin/sh" > $BUILD_DIR/targetcommand.sh
-
-echo "\
-rsync -av --delete --delete-after $RSYNC_EXCLUDES $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $TARGET_ROOT ; \
-cd $TARGET_ROOT/gluegen/make ; \
-export LD_LIBRARY_PATH=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$TARGET_ROOT/gluegen/make/$BUILD_DIR/test/build/natives ; \
-export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar ; \
-dalvikvm \
-  -Xjnigreflimit:2000 \
-  -cp ../make/lib/ant-junit-all.apk:../build-android-armv7/gluegen.apk:../build-android-armv7/test/build/gluegen-test.apk \
-  -Djogamp.debug.JNILibLoader=true \
-  -Djogamp.debug.NativeLibrary=true \
-  -Djogamp.debug.NativeLibrary.Lookup=true \
-  -Djogamp.debug.ProcAddressHelper=true \
-  com.android.internal.util.WithFramework \
-  org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner \
-  $TSTCLASS \
-  filtertrace=true \
-  haltOnError=false \
-  haltOnFailure=false \
-  showoutput=true \
-  outputtoformatters=true \
-  logfailedtests=true \
-  logtestlistenerevents=true \
-  formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \
-  formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,./TEST-result.xml \
-" >> $BUILD_DIR/targetcommand.sh
-
-chmod ugo+x $BUILD_DIR/targetcommand.sh
-adb push $BUILD_DIR/targetcommand.sh $TARGET_ROOT/targetcommand.sh
-adb shell $TARGET_ROOT/targetcommand.sh 2>&1 | tee $LOGFILE
-adb pull $TARGET_ROOT/gluegen/make/TEST-result.xml TEST-result.xml
-
diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh
deleted file mode 100755
index 7c180dd..0000000
--- a/make/scripts/make.gluegen.all.android-armv7-cross.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-
-if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/setenv-build-jogl-x86_64.sh
-fi
-
-if [ -e $SDIR/setenv-android-tools.sh ] ; then
-    . $SDIR/setenv-android-tools.sh
-fi
-
-export NODE_LABEL=.
-
-export HOST_UID=jogamp
-# jogamp02 - 10.1.0.122
-export HOST_IP=10.1.0.122
-export HOST_RSYNC_ROOT=PROJECTS/JOGL
-
-export TARGET_UID=jogamp
-export TARGET_IP=panda02
-#export TARGET_IP=jautab03
-#export TARGET_IP=jauphone04
-export TARGET_ADB_PORT=5555
-# needs executable bit (probably su)
-export TARGET_ROOT=/data/projects
-export TARGET_ANT_HOME=/usr/share/ant
-
-export ANDROID_VERSION=9
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-
-#export GCC_VERSION=4.4.3
-export GCC_VERSION=4.8
-HOST_ARCH=linux-x86_64
-export TARGET_TRIPLE=arm-linux-androideabi
-
-export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
-
-# Need to add toolchain bins to the PATH. 
-export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
-
-export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv7.xml"
-
-#export JUNIT_DISABLED="true"
-#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
-
-which gcc 2>&1 | tee make.gluegen.all.android-armv7-cross.log
-
-#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
-export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
-
-#BUILD_ARCHIVE=true \
-ant \
-    -Drootrel.build=build-android-armv7 \
-    $* 2>&1 | tee -a make.gluegen.all.android-armv7-cross.log