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

(-)a/make/build-jogl.xml (-8 / +21 lines)
Lines 197-202 Link Here
197
           <isset property="setup.noSWT"/> 
197
           <isset property="setup.noSWT"/> 
198
        </condition>
198
        </condition>
199
199
200
        <condition property="isLinuxARM">
201
            <and>
202
                <istrue value="${isLinux}" />
203
                <or>
204
                    <os arch="arm" />
205
                    <os arch="armv4" />
206
                    <os arch="armv5" />
207
                    <os arch="armv6" />
208
                    <os arch="armv7" />
209
                </or>
210
            </and>
211
        </condition>
212
200
        <property name="java.excludes.javadoc.packagenames"
213
        <property name="java.excludes.javadoc.packagenames"
201
                  value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
214
                  value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
202
215
Lines 1108-1114 Link Here
1108
        <includepath path="/usr/local/include" />
1121
        <includepath path="/usr/local/include" />
1109
      </compiler>
1122
      </compiler>
1110
1123
1111
      <compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
1124
      <compiler id="compiler.cfg.linux.arm.jogl.x11" extends="compiler.cfg.linux">
1112
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
1125
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
1113
        <compilerarg value="-idirafter" />
1126
        <compilerarg value="-idirafter" />
1114
        <compilerarg value="/usr/include" />
1127
        <compilerarg value="/usr/include" />
Lines 1136-1143 Link Here
1136
        <syslibset libs="X11"/>
1149
        <syslibset libs="X11"/>
1137
      </linker>
1150
      </linker>
1138
1151
1139
      <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
1152
      <linker id="linker.cfg.linux.arm.jogl.x11" extends="linker.cfg.linux">
1140
        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
1153
        <syslibset libs="X11"/>
1141
      </linker>
1154
      </linker>
1142
1155
1143
      <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
1156
      <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
Lines 1225-1234 Link Here
1225
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
1238
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
1226
    </target>
1239
    </target>
1227
    
1240
    
1228
    <target name="c.configure.linux.armv6" if="isLinuxARMv6">
1241
    <target name="c.configure.linux.arm" if="isLinuxARM">
1229
      <echo message="Linux.armv6" />
1242
      <echo message="Linux.arm" />
1230
      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.armv6.jogl.x11" />
1243
      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.arm.jogl.x11" />
1231
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.armv6.jogl.x11" />
1244
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.arm.jogl.x11" />
1232
    </target>
1245
    </target>
1233
    
1246
    
1234
    <target name="c.configure.linux.ia64" if="isLinuxIA64">
1247
    <target name="c.configure.linux.ia64" if="isLinuxIA64">
Lines 1273-1279 Link Here
1273
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
1286
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
1274
    </target>
1287
    </target>
1275
1288
1276
    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
1289
    <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
1277
1290
1278
    <target name="c.configure.android" if="isAndroid">
1291
    <target name="c.configure.android" if="isAndroid">
1279
      <echo message="Android" />
1292
      <echo message="Android" />
(-)a/make/build-nativewindow.xml (-10 / +23 lines)
Lines 88-93 Link Here
88
           <isset property="setup.noAWT"/> 
88
           <isset property="setup.noAWT"/> 
89
        </condition>
89
        </condition>
90
90
91
        <condition property="isLinuxARM">
92
            <and>
93
                <istrue value="${isLinux}" />
94
                <or>
95
                    <os arch="arm" />
96
                    <os arch="armv4" />
97
                    <os arch="armv5" />
98
                    <os arch="armv6" />
99
                    <os arch="armv7" />
100
                </or>
101
            </and>
102
        </condition>
103
91
        <property name="java.excludes.all" value="${java.excludes.awt}" />
104
        <property name="java.excludes.all" value="${java.excludes.awt}" />
92
        <echo message="java.excludes.all: ${java.excludes.all}" />
105
        <echo message="java.excludes.all: ${java.excludes.all}" />
93
    </target>
