summaryrefslogtreecommitdiffstats
path: root/make
Commit message (Collapse)AuthorAgeFilesLines
* fixed LongIntHashMap build config.Michael Bien2010-04-151-2/+2
|
* merged LongInt with IntIntHashMap.Michael Bien2010-04-151-7/+15
| | | | IntIntHashMap is now the single template used for all other maps.
* Merge branch 'master' of github.com:mbien/gluegenSven Gothel2010-04-131-3/+21
|\
| * gluegen creates now LongObject and LongLongHashMap from LongIntHashMap ↵Michael Bien2010-04-121-3/+21
| | | | | | | | additional to the Int*Maps.
* | Added Uptodate verification to build only when necessarySven Gothel2010-04-132-7/+33
|/
* ant 1.8.0 on win32Sven Gothel2010-04-101-1/+1
|
* Merge branch 'master' of github.com:mbien/gluegenSven Gothel2010-04-101-13/+35
|\
| * annotated certain token in IntIntHashMap for text substitution.Michael Bien2010-04-081-13/+35
| | | | | | | | build generates now via text substitution IntLong- and IntObjectHashmap in the pre-build phase.
* | *** Now Using Apache-Ant-1.8.0 ***Sven Gothel2010-04-108-3/+11
|/ | | | | | | | Adding ant-contrib-1.0b3.jar for loops and mutable properties. Cleanup: - Adding Javac includeAntRuntime argument (false whenever possible) - Clear junit results folder before testing - Move deprecated stuff from lib to lib/archive
* initial import of IntIntHashmap + JUnitTest including a benchmark.Michael Bien2010-04-081-0/+1
|
* http://jogamp.org/bugzilla/show_bug.cgi?id=393Sven Gothel2010-04-0815-88/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed junit test: test1 - Create seperate native libraries to reflect a real world example: test1 - the library to bind to (no more declaring __stdcall @nn functions) BindingTest1p1 - the dynamic fixed linkage binding test1p1, references dynamic library test1 at linktime. BindingTest1p2 - the dynamic runtime linkage binding test1p2, loads dynamic library test1 at runtime. Generic: - gluegen-cpptasks-base.xml - target 'gluegen.cpptasks.detect.os' Set new property 'system.env.library.path' DYLD_LIBRARY_PATH (macosx) LD_LIBRARY_PATH (unix) PATH (windows) - target 'gluegen.cpptasks.striplibs' Strips the symbols out of the native libraries in case c.compiler.debug is false. Maybe configured with the properties: c.strip.tool, c.strip.args - Using system.env.library.path in junit call to find the test1 library in case of runtime linkage and lookup (test1p2). - Use gluegen.cpptasks.striplibs for all native libs .. - Added macosx32 in analogy to macosx64, both defaults to true now - com.jogamp.common.os.WindowsDynamicLinkerImpl:lookupSymbol() - Added lookup for __stdcall @nn (stepping alignment 4, max-args: 12) in case no undecorated __cdecl symbol is found. Fixed Windows platform: - Use proper path.seperator on Windows. - test1.dll needs proper soname inside for fixed linkage (test1p1) hence the output name must be test1.dll, not libtest1.so +++ http://jogamp.org/bugzilla/show_bug.cgi?id=394 Fix MacOsX platform: The commit of cpptasks.jar, git hash 129e783741d91e9ee5cd7da5d5c962c32ec96b0b, broke the universal binary build on MacOSX. The above change used cpptasks-1.05b with a few patches in regards to crosscompilation, but missed one, which accepts the '-arch' argument for GccLinker undecorated. The new cpptasks.jar is vanilla 1.05b + cpptasks-1.0b5-darwin-patch.diff, the latter a more refined one. This version accepts the '-arch' argument undecorated on the darwin platform. +++
* disabled hard failure for junit tests, hope sven does not read this ;).Michael Bien2010-04-011-1/+1
|
* fixed generated imports rudimentary (not DRY).. cleanup in work.Michael Bien2010-03-311-0/+2
|
* Merged with latest of mbienSven Gothel2010-03-315-6/+8
|\
| * introduced com.jogamp.common.{nio,os} packages and moved some classes.Michael Bien2010-03-313-3/+3
| |
| * reduced verbosity in test output.Michael Bien2010-03-311-2/+5
| |
| * introduced internal NativeBuffer interface, this can be made public as soon ↵Michael Bien2010-03-301-1/+0
| | | | | | | | | | | | we move to java language level 5. removed accidentally commited verbose javac property in build-junit.xml.
* | Buffer heritage added. Migrated old runtime tests.Sven Gothel2010-03-311-14/+14
|/
* Resolved conflictsSven Gothel2010-03-293-10/+10
|\
| * updated scripts with correct package names.Michael Bien2010-03-283-10/+10
| |
* | New Int64Buffer type, which is being used for gluegen 'long *'Sven Gothel2010-03-295-1/+94
|/
* (part2) merged all cdc_fp special cases into one common superclass for each ↵Michael Bien2010-03-281-7/+4
| | | | | | | special case. introduced Platform as utility for querying platform information. special cdc build with cdc_fp bootclasspath temporary dissabled.
* Add missing fileSven Gothel2010-03-281-0/+17
|
* Merge with mbien's 2ea8c93d5fd27207872b97c964e3f8af5ac850c6Sven Gothel2010-03-284-16/+16
|\
| * Merge branch 'master' of git@github.com:mbien/gluegenMichael Bien2010-03-272-6/+10
| |\ | | | | | | | | | | | | Conflicts: src/junit/com/jogamp/gluegen/test/junit/Test1.java
| * | renamed com.sun.gluegen.runtime -> com.jogamp.gluegen.runtime.Michael Bien2010-03-274-16/+16
| | |
* | | http://www.jogamp.org/bugzilla/show_bug.cgi?id=389Sven Gothel2010-03-281-6/+40
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mixed types in generated code are functioning now, even though not all permutations are generated - still. However, this patch merges the indirect object passing, wheather it is a primitive array or an indirect NIO buffer, incl. PointerBuffer. This allows the usage of only one JNI functions for all combinations. Only in case of NIODirectOnly, the simplified direct only '0' variation is created - otherwise the parametrized '1' variant. The junit tests proves the implementation and almost completes the gluegen junit tests coverage for JavaEmitter and ProcAddressEmitter. Impact/Result: - Working mixed array types - JOGL GL2 native library shrunk around 30% - Simplified gluegen code - Almost complete gluegen junit tests TODO: Complete permutations of array/NIO arguments, if desired. ++++ Misc changes: - NativeLibrary implements DynamicLookupHelper: lookupFunction() -> dynamicLookupFunction()
* | Add coverage test (signatures and execution) ..Sven Gothel2010-03-271-3/+5
| |
* | Use property.location for compatible absolute path compositionSven Gothel2010-03-261-3/+5
|/
* Revert "Remove absolute path composing with basedir .."Michael Bien2010-03-261-1/+1
| | | | | looked fine but it did not work for all projects... This reverts commit 3793f181a21a38e8e4965eff073a5007c9c094a2.
* Remove absolute path composing with basedir ..Sven Gothel2010-03-261-1/+1
|
* removed ant warnings:Michael Bien2010-03-262-7/+7
| | | | | -Warning: Reference antlr.classpath has not been set at runtime, but was found during runtime -duplicated project name
* Fix import/basedir bug (ant?) for hudson workspaceSven Gothel2010-03-261-1/+8
|
* Add missing java.includes to cc build-junit.xmlSven Gothel2010-03-261-0/+2
|
* invoke junit.run on testSven Gothel2010-03-251-1/+1
|
* build-junit.xml unique build_t propertySven Gothel2010-03-252-34/+36
|
* start with gluegen.root ..Sven Gothel2010-03-251-5/+3
|
* http://www.jogamp.org/bugzilla/show_bug.cgi?id=390Sven Gothel2010-03-259-877/+1181
| | | | | | | | | | | | | | | | | Adding 'plain' junit tests. Plain stands for the simple processing of: ant.junit.compile: gluegen -> java/c files, javac/cc, jar ant.junit.run: junit batch run Avoiding 'black magic', ie kicking off gluegen and ant-compilation from within the junit tests. Same methodology as the JOGL junit tests, junit test sources are under 'src/junit' This way, the migration to other platform tests might be easier, as well as the we don't need to pass through ant properties (ant - junit - ant), see 3a32650d4229f9b4ad1f527d9e30c24ddb69bb3f.
* http://www.jogamp.org/bugzilla/show_bug.cgi?id=390Sven Gothel2010-03-253-8/+50
| | | | | | | | | | | | | | | | The current junit tests use a fixed 'build' sub-path, not the customizing 'rootrel.build' path. More properties needs to be passed through (ant -> junit -> ant) to comply with the current build system: * rootrel.build * os.arch * gluegen.user.compiler.file Fixed .. However .. since even more properties may influence the build, a more native solution with just plain 'ant' might be more desireable ..
* removed test from all build target to safe time when jogl builds.Michael Bien2010-03-121-2/+2
|
* fixed jdk tools.jar classpath for hudson to fix tests.Michael Bien2010-02-121-2/+4
|
* junit test code cleanup and some build preperations for hudson.Michael Bien2010-02-121-9/+9
|
* added test target to main build script.Michael Bien2010-02-122-4/+28
| | | | | added StructAccessorTest, refactored other tests. updated project files, paths etc.
* preparations for continuous builds and cross compilation (WIP).Michael Bien2009-11-203-6/+98
|
* Added quick hack to simplify crosscompilation with cpptasks.Michael Bien2009-11-173-3/+25
| | | | | | CppTasks uses a hardcoded command (compiler name) to invoke the specified compiler which makes crosscompilation with multiple versions of e.g gcc hard. Temporary disabled suncc compiler configuration since it does not work with cpptasks 1.0b5.
* fixed clean target.Michael Bien2009-11-161-2/+2
|
* added explicit -m32 and -m64 args to linux gcc compiler and linker configure ↵Michael Bien2009-11-131-0/+4
| | | | targets.
* Merge branch 'master' of ssh://git.kenai.com/gluegen~gluegen-gitSven Gothel2009-10-121-0/+16
|\
| * gluegen.jar compiles now with source=1.5 classfile version (However, ↵Michael Bien2009-10-081-0/+16
| | | | | | | | | | | | gluegen-rt.jar still uses 1.4). generified classes in pcpp package and removed warnings (java 5 cleanup).
* | Add custom config locations via properties 'gluegen.user.properties.file' ↵Sven Gothel2009-10-024-8/+46
|/ | | | and 'gluegen.user.compiler.file'