From 2d736fa22d2ad76a8e4c38671fe8d34c993955f2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 2 Aug 2011 10:34:20 +0200
Subject: Remove linux-armv7 native platform libraries (compile time only),
 reducing the burden to add a license file etc.

---
 make/gluegen-cpptasks-base.xml                        |   2 +-
 .../ubuntu-11.04/jre/lib/arm/libjawt.so               | Bin 5400 -> 0 bytes
 .../ubuntu-11.04/jre/lib/arm/server/libjvm.so         | Bin 4046310 -> 0 bytes
 make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so | Bin 914008 -> 0 bytes
 .../arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so | Bin 5472 -> 0 bytes
 .../arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so   | Bin 21904 -> 0 bytes
 .../arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so  | Bin 13676 -> 0 bytes
 make/scripts/make.gluegen.all.linux-armv7-cross.sh    |   3 +++
 make/scripts/make.gluegen.all.linux-armv7.sh          |   3 +++
 9 files changed, 7 insertions(+), 1 deletion(-)
 delete mode 100644 make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/libjawt.so
 delete mode 100644 make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/server/libjvm.so
 delete mode 100644 make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so
 delete mode 100644 make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so
 delete mode 100644 make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so
 delete mode 100644 make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 317da29..dd7f1cf 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -980,7 +980,7 @@
       <echo message="Linux.armv7" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.armv7" /> 
       <property name="linker.cfg.id.base"            value="linker.cfg.linux.armv7" /> 
-      <property name="java.lib.dir.platform"         value="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm" />
+      <property name="java.lib.dir.platform"         value="${env.TARGET_JAVA_LIBS}" />
     </target>
 
     <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/libjawt.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/libjawt.so
deleted file mode 100644
index f9e73cd..0000000
Binary files a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/libjawt.so and /dev/null differ
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/server/libjvm.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/server/libjvm.so
deleted file mode 100644
index 49171ad..0000000
Binary files a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/server/libjvm.so and /dev/null differ
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so
deleted file mode 100644
index 0a56c29..0000000
Binary files a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so and /dev/null differ
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so
deleted file mode 100644
index 8c7af7e..0000000
Binary files a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so and /dev/null differ
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so
deleted file mode 100644
index cfcecb8..0000000
Binary files a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so and /dev/null differ
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so
deleted file mode 100644
index b7b5830..0000000
Binary files a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so and /dev/null differ
diff --git a/make/scripts/make.gluegen.all.linux-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
index 1002756..369a497 100755
--- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
@@ -19,6 +19,9 @@ export TARGET_IP=beagle01
 export TARGET_ROOT=/home/jogamp/projects-cross
 export TARGET_ANT_HOME=/usr/share/ant
 
+export TARGET_PLATFORM_LIBS=/opt-linux-armv7-eabi
+export TARGET_JAVA_LIBS=/opt-linux-armv7-eabi/jre/lib/arm
+
 ant \
     -Drootrel.build=build-linux-armv7 \
     -Dgluegen.cpptasks.detected.os=true \
diff --git a/make/scripts/make.gluegen.all.linux-armv7.sh b/make/scripts/make.gluegen.all.linux-armv7.sh
index 527347c..2221c10 100755
--- a/make/scripts/make.gluegen.all.linux-armv7.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7.sh
@@ -7,6 +7,9 @@
 #    -DisLinuxX86=true \
 #    -DisX11=true \
 
+export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi
+export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm
+
 ant \
     -Drootrel.build=build-linux-armv7 \
     -DuseKD=true \
-- 
cgit v1.2.3