106
    </target>
Lines 342-348 Link Here
342
        <includepath path="/usr/local/include" />
355
        <includepath path="/usr/local/include" />
343
      </compiler>
356
      </compiler>
344
357
345
      <compiler id="compiler.cfg.linux.armv6.nativewindow.x11" extends="compiler.cfg.linux.armv6">
358
      <compiler id="compiler.cfg.linux.arm.nativewindow.x11" extends="compiler.cfg.linux">
346
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
359
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
347
        <compilerarg value="-idirafter" />
360
        <compilerarg value="-idirafter" />
348
        <compilerarg value="/usr/include" />
361
        <compilerarg value="/usr/include" />
Lines 395-404 Link Here
395
        <syslibset libs="Xrender"/>
408
        <syslibset libs="Xrender"/>
396
      </linker>
409
      </linker>
397
410
398
      <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
411
      <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
399
        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
412
        <syslibset libs="X11" />
400
        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" />
413
        <syslibset libs="Xxf86vm" />
401
        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" />
414
        <syslibset libs="Xrender" />
402
      </linker>
415
      </linker>
403
416
404
      <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
417
      <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
Lines 483-492 Link Here
483
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.amd64.nativewindow.x11" />
496
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.amd64.nativewindow.x11" />
484
    </target>
497
    </target>
485
    
498
    
486
    <target name="c.configure.linux.armv6" if="isLinuxARMv6">
499
    <target name="c.configure.linux.arm" if="isLinuxARM">
487
      <echo message="Linux.armv6" />
500
      <echo message="Linux.arm" />
488
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv6.nativewindow.x11" />
501
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.arm.nativewindow.x11" />
489
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.armv6.nativewindow.x11" />
502
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.arm.nativewindow.x11" />
490
    </target>
503
    </target>
491
    
504
    
492
    <target name="c.configure.linux.ia64" if="isLinuxIA64">
505
    <target name="c.configure.linux.ia64" if="isLinuxIA64">
Lines 531-537 Link Here
531
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
544
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
532
    </target>
545
    </target>
533
546
534
    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
547
    <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
535
548
536
    <target name="c.configure.android" if="isAndroid">
549
    <target name="c.configure.android" if="isAndroid">
537
      <echo message="Android" />
550
      <echo message="Android" />
(-)a/make/build-newt.xml (-11 / +24 lines)
Lines 157-162 Link Here
157
           <isset property="setup.noOpenGL"/>
157
           <isset property="setup.noOpenGL"/>
158
        </condition>
158
        </condition>
159
159
160
        <condition property="isLinuxARM">
161
            <and>
162
                <istrue value="${isLinux}" />
163
                <or>
164
                    <os arch="arm" />
165
                    <os arch="armv4" />
166
                    <os arch="armv5" />
167
                    <os arch="armv6" />
168
                    <os arch="armv7" />
169
                </or>
170
            </and>
171
        </condition>
172
160
        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" />
173
        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" />
161
        <echo message="java.excludes.all: ${java.excludes.all}" />
174
        <echo message="java.excludes.all: ${java.excludes.all}" />
162
175
Lines 265-271 Link Here
265
        <includepath path="/usr/local/include" />
278
        <includepath path="/usr/local/include" />
266
      </compiler>
279
      </compiler>
267
280
268
      <compiler id="compiler.cfg.linux.armv6.newt.x11" extends="compiler.cfg.linux.armv6">
281
      <compiler id="compiler.cfg.linux.arm.newt.x11" extends="compiler.cfg.linux">
269
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
282
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
270
        <compilerarg value="-idirafter" />
283
        <compilerarg value="-idirafter" />
271
        <compilerarg value="/usr/include" />
284
        <compilerarg value="/usr/include" />
Lines 320-332 Link Here
320
        <!--syslibset libs="X11-xcb" /-->
333
        <!--syslibset libs="X11-xcb" /-->
321
      </linker>
334
      </linker>
