summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove android excludes (compilation), ensuring 1:1 jar filesSven Gothel2011-08-021-6/+2
|
* Android: Drop android.jar ; Simplify 'aapt.signed' ; Move our android ↵Sven Gothel2011-08-0218-22/+415
| | | | | | | | | | | | | | | | resources -> make/resources Drop android.jar - version 8 and 9 - license: apache v2 (NOTICE.txt included) - allows compilation using Android API on all platforms Simplify 'aapt.signed' - removed 'jarclasspathrefid', seems to be not needed (commented out) Move our android resources make/lib/android -> make/resources/android - make/lib is for 3rd party stuff only
* resources: proper location, not mixing w/ 3rd party libsSven Gothel2011-08-022-0/+0
|
* resources: unique graphics locationSven Gothel2011-08-022-0/+0
|
* Merge remote-tracking branch 'rsantina/master'Sven Gothel2011-08-021-1/+46
|\
| * Fix: cleanup android.R based task and classpathsRami Santina2011-07-311-9/+14
| |
| * added generation and compilation of android Resource classRami Santina2011-07-291-1/+41
| |
* | cross test linux/armv7 scripts: use generic ANT_PATHSven Gothel2011-08-022-2/+4
| |
* | Remove linux-armv7 native platform libraries (compile time only),Sven Gothel2011-08-029-1/+7
|/ | | | reducing the burden to add a license file etc.
* Platform getArch() -> getArchName() (analogue to getOSName())Sven Gothel2011-07-282-2/+2
|
* Fix Android apk activity; Add apk VersionName; Add jar manifest to apkSven Gothel2011-07-2819-57/+429
| | | | | | | | | | | | | | | | - build: - exclude android packages if !isAndroid - aapt: - Use individual AndroidManifest xml files - optional: incl. our JAR manifest file to support detailed version info - use def. GluegenVersionActivity - APK VersionName: Retrieve and show - package/extension names: - gluegen.jar/apk: com.jogamp.gluegen - gluegen-rt.jar/apk: com.jogamp.common
* APK: Native lib gets picked up now apk/lib/armeabi -> /data/data/<package>/libSven Gothel2011-07-281-5/+5
|
* Fix android build/unit-test ; Generalize aapt packaging (macro) ; Use jogamp ↵Sven Gothel2011-07-287-124/+224
| | | | | | | | | | | | | | | | icons make/scripts/make.gluegen.all.android-armv7-cross.sh - make Rami and me happy :) - 3 default locations plus recognize user provided android toolkit path - fixes using ant targets as arguments make/jogamp-androidtasks.xml - macro aapt.signed: create signed apk file from jar - incl. adding native libraries - see macro doc. adding generic jogamp icons/images
* proper GlueGen spellingSven Gothel2011-07-281-2/+2
|
* Replace default Android icons w/ JogAmp iconsSven Gothel2011-07-283-0/+0
|
* Merge remote-tracking branch 'rsantina/wip_mobile' into wip_mobileSven Gothel2011-07-288-14/+142
|\
| * Merge branch 'wip_mobile' of git://github.com/sgothel/gluegen into wip_mobileRami Santina2011-07-266-93/+86
| |\
| * | Added android packaging for android gluegen-rt.apkRami Santina2011-07-268-14/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | the apk package can be installed on android device using adb install gluegen-rt.apk reference package on device is com.jogamp.gluegen gerenic icons is added to be replaced by jogamp logo changes to apk can be controled thru manifest lib/android/AndroidManifest.xml
* | | Add Ubuntu 11.04 arm-linux-gnueabi library folder for build time linker ↵Sven Gothel2011-07-287-1/+1
| |/ |/| | | | | resolution
* | Cross JUnit Tests - All Passed: Android+Linux armv7Sven Gothel2011-07-256-93/+86
|/ | | | | | | | | | | - junit.cross targets: - use scripting to save time, ie write all target commands to script, xfer, exec - junit: delete result folder just before junit.run - Test BuildEnvironment.java: Simplify path config via properties (for android) - AndroidVersion: No annoying exception dump if Build$VERSION* is not found (not android) - launch scripts: use absolute TARGET_ROOT path for dynamic linker env.
* Add native lib in apk, needs work to be installed (manifest ...)Sven Gothel2011-07-241-2/+10
|
* Cleaned up android build ; Cross junit/java android test/script; Fix ↵Sven Gothel2011-07-245-23/+88
| | | | | | | | | | | | | | | | | | | Test1p2ProcAddressEmitter Fix Test1p2ProcAddressEmitter - 3 tests used the wrong binding instance, where no native lib was loaded for - duh :) Cleaned up android build - add unix src (UnixDynamicLinkerImpl_JNI.c) - remove linker cmds in compile arguments Cross junit/java android test works via script - target command scrip is written to file, pushed and executed Status: com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter - passed - on par w/ linux-armv7
* Complete android apk creation and cont. unit test launch. Need to write unit ↵Sven Gothel2011-07-245-49/+36
| | | | test commands to file - too long for single adb shell command
* Android: Remove native (fake) detectionSven Gothel2011-07-243-21/+1
|
* Android integration / cross-test ; Enhance PlatformSven Gothel2011-07-2413-19/+316
| | | | | | | | | | | - android minor build fix - started dex'ing (gluegen-rt.apk, more to come for full junit tests) - android remote dalvikvm launch works (crosstest-java-android-armv7-rel.sh) - android detection, incl version (reflection) - Platform: - Add JAVA_VM_NAME and JAVA_VM_RUNIME - OSType maybe ANDROID, where the OS name (String) is Linux ! (ok ?)
* fix cross test: Test* -> *Test* ; Reduce iterations further for ARM to ↵Sven Gothel2011-07-236-9/+9
| | | | speedup test
* Add single cross test scriptsSven Gothel2011-07-232-0/+65
|
* Enable cross-testing on linux-armv7Sven Gothel2011-07-234-4/+105
|
* Adding Sylvestre Ledru's bug #487 verbosity patchSven Gothel2011-07-231-0/+1
|
* Add missing defines (__unix__, DEBUG) for solaris, etcSven Gothel2011-07-231-0/+12
|
* Adding native crosscompile test to ubuntu/armv7 and android/armv7Sven Gothel2011-07-2311-0/+552
|
* Cleanup [cross] compile propertiesSven Gothel2011-07-2210-19/+51
| | | | | | | | | | | | | - linux-armv7 (ubuntu) - added scripts/make.gluegen.all.linux-armv7-cross.sh - added symbolic links to cross toolchain (gcc, ld, ..) allowing gluegen's cpptask to pick it up - android-armv7 (android) - we have scripts/make.gluegen.all.android-armv7-cross.sh
* Fix regression (commit f733203dfbd034a6b1aa3eb2cd616437c982c435): Init of ↵Sven Gothel2011-07-221-2/+3
| | | | DEBUG and DEBUG_LOOKUP was removed, re-added.
* add props compiler.cfg.linux.x86, linker.cfg.linux.x86 for proper ↵Sven Gothel2011-07-223-40/+28
| | | | linux-x86_32 spec. removed android props, we use custom xml files
* Reversed Type relocation ; Minor fixSven Gothel2011-07-2136-60/+28
| | | | | | | Reversed Type relocation (commit 92d6c9dc5fa72b01703456452c60822f36c14fff) from com.jogamp.gluegen.runtime.types back to com.jogamp.gluegen.cgram.types Enabled MemoryLayoutType.setLayouted(), avoiding double layout
* Merge remote-tracking branch 'rsantina/wip_mobile' into wip_mobileSven Gothel2011-07-213-0/+174
|\
| * Added scripts and custom cpp-tasks to build on android-armv7lRami Santina2011-07-213-0/+174
| |
* | Fix TestStructAccessorEndianSven Gothel2011-07-216-10/+157
| | | | | | | | | | | | | | | | | | | | | | | | - StructAccessor uses byteOffset now (since 8b3057585930357bb16546f584d998953b084034) Fix linux armv7l eabi: - build.xml arm7 -> armv7 - all tests passes Adding NativeSizeAlignment-linux-armv7l_eabi from passing test OK: linux 32/64/armv7l, windows 32/64
* | GlueGen proper size / alignment of primitive and compound types usage [2/2] ↵Sven Gothel2011-07-2121-471/+1121
|/ | | | | | | | | | | | | | | | | | | | | | | | | | - Fin MachineDesction == MD MD.StaticConfig: - enum for all supported static configs (ID -> MD) - verified at runtime: test runtime queried-MD versus static-MD, hard fail if not compatible (size/alignment) SizeThunk primitive sizes: - Add notion of fixed native size (eg. int64_t) and otherwise (eg. long) java struct 'wrappers' code generation: - single class using size/offset arrays of all MachineDescription configurations - at runtime the array idx is queried in static block - type aligment for not fixed-native-size types (SizeThunk, undef long/int) via StructAccessor junit test: - add float test - fix native code - add java (create, write) -> native (verify) test works (tested) on: linux 32/64 and windows 32/64
* minor refinementSven Gothel2011-07-202-32/+30
|
* refined Android ARMv7 targets (android still dummy)Sven Gothel2011-07-201-18/+72
|
* FIX StructAccessor / JavaEmitter's struct-emitter: Using byte offsetsSven Gothel2011-07-202-167/+90
| | | | | | | | | | | | | | | | | | | | Problem: typedef struct { int8_t bits1; // +1 - 0 // +3 (p32) int32_t id; // +4 - 4 int8_t bits2; // +1 - 8 // +3 (p32) - int64_t long0; // +8 - 12 "longBuffer.get(<type-sized index>)" is invalid, but "byteBuffer.getLong(<byte index>)" must be done. The actual impl. doesn't matter, hence dropping the other nio type mappings is good. FIXES 32bit unit test, works well (static) on 32/64 bit (unix). TODO: Respect diff alignment for OS/ARCH either by offset tables for all, or runtime computing.
* Cleanup: Platform CPU enum, MachineDescription,Sven Gothel2011-07-2016-299/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform: - enum CPUFamily is part of CPUType - DALVIK -> ANDROID - ARM: ARM + ARMv[567] MachineDescription - self contained - static size/alignment Config (enum) for unix32, unix64, win32, win64 and armeabi - add 'long double' - Removed MachineDescription32Bit, MachineDescription64Bit - createStatic(..) uses OS/CPU to fetch best match if not at runtime FIXES: JavaEmitter's struct-emit: Proper 32/64 struct sizes TODO: StructAccessor's mapping to <Type>Buffer w/ index os sizeof(<Type>) doesn't work, since offset may not be multiple of sizeof(<Type>)! i.e. typedef struct { int8_t bits1; // +1 - 0 // +3 (p32) int32_t id; // +4 - 4 int8_t bits2; // +1 - 8 // +3 (p32) - int64_t long0; // +8 - 12 so "longBuffer.get(<type-sized index>)" is invalid, but "byteBuffer.getLong(<byte index>)" must be done. The actual impl. doesn't matter, hence dropping the other nio type mappings is good.
* Fix bad file rename/move: .jav -> .javaSven Gothel2011-07-181-0/+0
|
* - Moved most types and StructLayout to runtime package:Sven Gothel2011-07-1841-210/+353
| | | | | | | | | | | | | | | | | | | | | com.jogamp.gluegen.cgram.types -> com.jogamp.gluegen.runtime.types This is required for desired runtime memory layout. - Split CompoundType to StructType + UnionType - StructLayout: - Utilizing SizeThunk alignment - Alignment 1) Natural type alignment 2) Add Size 3) Trailing padding w/ largest element alignment - Only perform memory layout once for type. Status: - Unit test passes w/ static MachineDescriptor64Bit - FIXME static 32bit is faulty, uses 64bit size/alignment - TODO runtime struct layout to please all platforms w/o worrying
* GlueGen: Alignment Cleanup ..Sven Gothel2011-07-179-133/+133
| | | | | | | | | | - SizeThunk - rename: compute -> computeSize - add: computeAlignment - merge types: char -> int8, short -> int16 - 'int' and 'long' may differ -
* Clarify aligment docSven Gothel2011-07-171-7/+18
|
* Fix alignment query code docSven Gothel2011-07-171-3/+2
|
* Merge branch 'master' into wip_mobileSven Gothel2011-07-171-0/+65
|\
| * Add native alignment test c-codeSven Gothel2011-07-171-0/+65
| |