Attachment #231 for bug #476

View | Details | Raw Unified | Return to bug 476
Collapse All | Expand All

Lines 7-13 Link Here

(-)a/jogl.iml (-1 lines)
7	<sourceFolder url="file://$MODULE_DIR$/src/jogl/junit" isTestSource="true" />	7	<sourceFolder url="file://$MODULE_DIR$/src/jogl/junit" isTestSource="true" />
8	</content>	8	</content>
9	<content url="file://$MODULE_DIR$/build/jogl">	9	<content url="file://$MODULE_DIR$/build/jogl">
10	<sourceFolder url="file://$MODULE_DIR$/build/jogl/gensrc/classes-cdc" isTestSource="false" />
11	<sourceFolder url="file://$MODULE_DIR$/build/jogl/gensrc/classes" isTestSource="false" />	10	<sourceFolder url="file://$MODULE_DIR$/build/jogl/gensrc/classes" isTestSource="false" />
12	</content>	11	</content>
13	<orderEntry type="inheritedJdk" />	12	<orderEntry type="inheritedJdk" />

Lines 77-83 Link Here

(-)a/make/build-common.xml (-1 lines)
77		77
78	<echo message="setup.nodesktop: ${setup.nodesktop}" />	78	<echo message="setup.nodesktop: ${setup.nodesktop}" />
79	<echo message="setup.noAWT: ${setup.noAWT}" />	79	<echo message="setup.noAWT: ${setup.noAWT}" />
80	<echo message="setup.noCDC: ${setup.noCDC}" />
81		80
82	<!-- Load the user specified properties file that defines various host	81	<!-- Load the user specified properties file that defines various host
83	- specific paths. The user will be notified if this is does not	82	- specific paths. The user will be notified if this is does not

Lines 54-60 Link Here

(-)a/make/build-jogl.xml (-1 lines)
54	- Internal settings, may not be necessary to set them manually,	54	- Internal settings, may not be necessary to set them manually,
55	since all JAR archives are orthogonal.	55	since all JAR archives are orthogonal.
56	setup.noAWT	56	setup.noAWT
57	setup.noCDC
58		57
59	- Skip gluegen: java.generate.skip	58	- Skip gluegen: java.generate.skip
60	-->	59	-->

Lines 46-52 Link Here

(-)a/make/build-newt.xml (-1 lines)
46		46
47	- Internal settings, may not be necessary to set them manually,	47	- Internal settings, may not be necessary to set them manually,
48	since all JAR archives are orthogonal.	48	since all JAR archives are orthogonal.
49	setup.noCDC
50	setup.noAWT	49	setup.noAWT
51	setup.noOpenGL	50	setup.noOpenGL
52		51

Lines 60-66 Link Here

(-)a/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj (-2 lines)
60	Name="VCCLCompilerTool"	60	Name="VCCLCompilerTool"
61	ExecutionBucket="7"	61	ExecutionBucket="7"
62	Optimization="0"	62	Optimization="0"
63	AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm"
64	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"	63	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
65	MinimalRebuild="true"	64	MinimalRebuild="true"
66	RuntimeLibrary="2"	65	RuntimeLibrary="2"
Lines 677-683 Link Here
677	Name="VCCLCompilerTool"	676	Name="VCCLCompilerTool"
678	ExecutionBucket="7"	677	ExecutionBucket="7"
679	Optimization="2"	678	Optimization="2"
680	AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm"
681	PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"	679	PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
682	RuntimeLibrary="2"	680	RuntimeLibrary="2"
683	UsePrecompiledHeader="0"	681	UsePrecompiledHeader="0"

Lines 59-65 Link Here

(-)a/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj (-1 / +1 lines)
59	Name="VCCLCompilerTool"	59	Name="VCCLCompilerTool"
60	ExecutionBucket="7"	60	ExecutionBucket="7"
61	Optimization="0"	61	Optimization="0"
62	AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows"	62	AdditionalIncludeDirectories="..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows"
63	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"	63	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
64	MinimalRebuild="true"	64	MinimalRebuild="true"
65	RuntimeLibrary="2"	65	RuntimeLibrary="2"

Lines 59-65 Link Here

(-)a/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj (-1 / +1 lines)
59	Name="VCCLCompilerTool"	59	Name="VCCLCompilerTool"
60	ExecutionBucket="7"	60	ExecutionBucket="7"
61	Optimization="0"	61	Optimization="0"
62	AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows"	62	AdditionalIncludeDirectories="..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows"
63	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"	63	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
64	MinimalRebuild="true"	64	MinimalRebuild="true"
65	RuntimeLibrary="2"	65	RuntimeLibrary="2"

Lines 60-66 Link Here

