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

(-)a/make/build.xml (-1 / +49 lines)
Lines 306-313 Link Here
306
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7" /> 
306
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7" /> 
307
      <property name="linker.cfg.id"                        value="linker.cfg.linux.armv7" /> 
307
      <property name="linker.cfg.id"                        value="linker.cfg.linux.armv7" /> 
308
    </target>
308
    </target>
309
310
    <target name="declare.linux.alpha" if="isLinuxAlpha">
311
      <echo message="Linux.alpha" />
312
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
313
      <property name="linker.cfg.id"                        value="linker.cfg.linux.alpha" /> 
314
    </target>
315
316
    <target name="declare.linux.hppa" if="isLinuxHppa">
317
      <echo message="Linux.hppa" />
318
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
319
      <property name="linker.cfg.id"                        value="linker.cfg.linux.hppa" /> 
320
    </target>
321
322
    <target name="declare.linux.mips" if="isLinuxMips">
323
      <echo message="Linux.mips" />
324
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
325
      <property name="linker.cfg.id"                        value="linker.cfg.linux.mips" /> 
326
    </target>
327
328
    <target name="declare.linux.mipsel" if="isLinuxMipsel">
329
      <echo message="Linux.mipsel" />
330
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
331
      <property name="linker.cfg.id"                        value="linker.cfg.linux.mipsel" /> 
332
    </target>
333
334
    <target name="declare.linux.ppc" if="isLinuxPpc">
335
      <echo message="Linux.ppc" />
336
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
337
      <property name="linker.cfg.id"                        value="linker.cfg.linux.ppc" /> 
338
    </target>
339
340
    <target name="declare.linux.s390" if="isLinuxs390">
341
      <echo message="Linux.s390" />
342
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
343
      <property name="linker.cfg.id"                        value="linker.cfg.linux.s390" /> 
344
    </target>
345
346
    <target name="declare.linux.s390x" if="isLinuxs390x">
347
      <echo message="Linux.s390x" />
348
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
349
      <property name="linker.cfg.id"                        value="linker.cfg.linux.s390x" /> 
350
    </target>
351
352
    <target name="declare.linux.sparc" if="isLinuxSparc">
353
      <echo message="Linux.sparc" />
354
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
355
      <property name="linker.cfg.id"                        value="linker.cfg.linux.sparc" /> 
356
    </target>
309
    
357
    
310
    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.armv7" if="isLinux" >
358
    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv7" if="isLinux" >
311
      <property name="c.src.dir.os"                         value="unix" />
359
      <property name="c.src.dir.os"                         value="unix" />
312
      <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
360
      <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
313
    </target>
361
    </target>
(-)a/make/gluegen-cpptasks-base.xml (-4 / +224 lines)
Lines 30-35 Link Here
30
   -   isLinuxIA64
30
   -   isLinuxIA64
31
   -   isLinuxX86
31
   -   isLinuxX86
32
   -   isLinuxARMv7
32
   -   isLinuxARMv7
33
   -   isLinuxAlpha
34
   -   isLinuxHppa
35
   -   isLinuxMips
36
   -   isLinuxMipsel
37
   -   isLinuxPpc
38
   -   isLinuxs390
39
   -   isLinuxs390x
40
   -   isLinuxSparc
33
   -   isOSX
41
   -   isOSX
34
   -   isOSXPPC
42
   -   isOSXPPC
35
   -   isSolaris
43
   -   isSolaris
Lines 104-109 Link Here
104
   -   compiler.cfg.linux.x86
112
   -   compiler.cfg.linux.x86
105
   -   compiler.cfg.linux.amd64
113
   -   compiler.cfg.linux.amd64
106
   -   compiler.cfg.linux.armv7
114
   -   compiler.cfg.linux.armv7
115
   -   compiler.cfg.linux.alpha
116
   -   compiler.cfg.linux.hppa
117
   -   compiler.cfg.linux.mips
118
   -   compiler.cfg.linux.mipsel
119
   -   compiler.cfg.linux.ppc
120
   -   compiler.cfg.linux.s390