322
335
323
      <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6">
336
      <linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux">
324
        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
337
        <syslibset libs="X11" />
325
        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
338
        <syslibset libs="Xrandr" />
326
      </linker>
339
      </linker>
327
340
328
      <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
341
      <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
329
        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
342
        <syslibset libs="android" />
330
      </linker>
343
      </linker>
331
344
332
      <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
345
      <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
Lines 410-420 Link Here
410
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
423
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
411
    </target>
424
    </target>
412
425
413
    <target name="c.configure.linux.armv6" if="isLinuxARMv6">
426
    <target name="c.configure.linux.arm" if="isLinuxARM">
414
      <echo message="Linux.armv6" />
427
      <echo message="Linux.arm" />
415
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv6.newt.x11" />
428
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.arm.newt.x11" />
416
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.armv6.newt.x11"
429
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.arm.newt.x11"
417
                                                            else="linker.cfg.linux.armv6">
430
                                                            else="linker.cfg.linux.arm">
418
          <isset property="isX11" />
431
          <isset property="isX11" />
419
      </condition>
432
      </condition>
420
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
433
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
Lines 486-492 Link Here
486
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.newt.x11" />
499
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.newt.x11" />
487
    </target>
500
    </target>
488
501
489
    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
502
    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
490
503
491
    <target name="c.configure.android" if="isAndroid">
504
    <target name="c.configure.android" if="isAndroid">
492
      <echo message="Android" />
505
      <echo message="Android" />
(-)a/make/build.xml (+9 lines)
Lines 452-457 Link Here
452
             basedir="${javadoc.root.path}"
452
             basedir="${javadoc.root.path}"
453
             includes="jogl/**" />
453
             includes="jogl/**" />
454
    </target>
454
    </target>
455
    <target name="version" depends="init" description="Create Version.java">
456
      <echo file="src/${package.dir}/Version.java" message="package ${package.name};${line.separator}" />
457
      <echo file="src/${package.dir}/Version.java" append="true" message="public final class Version {${line.separator}" />
458
      <echo file="src/${package.dir}/Version.java"
459
            append="true"
460
            message=" public static String VERSION=&quot;${buildtime}&quot;;${line.separator}" />
461
      <echo file="src/${package.dir}/Version.java" append="true" message="}${line.separator}" />
462
      <echo message="BUILD ${buildtime}" />
463
</target>
455
464
456
</project>
465
</project>
457
466
(-)a/make/scripts/make.jogl.all.linux-armv7hf.sh (+27 lines)
Line 0 Link Here
1
#! /bin/sh
2
3
# arm-linux-gnueabihf == armhf triplet
4
PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH
5
export PATH
6
7
#    -Dc.compiler.debug=true 
8
#    -Dgluegen.cpptasks.detected.os=true \
9
#    -DisUnix=true \
10
#    -DisLinux=true \
11
#    -DisLinuxARMv7=true \
12
#    -DisX11=false \
13
14
export TARGET_PLATFORM_ROOT=/
15
export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf
16
export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
17
18
export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7hf.xml"
19
20
ant \
21
    -Drootrel.build=build-linux-armv7hf \
22
    -Dsetup.addNativeKD=true \
23
    -Dsetup.addNativeOpenMAX=true \
24
    -Dsetup.addNativeBroadcom=true \
25
    -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
26
    $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
27
(-)a/make/scripts/tests-armv7_armhf.sh (+7 lines)
Line 0 Link Here
1
#! /bin/bash
2
3
spath=`dirname $0`
4
5
. $spath/tests.sh  `which java` -DummyArg ../build-linux-armv7hf $*
6
7
(-)a/make/scripts/tests-linux-armv7hf.sh (-1 / +7 lines)
Line 0 Link Here
0
- 
1
#! /bin/bash
2
3
spath=`dirname $0`
4
5
. $spath/tests.sh  `which java` -DummyArg ../build-linux-armv7hf $*
6
7

Return to bug 650