(-)a/make/jogl_wince6_vs9/newt/newt.vcproj (-2 / +2 lines)
60	Name="VCCLCompilerTool"	60	Name="VCCLCompilerTool"
61	ExecutionBucket="7"	61	ExecutionBucket="7"
62	Optimization="0"	62	Optimization="0"
63	AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl"	63	AdditionalIncludeDirectories="..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl"
64	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"	64	PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
65	MinimalRebuild="true"	65	MinimalRebuild="true"
66	RuntimeLibrary="2"	66	RuntimeLibrary="2"
Lines 691-697 Link Here
691	Name="VCCLCompilerTool"	691	Name="VCCLCompilerTool"
692	ExecutionBucket="7"	692	ExecutionBucket="7"
693	Optimization="2"	693	Optimization="2"
694	AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl"	694	AdditionalIncludeDirectories="..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl"
695	PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"	695	PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
696	RuntimeLibrary="2"	696	RuntimeLibrary="2"
697	UsePrecompiledHeader="0"	697	UsePrecompiledHeader="0"




    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
    echo

    echo JOGL CDCFP DESKTOP
    report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
    echo

    echo JOGL CDCFP ES1 MOBILE
    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnewt.so.gz
    echo

    echo JOGL CDCFP ES2 MOBILE
    report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
    echo

    echo JOGL GLU
    report jogl.glu.*$JAR_SUFFIX