121
   -   compiler.cfg.linux.s390x
122
   -   compiler.cfg.linux.sparc
107
   -   compiler.cfg.solaris
123
   -   compiler.cfg.solaris
108
   -   compiler.cfg.solaris.sparcv9
124
   -   compiler.cfg.solaris.sparcv9
109
   -   compiler.cfg.solaris.amd64
125
   -   compiler.cfg.solaris.amd64
Lines 117-122 Link Here
117
   -   linker.cfg.linux.x86
133
   -   linker.cfg.linux.x86
118
   -   linker.cfg.linux.amd64
134
   -   linker.cfg.linux.amd64
119
   -   linker.cfg.linux.armv7
135
   -   linker.cfg.linux.armv7
136
   -   linker.cfg.linux.alpha
137
   -   linker.cfg.linux.hppa
138
   -   linker.cfg.linux.mips
139
   -   linker.cfg.linux.mipsel
140
   -   linker.cfg.linux.ppc
141
   -   linker.cfg.linux.s390
142
   -   linker.cfg.linux.s390x
143
   -   linker.cfg.linux.sparc
120
   -   linker.cfg.freebsd.x86
144
   -   linker.cfg.freebsd.x86
121
   -   linker.cfg.freebsd.amd64
145
   -   linker.cfg.freebsd.amd64
122
   -   linker.cfg.solaris
146
   -   linker.cfg.solaris
Lines 262-267 Link Here
262
        </or>
286
        </or>
263
      </and>
287
      </and>
264
    </condition>
288
    </condition>
289
    <condition property="isLinuxAlpha">
290
      <and>
291
        <istrue value="${isLinux}" />
292
        <os arch="alpha" />
293
      </and>
294
    </condition>
295
    <condition property="alpha">
296
      <os arch="alpha" />
297
    </condition>
298
    <condition property="arm">
299
      <os arch="arm" />
300
    </condition>
301
    <condition property="isLinuxHppa">
302
      <and>
303
        <istrue value="${isLinux}" />
304
        <os arch="hppa" />
305
      </and>
306
    </condition>
307
    <condition property="hppa">
308
      <os arch="hppa" />
309
    </condition>
310
    <condition property="isLinuxMips">
311
      <and>
312
        <istrue value="${isLinux}" />
313
        <os arch="mips" />
314
      </and>
315
    </condition>
316
    <condition property="mips">
317
      <os arch="mips" />
318
    </condition>
319
    <condition property="isLinuxMipsel">
320
      <and>
321
        <istrue value="${isLinux}" />
322
        <os arch="mipsel" />
323
      </and>
324
    </condition>
325
    <condition property="mipsel">
326
      <os arch="mipsel" />
327
    </condition>
328
    <condition property="isLinuxPpc">
329
      <and>
330
        <istrue value="${isLinux}" />
331
        <os arch="ppc" />
332
      </and>
333
    </condition>
334
    <condition property="ppc">
335
      <os arch="ppc" />
336
    </condition>
337
    <condition property="isLinuxs390">
338
      <and>
339
        <istrue value="${isLinux}" />
340
        <os arch="s390" />
341
      </and>
342
    </condition>
343
    <condition property="s390">
344
      <os arch="s390" />
345
    </condition>
346
    <condition property="isLinuxs390x">
347
      <and>
348
        <istrue value="${isLinux}" />
349
        <os arch="s390x" />
350
      </and>
351
    </condition>
352
    <condition property="s390x">
353
      <os arch="s390x" />
354
    </condition>
355
    <condition property="isLinuxSparc">
356
      <and>
357
        <istrue value="${isLinux}" />
358
        <os arch="sparc" />
359
      </and>
360
    </condition>
361
    <condition property="sparc">
362
      <os arch="sparc" />
363
    </condition>
364
265
    <condition property="isLinuxX86">
365
    <condition property="isLinuxX86">
266
      <and>
366
      <and>
267
        <istrue value="${isLinux}" />
367
        <istrue value="${isLinux}" />
