diff options
| author | sg215889 <[email protected]> | 2009-07-13 14:37:30 -0700 |
|---|---|---|
| committer | sg215889 <[email protected]> | 2009-07-13 14:37:30 -0700 |
| commit | fbb6367aa6c7b80bb57f07942c588b7de582674d (patch) | |
| tree | 4ec57cd5ef6a59f6bb25519364cca6eb48061a90 | |
| parent | 69d2f49619b303e51e1583a02115756dfc6d1f2f (diff) | |
Add unique CVM lib dir target in cdcfp build scripts
| -rw-r--r-- | make/make.jogl.cdcfp.linux-x86.sh | 14 | ||||
| -rw-r--r-- | make/make.jogl.cdcfp.macosx.sh | 14 |
2 files changed, 26 insertions, 2 deletions
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh index 9a74fd10d..67ef9fb65 100644 --- a/make/make.jogl.cdcfp.linux-x86.sh +++ b/make/make.jogl.cdcfp.linux-x86.sh @@ -12,9 +12,11 @@ fi # -Djava.generate.skip=true \ # -Dbuild.noarchives=true +BUILD_SUBDIR=build-cdcfp-x86 + ant -v \ -Dbuild.noarchives=true \ - -Drootrel.build=build-cdcfp-x86 \ + -Drootrel.build=$BUILD_SUBDIR \ -Dsetup.cdcfp=true \ -Dgluegen.cpptasks.detected.os=true \ -DisUnix=true \ @@ -24,3 +26,13 @@ ant -v \ -DuseKD=true \ -DuseOpenMAX=true \ $* 2>&1 | tee make.jogl.cdcfp.linux-x86.log + +rm -rf ../$BUILD_SUBDIR/lib +mkdir -p ../$BUILD_SUBDIR/lib +for i in `find ../$BUILD_SUBDIR/ -name \*so` ; do + cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .so).so +done +for i in `find ../../gluegen/$BUILD_SUBDIR/ -name \*so` ; do + cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .so).so +done + diff --git a/make/make.jogl.cdcfp.macosx.sh b/make/make.jogl.cdcfp.macosx.sh index f9f79500e..d36f0bb7e 100644 --- a/make/make.jogl.cdcfp.macosx.sh +++ b/make/make.jogl.cdcfp.macosx.sh @@ -8,8 +8,20 @@ fi # -Dc.compiler.debug=true # -Dbuild.noarchives=true +BUILD_SUBDIR=build-cdcfp-macosx + ant \ -Dbuild.noarchives=true \ -Dsetup.cdcfp=true \ - -Drootrel.build=build-cdcfp-macosx \ + -Drootrel.build=$BUILD_SUBDIR \ $* 2>&1 | tee make.jogl.cdcfp.macosx.log + +rm -rf ../$BUILD_SUBDIR/lib +mkdir -p ../$BUILD_SUBDIR/lib +for i in `find ../$BUILD_SUBDIR/ -name \*jnilib` ; do + cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .jnilib).so +done +for i in `find ../../gluegen/$BUILD_SUBDIR/ -name \*jnilib` ; do + cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .jnilib).so +done + |