cp -a $BUILDDIR/jogl/*.jar $STATDIR
cp -a $BUILDDIR/newt/*.jar $STATDIR
cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR
cp -a $BUILDDIR_GLUEGEN/gluegen-rt-cdc.jar $STATDIR
cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586.jar $STATDIR
cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586-cdc.jar $STATDIR
cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR

cd $STATDIR

rm -rf nope
mkdir -p nope

mv jogl.test.lst *-noawt.lst *.all*.lst nope/

mv jogl.gl2es12.*.lst jogl.gldesktop.*.lst nope/
echo duplicates - w/o gl2es12.* gldesktop.*

sort jogl*.lst | uniq -d
mv nope/* .

mv jogl.test.lst *.all*.lst gluegen-gl.lst nope/
cat *.lst | sort -u > allparts.lst
mv nope/* .
cat *.all.lst gluegen-rt.lst   | sort -u > allall.lst
cat jogl.all.cdc.lst newt.all.cdc.lst nativewindow.core.lst | sort -u > allcdc.lst

echo all vs allparts delta
echo




#! /bin/sh

if [ -e ../../setenv-build-jogl-x86.sh ] ; then
    . ../../setenv-build-jogl-x86.sh
fi

#    -Dc.compiler.debug=true 
#
#    -Djavacdebug="false" \
#    -Djavacdebuglevel="none" \
#
#    -Djava.generate.skip=true \
#    -Dbuild.noarchives=true

BUILD_SUBDIR=build-cdcfp-x86

ant -v \
    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
    -Dbuild.noarchives=true \
    -Drootrel.build=$BUILD_SUBDIR \
    -Dsetup.cdcfp=true \
    -Dgluegen.cpptasks.detected.os=true \
    -DisUnix=true \
    -DisLinux=true \
    -DisLinuxX86=true \
    -DisX11=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





#! /bin/sh

if [ -e /opt-share/etc/profile.ant ] ; then
    . /opt-share/etc/profile.ant
fi


#    -Dc.compiler.debug=true 
#    -Dbuild.noarchives=true

BUILD_SUBDIR=build-cdcfp-macosx

ant \
    -Dbuild.noarchives=true \
    -Dsetup.cdcfp=true \
    -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


Lines 3-9 Link Here

(-)a/nativewindow.iml (-2 lines)
3	<component name="NewModuleRootManager" inherit-compiler-output="true">	3	<component name="NewModuleRootManager" inherit-compiler-output="true">
4	<exclude-output />	4	<exclude-output />
5	<content url="file://$MODULE_DIR$/build/nativewindow">	5	<content url="file://$MODULE_DIR$/build/nativewindow">
6	<sourceFolder url="file://$MODULE_DIR$/build/nativewindow/gensrc/classes-cdc" isTestSource="false" />
7	<sourceFolder url="file://$MODULE_DIR$/build/nativewindow/gensrc/classes" isTestSource="false" />	6	<sourceFolder url="file://$MODULE_DIR$/build/nativewindow/gensrc/classes" isTestSource="false" />
8	</content>	7	</content>
9	<content url="file://$MODULE_DIR$/src/nativewindow">	8	<content url="file://$MODULE_DIR$/src/nativewindow">
10	-

Return to bug 476

Lines 66-82 function listdeployment() { Link Here

(-)a/make/scripts/lstjars.sh (-16 / +2 lines)
66	report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz	66	report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
67	echo	67	echo
68		68
69	echo JOGL CDCFP DESKTOP
70	report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
71	echo
72
73	echo JOGL CDCFP ES1 MOBILE
74	report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnewt.so.gz
75	echo
76
77	echo JOGL CDCFP ES2 MOBILE
78	report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
79	echo
80		69
81	echo JOGL GLU	70	echo JOGL GLU
82	report jogl.glu.*$JAR_SUFFIX	71	report jogl.glu.*$JAR_SUFFIX
Lines 96-104 cp -a $BUILDDIR/nativewindow/*.jar $STATDIR Link Here
96	cp -a $BUILDDIR/jogl/*.jar $STATDIR	85	cp -a $BUILDDIR/jogl/*.jar $STATDIR
97	cp -a $BUILDDIR/newt/*.jar $STATDIR	86	cp -a $BUILDDIR/newt/*.jar $STATDIR
98	cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR	87	cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR
99	cp -a $BUILDDIR_GLUEGEN/gluegen-rt-cdc.jar $STATDIR
100	cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586.jar $STATDIR	88	cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586.jar $STATDIR
101	cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586-cdc.jar $STATDIR
102	cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR	89	cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR
103		90
104	cd $STATDIR	91	cd $STATDIR
Lines 123-129 done Link Here
123	rm -rf nope	110	rm -rf nope
124	mkdir -p nope	111	mkdir -p nope
125		112
126	mv jogl.test.lst -noawt.lst .cdc.lst .all.lst nope/	113	mv jogl.test.lst -noawt.lst .all*.lst nope/
127		114
128	mv jogl.gl2es12..lst jogl.gldesktop..lst nope/	115	mv jogl.gl2es12..lst jogl.gldesktop..lst nope/
129	echo duplicates - w/o gl2es12.* gldesktop.*	116	echo duplicates - w/o gl2es12.* gldesktop.*
Lines 131-141 echo Link Here
131	sort jogl*.lst \| uniq -d	118	sort jogl*.lst \| uniq -d
132	mv nope/* .	119	mv nope/* .
133		120
134	mv jogl.test.lst .cdc.lst .all*.lst gluegen-gl.lst nope/	121	mv jogl.test.lst .all.lst gluegen-gl.lst nope/
135	cat *.lst \| sort -u > allparts.lst	122	cat *.lst \| sort -u > allparts.lst
136	mv nope/* .	123	mv nope/* .
137	cat *.all.lst gluegen-rt.lst \| sort -u > allall.lst	124	cat *.all.lst gluegen-rt.lst \| sort -u > allall.lst
138	cat jogl.all.cdc.lst newt.all.cdc.lst nativewindow.core.lst \| sort -u > allcdc.lst
139		125
140	echo all vs allparts delta	126	echo all vs allparts delta
141	echo	127	echo

Lines 1-38 Link Here

(-)a/make/scripts/make.jogl.cdcfp.linux-x86.sh (-38 lines)
1	#! /bin/sh
2
3	if [ -e ../../setenv-build-jogl-x86.sh ] ; then
4	. ../../setenv-build-jogl-x86.sh
5	fi
6
7	# -Dc.compiler.debug=true
8	#
9	# -Djavacdebug="false" \
10	# -Djavacdebuglevel="none" \
11	#
12	# -Djava.generate.skip=true \
13	# -Dbuild.noarchives=true
14
15	BUILD_SUBDIR=build-cdcfp-x86
16
17	ant -v \
18	-Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
19	-Dbuild.noarchives=true \
20	-Drootrel.build=$BUILD_SUBDIR \
21	-Dsetup.cdcfp=true \
22	-Dgluegen.cpptasks.detected.os=true \
23	-DisUnix=true \
24	-DisLinux=true \
25	-DisLinuxX86=true \
26	-DisX11=true \
27	-DuseOpenMAX=true \
28	$* 2>&1 \| tee make.jogl.cdcfp.linux-x86.log
29
30	rm -rf ../$BUILD_SUBDIR/lib
31	mkdir -p ../$BUILD_SUBDIR/lib
32	for i in `find ../$BUILD_SUBDIR/ -name \*so` ; do
33	cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .so).so
34	done
35	for i in `find ../../gluegen/$BUILD_SUBDIR/ -name \*so` ; do
36	cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .so).so
37	done
38

Lines 1-27 Link Here

(-)a/make/scripts/make.jogl.cdcfp.macosx.sh (-27 lines)
1	#! /bin/sh
2
3	if [ -e /opt-share/etc/profile.ant ] ; then
4	. /opt-share/etc/profile.ant
5	fi
6
7
8	# -Dc.compiler.debug=true
9	# -Dbuild.noarchives=true
10
11	BUILD_SUBDIR=build-cdcfp-macosx
12
13	ant \
14	-Dbuild.noarchives=true \
15	-Dsetup.cdcfp=true \
16	-Drootrel.build=$BUILD_SUBDIR \
17	$* 2>&1 \| tee make.jogl.cdcfp.macosx.log
18
19	rm -rf ../$BUILD_SUBDIR/lib
20	mkdir -p ../$BUILD_SUBDIR/lib
21	for i in `find ../$BUILD_SUBDIR/ -name \*jnilib` ; do
22	cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .jnilib).so
23	done
24	for i in `find ../../gluegen/$BUILD_SUBDIR/ -name \*jnilib` ; do
25	cp -v $i ../$BUILD_SUBDIR/lib/$(basename $i .jnilib).so
26	done
27