Lines 384-389 Link Here
384
    <echo message="LinuxIA64=${isLinuxIA64}" />
484
    <echo message="LinuxIA64=${isLinuxIA64}" />
385
    <echo message="LinuxX86=${isLinuxX86}" />
485
    <echo message="LinuxX86=${isLinuxX86}" />
386
    <echo message="LinuxARMv7=${isLinuxARMv7}" />
486
    <echo message="LinuxARMv7=${isLinuxARMv7}" />
487
    <echo message="LinuxAlpha=${isLinuxAlpha}" />
488
    <echo message="LinuxHppa=${isLinuxHppa}" />
489
    <echo message="LinuxMips=${isLinuxMips}" />
490
    <echo message="LinuxMipsel=${isLinuxMipsel}" />
491
    <echo message="LinuxPpc=${isLinuxPpc}" />
492
    <echo message="Linuxs390=${isLinuxs390}" />
493
    <echo message="Linuxs390x=${isLinuxs390x}" />
494
    <echo message="LinuxSparc=${isLinuxSparc}" />
387
    <echo message="OS X=${isOSX}" />
495
    <echo message="OS X=${isOSX}" />
388
    <echo message="OS X PPC=${use.macosppc}" />
496
    <echo message="OS X PPC=${use.macosppc}" />
389
    <echo message="OS X x32=${use.macosx32}" />
497
    <echo message="OS X x32=${use.macosx32}" />
Lines 433-443 Link Here
433
    <property name="os.and.arch" value="linux-armv7" />
541
    <property name="os.and.arch" value="linux-armv7" />
434
  </target>
542
  </target>
435
543
544
  <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha">
545
    <property name="os.and.arch" value="linux-alpha" />
546
  </target>
547
548
  <target name="gluegen.cpptasks.detect.os.linux.hppa" unless="gluegen.cpptasks.detected.os.2" if="isLinuxHppa">
549
    <property name="os.and.arch" value="linux-hppa" />
550
  </target>
551
552
  <target name="gluegen.cpptasks.detect.os.linux.mips" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips">
553
    <property name="os.and.arch" value="linux-mips" />
554
  </target>
555
556
  <target name="gluegen.cpptasks.detect.os.linux.mipsel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsel">
557
    <property name="os.and.arch" value="linux-mipsel" />
558
  </target>
559
560
  <target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc">
561
    <property name="os.and.arch" value="linux-ppc" />
562
  </target>
563
564
  <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
565
    <property name="os.and.arch" value="linux-s390" />
566
  </target>
567
568
  <target name="gluegen.cpptasks.detect.os.linux.s390x" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390x">
569
    <property name="os.and.arch" value="linux-s390x" />
570
  </target>
571
572
  <target name="gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxSparc">
573
    <property name="os.and.arch" value="linux-sparc" />
574
  </target>
575
576
436
  <target name="gluegen.cpptasks.detect.os.android.armv7" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv7">
577
  <target name="gluegen.cpptasks.detect.os.android.armv7" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv7">
437
    <property name="os.and.arch" value="android-armv7" />
578
    <property name="os.and.arch" value="android-armv7" />
438
  </target>
579
  </target>
439
580
440
  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv7,gluegen.cpptasks.detect.os.android.armv7" unless="gluegen.cpptasks.detected.os.2" />
581
  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv7,gluegen.cpptasks.detect.os.android.armv7,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
441
582
442
  <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
583
  <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
443
    <property name="native.library.suffix"     value="*lib" />
584
    <property name="native.library.suffix"     value="*lib" />
Lines 894-899 Link Here
894
    <linker id="linker.cfg.linux.armv7" name="gcc">
1035
    <linker id="linker.cfg.linux.armv7" name="gcc">
895
    </linker>
1036
    </linker>
896
1037
1038
    <linker id="linker.cfg.linux.alpha" name="gcc">
1039
    </linker>
1040
1041
    <linker id="linker.cfg.linux.hppa" name="gcc">
1042
    </linker>
1043
1044
    <linker id="linker.cfg.linux.mips" name="gcc">
1045
    </linker>
1046
1047
    <linker id="linker.cfg.linux.mipsel" name="gcc">
1048
    </linker>
1049
1050
    <linker id="linker.cfg.linux.ppc" name="gcc">
1051
    </linker>
1052
1053
    <linker id="linker.cfg.linux.s390" name="gcc">
1054
    </linker>
1055
1056
    <linker id="linker.cfg.linux.s390x" name="gcc">
1057
    </linker>
1058
1059
    <linker id="linker.cfg.linux.sparc" name="gcc">
1060
    </linker>
1061
897
    <compiler id="linker.cfg.android" name="gcc">
1062
    <compiler id="linker.cfg.android" name="gcc">
898
        <!-- shall be defined in custom ${gluegen-cpptasks.file} ! -->
1063
        <!-- shall be defined in custom ${gluegen-cpptasks.file} ! -->
899
    </compiler>
1064
    </compiler>
Lines 1043-1053 Link Here
1043
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/amd64" />
1208
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/amd64" />
1044
    </target>
1209
    </target>
1045
1210
1211
    <target name="gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinuxAlpha">
1212
      <echo message="Linux.alpha" />
1213
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.alpha" /> 
1214
      <property name="linker.cfg.id.base"            value="linker.cfg.linux.alpha" /> 
1215
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/alpha" />
1216
    </target>
1217
1046
    <target name="gluegen.cpptasks.declare.compiler.linux.armv7" if="isLinuxARMv7">
1218
    <target name="gluegen.cpptasks.declare.compiler.linux.armv7" if="isLinuxARMv7">
1047
      <echo message="Linux.armv7" />
1219
      <echo message="Linux.armv7" />
1048
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.armv7" /> 
1220
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.armv7" /> 
1049
      <property name="linker.cfg.id.base"            value="linker.cfg.linux.armv7" /> 
1221
      <property name="linker.cfg.id.base"            value="linker.cfg.linux.armv7" /> 
1050
      <property name="java.lib.dir.platform"         value="${env.TARGET_JAVA_LIBS}" />
1222
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/arm" />
1051
    </target>
1223
    </target>
1052
1224
1053
    <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
1225
    <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
Lines 1057-1063 Link Here
1057
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ia64" />
1229
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ia64" />
1058
    </target>
1230
    </target>
1059
1231
1060
    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv7" if="isLinux">
1232
    <target name="gluegen.cpptasks.declare.compiler.linux.hppa" if="isLinuxHppa">
1233
      <echo message="Linux.hppa" />
1234
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1235
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
1236
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/hppa" />
1237
    </target>
1238
1239
    <target name="gluegen.cpptasks.declare.compiler.linux.mips" if="isLinuxMips">
1240
      <echo message="Linux.Mips" />
1241
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1242
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
1243
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/mips" />
1244
    </target>
1245
1246
    <target name="gluegen.cpptasks.declare.compiler.linux.mipsel" if="isLinuxMipsel">
1247
      <echo message="Linux.Mipsel" />
1248
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1249
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
1250
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/mipsel" />
1251
    </target>
1252
1253
    <target name="gluegen.cpptasks.declare.compiler.linux.ppc" if="isLinuxPpc">
1254
      <echo message="Linux.Ppc" />
1255
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1256
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
1257
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ppc" />
1258
    </target>
1259
1260
    <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
1261
      <echo message="Linux.s390" />
1262
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1263
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
1264
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/s390" />
1265
    </target>
1266
1267
    <target name="gluegen.cpptasks.declare.compiler.linux.s390x" if="isLinuxs390x">
1268
      <echo message="Linux.s390x" />
1269
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1270
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
1271
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/s390x" />
1272
    </target>
1273
1274
    <target name="gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinuxSparc">
1275
      <echo message="Linux.Sparc" />
1276
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1277
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
1278
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/sparc" />
1279
    </target>
1280
1281
    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv7,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
1061
        <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
1282
        <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
1062
    </target>
1283
    </target>
1063
1284
1064
- 

Return to bug 488