1
=== removed file '.pc/applied-patches'
2
--- .pc/applied-patches	2011-11-22 00:42:13 +0000
3
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
4
@@ -1,9 +0,0 @@
5
1
variousFixes.diff
6
2
swt.diff
7
3
otherArchsoswin.diff
8
4
disable_android.diff
9
5
disable_git_call.diff
10
6
disable_android_2.diff
11
7
arch_naming.diff
12
8
linker.cfg.id.os.diff
13
9
otherArchsoswin_2.diff
14
10
0
15
=== removed directory '.pc/arch_naming.diff'
16
=== removed directory '.pc/arch_naming.diff/make'
17
=== removed file '.pc/arch_naming.diff/make/build-nativewindow.xml'
18
--- .pc/arch_naming.diff/make/build-nativewindow.xml	2011-10-09 19:26:30 +0000
19
+++ .pc/arch_naming.diff/make/build-nativewindow.xml	1970-01-01 00:00:00 +0000
20
@@ -1,901 +0,0 @@
21
1
<?xml version="1.0" encoding="UTF-8"?>
22
2
<!--
23
3
   - Ant build for the NativeWindow package.  This build has been tested with ANT 1.7.0.  The
24
4
   - optional.jar that contains the optional ANT tasks must be in the ANT
25
5
   - classpath (typically the ant/lib directory).
26
6
   -
27
7
   - A clean download of the NativeWindow sources is required for this build.
28
8
   -
29
9
   - This build has no dependence on environment variables; the needed
30
10
   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
31
11
   - script, by the virtual machine, or elsewhere. However, on all platforms,
32
12
   - the C compiler and linker should be in the path. All other paths that
33
13
   - need to be set are in host.properties.
34
14
   -
35
15
   - NOTE:  because the GlueGen config files have their own relative paths
36
16
   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
37
17
   -        the "make" directory. This also means that this build.xml MUST
38
18
   -        be run from the "make" directory.
39
19
   -
40
20
   - Public targets:
41
21
   -   all: (default; autodetects OS and chooses C compiler from gluegen.properties)
42
22
   -   clean:        clean all built
43
23
   -   javadoc:      create the standard developer Javadoc (recommended)
44
24
   -                 (Note: should build all first - may be dependence in the future)
45
25
   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
46
26
   -   javadoc.dev:  create the internal developer Javadoc.  This includes the
47
27
   -                       Java and C file generators. Note that it is only supported
48
28
   -                       to create the Javadoc for the platform on which you are
49
29
   -                       currently running.
50
30
   - 
51
31
   - Note: on Windows the "win32.c.compiler" property in gluegen.properties
52
32
   - is required to select the appropriate C compiler. See the example
53
33
   - gluegen.properties in the gluegen workspace for valid values. On Mac OS X
54
34
   - universal binaries may also be built by setting the "macosxfat"
55
35
   - property in gluegen.properties; again see the example file in this
56
36
   - directory.
57
37
   -   
58
38
   - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
59
39
   - ANT build, including the GlueGen tasks, the building of
60
40
   - the Java generated sources, the first and second phase Java compiles, and
61
41
   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
62
42
   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
63
43
   - the original OS detection code.
64
44
   -
65
45
   - Some environment defs affecting native compilation
66
46
       setup.noNativeAWT
67
47
68
48
   - Internal settings, may not be necessary to set them manually,
69
49
     since all JAR archives are orthogonal.
70
50
       setup.noAWT
71
51
   -->
72
52
<project name="NativeWindow" basedir="." default="all">
73
53
74
54
    <import file="build-common.xml"/>
75
55
76
56
	<!-- needed for outofdate task -->
77
57
    <taskdef resource="net/sf/antcontrib/antlib.xml">
78
58
      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
79
59
    </taskdef>
80
60
81
61
	<!-- ================================================================== -->
82
62
    <!-- 
83
63
       - Base initialization and detection of operating system.
84
64
      -->
85
65
    <target name="base.init" depends="common.init">
86
66
87
67
        <!-- partitioning -->
88
68
89
69
        <property name="java.part.swt"
90
70
                  value="jogamp/nativewindow/swt/**"/>
91
71
92
72
        <property name="java.part.core"
93
73
                  value="javax/media/nativewindow/* javax/media/nativewindow/util/* javax/media/nativewindow/egl/* com/jogamp/nativewindow/* jogamp/nativewindow/* jogamp/nativewindow/jvm/* ${java.part.swt}"/>
94
74
95
75
        <property name="java.part.awt"
96
76
                  value="javax/media/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/>
97
77
98
78
        <property name="java.part.x11"
99
79
                  value="jogamp/nativewindow/x11/** javax/media/nativewindow/x11/*" />
100
80
101
81
        <property name="java.part.windows"
102
82
                  value="jogamp/nativewindow/windows/** javax/media/nativewindow/windows/*" />
103
83
104
84
        <property name="java.part.macosx"
105
85
                  value="jogamp/nativewindow/macosx/** javax/media/nativewindow/macosx/*" />
106
86
107
87
        <!-- condition excludes -->
108
88
109
89
        <condition property="java.excludes.awt"
110
90
                   value="${java.part.awt}">
111
91
           <isset property="setup.noAWT"/> 
112
92
        </condition>
113
93
114
94
        <property name="java.excludes.all" value="${java.excludes.awt}" />
115
95
        <echo message="java.excludes.all: ${java.excludes.all}" />
116
96
    </target>
117
97
118
98
119
99
    <!-- ================================================================== -->
120
100
    <!-- 
121
101
       - Declare all paths and user defined variables.
122
102
      -->
123
103
    <target name="declare.common" description="Declare properties" depends="base.init">
124
104
125
105
        <property name="config.nativewindow" value="${config}/nativewindow" />
126
106
127
107
        <property name="rootrel.src" value="src/nativewindow" />
128
108
        <property name="rootrel.src.java" value="${rootrel.src}/classes" />
129
109
        <property name="rootrel.src.c" value="${rootrel.src}/native" />
130
110
131
111
        <property name="rootrel.src.generated" value="${rootrel.build}/nativewindow/gensrc" />
132
112
        <property name="rootrel.generated.c" value="${rootrel.src.generated}/native" />
133
113
134
114
        <!-- The source directories. -->
135
115
        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
136
116
        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
137
117
        
138
118
        <!-- The generated source directories. -->
139
119
        <property name="src.generated" value="${build.nativewindow}/gensrc" />
140
120
        <property name="src.generated.java" value="${src.generated}/classes" />
141
121
        <property name="src.generated.c" value="${src.generated}/native" />
142
122
        
143
123
        <!-- The compiler output directories. -->
144
124
        <property name="classes" value="${build.nativewindow}/classes" />
145
125
146
126
        <property name="javah.classpath" value="${gluegen-rt.jar}:${classes}" />
147
127
148
128
        <!-- The headers from which Java files are generated -->
149
129
        <dirset id="stub.includes.fileset.all" dir=".">
150
130
            <include name="${stub.includes}/macosx/**" />
151
131
            <include name="${stub.includes}/win32/**" />
152
132
            <include name="${stub.includes}/x11/**" />
153
133
            <include name="${stub.includes}/gluegen/**" />
154
134
            <include name="${stub.includes}/khr/**" />
155
135
            <include name="${stub.includes}/jni/**" />
156
136
        </dirset>
157
137
        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
158
138
            <include name="macosx/**" />
159
139
            <include name="win32/**" />
160
140
            <include name="x11/**" />
161
141
            <include name="common/**" />
162
142
            <include name="jni/**" />
163
143
        </fileset>
164
144
        <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
165
145
        <fileset id="stub.includes.dependencies.fileset.3" dir="${config.nativewindow}">
166
146
            <include name="*.cfg" />
167
147
            <include name="*.java" />
168
148
            <include name="*.c" />
169
149
        </fileset>
170
150
171
151
        <!-- The javadoc dirs. -->
172
152
        <property name="javadoc" value="${project.root}/javadoc_nativewindow_public" />
173
153
        <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" />
174
154
        <property name="javadoc.dev" value="${project.root}/javadoc_nativewindow_dev" />
175
155
        <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${nativewindow_base_version} Specification" />
176
156
        <property name="javadoc.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" />
177
157
        <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*" />
178
158
179
159
        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
180
160
181
161
        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.nativewindow.util.*,jogamp.nativewindow.*,com.jogamp.gluegen,com.jogamp.gluegen.runtime" />
182
162
    <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
183
163
    </target>
184
164
    
185
165
    <!-- ================================================================== -->
186
166
    <!-- 
187
167
       - Initialize all parameters required for the build and create any
188
168
       - required directories.
189
169
      -->
190
170
    <target name="init" depends="declare.common">
191
171
        <!-- Create the required output directories. -->
192
172
        <mkdir dir="${src.generated.java}" />
193
173
        <mkdir dir="${src.generated.c}" />
194
174
        <mkdir dir="${src.generated.c}/MacOSX" />
195
175
        <mkdir dir="${src.generated.c}/Windows" />
196
176
        <mkdir dir="${src.generated.c}/X11" />
197
177
        <mkdir dir="${classes}" />
198
178
        <mkdir dir="${obj.nativewindow}" />
199
179
    </target>
200
180
201
181
    <!--
202
182
       - Check to see whether we need to rebuild the generated sources.
203
183
      -->
204
184
    <target name="java.generate.check">
205
185
        <!-- Blow away all target files if any dependencies are violated
206
186
             (the uptodate task doesn't allow arbitrary source and target filesets but should) -->
207
187
             <!--
208
188
        <dependset>
209
189
            <srcfileset refid="stub.includes.dependencies.fileset.1" />
210
190
            <srcfileset refid="stub.includes.dependencies.fileset.2" />
211
191
            <srcfileset refid="stub.includes.dependencies.fileset.3" />
212
192
            <targetfileset dir="${src.generated}">
213
193
                <include name="**/*.java" />
214
194
                <include name="**/*.c" />
215
195
            </targetfileset>
216
196
        </dependset>
217
197
        -->
218
198
219
199
        <!-- Now check for the presence of one well-known file -->
220
200
        <uptodate property="java.generate.skip.x11windowlib"
221
201
                  targetfile="${src.generated.java}/jogamp/nativewindow/x11/X11Lib.java">
222
202
            <srcfiles refid="stub.includes.dependencies.fileset.1" />
223
203
            <srcfiles refid="stub.includes.dependencies.fileset.2" />
224
204
            <srcfiles refid="stub.includes.dependencies.fileset.3" />
225
205
        </uptodate>
226
206
        <uptodate property="java.generate.skip.jawt"
227
207
                  targetfile="${src.generated.java}/jogamp/nativewindow/jawt/JAWT.java">
228
208
            <srcfiles refid="stub.includes.dependencies.fileset.1" />
229
209
            <srcfiles refid="stub.includes.dependencies.fileset.2" />
230
210
            <srcfiles refid="stub.includes.dependencies.fileset.3" />
231
211
        </uptodate>
232
212
233
213
        <condition property="java.generate.skip">
234
214
          <and>
235
215
              <isset property="java.generate.skip.x11windowlib"/>
236
216
              <isset property="java.generate.skip.jawt"/>
237
217
          </and>
238
218
        </condition>
239
219
240
220
        <!--property name="java.generate.skip" value="true"/-->
241
221
    </target>
242
222
243
223
    <target name="java.generate.windowlib" if="windowlib.os.cfg">
244
224
        <echo message="Generating Windowing Lib implementation class" />
245
225
        <gluegen src="${stub.includes}/${window.os.system}/window-lib.c"
246
226
                 outputRootDir="${build.nativewindow}"
247
227
                 config="${windowlib.os.cfg}"
248
228
                 includeRefid="stub.includes.fileset.platform"
249
229
                 literalInclude="${stub.includes.gluegen.gg}"
250
230
                 emitter="com.jogamp.gluegen.JavaEmitter"
251
231
                 debug="false"
252
232
                 dumpCPP="false">
253
233
            <classpath refid="gluegen.classpath" />
254
234
        </gluegen>
255
235
    </target>
256
236
257
237
    <target name="java.generate.jawt" unless="setup.noAWT">
258
238
        <!-- NOTE:  the "literalInclude" in this GlueGen call is simply to
259
239
           -        get around the fact that neither FileSet nor DirSet can
260
240
           -        handle different drives in an effective manner. -->
261
241
        <echo message="Generating JAWT interface class" />
262
242
        <echo message="java.home.dir=${java.home.dir}" />
263
243
        <gluegen src="${jawt.platform.header}"
264
244
                 outputRootDir="${build.nativewindow}"
265
245
                 config="${jawt.cfg}"
266
246
                 includeRefid="stub.includes.fileset.platform"
267
247
                 literalInclude="${stub.includes.gluegen.gg}, ${stub.includes}/jni"
268
248
                 emitter="com.jogamp.gluegen.JavaEmitter">
269
249
            <classpath refid="gluegen.classpath" />
270
250
        </gluegen>
271
251
    </target>
272
252
273
253
    <target name="java.generate.platforms" >
274
254
        <echo message="Generating platform-specifics: os: ${window.os.system}, cfgs: ${windowlib.os.cfg}, ${jawt.cfg}" />
275
255
        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" />
276
256
        <antcall target="java.generate.windowlib" inheritRefs="true" />
277
257
        <antcall target="java.generate.jawt" inheritRefs="true" />
278
258
    </target>
279
259
280
260
    <!--
281
261
       - Setup the generating ANT tasks and use it to generate the Java files 
282
262
       - from the C GL headers.  This involves setting the taskdef and creating
283
263
       - the classpath reference id then running the task on each header.
284
264
      -->
285
265
    <target name="java.generate" depends="init, common.gluegen.build, java.generate.check" unless="java.generate.skip">
286
266
287
267
        <!-- Add the GlueGen task to ANT -->
288
268
        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
289
269
                 classpathref="gluegen.classpath" />
290
270
                 
291
271
        <!-- Use the GlueGen task to generate the Java files -->
292
272
293
273
        <echo message="Generating platform-specifics: X11" />
294
274
        <antcall target="java.generate.platforms" inheritRefs="true">
295
275
            <param name="window.os.system"                       value="x11"/>
296
276
            <param name="windowlib.os.cfg"                       value="${config.nativewindow}/x11-lib.cfg" />
297
277
            <param name="jawt.cfg"                               value="${config.nativewindow}/jawt-x11.cfg" />
298
278
            <param name="jawt.platform.header"                   value="${stub.includes}/jni/x11/jawt_md.h" />
299
279
        </antcall>
300
280
301
281
        <echo message="Generating platform-specifics: Win32" />
302
282
        <antcall target="java.generate.platforms" inheritRefs="true">
303
283
            <param name="window.os.system"                       value="win32"/>
304
284
            <param name="windowlib.os.cfg"                       value="${config.nativewindow}/win32-lib.cfg" />
305
285
            <param name="jawt.cfg"                               value="${config.nativewindow}/jawt-win32.cfg" />
306
286
            <param name="jawt.platform.header"                   value="${stub.includes}/jni/win32/jawt_md.h" />
307
287
        </antcall>          
308
288
309
289
        <echo message="Generating platform-specifics: MaxOsX" />
310
290
        <antcall target="java.generate.platforms" inheritRefs="true">
311
291
          <param name="window.os.system"                     value="macosx"/>
312
292
          <param name="jawt.cfg"                             value="${config.nativewindow}/jawt-macosx.cfg" />
313
293
          <param name="jawt.platform.header"                 value="${stub.includes}/jni/macosx/jawt_md.h" />
314
294
        </antcall>
315
295
    
316
296
        <!-- Inform the user that the generators have successfully created 
317
297
           - the necessary Java files -->
318
298
        <echo message="" />
319
299
        <echo message="GlueGen has successfully generated files." />
320
300
    
321
301
    </target>      
322
302
323
303
    <!-- ================================================================== -->
324
304
    <!-- 
325
305
       - Compile the original and generated source.  The composable pipelines
326
306
       - will be generated.
327
307
      -->
328
308
    <target name="java.compile.javase" depends="java.generate">
329
309
        <!-- Perform the second pass Java compile; everything. -->
330
310
        <javac destdir="${classes}"
331
311
               excludes="${java.excludes.all}"
332
312
               source="${target.sourcelevel}"
333
313
               fork="yes"
334
314
               includeAntRuntime="false"
335
315
               memoryMaximumSize="${javac.memorymax}"
336
316
               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
337
317
            <classpath refid="swt_gluegen.classpath"/>
338
318
            <src path="${src.java}" />
339
319
            <src path="${src.generated.java}" />
340
320
        </javac>
341
321
    </target>
342
322
343
323
    <target name="java.compile" depends="java.compile.javase" />
344
324
345
325
    <!-- ================================================================== -->
346
326
    <!-- 
347
327
       - Compile the native C code for JOGL (and optionally the Cg binding).
348
328
      -->
349
329
350
330
    <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
351
331
      <!-- compiler configuration -->
352
332
353
333
      <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
354
334
      <compiler id="compiler.cfg.freebsd.nativewindow" extends="compiler.cfg.freebsd">
355
335
        <!-- Need to force X11R6 headers on to include path after stub_includes -->
356
336
        <includepath path="/usr/local/include" />
357
337
      </compiler>
358
338
359
339
      <compiler id="compiler.cfg.linux.armv7.nativewindow.x11" extends="compiler.cfg.linux.armv7">
360
340
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
361
341
        <compilerarg value="-idirafter" />
362
342
        <compilerarg value="/usr/include" />
363
343
      </compiler>
364
344
365
345
      <!-- linker configuration -->
366
346
367
347
      <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
368
348
        <syslibset dir="/usr/local/lib" libs="X11"/>
369
349
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
370
350
        <syslibset dir="/usr/local/lib" libs="Xinerama"/>
371
351
        <syslibset dir="/usr/local/lib" libs="Xrender"/>
372
352
      </linker>
373
353
374
354
      <linker id="linker.cfg.freebsd.amd64.nativewindow.x11" extends="linker.cfg.freebsd.amd64">
375
355
        <syslibset dir="/usr/local/lib" libs="X11" />
376
356
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
377
357
        <syslibset dir="/usr/local/lib" libs="Xinerama"/>
378
358
        <syslibset dir="/usr/local/lib" libs="Xrender"/>
379
359
      </linker>
380
360
381
361
      <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux">
382
362
        <syslibset libs="X11"/>
383
363
        <syslibset libs="Xxf86vm" />
384
364
        <syslibset libs="Xinerama"/>
385
365
        <syslibset libs="Xrender"/>
386
366
      </linker>
387
367
388
368
      <linker id="linker.cfg.linux.x86.nativewindow.x11" extends="linker.cfg.linux.x86">
389
369
        <syslibset libs="X11"/>
390
370
        <syslibset libs="Xxf86vm" />
391
371
        <syslibset libs="Xinerama"/>
392
372
        <syslibset libs="Xrender"/>
393
373
      </linker>
394
374
395
375
      <linker id="linker.cfg.linux.amd64.nativewindow.x11" extends="linker.cfg.linux.amd64">
396
376
        <syslibset libs="X11"/>
397
377
        <syslibset libs="Xxf86vm" />
398
378
        <syslibset libs="Xinerama"/>
399
379
        <syslibset libs="Xrender"/>
400
380
      </linker>
401
381
402
382
      <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
403
383
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
404
384
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
405
385
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xinerama" />
406
386
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrender" />
407
387
      </linker>
408
388
409
389
      <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
410
390
        <syslibset libs="X11"/>
411
391
      </linker>
412
392
413
393
      <linker id="linker.cfg.solaris.sparcv9.nativewindow.x11" extends="linker.cfg.solaris.sparcv9">
414
394
        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
415
395
      </linker>
416
396
417
397
      <linker id="linker.cfg.solaris.amd64.nativewindow.x11" extends="linker.cfg.solaris.amd64">
418
398
        <syslibset dir="/usr/lib/amd64" libs="X11"/>
419
399
      </linker>
420
400
421
401
      <linker id="linker.cfg.win32.mingw.nativewindow" extends="linker.cfg.win32.mingw">
422
402
        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
423
403
        <syslibset libs="gdi32, kernel32"/>
424
404
      </linker>
425
405
426
406
      <linker id="linker.cfg.win64.mingw.nativewindow" extends="linker.cfg.win64.mingw">
427
407
        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
428
408
        <syslibset libs="gdi32, kernel32"/>
429
409
      </linker>
430
410
431
411
      <linker id="linker.cfg.win32.msvc.nativewindow" extends="linker.cfg.win32.msvc">
432
412
        <syslibset libs="gdi32, user32, kernel32" />
433
413
      </linker>
434
414
      
435
415
      <linker id="linker.cfg.macosx.nativewindow" extends="linker.cfg.macosx">
436
416
        <linkerarg value="-framework" />
437
417
        <linkerarg value="Cocoa" />
438
418
      </linker>
439
419
440
420
      <linker id="linker.cfg.hpux.nativewindow" extends="linker.cfg.hpux">
441
421
        <syslibset dir="/usr/lib" libs="X11"/>
442
422
        <syslibset dir="/usr/lib" libs="Xinerama"/>
443
423
      </linker>
444
424
    </target>
445
425
446
426
    <target name="c.configure.win32.vc" if="isVCFamily">
447
427
      <echo message="Win32.VC" />
448
428
      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
449
429
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.msvc.nativewindow" />
450
430
    </target>
451
431
    
452
432
    <target name="c.configure.win32.mingw" if="isMingW32">
453
433
      <echo message="Win32.MingW" />
454
434
      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
455
435
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.mingw.nativewindow" />
456
436
    </target>
457
437
458
438
    <target name="c.configure.win64.mingw" if="isMingW64">
459
439
      <echo message="Win64.MingW" />
460
440
      <property name="compiler.cfg.id"                      value="compiler.cfg.win64.mingw" />
461
441
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win64.mingw.nativewindow" />
462
442
    </target>
463
443
464
444
    <target name="c.configure.linux.x86" if="isLinuxX86">
465
445
      <echo message="Linux.x86" />
466
446
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.x86" />
467
447
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.x86.nativewindow.x11" />
468
448
    </target>
469
449
    
470
450
    <target name="c.configure.linux.amd64" if="isLinuxAMD64">
471
451
      <echo message="Linux.AMD64" />
472
452
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
473
453
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.amd64.nativewindow.x11" />
474
454
    </target>
475
455
    
476
456
    <target name="c.configure.linux.armv7" if="isLinuxARMv7">
477
457
      <echo message="Linux.armv7" />
478
458
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7.nativewindow.x11" />
479
459
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.armv7.nativewindow.x11" />
480
460
    </target>
481
461
    
482
462
    <target name="c.configure.linux.ia64" if="isLinuxIA64">
483
463
      <echo message="Linux.IA64" />
484
464
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
485
465
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
486
466
    </target>
487
467
488
468
    <target name="c.configure.linux.hppa" if="isLinuxHPPA">
489
469
      <echo message="Linux.HPPA" />
490
470
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
491
471
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
492
472
    </target>
493
473
494
474
    <target name="c.configure.linux.mips" if="isLinuxMIPS">
495
475
      <echo message="Linux.MIPS" />
496
476
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
497
477
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
498
478
    </target>
499
479
500
480
    <target name="c.configure.linux.mipsel" if="isLinuxMIPSEL">
501
481
      <echo message="Linux.MIPSEL" />
502
482
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
503
483
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
504
484
    </target>
505
485
506
486
    <target name="c.configure.linux.ppc" if="isLinuxPPC">
507
487
      <echo message="Linux.PPC" />
508
488
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
509
489
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
510
490
    </target>
511
491
512
492
    <target name="c.configure.linux.s390" if="isLinuxS390">
513
493
      <echo message="Linux.S390" />
514
494
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
515
495
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
516
496
    </target>
517
497
518
498
    <target name="c.configure.linux.sparc" if="isLinuxSPARC">
519
499
      <echo message="Linux.SPARC" />
520
500
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
521
501
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
522
502
    </target>
523
503
524
504
    <target name="c.configure.linux" depends="c.configure.linux.armv7,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" />
525
505
526
506
    <target name="c.configure.android" if="isAndroid">
527
507
      <echo message="Android" />
528
508
      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
529
509
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.android" />
530
510
    </target>
531
511
    
532
512
    <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
533
513
      <echo message="Solaris" />
534
514
      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris" />
535
515
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.nativewindow.x11" />
536
516
    </target>
537
517
  
538
518
 
539
519
    <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
540
520
      <echo message="SolarisSparcv9" />
541
521
      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.sparcv9" />
542
522
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.sparcv9.nativewindow.x11" />
543
523
    </target>
544
524
   
545
525
546
526
    <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
547
527
      <echo message="SolarisAMD64" />
548
528
      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.amd64" />
549
529
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.amd64.nativewindow.x11" />
550
530
    </target>
551
531
   
552
532
    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
553
533
      <echo message="FreeBSD.x86" />
554
534
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
555
535
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.nativewindow.x11" />
556
536
    </target>
557
537
    
558
538
    <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
559
539
      <echo message="FreeBSD.AMD64" />
560
540
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
561
541
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.amd64.nativewindow.x11" />
562
542
    </target>
563
543
    
564
544
    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
565
545
566
546
    <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
567
547
      <echo message="HP-UX" />
568
548
      <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
569
549
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.hpux.nativewindow.x11" />
570
550
    </target>
571
551
572
552
    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
573
553
574
554
    <target name="c.configure.x11" if="isX11" />
575
555
576
556
    <target name="c.configure.macosx" if="isOSX">
577
557
      <property name="compiler.cfg.id"                      value="compiler.cfg.macosx" />
578
558
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.macosx.nativewindow" />
579
559
    </target>
580
560
    
581
561
    <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.android,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
582
562
583
563
    <target name="c.configure" depends="c.configure.1,c.configure.2" />
584
564
585
565
    <target name="rename.mingw.dll" if="isMingW">
586
566
        <move file="${src}" tofile="${dest}" />
587
567
    </target>
588
568
589
569
    <target name="rename.dylib" if="isOSX">
590
570
        <move file="${src}" tofile="${dest}" />
591
571
    </target>
592
572
593
573
    <macrodef name="c.build">
594
574
      <attribute name="c.compiler.src.files" />
595
575
      <attribute name="compiler.cfg.id" />
596
576
      <attribute name="linker.cfg.id" />
597
577
      <attribute name="output.lib.name" />
598
578
      <attribute name="c.compiler.use-jawt" default="false"/>
599
579
      <sequential>
600
580
        <echo message="Output lib name = @{output.lib.name}" />
601
581
602
582
        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
603
583
        <property name="c.compiler.debug"     value="false" /> 
604
584
        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } --> 
605
585
        <property name="c.compiler.optimise"  value="none" /> 
606
586
607
587
        <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
608
588
609
589
        <!-- since properties are immutable, we need one for each target -->
610
590
        <condition property="@{output.lib.name}.useLibJAWT">
611
591
            <istrue value="@{c.compiler.use-jawt}" />
612
592
        </condition>
613
593
        <echo message="c.compiler.use-jawt @{c.compiler.use-jawt}"/>
614
594
        <echo message="@{output.lib.name}.useLibJAWT ${@{output.lib.name}.useLibJAWT}"/>
615
595
616
596
        <condition property="@{output.lib.name}.useLibJVM">
617
597
          <and>
618
598
            <isset property="isHPUX"/>
619
599
            <isset property="@{output.lib.name}.useLibJAWT"/>
620
600
          </and>
621
601
        </condition> 
622
602
623
603
        <patternset id="c.src.files.awt">
624
604
          <include name="${rootrel.src.c}/JAWT*.c"/>
625
605
          <include name="${rootrel.generated.c}/X11/JAWT*.c" if="isX11"/>
626
606
          <include name="${rootrel.generated.c}/MacOSX/JAWT*.c" if="isOSX"/>
627
607
          <include name="${rootrel.generated.c}/Windows/JAWT*.c" if="isWindows"/>
628
608
        </patternset>
629
609
630
610
        <patternset id="c.src.files.x11">
631
611
          <include name="${rootrel.generated.c}/X11/X11*.c"/>
632
612
          <include name="${rootrel.src.c}/x11/Xmisc.c"/>
633
613
          <include name="${rootrel.src.c}/x11/XineramaHelper.c"/>
634
614
          <include name="${rootrel.src.c}/NativewindowCommon.c"/>
635
615
        </patternset>
636
616
637
617
        <patternset id="c.src.files.windows">
638
618
          <include name="${rootrel.generated.c}/Windows/GDI*.c"/>
639
619
          <include name="${rootrel.src.c}/windows/GDImisc.c"/>
640
620
          <include name="${rootrel.src.c}/windows/WindowsDWM.c"/>
641
621
          <include name="${rootrel.src.c}/NativewindowCommon.c"/>
642
622
        </patternset>
643
623
644
624
        <patternset id="c.src.files.macosx">
645
625
          <include name="${rootrel.src.c}/macosx/OSXmisc.c"/>
646
626
          <include name="${rootrel.src.c}/NativewindowCommon.c"/>
647
627
        </patternset>
648
628
649
629
        <echo message="Compiling @{output.lib.name}" />
650
630
651
631
        <!-- have to wrap cc task with outofdate, because otherwise cc links a new library
652
632
             even when no files have been compiled -->
653
633
      	<outofdate>
654
634
          <sourcefiles>
655
635
            <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
656
636
          </sourcefiles>
657
637
          <targetfiles>
658
638
            <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/>
659
639
            <fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/>
660
640
            <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.jnilib"/>
661
641
          </targetfiles>
662
642
          <sequential>
663
643
            <cc outtype="shared" 
664
644
                objdir="${obj.nativewindow}" 
665
645
                outfile="${obj.nativewindow}/@{output.lib.name}"
666
646
                optimize="${c.compiler.optimise}" 
667
647
                debug="${c.compiler.debug}"
668
648
                multithreaded="true" 
669
649
                exceptions="false" 
670
650
                rtti="false">   
671
651
      
672
652
              <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
673
653
      
674
654
              <compiler extends="@{compiler.cfg.id}" >
675
655
                <sysincludepath path="${java.includes.dir}"/>
676
656
                <sysincludepath path="${java.includes.dir.platform}"/>
677
657
                <sysincludepath path="${stub.includes.gluegen.cc}"/>
678
658
                <!-- This is for the generated headers for handwritten C code -->
679
659
                <includepath path="${src.generated.c}" />
680
660
                <includepath path="${src.generated.c}/X11"     if="isX11"/>
681
661
                <includepath path="${src.generated.c}/MacOSX"  if="isOSX"/>
682
662
                <includepath path="${src.generated.c}/Windows" if="isWindows"/>
683
663
                <includepath path="${src.c}/windows"           if="isWindows"/>
684
664
                <includepath path="${src.c}"/>
685
665
      
686
666
                <!-- This must come last to not override real include paths -->
687
667
                <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
688
668
              </compiler>
689
669
      
690
670
              <linker extends="@{linker.cfg.id}">
691
671
                <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
692
672
                <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
693
673
              </linker>
694
674
            </cc>
695
675
696
676
            <!-- FIXME: this is a hack; the cpptask should have an option to change the
697
677
                 suffix or at least understand the override from dylib to jnilib -->
698
678
            <antcall target="rename.dylib" inheritRefs="true">
699
679
                <param name="src"  value="${obj.nativewindow}/lib@{output.lib.name}.dylib" />
700
680
                <param name="dest" value="${obj.nativewindow}/lib@{output.lib.name}.jnilib" />
701
681
            </antcall>
702
682
703
683
            <!-- FIXME: this is a hack; the cpptask should have an option to change the
704
684
                 suffix or at least understand the override from dylib to jnilib -->
705
685
            <antcall target="rename.mingw.dll" inheritRefs="true">
706
686
                <param name="src"  value="${obj.nativewindow}/lib@{output.lib.name}.so" />
707
687
                <param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" />
708
688
            </antcall>
709
689
710
690
            <!-- this stripping may be called more than once on the same library dir,
711
691
                 but that should cause no harm, and doing it here inside outofdate
712
692
                 prevents the JARs from always being rebuilt even if no source code changes -->
713
693
            <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
714
694
                <param name="libdir" value="${obj.nativewindow}"/>
715
695
            </antcall>
716
696
717
697
          </sequential>
718
698
      	</outofdate>
719
699
      </sequential>
720
700
    </macrodef>  
721
701
722
702
    <target name="c.fixup.jawt.version.macosx" if="isOSX" unless="setup.noNativeAWT">
723
703
      <!-- Edit the link to the JAWT version in the resulting jnilib
724
704
           file; this isn't strictly needed but seems to allow the
725
705
           universal binaries to work on 10.3 machines as well, which
726
706
           is desirable for some end users -->
727
707
      <apply executable="install_name_tool">
728
708
        <arg value="-change" />
729
709
        <arg value="/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Libraries/libjawt.dylib" />
730
710
        <arg value="/System/Library/Frameworks/JavaVM.framework/Libraries/libjawt.dylib" />
731
711
        <srcfile />
732
712
        <fileset dir="${obj.nativewindow}" includes="libnativewindow_awt.jnilib" />
733
713
      </apply>
734
714
    </target>
735
715
736
716
    <target name="c.build.nativewindow.awt" unless="setup.noNativeAWT">
737
717
      <c.build c.compiler.src.files="c.src.files.awt"
738
718
               c.compiler.use-jawt="true"
739
719
               output.lib.name="nativewindow_awt"
740
720
               compiler.cfg.id="${compiler.cfg.id}"
741
721
               linker.cfg.id="${linker.cfg.id.oswin}"/>
742
722
    </target>
743
723
744
724
    <target name="c.build.nativewindow.windowlib.x11" if="isX11">
745
725
      <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.nativewindow.x11.X11Lib" />
746
726
747
727
      <c.build c.compiler.src.files="c.src.files.x11"
748
728
               output.lib.name="nativewindow_x11"
749
729
               compiler.cfg.id="${compiler.cfg.id}"
750
730
               linker.cfg.id="${linker.cfg.id.oswin}"/>
751
731
    </target>
752
732
753
733
    <target name="c.build.nativewindow.windowlib.windows" if="isWindows">
754
734
      <javah destdir="${src.generated.c}/Windows" classpath="${javah.classpath}" class="jogamp.nativewindow.windows.GDI" />
755
735
756
736
      <c.build c.compiler.src.files="c.src.files.windows"
757
737
               output.lib.name="nativewindow_win32"
758
738
               compiler.cfg.id="${compiler.cfg.id}"
759
739
               linker.cfg.id="${linker.cfg.id.oswin}"/>
760
740
    </target>
761
741
762
742
    <target name="c.build.nativewindow.windowlib.macosx" if="isOSX">
763
743
      <javah destdir="${src.generated.c}/MacOSX" classpath="${javah.classpath}" class="jogamp.nativewindow.macosx.OSXUtil" />
764
744
765
745
      <c.build c.compiler.src.files="c.src.files.macosx"
766
746
               output.lib.name="nativewindow_macosx"
767
747
               compiler.cfg.id="${compiler.cfg.id}"
768
748
               linker.cfg.id="${linker.cfg.id.oswin}"/>
769
749
    </target>
770
750
771
751
    <target name="c.build.nativewindow.windowlib" depends="c.build.nativewindow.windowlib.x11, c.build.nativewindow.windowlib.windows, c.build.nativewindow.windowlib.macosx"/>
772
752
773
753
    <target name="c.manifest" if="isVC8Family">
774
754
      <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
775
755
      <msvc.manifest objdir="${obj.nativewindow}" dllname="nativewindow_awt" />
776
756
      <msvc.manifest objdir="${obj.nativewindow}" dllname="nativewindow_win32" />
777
757
    </target>
778
758
779
759
    <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.awt">
780
760
      <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
781
761
      <antcall target="c.manifest" inheritRefs="true" />
782
762
    </target>
783
763
784
764
    <!-- ================================================================== -->
785
765
    <!--
786
766
       - Build the nativewindow.jar files.
787
767
      -->
788
768
    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
789
769
790
770
    <target name="setup-manifestfile">
791
771
        <property name="manifestfile" value="nativewindowversion"/>
792
772
        <copy file="${manifestfile}"
793
773
          tofile="${build.nativewindow}/manifest.mf"
794
774
          overwrite="true">
795
775
          <filterset>
796
776
              <filter token="VERSION" value="${nativewindow.version}"/>
797
777
              <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
798
778
              <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
799
779
              <filter token="BASEVERSION" value="${nativewindow_base_version}"/>
800
780
          </filterset>
801
781
        </copy>
802
782
    </target>
803
783
804
784
    <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
805
785
        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.awt.jar}" filesonly="true">
806
786
            <fileset dir="${classes}"
807
787
                     includes="${java.part.awt}"
808
788
                     excludes="${java.excludes.awt}"/>
809
789
        </jar>
810
790
    </target>
811
791
812
792
    <target name="build-jars-x11" depends="setup-manifestfile">
813
793
        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.x11.jar}" filesonly="true">
814
794
            <fileset dir="${classes}"
815
795
                     includes="${java.part.x11}" />
816
796
        </jar>
817
797
    </target>
818
798
819
799
    <target name="build-jars-windows" depends="setup-manifestfile">
820
800
        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.win.jar}" filesonly="true">
821
801
            <fileset dir="${classes}"
822
802
                     includes="${java.part.windows}" />
823
803
        </jar>
824
804
    </target>
825
805
826
806
    <target name="build-jars-macosx" depends="setup-manifestfile">
827
807
        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.os.macosx.jar}" filesonly="true">
828
808
            <fileset dir="${classes}"
829
809
                     includes="${java.part.macosx}" />
830
810
        </jar>
831
811
    </target>
832
812
833
813
    <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-windows,build-jars-macosx">
834
814
        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.core.jar}" filesonly="true">
835
815
            <fileset dir="${classes}"
836
816
                     includes="${java.part.core}"
837
817
                     excludes="${java.part.awt} ${java.part.x11} ${java.part.windows}"/>
838
818
        </jar>
839
819
        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
840
820
            <fileset dir="${obj.nativewindow}">
841
821
              <include name="*.${native.library.suffix}" />
842
822
            </fileset>
843
823
        </jar>
844
824
    </target>
845
825
846
826
    <!-- ================================================================== -->
847
827
    <!--
848
828
       - Build the Javadocs for the sources.
849
829
       - NOTE:  these are not entirely correct as the javadoc targets depend 
850
830
       -        on the platform specific build targets.  To circumvent any 
851
831
       -        errors, ensure that the source is built first.
852
832
      -->
853
833
    <target name="javadoc" depends="init">
854
834
        <!-- Build the general public Javadoc -->
855
835
        <javadoc packagenames="${javadoc.packagenames}"
856
836
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
857
837
                 sourcepath="${src.java};${src.generated.java}"        
858
838
                 classpath="${gluegen-rt.jar}"
859
839
                 destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
860
840
                 overview="${javadoc.overview}" 
861
841
                 source="${target.sourcelevel}"
862
842
                 linkoffline="${javadoc.link} 142-packages"
863
843
         bottom="${javadoc.bottom}" >
864
844
        </javadoc>
865
845
    </target>
866
846
867
847
    <target name="javadoc.spec" depends="init">
868
848
        <!-- Build the specification Javadoc -->
869
849
        <javadoc packagenames="${javadoc.spec.packagenames}"
870
850
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
871
851
                 sourcepath="${src.java};${src.generated.java}"
872
852
                 classpath="${gluegen-rt.jar}"
873
853
                 destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
874
854
                 overview="${javadoc.overview}"
875
855
                 source="${target.sourcelevel}"
876
856
                 linkoffline="${javadoc.link} 142-packages"
877
857
                 bottom="${javadoc.bottom}" >
878
858
        </javadoc>
879
859
    </target>
880
860
                                                                                                                                   
881
861
    <target name="javadoc.dev" depends="init">
882
862
        <!-- Build the internal developer Javadoc -->
883
863
        <javadoc packagenames="${javadoc.dev.packagenames}"
884
864
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
885
865
                 sourcepath="${src.java};${src.generated.java}"        
886
866
                 classpath="${gluegen-rt.jar}"
887
867
                 destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
888
868
                 overview="${javadoc.overview}" 
889
869
                 source="${target.sourcelevel}"
890
870
                 linkoffline="${javadoc.link} 142-packages"
891
871
         bottom="${javadoc.bottom}" >
892
872
        </javadoc>
893
873
    </target>
894
874
895
875
    <target name="all.doc" description="Build NativeWindow docs" depends="init,javadoc,javadoc.spec,javadoc.dev" />
896
876
897
877
    <!-- ================================================================== -->
898
878
    <!--
899
879
       - Clean up all that is built.
900
880
      -->
901
881
    <target name="clean" description="Remove all build products" depends="declare.common">
902
882
        <delete includeEmptyDirs="true" quiet="true">
903
883
            <fileset dir="${build.nativewindow}" />
904
884
            <fileset dir="${javadoc}" />
905
885
            <fileset dir="${javadoc.spec}" />
906
886
            <fileset dir="${javadoc.dev}" />
907
887
        </delete>
908
888
    </target>
909
889
910
890
    <!-- ================================================================== -->
911
891
    <!--
912
892
       - Build everything.
913
893
      -->
914
894
    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,java.compile,c.build.nativewindow,build-jars,generate.version.txt" />
915
895
916
896
    <target name="generate.version.txt" depends="init">
917
897
        <!-- Create a version.txt file indicating which version we just built -->
918
898
        <echo message="${nativewindow.version}" file="${build.nativewindow}/version.txt" />
919
899
    </target>
920
900
921
901
</project>
922
902
0
923
=== removed directory '.pc/disable_android.diff'
924
=== removed directory '.pc/disable_android.diff/make'
925
=== removed file '.pc/disable_android.diff/make/build-newt.xml'
926
--- .pc/disable_android.diff/make/build-newt.xml	2011-10-06 15:53:38 +0000
927
+++ .pc/disable_android.diff/make/build-newt.xml	1970-01-01 00:00:00 +0000
928
@@ -1,762 +0,0 @@
929
1
<?xml version="1.0" encoding="UTF-8"?>
930
2
<!--
931
3
   - Ant build for NEWT.  This build has been tested with ANT 1.7.0.  The
932
4
   - optional.jar that contains the optional ANT tasks must be in the ANT
933
5
   - classpath (typically the ant/lib directory).
934
6
   -
935
7
   - A clean download of NEWT is required for this build.
936
8
   -
937
9
   - This build has no dependence on environment variables; the needed
938
10
   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
939
11
   - script, by the virtual machine, or elsewhere. However, on all platforms,
940
12
   - the C compiler and linker should be in the path. All other paths that
941
13
   - need to be set are in host.properties.
942
14
   -
943
15
   - NOTE:  because the GlueGen config files have their own relative paths
944
16
   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
945
17
   -        the "make" directory. This also means that this build.xml MUST
946
18
   -        be run from the "make" directory.
947
19
   -
948
20
   - Public targets:
949
21
   -   all: (default; autodetects OS and chooses C compiler from newt.properties)
950
22
   -   clean:        clean all built
951
23
   -   javadoc:      create the standard developer Javadoc (recommended)
952
24
   -                 (Note: should build all first - may be dependence in the future)
953
25
   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
954
26
   -   javadoc.dev:  create the internal developer Javadoc.  This includes the
955
27
   -                       Java and C file generators. Note that it is only supported
956
28
   -                       to create the Javadoc for the platform on which you are
957
29
   -                       currently running.
958
30
   -
959
31
   - Note: on Windows the "win32.c.compiler" property in newt.properties
960
32
   - is required to select the appropriate C compiler. See the example
961
33
   - newt.properties in this directory for valid values. On Mac OS X
962
34
   - universal binaries may also be built by setting the "macosxfat"
963
35
   - property in newt.properties; again see the example file in this
964
36
   - directory.
965
37
   -
966
38
   - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
967
39
   - ANT build, including the GlueGen and StaticGLInfo tasks, the building of
968
40
   - the Java generated sources, the first and second phase Java compiles, and
969
41
   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
970
42
   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
971
43
   - the original OS detection code.
972
44
   -
973
45
   - Some environment defs affecting compilation
974
46
975
47
   - Some environment defs affecting native compilation
976
48
       setup.noNativeDesktop
977
49
       setup.addNativeKD
978
50
       setup.addNativeIntelGDL
979
51
       setup.addNativeBroadcomEGL
980
52
981
53
   - Internal settings, may not be necessary to set them manually,
982
54
     since all JAR archives are orthogonal.
983
55
       setup.noAWT
984
56
       setup.noOpenGL
985
57
986
58
   -->
987
59
<project name="NEWT" basedir="." default="all">
988
60
989
61
    <import file="build-common.xml"/>
990
62
991
63
    <!-- needed for outofdate task -->
992
64
    <taskdef resource="net/sf/antcontrib/antlib.xml">
993
65
      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
994
66
    </taskdef>
995
67
996
68
    <!-- ================================================================== -->
997
69
    <!--
998
70
       - Base initialization and detection of operating system.
999
71
      -->
1000
72
    <target name="base.init" depends="common.init">
1001
73
1002
74
        <condition property="setup.nonatives">
1003
75
            <and>
1004
76
                <isfalse value="${isWindows}" />
1005
77
                <isfalse value="${isOSX}" />
1006
78
                <isfalse value="${isX11}" />
1007
79
                <isfalse value="${isAndroid}" />
1008
80
                <isfalse value="${setup.addNativeKD}" />
1009
81
                <isfalse value="${setup.addNativeIntelGDL}" />
1010
82
                <isfalse value="${setup.addNativeBroadcomEGL}" />
1011
83
            </and>
1012
84
        </condition>
1013
85
1014
86
        <echo message="setup.noOpenGL: ${setup.noOpenGL}" />
1015
87
        <echo message="isWindows: ${isWindows}" />
1016
88
        <echo message="isOSX: ${isOSX}" />
1017
89
        <echo message="isX11: ${isX11}" />
1018
90
        <echo message="isAndroid: ${isAndroid}" />
1019
91
        <echo message="setup.addNativeKD: ${setup.addNativeKD}" />
1020
92
        <echo message="setup.addNativeIntelGDL: ${setup.addNativeIntelGDL}" />
1021
93
        <echo message="setup.addNativeBroadcomEGL: ${setup.addNativeBroadcomEGL}" />
1022
94
        <echo message="setup.nonatives: ${setup.nonatives}" />
1023
95
1024
96
        <!-- partitioning -->
1025
97
1026
98
        <property name="java.part.core"
1027
99
                  value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/*"/>
1028
100
1029
101
        <property name="java.part.opengl"
1030
102
                  value="com/jogamp/newt/opengl/**"/>
1031
103
1032
104
        <property name="java.part.driver.awt"
1033
105
                  value="jogamp/newt/driver/awt/**"/>
1034
106
1035
107
        <property name="java.part.awt"
1036
108
                  value="com/jogamp/newt/awt/** com/jogamp/newt/event/awt/** jogamp/newt/awt/** ${java.part.driver.awt}"/>
1037
109
1038
110
        <property name="java.part.driver.x11"
1039
111
                  value="jogamp/newt/driver/x11/**"/>
1040
112
1041
113
        <property name="java.part.driver.windows"
1042
114
                  value="jogamp/newt/driver/windows/**"/>
1043
115
1044
116
        <property name="java.part.driver.macosx"
1045
117
                  value="jogamp/newt/driver/macosx/**"/>
1046
118
1047
119
        <property name="java.part.driver.kd"
1048
120
                  value="jogamp/newt/driver/kd/**"/>
1049
121
1050
122
        <property name="java.part.driver.intelgdl"
1051
123
                  value="jogamp/newt/driver/intel/gdl/**"/>
1052
124
1053
125
        <property name="java.part.driver.broadcomegl"
1054
126
                  value="jogamp/newt/driver/broadcom/egl/**"/>
1055
127
1056
128
        <property name="java.part.driver.android"
1057
129
                  value="jogamp/newt/driver/android/**"/>
1058
130
1059
131
        <!-- condition excludes -->
1060
132
1061
133
        <condition property="java.excludes.awt"
1062
134
                   value="${java.part.awt}">
1063
135
           <isset property="setup.noAWT"/>
1064
136
        </condition>
1065
137
1066
138
        <condition property="java.excludes.opengl" value="${java.part.opengl}">
1067
139
           <isset property="setup.noOpenGL"/>
1068
140
        </condition>
1069
141
1070
142
        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl}" />
1071
143
        <echo message="java.excludes.all: ${java.excludes.all}" />
1072
144
1073
145
    </target>
1074
146
1075
147
    <!-- ================================================================== -->
1076
148
    <!--
1077
149
       - Declare all paths and user defined variables.
1078
150
      -->
1079
151
    <target name="declare.common" description="Declare properties" depends="base.init">
1080
152
        <property name="rootrel.src" value="src/newt" />
1081
153
        <property name="rootrel.src.java" value="${rootrel.src}/classes" />
1082
154
        <property name="rootrel.src.c" value="${rootrel.src}/native" />
1083
155
1084
156
        <!-- The source directories. -->
1085
157
        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
1086
158
        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
1087
159
1088
160
        <!-- The generated source directories. -->
1089
161
        <property name="src.generated" value="${build.newt}/gensrc" />
1090
162
        <property name="src.generated.c" value="${src.generated}/native/newt" />
1091
163
1092
164
        <!-- The compiler output directories. -->
1093
165
        <property name="classes" value="${build.newt}/classes" />
1094
166
1095
167
        <property name="javah.classpath" value="${gluegen-rt.jar}:${build.nativewindow}/classes:${classes}" />
1096
168
1097
169
        <!-- The javadoc dirs. -->
1098
170
        <property name="javadoc" value="${project.root}/javadoc_newt_public" />
1099
171
        <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" />
1100
172
        <property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" />
1101
173
        <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
1102
174
        <property name="javadoc.overview" value="spec-overview.html" />
1103
175
        <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event, com.jogamp.newt.opengl, com.jogamp.newt.util" />
1104
176
1105
177
        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
1106
178
1107
179
        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.newt.*" />
1108
180
    <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
1109
181
    </target>
1110
182
1111
183
    <!-- ================================================================== -->
1112
184
    <!--
1113
185
       - Initialize all parameters required for the build and create any
1114
186
       - required directories.
1115
187
      -->
1116
188
    <target name="init" depends="declare.common">
1117
189
        <mkdir dir="${src.generated.c}" />
1118
190
        <mkdir dir="${src.generated.c}/Android" />
1119
191
        <mkdir dir="${src.generated.c}/X11" />
1120
192
        <mkdir dir="${src.generated.c}/MacOSX" />
1121
193
        <mkdir dir="${src.generated.c}/Windows" />
1122
194
        <mkdir dir="${src.generated.c}/KD" />
1123
195
        <mkdir dir="${src.generated.c}/IntelGDL" />
1124
196
        <mkdir dir="${src.generated.c}/BroadcomEGL" />
1125
197
        <mkdir dir="${classes}" />
1126
198
        <mkdir dir="${obj.newt}" />
1127
199
    </target>
1128
200
1129
201
    <!-- ================================================================== -->
1130
202
    <!--
1131
203
       - Compile the original and generated source.
1132
204
      -->
1133
205
    <target name="java.compile.javase">
1134
206
        <!-- Perform the second pass Java compile; everything. -->
1135
207
        <javac destdir="${classes}"
1136
208
               excludes="${java.excludes.all}"
1137
209
               source="${target.sourcelevel}"
1138
210
               fork="yes"
1139
211
               includeAntRuntime="false"
1140
212
               memoryMaximumSize="${javac.memorymax}"
1141
213
               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
1142
214
            <src path="${src.java}" />
1143
215
            <classpath refid="jogl_nativewindow_gluegen.classpath"/>
1144
216
        </javac>
1145
217
    </target>
1146
218
1147
219
    <target name="java.compile" depends="java.compile.javase" />
1148
220
1149
221
    <!-- ================================================================== -->
1150
222
    <!--
1151
223
       - Compile the native C code for JOGL (and optionally the Cg binding).
1152
224
      -->
1153
225
1154
226
    <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
1155
227
      <!-- compiler configuration -->
1156
228
      <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
1157
229
      <compiler id="compiler.cfg.freebsd.newt" extends="compiler.cfg.freebsd">
1158
230
        <includepath path="/usr/local/include" />
1159
231
      </compiler>
1160
232
1161
233
      <compiler id="compiler.cfg.linux.armv7.newt.x11" extends="compiler.cfg.linux.armv7">
1162
234
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
1163
235
        <compilerarg value="-idirafter" />
1164
236
        <compilerarg value="/usr/include" />
1165
237
      </compiler>
1166
238
1167
239
      <!-- linker configuration -->
1168
240
1169
241
      <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
1170
242
        <syslibset dir="/usr/local/lib" libs="X11"/>
1171
243
        <syslibset libs="Xrandr"/>
1172
244
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
1173
245
      </linker>
1174
246
1175
247
      <linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64">
1176
248
        <syslibset dir="/usr/local/lib" libs="X11"/>
1177
249
        <syslibset libs="Xrandr"/>
1178
250
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
1179
251
      </linker>
1180
252
1181
253
      <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
1182
254
        <syslibset libs="EGL"/>
1183
255
        <syslibset libs="GLES_CM"/>
1184
256
      </linker>
1185
257
1186
258
      <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux">
1187
259
        <syslibset libs="X11"/>
1188
260
        <syslibset libs="Xrandr"/>
1189
261
        <syslibset libs="Xxf86vm" />
1190
262
      </linker>
1191
263
1192
264
      <linker id="linker.cfg.linux.x86.newt.x11" extends="linker.cfg.linux.x86">
1193
265
        <syslibset libs="X11"/>
1194
266
        <syslibset libs="Xrandr"/>
1195
267
        <syslibset libs="Xxf86vm" />
1196
268
      </linker>
1197
269
1198
270
      <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64">
1199
271
        <syslibset libs="X11"/>
1200
272
        <syslibset libs="Xrandr"/>
1201
273
        <syslibset libs="Xxf86vm" />
1202
274
      </linker>
1203
275
1204
276
      <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
1205
277
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
1206
278
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" />
1207
279
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
1208
280
      </linker>
1209
281
1210
282
      <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
1211
283
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="android" />
1212
284
      </linker>
1213
285
1214
286
      <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
1215
287
        <syslibset libs="X11"/>
1216
288
      </linker>
1217
289
1218
290
      <linker id="linker.cfg.solaris.sparcv9.newt.x11" extends="linker.cfg.solaris.sparcv9">
1219
291
        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
1220
292
      </linker>
1221
293
1222
294
      <linker id="linker.cfg.solaris.amd64.newt.x11" extends="linker.cfg.solaris.amd64">
1223
295
        <syslibset dir="/usr/lib/amd64" libs="X11"/>
1224
296
      </linker>
1225
297
1226
298
      <linker id="linker.cfg.win32.mingw.newt" extends="linker.cfg.win32.mingw">
1227
299
        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
1228
300
        <syslibset libs="gdi32, kernel32"/>
1229
301
      </linker>
1230
302
1231
303
      <linker id="linker.cfg.win64.mingw.newt" extends="linker.cfg.win64.mingw">
1232
304
        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
1233
305
        <syslibset libs="gdi32, kernel32"/>
1234
306
      </linker>
1235
307
1236
308
      <linker id="linker.cfg.win32.msvc.newt" extends="linker.cfg.win32.msvc">
1237
309
        <syslibset libs="gdi32, user32, kernel32" />
1238
310
      </linker>
1239
311
1240
312
      <linker id="linker.cfg.macosx.newt" extends="linker.cfg.macosx">
1241
313
        <linkerarg value="-framework" />
1242
314
        <linkerarg value="Cocoa" />
1243
315
      </linker>
1244
316
1245
317
      <linker id="linker.cfg.hpux.newt" extends="linker.cfg.hpux">
1246
318
        <syslibset dir="/usr/lib" libs="X11"/>
1247
319
      </linker>
1248
320
    </target>
1249
321
1250
322
    <target name="c.configure.win32.vc" if="isVCFamily">
1251
323
      <echo message="Win32.VC" />
1252
324
      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
1253
325
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.msvc.newt" />
1254
326
    </target>
1255
327
1256
328
    <target name="c.configure.win32.mingw" if="isMingW32">
1257
329
      <echo message="Win32.MingW" />
1258
330
      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
1259
331
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win32.mingw.newt" />
1260
332
    </target>
1261
333
1262
334
    <target name="c.configure.win64.mingw" if="isMingW64">
1263
335
      <echo message="Win64.MingW" />
1264
336
      <property name="compiler.cfg.id"                      value="compiler.cfg.win64.mingw" />
1265
337
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.win64.mingw.newt" />
1266
338
    </target>
1267
339
1268
340
    <target name="c.configure.linux.x86" if="isLinuxX86">
1269
341
      <echo message="Linux.x86" />
1270
342
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.x86" />
1271
343
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.x86.newt.x11"
1272
344
                                                            else="linker.cfg.linux.x86">
1273
345
          <isset property="isX11" />
1274
346
      </condition>
1275
347
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
1276
348
    </target>
1277
349
1278
350
    <target name="c.configure.linux.amd64" if="isLinuxAMD64">
1279
351
      <echo message="Linux.AMD64" />
1280
352
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
1281
353
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.amd64.newt.x11"
1282
354
                                                            else="linker.cfg.linux.amd64">
1283
355
          <isset property="isX11" />
1284
356
      </condition>
1285
357
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
1286
358
    </target>
1287
359
1288
360
    <target name="c.configure.linux.armv7" if="isLinuxARMv7">
1289
361
      <echo message="Linux.armv7" />
1290
362
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7.newt.x11" />
1291
363
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.armv7.newt.x11"
1292
364
                                                            else="linker.cfg.linux.armv7">
1293
365
          <isset property="isX11" />
1294
366
      </condition>
1295
367
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
1296
368
    </target>
1297
369
1298
370
    <target name="c.configure.linux.ia64" if="isLinuxIA64">
1299
371
      <echo message="Linux.IA64" />
1300
372
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
1301
373
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.newt.x11" />
1302
374
    </target>
1303
375
1304
376
    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
1305
377
1306
378
    <target name="c.configure.android" if="isAndroid">
1307
379
      <echo message="Android" />
1308
380
      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
1309
381
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.android.newt" />
1310
382
    </target>
1311
383
    
1312
384
    <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
1313
385
      <echo message="Solaris" />
1314
386
      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris" />
1315
387
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.newt.x11" />
1316
388
    </target>
1317
389
1318
390
1319
391
    <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
1320
392
      <echo message="SolarisSparcv9" />
1321
393
      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.sparcv9" />
1322
394
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.sparcv9.newt.x11" />
1323
395
    </target>
1324
396
1325
397
1326
398
    <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
1327
399
      <echo message="SolarisAMD64" />
1328
400
      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.amd64" />
1329
401
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.solaris.amd64.newt.x11" />
1330
402
    </target>
1331
403
1332
404
    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
1333
405
      <echo message="FreeBSD.x86" />
1334
406
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
1335
407
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.newt.x11"
1336
408
                                                            else="linker.cfg.freebsd">
1337
409
          <isset property="isX11" />
1338
410
      </condition>
1339
411
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
1340
412
    </target>
1341
413
1342
414
    <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
1343
415
      <echo message="FreeBSD.AMD64" />
1344
416
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
1345
417
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.amd64.newt.x11"
1346
418
                                                            else="linker.cfg.freebsd.amd64">
1347
419
          <isset property="isX11" />
1348
420
      </condition>
1349
421
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
1350
422
    </target>
1351
423
1352
424
    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/>
1353
425
1354
426
    <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
1355
427
      <echo message="HP-UX" />
1356
428
      <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
1357
429
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.hpux.newt.x11" />
1358
430
    </target>
1359
431
1360
432
    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
1361
433
1362
434
    <target name="c.configure.x11" if="isX11" />
1363
435
1364
436
    <target name="c.configure.macosx" if="isOSX">
1365
437
      <property name="compiler.cfg.id"                      value="compiler.cfg.macosx" />
1366
438
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.macosx.newt" />
1367
439
    </target>
1368
440
1369
441
    <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.android,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
1370
442
1371
443
    <target name="c.configure" depends="c.configure.1,c.configure.2" />
1372
444
1373
445
    <target name="rename.mingw.dll" if="isMingW">
1374
446
        <move file="${src}" tofile="${dest}" />
1375
447
    </target>
1376
448
1377
449
    <target name="rename.dylib" if="isOSX">
1378
450
        <move file="${src}" tofile="${dest}" />
1379
451
    </target>
1380
452
1381
453
    <macrodef name="c.build">
1382
454
      <attribute name="c.compiler.src.files" />
1383
455
      <attribute name="compiler.cfg.id" />
1384
456
      <attribute name="linker.cfg.id" />
1385
457
      <attribute name="output.lib.name" />
1386
458
      <attribute name="c.compiler.use-jawt" default="false"/>
1387
459
      <sequential>
1388
460
        <echo message="Output lib name = @{output.lib.name}" />
1389
461
1390
462
        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
1391
463
        <property name="c.compiler.debug"     value="false" />
1392
464
        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } -->
1393
465
        <property name="c.compiler.optimise"  value="none" />
1394
466
1395
467
        <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
1396
468
1397
469
        <patternset id="c.src.files.newt">
1398
470
          <include name="${rootrel.src.c}/NewtCommon.c" />
1399
471
          <include name="${rootrel.src.c}/WindowsWindow.c" if="isWindows"/>
1400
472
          <include name="${rootrel.src.c}/*.m"             if="isOSX"/>
1401
473
          <include name="${rootrel.src.c}/AndroidWindow.c" if="isAndroid"/>
1402
474
          <include name="${rootrel.src.c}/X11Window.c"     if="isX11"/>
1403
475
          <include name="${rootrel.src.c}/KDWindow.c"      if="setup.addNativeKD"/>
1404
476
          <include name="${rootrel.src.c}/IntelGDL.c"      if="setup.addNativeIntelGDL"/>
1405
477
          <include name="${rootrel.src.c}/BroadcomEGL.c"   if="setup.addNativeBroadcomEGL"/>
1406
478
        </patternset>
1407
479
1408
480
        <echo message="Compiling @{output.lib.name}" />
1409
481
1410
482
        <!-- have to wrap cc task with outofdate, because otherwise cc links a new library
1411
483
             even when no files have been compiled -->
1412
484
        <outofdate>
1413
485
          <sourcefiles>
1414
486
            <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
1415
487
          </sourcefiles>
1416
488
          <targetfiles>
1417
489
            <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/>
1418
490
            <fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/>
1419
491
            <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.jnilib"/>
1420
492
          </targetfiles>
1421
493
          <sequential>
1422
494
            <cc outtype="shared"
1423
495
                objdir="${obj.newt}"
1424
496
                outfile="${obj.newt}/@{output.lib.name}"
1425
497
                optimize="${c.compiler.optimise}"
1426
498
                debug="${c.compiler.debug}"
1427
499
                multithreaded="true"
1428
500
                exceptions="false"
1429
501
                rtti="false">
1430
502
    
1431
503
              <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
1432
504
    
1433
505
              <compiler extends="@{compiler.cfg.id}" >
1434
506
                <sysincludepath path="${java.includes.dir}"/>
1435
507
                <sysincludepath path="${java.includes.dir.platform}"/>
1436
508
                <sysincludepath path="${stub.includes.gluegen.cc}"/>
1437
509
                <includepath path="stub_includes/khr"/>
1438
510
                <includepath path="stub_includes/egl"/>
1439
511
                <!-- This is for finding Xrandr.h on Solaris. -->
1440
512
                <includepath path="/usr/X11/include" />
1441
513
                <!-- This is for the generated headers for handwritten C code -->
1442
514
                <includepath path="${src.generated.c}" />
1443
515
                <includepath path="${src.generated.c}/Android"      if="isAndroid"/>
1444
516
                <includepath path="${src.generated.c}/X11"          if="isX11"/>
1445
517
                <includepath path="${src.generated.c}/MacOSX"       if="isOSX"/>
1446
518
                <includepath path="${src.generated.c}/Windows"      if="isWindows"/>
1447
519
                <includepath path="${src.generated.c}/KD"           if="setup.addNativeKD" />
1448
520
                <includepath path="${src.generated.c}/IntelGDL"     if="setup.addNativeIntelGDL" />
1449
521
                <includepath path="stub_includes/embedded/IntelGDL" if="setup.addNativeIntelGDL" />
1450
522
                <includepath path="${src.generated.c}/BroadcomEGL"  if="setup.addNativeBroadcomEGL" />
1451
523
    
1452
524
                <!-- This must come last to not override real include paths -->
1453
525
                <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
1454
526
              </compiler>
1455
527
    
1456
528
              <linker extends="@{linker.cfg.id}">
1457
529
                <syslibset dir="${java.lib.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
1458
530
                <syslibset dir="${java.lib.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
1459
531
              </linker>
1460
532
            </cc>
1461
533
    
1462
534
            <!-- FIXME: this is a hack; the cpptask should have an option to change the
1463
535
                 suffix or at least understand the override from dylib to jnilib -->
1464
536
            <antcall target="rename.dylib" inheritRefs="true">
1465
537
                <param name="src"  value="${obj.newt}/lib@{output.lib.name}.dylib" />
1466
538
                <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" />
1467
539
            </antcall>
1468
540
    
1469
541
            <!-- FIXME: this is a hack; the cpptask should have an option to change the
1470
542
                 suffix or at least understand the override from dylib to jnilib -->
1471
543
            <antcall target="rename.mingw.dll" inheritRefs="true">
1472
544
                <param name="src"  value="${obj.newt}/lib@{output.lib.name}.so" />
1473
545
                <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" />
1474
546
            </antcall>
1475
547
1476
548
          	<!-- this stripping may be called more than once on the same library dir,
1477
549
          	     but that should cause no harm, and doing it here inside outofdate
1478
550
          	     prevents the JARs from always being rebuilt even if no source code changes -->
1479
551
          	<antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
1480
552
                <param name="libdir" value="${obj.newt}"/>
1481
553
            </antcall>
1482
554
1483
555
          </sequential>
1484
556
        </outofdate>
1485
557
      </sequential>
1486
558
    </macrodef>
1487
559
1488
560
    <target name="c.build.newt.prepare">
1489
561
      <javah destdir="${src.generated.c}/KD"          classpath="${javah.classpath}" class="jogamp.newt.driver.kd.KDWindow" />
1490
562
1491
563
      <javah destdir="${src.generated.c}/IntelGDL"    classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Display" />
1492
564
      <javah destdir="${src.generated.c}/IntelGDL"    classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Screen" />
1493
565
      <javah destdir="${src.generated.c}/IntelGDL"    classpath="${javah.classpath}" class="jogamp.newt.driver.intel.gdl.Window" />
1494
566
1495
567
      <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${javah.classpath}" class="jogamp.newt.driver.broadcom.egl.Window" />
1496
568
1497
569
      <javah destdir="${src.generated.c}/Windows"     classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsWindow" />
1498
570
      <javah destdir="${src.generated.c}/Windows"     classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsScreen" />
1499
571
      <javah destdir="${src.generated.c}/Windows"     classpath="${javah.classpath}" class="jogamp.newt.driver.windows.WindowsDisplay" />
1500
572
      <javah destdir="${src.generated.c}/MacOSX"      classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.MacWindow" />
1501
573
      <javah destdir="${src.generated.c}/MacOSX"      classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.MacScreen" />
1502
574
      <javah destdir="${src.generated.c}/MacOSX"      classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.MacDisplay" />
1503
575
      <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" />
1504
576
      <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" />
1505
577
      <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" />
1506
578
      <javah destdir="${src.generated.c}/Android"     classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />
1507
579
    </target>
1508
580
1509
581
    <target name="c.build.newt.windowlib" unless="setup.nonatives">
1510
582
      <c.build c.compiler.src.files="c.src.files.newt"
1511
583
               output.lib.name="newt"
1512
584
               compiler.cfg.id="${compiler.cfg.id}"
1513
585
               linker.cfg.id="${linker.cfg.id.oswin}"/>
1514
586
    </target>
1515
587
1516
588
    <target name="c.manifest" if="isVC8Family">
1517
589
      <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
1518
590
      <msvc.manifest objdir="${obj.newt}" dllname="newt" />
1519
591
    </target>
1520
592
1521
593
    <target name="c.build.newt.natives" depends="c.build.newt.windowlib" unless="setup.nonatives">
1522
594
    </target>
1523
595
1524
596
    <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.natives">
1525
597
      <antcall target="c.manifest" inheritRefs="true" />
1526
598
    </target>
1527
599
1528
600
    <!-- ================================================================== -->
1529
601
    <!--
1530
602
       - Build the newt.jar files.
1531
603
      -->
1532
604
    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
1533
605
1534
606
    <target name="setup-manifestfile">
1535
607
        <property name="manifestfile" value="newtversion"/>
1536
608
        <copy file="${manifestfile}"
1537
609
          tofile="${build.newt}/manifest.mf"
1538
610
          overwrite="true">
1539
611
          <filterset>
1540
612
              <filter token="VERSION" value="${newt.version}"/>
1541
613
              <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
1542
614
              <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
1543
615
              <filter token="BASEVERSION" value="${newt_base_version}"/>
1544
616
          </filterset>
1545
617
        </copy>
1546
618
    </target>
1547
619
1548
620
    <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
1549
621
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.awt.jar}" filesonly="true">
1550
622
            <fileset dir="${classes}"
1551
623
                     includes="${java.part.awt}"/>
1552
624
        </jar>
1553
625
    </target>
1554
626
1555
627
    <target name="build-jars-opengl" depends="setup-manifestfile" unless="setup.noOpenGL">
1556
628
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.ogl.jar}" filesonly="true">
1557
629
            <fileset dir="${classes}"
1558
630
                     includes="${java.part.opengl}"/>
1559
631
        </jar>
1560
632
    </target>
1561
633
1562
634
    <target name="build-jars-driver" depends="setup-manifestfile">
1563
635
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.x11.jar}" filesonly="true">
1564
636
            <fileset dir="${classes}"
1565
637
                     includes="${java.part.driver.x11}"/>
1566
638
        </jar>
1567
639
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.win.jar}" filesonly="true">
1568
640
            <fileset dir="${classes}"
1569
641
                     includes="${java.part.driver.windows}"/>
1570
642
        </jar>
1571
643
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.macosx.jar}" filesonly="true">
1572
644
            <fileset dir="${classes}"
1573
645
                     includes="${java.part.driver.macosx}"/>
1574
646
        </jar>
1575
647
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.android.jar}" filesonly="true">
1576
648
            <fileset dir="${classes}"
1577
649
                     includes="${java.part.driver.android}"/>
1578
650
        </jar>
1579
651
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.kd.jar}" filesonly="true">
1580
652
            <fileset dir="${classes}"
1581
653
                     includes="${java.part.driver.kd}"/>
1582
654
        </jar>
1583
655
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.broadcomegl.jar}" filesonly="true">
1584
656
            <fileset dir="${classes}"
1585
657
                     includes="${java.part.driver.broadcomegl}"/>
1586
658
        </jar>
1587
659
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.intelgdl.jar}" filesonly="true">
1588
660
            <fileset dir="${classes}"
1589
661
                     includes="${java.part.driver.intelgdl}"/>
1590
662
        </jar>
1591
663
    </target>
1592
664
1593
665
    <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-driver">
1594
666
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.core.jar}" filesonly="true">
1595
667
            <fileset dir="${classes}"
1596
668
                     includes="${java.part.core}"/>
1597
669
        </jar>
1598
670
        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.event.jar}" filesonly="true">
1599
671
            <fileset dir="${classes}">
1600
672
                <include name="com/jogamp/newt/Display*" />
1601
673
                <include name="com/jogamp/newt/Screen*" />
1602
674
                <include name="com/jogamp/newt/Window*" />
1603
675
                <include name="com/jogamp/newt/ScreenMode*" />
1604
676
                <include name="com/jogamp/newt/event/**" />
1605
677
                <include name="jogamp/newt/Debug*" />
1606
678
            </fileset>
1607
679
        </jar>
1608
680
        <jar manifest="${build.newt}/manifest.mf" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
1609
681
            <fileset dir="${obj.newt}">
1610
682
              <include name="*.${native.library.suffix}" />
1611
683
            </fileset>
1612
684
        </jar>
1613
685
    </target>
1614
686
1615
687
    <!-- ================================================================== -->
1616
688
    <!--
1617
689
       - Build the Javadocs for the sources.
1618
690
       - NOTE:  these are not entirely correct as the javadocs targets depend
1619
691
       -        on the platform specific build targets.  To circumvent any
1620
692
       -        errors, ensure that the source is built first.
1621
693
      -->
1622
694
    <target name="javadoc" depends="init">
1623
695
        <!-- Build the general Javadoc -->
1624
696
        <javadoc packagenames="${javadoc.packagenames}"
1625
697
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
1626
698
                 sourcepath="${src.java};${src.generated.java}"
1627
699
                 destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
1628
700
                 overview="${javadoc.overview}"
1629
701
                 source="${target.sourcelevel}"
1630
702
                 linkoffline="${javadoc.link} 142-packages"
1631
703
         bottom="${javadoc.bottom}" >
1632
704
         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
1633
705
        </javadoc>
1634
706
    </target>
1635
707
1636
708
    <target name="javadoc.spec" depends="init">
1637
709
        <!-- Build the general Javadoc -->
1638
710
        <javadoc packagenames="${javadoc.spec.packagenames}"
1639
711
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
1640
712
                 sourcepath="${src.java};${src.generated.java}"
1641
713
                 destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
1642
714
                 overview="${javadoc.overview}"
1643
715
                 source="${target.sourcelevel}"
1644
716
                 linkoffline="${javadoc.link} 142-packages"
1645
717
                 bottom="${javadoc.bottom}" >
1646
718
         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
1647
719
        </javadoc>
1648
720
    </target>
1649
721
1650
722
    <target name="javadoc.dev" depends="init">
1651
723
        <!-- Build the internal developer Javadoc -->
1652
724
        <javadoc packagenames="${javadoc.dev.packagenames}"
1653
725
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
1654
726
                 sourcepath="${src.java};${src.generated.java}"
1655
727
                 destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
1656
728
                 overview="${javadoc.overview}"
1657
729
                 source="${target.sourcelevel}"
1658
730
                 linkoffline="${javadoc.link} 142-packages"
1659
731
         bottom="${javadoc.bottom}" >
1660
732
         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
1661
733
        </javadoc>
1662
734
    </target>
1663
735
1664
736
    <target name="all.doc" description="Build NEWT docs" depends="init,javadoc,javadoc.spec,javadoc.dev" />
1665
737
1666
738
    <!-- ================================================================== -->
1667
739
    <!--
1668
740
       - Clean up all that is built.
1669
741
      -->
1670
742
    <target name="clean" description="Remove all build products" depends="declare.common">
1671
743
        <delete includeEmptyDirs="true" quiet="true">
1672
744
            <fileset dir="${build.newt}" />
1673
745
            <fileset dir="${javadoc}" />
1674
746
            <fileset dir="${javadoc.spec}" />
1675
747
            <fileset dir="${javadoc.dev}" />
1676
748
        </delete>
1677
749
    </target>
1678
750
1679
751
    <!-- ================================================================== -->
1680
752
    <!--
1681
753
       - Build everything.
1682
754
      -->
1683
755
    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,java.compile,c.build.newt,build-jars,generate.version.txt" />
1684
756
1685
757
    <target name="generate.version.txt" depends="init">
1686
758
        <!-- Create a version.txt file indicating which version we just built -->
1687
759
        <echo message="${newt.version}" file="${build.newt}/version.txt" />
1688
760
    </target>
1689
761
1690
762
</project>
1691
763
0
1692
=== removed file '.pc/disable_android.diff/make/build-test.xml'
1693
--- .pc/disable_android.diff/make/build-test.xml	2011-10-06 15:53:38 +0000
1694
+++ .pc/disable_android.diff/make/build-test.xml	1970-01-01 00:00:00 +0000
1695
@@ -1,495 +0,0 @@
1696
1
<?xml version="1.0" encoding="UTF-8"?>
1697
2
1698
3
<project name="JOGLTest" basedir="." default="all">
1699
4
1700
5
    <description>JUNIT Tests JOGL</description>
1701
6
1702
7
    <import file="build-common.xml"/>
1703
8
1704
9
    <taskdef resource="net/sf/antcontrib/antlib.xml">
1705
10
      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
1706
11
    </taskdef>
1707
12
1708
13
    <!-- ================================================================== -->
1709
14
    <!-- 
1710
15
       - Declare all paths and user defined variables.
1711
16
      -->
1712
17
    <target name="declare.common" description="Declare properties" depends="common.init">
1713
18
        <property name="rootrel.src.test"     value="src/test" />
1714
19
        <property name="src.test"             value="${project.root}/${rootrel.src.test}" />
1715
20
1716
21
        <property name="classes"              value="${build.test}/classes" />
1717
22
        <property name="classes.path"         location="${classes}"/> <!-- absolute path -->
1718
23
1719
24
        <property name="java.part.test"       value="com/jogamp/** jogamp/**"/>
1720
25
        <property name="java.dir.test"        value="com/jogamp/opengl/test"/>
1721
26
        <property name="java.dir.junit"       value="${java.dir.test}/junit"/>
1722
27
        <property name="java.dir.bugs"        value="${java.dir.test}/bugs"/>
1723
28
1724
29
        <property name="test.archive.name"    value="${archive.name}-test-results-${build.node.name}"/>
1725
30
        <condition property="jvmarg.mainthrd" value="-XstartOnFirstThread"><isset property="isOSX"/></condition>
1726
31
        <condition property="jvmarg.mainthrd" value="-Ddummy"><not><isset property="isOSX"/></not></condition>
1727
32
        <condition property="jvmarg.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
1728
33
        <condition property="jvmarg.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
1729
34
1730
35
        <property name="batchtest.timeout"    value="1800000"/> <!-- 30 min -->
1731
36
    </target>
1732
37
    
1733
38
    <!-- ================================================================== -->
1734
39
    <!--
1735
40
       - Clean up all that is built.
1736
41
      -->
1737
42
    <target name="clean" description="Remove all build products" depends="declare.common">
1738
43
        <delete includeEmptyDirs="true" quiet="true">
1739
44
            <fileset dir="${build.test}" />
1740
45
            <fileset dir="." includes="*.tga" />
1741
46
            <fileset file="${jogl.test.jar}" />
1742
47
        </delete>
1743
48
    </target>
1744
49
1745
50
    <!-- ================================================================== -->
1746
51
    <!--
1747
52
       - Build/run tests/junit.
1748
53
      -->
1749
54
    <target name="test.compile.check" depends="declare.common">
1750
55
      <!-- Create the required output directories. -->
1751
56
      <mkdir dir="${obj.test}" />
1752
57
      <mkdir dir="${classes}" />
1753
58
1754
59
      <!-- Clean the results -->
1755
60
      <delete quiet="true">
1756
61
        <fileset dir="${results.test}" includes="**"/>
1757
62
        <fileset file="${build}/${test.archive.name}.7z"/>
1758
63
        <fileset dir="." includes="*.tga" />
1759
64
      </delete>
1760
65
      <mkdir dir="${results.test}" />
1761
66
1762
67
      <property name="jogl.test.jar.path" location="${jogl.test.jar}"/> <!-- absolute path -->
1763
68
      <echo message="jogl.test.jar ${jogl.test.jar.path}"/>
1764
69
      <uptodate property="test.compile.skip">
1765
70
        <srcfiles dir= "."                 includes="*.xml"/>
1766
71
        <srcfiles dir= "${src.test}"       includes="**"/>
1767
72
        <srcfiles                          file="${gluegen.jar}" />
1768
73
        <srcfiles                          dir="${src}/nativewindow" />
1769
74
        <srcfiles                          dir="${src}/jogl" />
1770
75
        <srcfiles                          dir="${src}/newt" />
1771
76
        <mapper type="merge" to="${jogl.test.jar.path}"/>
1772
77
      </uptodate>
1773
78
    </target>
1774
79
1775
80
    <target name="test.compile" depends="test.compile.check" unless="test.compile.skip">
1776
81
        <!-- Perform the junit pass Java compile -->
1777
82
        <javac destdir="${classes}"
1778
83
               source="${host.sourcelevel}"
1779
84
               fork="yes"
1780
85
               memoryMaximumSize="${javac.memorymax}"
1781
86
               includeAntRuntime="false"
1782
87
               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
1783
88
            <classpath refid="junit_jogl_newt_android.compile.classpath"/>
1784
89
            <src path="${src.test}" />
1785
90
        </javac>
1786
91
        <!-- include any resource files that tests may require -->
1787
92
        <copy todir="${classes}">
1788
93
            <fileset dir="${src.test}">
1789
94
                <exclude name="**/*.java"/>
1790
95
            </fileset>
1791
96
        </copy>
1792
97
        <jar destfile="${jogl.test.jar}" filesonly="true">
1793
98
            <!-- get all class files, but skip any resource files that external tools
1794
99
                 might have copied into the class directory (otherwise, it's possible
1795
100
                 to get the same resource file twice in the jar) -->
1796
101
            <fileset dir="${classes}"
1797
102
                includes="${java.part.test}"/>
1798
103
        </jar>
1799
104
    </target>
1800
105
1801
106
    <target name="test.manual.run" depends="test.compile">
1802
107
        <for param="test.class.path.m" keepgoing="true">
1803
108
            <!-- results in absolute path -->
1804
109
            <fileset dir="${classes}">
1805
110
                <include name="${java.dir.bugs}/**/*Test*"/>
1806
111
                <exclude name="**/*$$*"/>
1807
112
            </fileset>
1808
113
          <sequential>
1809
114
            <var name="test.class.path" unset="true"/>
1810
115
            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
1811
116
            <var name="test.class.fqn" unset="true"/>
1812
117
            <pathconvert property="test.class.fqn">
1813
118
              <fileset file="${classes}${file.separator}${test.class.path}"/>
1814
119
              <chainedmapper>
1815
120
                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
1816
121
                  <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
1817
122
              </chainedmapper>
1818
123
            </pathconvert>
1819
124
            <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.log"/>
1820
125
            <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
1821
126
            <apply dir="." executable="${java.home}/bin/java" 
1822
127
                 parallel="false" 
1823
128
                 timeout="${batchtest.timeout}"
1824
129
                 vmlauncher="false"
1825
130
                 relative="true"
1826
131
                 failonerror="false"
1827
132
                 output="${test.class.result.file}">
1828
133
                <env key="${system.env.library.path}" path="${obj.all.paths}"/>
1829
134
                <env key="CLASSPATH" value="${junit_jogl_awt.run.jars}"/>
1830
135
                <arg value="-Djava.library.path=${obj.all.paths}"/>
1831
136
                <!--
1832
137
                <arg line="-Dnewt.debug.EDT"/>
1833
138
                -->
1834
139
                <srcfile/>
1835
140
                <mappedresources>
1836
141
                    <fileset dir="${classes}" includes="${test.class.path}"/>
1837
142
                    <packagemapper from="*.class" to="*"/>
1838
143
                </mappedresources>
1839
144
            </apply>
1840
145
          </sequential>
1841
146
        </for>
1842
147
        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
1843
148
    </target>
1844
149
1845
150
    <target name="junit.run.noui" depends="test.compile">
1846
151
        <!-- Test*NOUI* -->
1847
152
        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
1848
153
            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
1849
154
            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
1850
155
1851
156
            <!--
1852
157
            <jvmarg value="-Djogl.debug=all"/>
1853
158
            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
1854
159
            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
1855
160
            <jvmarg value="-Djogl.debug.GLSLState"/>
1856
161
            <jvmarg value="-Dnativewindow.debug=all"/>
1857
162
            <jvmarg value="-verbose:jni"/> 
1858
163
            <jvmarg value="-client"/>
1859
164
            <jvmarg value="-d32"/>
1860
165
            -->
1861
166
1862
167
            <formatter usefile="false" type="plain"/>
1863
168
            <formatter usefile="true" type="xml"/>
1864
169
            <classpath refid="junit_jogl_awt.run.classpath"/>
1865
170
1866
171
            <batchtest todir="${results.test}">
1867
172
              <fileset dir="${classes}">
1868
173
                  <include name="${java.dir.junit}/**/Test*NOUI*"/>
1869
174
                  <exclude name="**/*$$*"/>
1870
175
              </fileset>
1871
176
              <formatter usefile="false" type="brief"/>
1872
177
              <formatter usefile="true" type="xml"/>
1873
178
            </batchtest>
1874
179
        </junit>
1875
180
    </target>
1876
181
1877
182
    <target name="junit.run.newt.headless" depends="test.compile">
1878
183
        <!-- Test*NEWT* 
1879
184
1880
185
             Emulation of junit task,
1881
186
             due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
1882
187
1883
188
             Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
1884
189
          --> 
1885
190
        <for param="test.class.path.m" keepgoing="true">
1886
191
            <!-- results in absolute path -->
1887
192
            <fileset dir="${classes}">
1888
193
                <include name="${java.dir.junit}/**/Test*NEWT*"/>
1889
194
                <exclude name="**/*$$*"/>
1890
195
            </fileset>
1891
196
          <sequential>
1892
197
            <var name="test.class.path" unset="true"/>
1893
198
            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
1894
199
            <var name="test.class.fqn" unset="true"/>
1895
200
            <pathconvert property="test.class.fqn">
1896
201
              <fileset file="${classes}${file.separator}${test.class.path}"/>
1897
202
              <chainedmapper>
1898
203
                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
1899
204
                  <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
1900
205
              </chainedmapper>
1901
206
            </pathconvert>
1902
207
            <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/>
1903
208
            <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
1904
209
            <apply dir="." executable="${java.home}/bin/java" 
1905
210
                 parallel="false" 
1906
211
                 timeout="${batchtest.timeout}"
1907
212
                 vmlauncher="false"
1908
213
                 relative="true"
1909
214
                 failonerror="false">
1910
215
                <env key="${system.env.library.path}" path="${obj.all.paths}"/>
1911
216
                <env key="CLASSPATH" value="${junit_jogl_noawt.run.jars}"/>
1912
217
                <arg value="-Djava.library.path=${obj.all.paths}"/>
1913
218
                <arg line="${jvmarg.headless}"/>
1914
219
                <!--
1915
220
                <arg line="-Dnewt.debug.EDT"/>
1916
221
                -->
1917
222
                <arg line="com.jogamp.newt.util.MainThread"/>
1918
223
                <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/>
1919
224
                <srcfile/>
1920
225
                <arg line="filtertrace=true"/>
1921
226
                <arg line="haltOnError=false"/>
1922
227
                <arg line="haltOnFailure=false"/>
1923
228
                <arg line="showoutput=true"/>
1924
229
                <arg line="outputtoformatters=true"/>
1925
230
                <arg line="logfailedtests=true"/>
1926
231
                <arg line="logtestlistenerevents=true"/>
1927
232
                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter"/>
1928
233
                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.class.result.file}"/>
1929
234
                <mappedresources>
1930
235
                    <fileset dir="${classes}" includes="${test.class.path}"/>
1931
236
                    <packagemapper from="*.class" to="*"/>
1932
237
                </mappedresources>
1933
238
            </apply>
1934
239
          </sequential>
1935
240
        </for>
1936
241
    </target>
1937
242
1938
243
    <!-- junit.run.newt is covered by junit.run.newt.headless, disable it for now, but may be checked manually.
1939
244
         This test target would also overwrite the test result XML files, we would also need a solution here for hudson,
1940
245
         if run in parallel.
1941
246
         NEWT is currently not supported on OSX 
1942
247
      -->
1943
248
    <target name="junit.run.newt" depends="test.compile">
1944
249
        <!-- Test*NEWT* -->
1945
250
        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
1946
251
            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
1947
252
            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
1948
253
1949
254
            <!--
1950
255
            <jvmarg value="-Dnewt.debug.EDT"/>
1951
256
            <jvmarg value="-Djogl.debug=all"/>
1952
257
            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
1953
258
            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
1954
259
            <jvmarg value="-Djogl.debug.GLSLState"/>
1955
260
            <jvmarg value="-Dnativewindow.debug=all"/>
1956
261
            <jvmarg value="-Dnewt.debug=all"/>
1957
262
            <jvmarg value="-verbose:jni"/> 
1958
263
            <jvmarg value="-client"/>
1959
264
            <jvmarg value="-d32"/>
1960
265
            -->
1961
266
1962
267
            <formatter usefile="false" type="plain"/>
1963
268
            <formatter usefile="true" type="xml"/>
1964
269
            <classpath refid="junit_jogl_noawt.run.classpath"/>
1965
270
1966
271
            <batchtest todir="${results.test}">
1967
272
              <fileset dir="${classes}">
1968
273
                  <include name="${java.dir.junit}/**/Test*NEWT*"/>
1969
274
                  <exclude name="**/*$$*"/>
1970
275
              </fileset>
1971
276
              <formatter usefile="false" type="brief"/>
1972
277
              <formatter usefile="true" type="xml"/>
1973
278
            </batchtest>
1974
279
        </junit>
1975
280
    </target>
1976
281
1977
282
    <target name="junit.run.awt" depends="test.compile">
1978
283
        <!-- Test*AWT* -->
1979
284
        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
1980
285
            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
1981
286
            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
1982
287
1983
288
            <!--
1984
289
            <jvmarg value="-Djogl.debug=all"/>
1985
290
            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
1986
291
            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
1987
292
            <jvmarg value="-Djogl.debug.GLSLState"/>
1988
293
            <jvmarg value="-Dnativewindow.debug=all"/>
1989
294
            <jvmarg value="-verbose:jni"/> 
1990
295
            <jvmarg value="-client"/>
1991
296
            <jvmarg value="-d32"/>
1992
297
            -->
1993
298
1994
299
            <formatter usefile="false" type="plain"/>
1995
300
            <formatter usefile="true" type="xml"/>
1996
301
            <classpath refid="junit_jogl_awt.run.classpath"/>
1997
302
1998
303
            <batchtest todir="${results.test}">
1999
304
              <fileset dir="${classes}">
2000
305
                  <include name="${java.dir.junit}/**/Test*AWT*"/>
2001
306
                  <exclude name="**/*$$*"/>
2002
307
                  <exclude name="**/*SWT*"/>
2003
308
                  <exclude name="**/newt/**"/>
2004
309
              </fileset>
2005
310
              <formatter usefile="false" type="brief"/>
2006
311
              <formatter usefile="true" type="xml"/>
2007
312
            </batchtest>
2008
313
        </junit>
2009
314
    </target>
2010
315
2011
316
    <target name="junit.run.awt.singletest" depends="test.compile">
2012
317
        <!-- Test*AWT* -->
2013
318
        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
2014
319
            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
2015
320
            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
2016
321
2017
322
            <!--
2018
323
            <jvmarg value="-Djogl.debug=all"/>
2019
324
            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
2020
325
            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
2021
326
            <jvmarg value="-Djogl.debug.GLSLState"/>
2022
327
            <jvmarg value="-Dnativewindow.debug=all"/>
2023
328
            <jvmarg value="-verbose:jni"/> 
2024
329
            <jvmarg value="-client"/>
2025
330
            <jvmarg value="-d32"/>
2026
331
            -->
2027
332
2028
333
            <formatter usefile="false" type="plain"/>
2029
334
            <formatter usefile="true" type="xml"/>
2030
335
            <classpath refid="junit_jogl_awt.run.classpath"/>
2031
336
2032
337
            <test name="${testclass}"/>
2033
338
        </junit>
2034
339
    </target>
2035
340
2036
341
    <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests.">
2037
342
        <!-- Test*SWT* 
2038
343
2039
344
             Emulation of junit task,
2040
345
             due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
2041
346
2042
347
             Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
2043
348
          --> 
2044
349
        <for param="test.class.path.m" keepgoing="true">
2045
350
            <!-- results in absolute path -->
2046
351
            <fileset dir="${classes}">
2047
352
                <include name="${java.dir.junit}/**/Test*SWT*"/>
2048
353
                <exclude name="**/*$$*"/>
2049
354
                <exclude name="**/*AWT*"/>
2050
355
                <exclude name="**/newt/**"/>
2051
356
            </fileset>
2052
357
          <sequential>
2053
358
            <var name="test.class.path" unset="true"/>
2054
359
            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
2055
360
            <var name="test.class.fqn" unset="true"/>
2056
361
            <pathconvert property="test.class.fqn">
2057
362
              <fileset file="${classes}${file.separator}${test.class.path}"/>
2058
363
              <chainedmapper>
2059
364
                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
2060
365
                  <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
2061
366
              </chainedmapper>
2062
367
            </pathconvert>
2063
368
            <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/>
2064
369
            <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
2065
370
            <apply dir="." executable="${java.home}/bin/java" 
2066
371
                 parallel="false" 
2067
372
                 timeout="${batchtest.timeout}"
2068
373
                 vmlauncher="false"
2069
374
                 relative="true"
2070
375
                 failonerror="false">
2071
376
                <env key="${system.env.library.path}" path="${obj.all.paths}"/>
2072
377
                <env key="CLASSPATH" value="${junit_jogl_swt.run.jars}"/>
2073
378
                <arg value="-Djava.library.path=${obj.all.paths}"/>
2074
379
                <arg line="${jvmarg.headless}"/>
2075
380
                <!--
2076
381
                <arg line="-Dnewt.debug.EDT"/>
2077
382
                -->
2078
383
                <arg line="com.jogamp.newt.util.MainThread"/>
2079
384
                <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/>
2080
385
                <srcfile/>
2081
386
                <arg line="filtertrace=true"/>
2082
387
                <arg line="haltOnError=false"/>
2083
388
                <arg line="haltOnFailure=false"/>
2084
389
                <arg line="showoutput=true"/>
2085
390
                <arg line="outputtoformatters=true"/>
2086
391
                <arg line="logfailedtests=true"/>
2087
392
                <arg line="logtestlistenerevents=true"/>
2088
393
                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter"/>
2089
394
                <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.class.result.file}"/>
2090
395
                <mappedresources>
2091
396
                    <fileset dir="${classes}" includes="${test.class.path}"/>
2092
397
                    <packagemapper from="*.class" to="*"/>
2093
398
                </mappedresources>
2094
399
            </apply>
2095
400
          </sequential>
2096
401
        </for>
2097
402
    </target>
2098
403
2099
404
    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT_AWT tests.">
2100
405
      <!-- Test*SWT* -->
2101
406
      <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
2102
407
          <env key="${system.env.library.path}" path="${obj.all.paths}"/>
2103
408
          <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
2104
409
          <jvmarg value="${jvmarg.mainthrd}"/>
2105
410
2106
411
          <!--
2107
412
          <jvmarg value="-Djogl.debug=all"/>
2108
413
          <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
2109
414
          <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
2110
415
          <jvmarg value="-Djogl.debug.GLSLState"/>
2111
416
          <jvmarg value="-Dnativewindow.debug=all"/>
2112
417
          <jvmarg value="-verbose:jni"/> 
2113
418
          <jvmarg value="-client"/>
2114
419
          <jvmarg value="-d32"/>
2115
420
          -->
2116
421
2117
422
          <formatter usefile="false" type="plain"/>
2118
423
          <formatter usefile="true" type="xml"/>
2119
424
          <classpath refid="junit_jogl_swt.run.classpath"/>
2120
425
2121
426
          <batchtest todir="${results.test}">
2122
427
            <fileset dir="${classes}">
2123
428
                <include name="${java.dir.junit}/**/Test*SWT*AWT*"/>
2124
429
                <exclude name="**/*$$*"/>
2125
430
                <exclude name="**/newt/**"/>
2126
431
            </fileset>
2127
432
            <formatter usefile="false" type="brief"/>
2128
433
            <formatter usefile="true" type="xml"/>
2129
434
          </batchtest>
2130
435
      </junit>
2131
436
    </target>
2132
437
2133
438
    <!-- NEWT is currently not supported on OSX -->
2134
439
    <target name="junit.run.newt.awt" depends="test.compile">
2135
440
        <!-- Test*AWT* -->
2136
441
        <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
2137
442
            <env key="${system.env.library.path}" path="${obj.all.paths}"/>
2138
443
            <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
2139
444
2140
445
            <!--
2141
446
            <jvmarg value="-Dnewt.debug.EDT"/>
2142
447
            <jvmarg value="-Djogl.debug=all"/>
2143
448
            <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
2144
449
            <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
2145
450
            <jvmarg value="-Djogl.debug.GLSLState"/>
2146
451
            <jvmarg value="-Dnativewindow.debug=all"/>
2147
452
            <jvmarg value="-Dnewt.debug=all"/>
2148
453
            <jvmarg value="-verbose:jni"/> 
2149
454
            <jvmarg value="-client"/>
2150
455
            <jvmarg value="-d32"/>
2151
456
            -->
2152
457
2153
458
            <formatter usefile="false" type="plain"/>
2154
459
            <formatter usefile="true" type="xml"/>
2155
460
            <classpath refid="junit_jogl_awt.run.classpath"/>
2156
461
2157
462
            <batchtest todir="${results.test}">
2158
463
              <fileset dir="${classes}">
2159
464
                  <include name="${java.dir.junit}/**/newt/**/Test*AWT*"/>
2160
465
                  <exclude name="**/*$$*"/>
2161
466
              </fileset>
2162
467
              <formatter usefile="false" type="brief"/>
2163
468
              <formatter usefile="true" type="xml"/>
2164
469
            </batchtest>
2165
470
        </junit>
2166
471
    </target>
2167
472
2168
473
    <target name="test.auto.run" depends="junit.run"/>
2169
474
    <target name="junit.run" depends="junit.run.noui,junit.run.newt.headless,junit.run.awt,junit.run.newt.awt,junit.run.swt.headless,junit.run.swt.awt">
2170
475
        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
2171
476
    </target>
2172
477
2173
478
    <!-- updates / create the test results zip file -->
2174
479
    <target name="test-zip-archive" depends="declare.common">
2175
480
        <move todir="${results.test}">
2176
481
            <fileset dir="." includes="*.tga" />
2177
482
        </move>
2178
483
        <mkdir dir="${results.test}" />
2179
484
        <archive.7z destfile="${build}/${test.archive.name}.7z"
2180
485
                    basedir="${results.test}" 
2181
486
                    includes="**" />
2182
487
    </target>
2183
488
2184
489
    <!-- ================================================================== -->
2185
490
    <!--
2186
491
       - Build everything.
2187
492
      -->
2188
493
    <target name="all" description="Build JOGL JUNIT tests" depends="test.compile" />
2189
494
2190
495
</project>
2191
496
0
2192
=== removed directory '.pc/disable_android_2.diff'
2193
=== removed directory '.pc/disable_android_2.diff/make'
2194
=== removed file '.pc/disable_android_2.diff/make/build-common.xml'
2195
--- .pc/disable_android_2.diff/make/build-common.xml	2011-10-09 19:26:30 +0000
2196
+++ .pc/disable_android_2.diff/make/build-common.xml	1970-01-01 00:00:00 +0000
2197
@@ -1,486 +0,0 @@
2198
1
<?xml version="1.0" encoding="UTF-8"?>
2199
2
2200
3
<project name="JOGLCommonStuff" basedir="." default="common.init">
2201
4
2202
5
    <description>Common JOGL Stuff</description>
2203
6
2204
7
    <fail message="Please build using Ant 1.8.0 or higher.">
2205
8
        <condition>
2206
9
            <not>
2207
10
                <antversion atleast="1.8.0"/>
2208
11
            </not>
2209
12
        </condition>
2210
13
    </fail>
2211
14
2212
15
    <!-- Pull in GlueGen cpptasks build file -->
2213
16
    <property name="gluegen.root" value="/usr/share/gluegen2/" />
2214
17
    <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
2215
18
    <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
2216
19
    <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
2217
20
    <import file="${gluegen.root}/make/jogamp-env.xml" />
2218
21
2219
22
    <property name="ant-contrib.jar"  value="/usr/share/java/ant-contrib.jar" />
2220
23
2221
24
    <condition property="rootrel.build" value="build">
2222
25
      <not>
2223
26
          <isset property="rootrel.build"/>
2224
27
      </not>
2225
28
    </condition>
2226
29
2227
30
    <import file="versions.xml" />
2228
31
2229
32
    <!-- ================================================================== -->
2230
33
    <!-- 
2231
34
       - Base initialization of properties and detection of operating system.
2232
35
      -->
2233
36
    <target name="set.debug">
2234
37
        <property name="c.compiler.debug" value="true" /> 
2235
38
        <property name="javacdebug"       value="true" /> 
2236
39
        <property name="javacdebuglevel"  value="source,lines,vars" /> 
2237
40
    </target>
2238
41
    <target name="common.init.debug" depends="set.debug, common.init"/>
2239
42
2240
43
    <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done">
2241
44
        <property name="common.init.done" value="true" />
2242
45
2243
46
        <!-- Set the project root directory to be up one directory. -->
2244
47
        <property name="project.root"               value=".." />
2245
48
        <property name="build"                      value="${project.root}/${rootrel.build}" />
2246
49
        <property name="tempdir"                    value="${project.root}/build-temp" />
2247
50
        <property name="src"                        value="${project.root}/src" />
2248
51
        <property name="lib"                        value="${build}/lib" />
2249
52
        <property name="jar"                        value="${build}/jar" />
2250
53
2251
54
        <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
2252
55
        <!-- No generated classes for Newt at the present time -->
2253
56
        <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
2254
57
2255
58
        <!-- Set the configuration and build files to this directory. -->
2256
59
        <property name="make"                       value="." />
2257
60
        <property name="config"                     value="${make}/config" />
2258
61
        <property name="stub.includes"              value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
2259
62
2260
63
        <property name="stub.includes.gluegen.gg"  value="${gluegen.root}/make/stub_includes/gluegen" />
2261
64
        <property name="stub.includes.gluegen.cc"  value="${gluegen.root}/make/stub_includes/platform" />
2262
65
2263
66
        <tstamp>
2264
67
             <format property="version.timestamp" pattern="yyyyMMdd"/>
2265
68
        </tstamp>
2266
69
2267
70
        <property name="jogl.build.number" value="manual"/>
2268
71
        <property name="jogl.build.id"     value="${version.timestamp}"/>
2269
72
        <mkdir dir="${tempdir}" />
2270
73
        <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
2271
74
        <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
2272
75
2273
76
        <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
2274
77
        <property name="jogl.version"         value="${jogl_base_version}-b${jogl.build.number}-${version.timestamp}" />
2275
78
        <property name="newt.version"         value="${newt_base_version}-b${jogl.build.number}-${version.timestamp}" />
2276
79
        <property name="jogl.version.plus"    value="${jogl_base_version}-${jogl.build.branch}-b${jogl.build.number}-${jogl.build.commit}-${version.timestamp}" />
2277
80
2278
81
        <property name="archive.name"         value="jogl-${jogl.version}-${os.and.arch}" />
2279
82
        <property name="archive"              value="${build}/${archive.name}" />
2280
83
2281
84
        <condition property="setup.noNativeAWT">
2282
85
            <or>
2283
86
                <isset property="setup.noAWT"/> 
2284
87
                <isset property="isAndroid"/> 
2285
88
            </or>
2286
89
        </condition>
2287
90
2288
91
        <condition property="setup.noNativeDesktop">
2289
92
            <or>
2290
93
                <isset property="isAndroid"/> 
2291
94
            </or>
2292
95
        </condition>
2293
96
2294
97
        <echo message="setup.noAWT: ${setup.noAWT}" />
2295
98
        <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
2296
99
        <echo message="setup.noNativeDesktop: ${setup.noNativeDesktop}" />
2297
100
2298
101
        <!-- Load the user specified properties file that defines various host
2299
102
           - specific paths.  The user will be notified if this is does not
2300
103
           - exist. -->
2301
104
        <property name="user.properties.file" value="${user.home}/jogl.properties" />
2302
105
        <property file="${user.properties.file}" />
2303
106
        <echo message="Loaded ${user.properties.file}." />
2304
107
        <property file="${user.home}/gluegen.properties" />
2305
108
        <echo message="Loaded ${user.home}/gluegen.properties." />
2306
109
        <echo message="antlr.jar=${antlr.jar}" />
2307
110
        <echo message="junit.jar=${junit.jar}" />
2308
111
        <echo message="android.jar=${android.jar}" />
2309
112
2310
113
        <!-- Set swt.jar to the correct file for this platform. We point to the debug JARs to allow
2311
114
             stepping into SWT calls using the accompanying source code zip archives. -->
2312
115
        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt-debug.jar">
2313
116
          <istrue value="${isWindowsAMD64}" />
2314
117
        </condition>
2315
118
        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
2316
119
          <istrue value="${isWindowsX86}" />
2317
120
        </condition>
2318
121
        <condition property="swt.jar" value="/usr/share/java/swt.jar">
2319
122
          <istrue value="${isLinux}" />
2320
123
        </condition>
2321
124
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
2322
125
          <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
2323
126
        </condition>
2324
127
        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
2325
128
          <and>
2326
129
            <istrue value="${isOSX}" />
2327
130
            <or>
2328
131
              <os arch="AMD64" />
2329
132
              <os arch="x86_64" />
2330
133
            </or>                
2331
134
          </and>
2332
135
        </condition>
2333
136
        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar">
2334
137
          <and>
2335
138
            <istrue value="${isOSX}" />
2336
139
            <or>
2337
140
              <os arch="i386" />
2338
141
              <os arch="x86" />
2339
142
            </or>
2340
143
          </and>
2341
144
        </condition>
2342
145
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
2343
146
          <istrue value="${isSolarisX86}" />
2344
147
        </condition>
2345
148
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
2346
149
          <istrue value="${isSolarisAMD64}" />
2347
150
        </condition>
2348
151
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
2349
152
          <istrue value="${isSolarisSparc}" />
2350
153
        </condition>
2351
154
		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
2352
155
          <istrue value="${isSolarisSparcv9}" />
2353
156
        </condition>
2354
157
        <echo message="swt.jar=${swt.jar}" />
2355
158
2356
159
        <property name="target.sourcelevel" value="1.5" />
2357
160
        <property name="host.sourcelevel"   value="1.5" />
2358
161
2359
162
        <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
2360
163
        <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
2361
164
2362
165
        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
2363
166
        <property name="javacdebug"       value="true" /> 
2364
167
        <property name="javacdebuglevel"  value="source,lines" /> 
2365
168
        <!--property name="javacdebuglevel"  value="source,lines,vars" /--> 
2366
169
        <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
2367
170
        <property name="javac.memorymax"  value="512m" /> 
2368
171
2369
172
        <!-- Names of directories relative to the project root.
2370
173
             Some of these are used in FileMappers later for dependence information
2371
174
             and need exact string matching, which is why they use file.separator
2372
175
             instead of "/". -->
2373
176
2374
177
        <!-- NOTE that these require a checked-out GlueGen, etc workspace as a -->
2375
178
        <!-- sibling of the JOGL workspace. -->
2376
179
        <property name="gluegen.make"               value="${gluegen.root}/make" />
2377
180
        <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
2378
181
        <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
2379
182
        <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
2380
183
        <property name="gluegen.jar"                value="/usr/share/java/gluegen2.jar" />
2381
184
        <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
2382
185
        <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
2383
186
2384
187
        <property name="nativewindow.make"          value="." />
2385
188
        <property name="nativewindow.build.xml"     value="${nativewindow.make}/build-nativewindow.xml" />
2386
189
        <property name="build.nativewindow"         value="${build}/nativewindow" />
2387
190
        <property name="obj.nativewindow"           value="${build.nativewindow}/obj"/>
2388
191
2389
192
        <property name="jogl.make"                  value="." />
2390
193
        <property name="jogl.build.xml"             value="${jogl.make}/build-jogl.xml" />
2391
194
        <property name="build.jogl"                 value="${build}/jogl" />
2392
195
        <property name="obj.jogl"                   value="${build.jogl}/obj"/>
2393
196
2394
197
        <property name="newt.make"                  value="." />
2395
198
        <property name="newt.build.xml"             value="${newt.make}/build-newt.xml" />
2396
199
        <property name="build.newt"                 value="${build}/newt" />
2397
200
        <property name="obj.newt"                   value="${build.newt}/obj"/>
2398
201
2399
202
        <property name="results.test"              value="${build}/test/results" />
2400
203
        <property name="build.test"                value="${build}/test/build" />
2401
204
        <property name="obj.test"                  value="${build.test}/obj"/>
2402
205
2403
206
        <condition property="obj.custom" value="${custom.libdir}${path.separator}" else="">
2404
207
          <isset property="custom.libdir"/>
2405
208
        </condition>
2406
209
2407
210
        <property name="obj.all.paths"              value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.test}" />
2408
211
2409
212
        <path id="gluegen.classpath">
2410
213
          <pathelement location="${gluegen.jar}" />
2411
214
          <pathelement location="${antlr.jar}" />
2412
215
        </path>
2413
216
2414
217
        <property name="gluegen-gl.jar"             value="${build.jogl}/gluegen-gl.jar" />
2415
218
2416
219
        <path id="gluegen-gl.classpath">
2417
220
          <pathelement location="${gluegen.jar}" />
2418
221
          <pathelement location="${gluegen-gl.jar}" />
2419
222
        </path>
2420
223
2421
224
        <!-- Atomic JavaSE JARS -->
2422
225
2423
226
        <property name="nativewindow.core.jar"         value="${build.nativewindow}/nativewindow.core.jar" />
2424
227
        <property name="nativewindow.awt.jar"          value="${build.nativewindow}/nativewindow.awt.jar"  />
2425
228
        <property name="nativewindow.os.x11.jar"       value="${build.nativewindow}/nativewindow.os.x11.jar"  />
2426
229
        <property name="nativewindow.os.win.jar"       value="${build.nativewindow}/nativewindow.os.win.jar"  />
2427
230
        <property name="nativewindow.os.macosx.jar"    value="${build.nativewindow}/nativewindow.os.macosx.jar"  />
2428
231
2429
232
        <path id="nativewindow_all_atoms.classpath">
2430
233
            <pathelement location="${nativewindow.core.jar}" />
2431
234
            <pathelement location="${nativewindow.awt.jar}" />
2432
235
            <pathelement location="${nativewindow.os.x11.jar}" />
2433
236
            <pathelement location="${nativewindow.os.win.jar}" />
2434
237
            <pathelement location="${nativewindow.os.macosx.jar}" />
2435
238
        </path>
2436
239
        <path id="nativewindow_all-noawt_atoms.classpath">
2437
240
            <pathelement location="${nativewindow.core.jar}" />
2438
241
            <pathelement location="${nativewindow.os.x11.jar}" />
2439
242
            <pathelement location="${nativewindow.os.win.jar}" />
2440
243
            <pathelement location="${nativewindow.os.macosx.jar}" />
2441
244
        </path>
2442
245
        <path id="nativewindow_core_atoms.classpath">
2443
246
            <pathelement location="${nativewindow.core.jar}" />
2444
247
        </path>
2445
248
        
2446
249
        <property name="jogl.core.jar"                  value="${build.jogl}/jogl.core.jar" />
2447
250
        <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
2448
251
        <property name="jogl.glmobile.jar"              value="${build.jogl}/jogl.glmobile.jar" />
2449
252
        <property name="jogl.glmobile.dbg.jar"          value="${build.jogl}/jogl.glmobile.dbg.jar" />
2450
253
        <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
2451
254
        <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
2452
255
        <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
2453
256
        <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
2454
257
        <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
2455
258
        <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
2456
259
        <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
2457
260
        <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
2458
261
        <property name="jogl.os.osx.jar"                value="${build.jogl}/jogl.os.osx.jar" />
2459
262
        <property name="jogl.gldesktop.jar"             value="${build.jogl}/jogl.gldesktop.jar" />
2460
263
        <property name="jogl.gldesktop.dbg.jar"         value="${build.jogl}/jogl.gldesktop.dbg.jar" />
2461
264
        <property name="jogl.glugldesktop.jar"          value="${build.jogl}/jogl.glu.gldesktop.jar" />
2462
265
        <property name="jogl.util.gldesktop.jar"        value="${build.jogl}/jogl.util.gldesktop.jar" />
2463
266
        <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
2464
267
        <property name="jogl.cg.jar"                    value="${build.jogl}/jogl.cg.jar" />
2465
268
2466
269
        <path id="jogl_all_atoms.classpath">
2467
270
            <pathelement location="${jogl.core.jar}" />
2468
271
            <pathelement location="${jogl.sdk.jar}" />
2469
272
            <pathelement location="${jogl.glmobile.jar}" />
2470
273
            <pathelement location="${jogl.glmobile.dbg.jar}" />
2471
274
            <pathelement location="${jogl.util.jar}" />
2472
275
            <pathelement location="${jogl.glutess.jar}" />
2473
276
            <pathelement location="${jogl.glumipmap.jar}" />
2474
277
            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
2475
278
            <pathelement location="${jogl.awt.jar}" />
2476
279
            <pathelement location="${jogl.util.awt.jar}" />
2477
280
            <pathelement location="${jogl.os.x11.jar}" />
2478
281
            <pathelement location="${jogl.os.win.jar}" />
2479
282
            <pathelement location="${jogl.os.osx.jar}" />
2480
283
            <pathelement location="${jogl.gldesktop.jar}" />
2481
284
            <pathelement location="${jogl.gldesktop.dbg.jar}" />
2482
285
            <pathelement location="${jogl.glugldesktop.jar}" />
2483
286
            <pathelement location="${jogl.util.gldesktop.jar}" />
2484
287
            <pathelement location="${jogl.omx.jar}" />
2485
288
        </path>
2486
289
        <path id="jogl_all-noawt_atoms.classpath">
2487
290
            <pathelement location="${jogl.core.jar}" />
2488
291
            <pathelement location="${jogl.sdk.jar}" />
2489
292
            <pathelement location="${jogl.glmobile.jar}" />
2490
293
            <pathelement location="${jogl.glmobile.dbg.jar}" />
2491
294
            <pathelement location="${jogl.util.jar}" />
2492
295
            <pathelement location="${jogl.glutess.jar}" />
2493
296
            <pathelement location="${jogl.glumipmap.jar}" />
2494
297
            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
2495
298
            <pathelement location="${jogl.os.x11.jar}" />
2496
299
            <pathelement location="${jogl.os.win.jar}" />
2497
300
            <pathelement location="${jogl.os.osx.jar}" />
2498
301
            <pathelement location="${jogl.gldesktop.jar}" />
2499
302
            <pathelement location="${jogl.gldesktop.dbg.jar}" />
2500
303
            <pathelement location="${jogl.glugldesktop.jar}" />
2501
304
            <pathelement location="${jogl.util.gldesktop.jar}" />
2502
305
            <pathelement location="${jogl.omx.jar}" />
2503
306
        </path>
2504
307
        <path id="jogl_all-mobile_atoms.classpath">
2505
308
            <pathelement location="${jogl.core.jar}" />
2506
309
            <pathelement location="${jogl.glmobile.jar}" />
2507
310
            <pathelement location="${jogl.glmobile.dbg.jar}" />
2508
311
            <pathelement location="${jogl.util.jar}" />
2509
312
            <pathelement location="${jogl.glutess.jar}" />
2510
313
            <pathelement location="${jogl.glumipmap.jar}" />
2511
314
            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
2512
315
            <pathelement location="${jogl.omx.jar}" />
2513
316
        </path>
2514
317
        <!-- 
2515
318
            ${jogl.core.jar} ${jogl.glutess.jar} ${jogl.glumipmap.jar} ${jogl.glugldesktop.jar} ${jogl.os.x11.jar} ${jogl.os.win.jar} ${jogl.os.osx.jar} ${jogl.gldesktop.jar} ${jogl.gldesktop.dbg.jar} ${jogl.glmobile.jar} ${jogl.glmobile.dbg.jar} ${jogl.omx.jar} ${jogl.util.jar} ${jogl.util.gldesktop.jar} ${jogl.util.awt.jar} ${jogl.util.fixedfuncemu.jar} ${jogl.sdk.jar} -->
2516
319
2517
320
        <property name="newt.core.jar"                  value="${build.newt}/newt.core.jar" />
2518
321
        <property name="newt.ogl.jar"                   value="${build.newt}/newt.ogl.jar" />
2519
322
        <property name="newt.awt.jar"                   value="${build.newt}/newt.awt.jar" />
2520
323
        <property name="newt.driver.x11.jar"            value="${build.newt}/newt.driver.x11.jar" />
2521
324
        <property name="newt.driver.win.jar"            value="${build.newt}/newt.driver.win.jar" />
2522
325
        <property name="newt.driver.macosx.jar"         value="${build.newt}/newt.driver.macosx.jar" />
2523
326
        <property name="newt.driver.android.jar"        value="${build.newt}/newt.driver.android.jar" />     <!-- excluded from all -->
2524
327
        <property name="newt.driver.kd.jar"             value="${build.newt}/newt.driver.kd.jar" />          <!-- excluded from all -->
2525
328
        <property name="newt.driver.intelgdl.jar"       value="${build.newt}/newt.driver.intelgdl.jar" />    <!-- excluded from all -->
2526
329
        <property name="newt.driver.broadcomegl.jar"    value="${build.newt}/newt.driver.broadcomegl.jar" /> <!-- excluded from all -->
2527
330
        <path id="newt_all_atoms.classpath">
2528
331
            <pathelement location="${newt.core.jar}" />
2529
332
            <pathelement location="${newt.ogl.jar}" />
2530
333
            <pathelement location="${newt.awt.jar}" />
2531
334
            <pathelement location="${newt.driver.x11.jar}" />
2532
335
            <pathelement location="${newt.driver.win.jar}" />
2533
336
            <pathelement location="${newt.driver.macosx.jar}" />
2534
337
        </path>
2535
338
        <path id="newt_all-noawt_atoms.classpath">
2536
339
            <pathelement location="${newt.core.jar}" />
2537
340
            <pathelement location="${newt.ogl.jar}" />
2538
341
            <pathelement location="${newt.driver.x11.jar}" />
2539
342
            <pathelement location="${newt.driver.win.jar}" />
2540
343
            <pathelement location="${newt.driver.macosx.jar}" />
2541
344
        </path>
2542
345
        <path id="newt_all-mobile_atoms.classpath">
2543
346
            <pathelement location="${newt.core.jar}" />
2544
347
            <pathelement location="${newt.ogl.jar}" />
2545
348
            <pathelement location="${newt.driver.x11.jar}" />
2546
349
            <pathelement location="${newt.driver.win.jar}" />
2547
350
        </path>
2548
351
        <path id="newt_all-android_atoms.classpath">
2549
352
            <pathelement location="${newt.core.jar}" />
2550
353
            <pathelement location="${newt.ogl.jar}" />
2551
354
            <pathelement location="${newt.driver.android.jar}" />
2552
355
        </path>
2553
356
2554
357
        <!-- JavaSE combinations -->
2555
358
        <property name="gluegen-rt.jar"                 value="/usr/share/java/gluegen2-rt.jar" />
2556
359
        <property name="jogl.test.jar"                  value="${jar}/jogl.test.jar"/>
2557
360
2558
361
        <!-- JavaSE combinations . AWT -->
2559
362
        <property name="jogl.all.jar"                   value="${jar}/jogl.all.jar" />
2560
363
        <property name="newt.event.jar"                 value="${jar}/newt.event.jar" />
2561
364
2562
365
        <!-- JavaSE combinations . NO.AWT -->
2563
366
        <property name="jogl.all-noawt.jar"             value="${jar}/jogl.all-noawt.jar" />
2564
367
        <property name="jogl.all-mobile.jar"            value="${jar}/jogl.all-mobile.jar" />
2565
368
        <property name="jogl.all-android.jar"           value="${jar}/jogl.all-android.jar" />
2566
369
2567
370
        <path id="swt_gluegen.classpath">
2568
371
            <pathelement location="${gluegen-rt.jar}" />
2569
372
            <pathelement location="${swt.jar}" />
2570
373
        </path>
2571
374
2572
375
        <!-- JOGL Compilation .. -->
2573
376
        <path id="nativewindow_gluegen.classpath">
2574
377
            <pathelement location="${gluegen-rt.jar}" />
2575
378
            <pathelement location="${swt.jar}" />
2576
379
            <path refid="nativewindow_all_atoms.classpath" />
2577
380
        </path>
2578
381
2579
382
        <!-- NEWT Compilation .. -->
2580
383
        <path id="jogl_nativewindow_gluegen.classpath">
2581
384
            <pathelement location="${android.jar}" />
2582
385
            <pathelement location="${gluegen-rt.jar}" />
2583
386
            <pathelement location="${swt.jar}" />
2584
387
            <path refid="nativewindow_all_atoms.classpath" />
2585
388
            <path refid="jogl_all_atoms.classpath" />
2586
389
        </path>
2587
390
2588
391
        <!-- Test Compilation .. -->
2589
392
        <path id="junit_jogl_newt_android.compile.classpath">
2590
393
            <pathelement location="${android.jar}" />
2591
394
            <pathelement location="${junit.jar}" />
2592
395
            <pathelement location="${ant.jar}" />
2593
396
            <pathelement location="${ant-junit.jar}" />
2594
397
            <pathelement location="${gluegen-rt.jar}" />
2595
398
            <pathelement location="${swt.jar}" />
2596
399
            <path refid="nativewindow_all_atoms.classpath" />
2597
400
            <path refid="jogl_all_atoms.classpath" />
2598
401
            <path refid="newt_all_atoms.classpath" />
2599
402
            <pathelement location="${newt.driver.android.jar}" />
2600
403
        </path>
2601
404
2602
405
        <!-- Postbuild: javadoc .. -->
2603
406
        <path id="jogl_all.classpath">
2604
407
            <pathelement location="${android.jar}" />
2605
408
            <pathelement location="${gluegen-rt.jar}" />
2606
409
            <pathelement location="${swt.jar}" />
2607
410
            <pathelement location="${jogl.all.jar}" />
2608
411
        </path>
2609
412
2610
413
        <!-- Test Run w/ AWT .. -->
2611
414
        <path id="junit_jogl_awt.run.classpath">
2612
415
            <pathelement location="${junit.jar}" />
2613
416
            <pathelement location="${ant.jar}" />
2614
417
            <pathelement location="${ant-junit.jar}" />
2615
418
            <pathelement location="${gluegen-rt.jar}" />
2616
419
            <pathelement location="${jogl.all.jar}" />
2617
420
            <pathelement location="${jogl.test.jar}" />
2618
421
        </path>
2619
422
        <property name="junit_jogl_awt.run.jars"
2620
423
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
2621
424
2622
425
        <!-- Test Run w/o AWT .. -->
2623
426
        <path id="junit_jogl_noawt.run.classpath">
2624
427
            <pathelement location="${junit.jar}" />
2625
428
            <pathelement location="${ant.jar}" />
2626
429
            <pathelement location="${ant-junit.jar}" />
2627
430
            <pathelement location="${gluegen-rt.jar}" />
2628
431
            <pathelement location="${jogl.all-noawt.jar}" />
2629
432
            <pathelement location="${jogl.test.jar}" />
2630
433
        </path>
2631
434
        <property name="junit_jogl_noawt.run.jars"
2632
435
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
2633
436
2634
437
        <!-- Test Run w/ SWT .. -->
2635
438
        <path id="junit_jogl_swt.run.classpath">
2636
439
          <pathelement location="${junit.jar}" />
2637
440
          <pathelement location="${ant.jar}" />
2638
441
          <pathelement location="${ant-junit.jar}" />
2639
442
          <pathelement location="${gluegen-rt.jar}" />
2640
443
          <pathelement location="${swt.jar}" />
2641
444
          <pathelement location="${jogl.all.jar}" />
2642
445
          <pathelement location="${jogl.test.jar}" />
2643
446
        </path>
2644
447
        <property name="junit_jogl_swt.run.jars"
2645
448
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
2646
449
2647
450
        <!-- Test Run w/ Android [w/o AWT] .. -->
2648
451
        <path id="junit_jogl_android.run.classpath">
2649
452
            <pathelement location="${junit.jar}" />
2650
453
            <pathelement location="${ant.jar}" />
2651
454
            <pathelement location="${ant-junit.jar}" />
2652
455
            <pathelement location="${android.jar}" />
2653
456
            <pathelement location="${gluegen-rt.jar}" />
2654
457
            <pathelement location="${jogl.all-android.jar}" />
2655
458
            <pathelement location="${jogl.test.jar}" />
2656
459
        </path>
2657
460
        <property name="junit_jogl_android.run.jars"
2658
461
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/>
2659
462
2660
463
2661
464
        <!-- The location and name of the configuration ANT file that will 
2662
465
           - validate to ensure that all user-define variables are set. -->
2663
466
        <property name="validate.user.properties" value="${make}/validate-properties.xml" />
2664
467
    </target>
2665
468
2666
469
    <!-- ================================================================== -->
2667
470
    <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
2668
471
    <!--
2669
472
       - Build GlueGen
2670
473
      -->
2671
474
    <target name="common.gluegen.build" depends="common.init" unless="common.gluegen.build.done">
2672
475
        <property name="common.gluegen.build.done" value="true" />
2673
476
2674
477
        <!-- Run the GlueGen build to ensure that the GlueGen ANT task
2675
478
           - has been built. -->
2676
479
        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
2677
480
          <property name="build" value="${basedir}/../"/>
2678
481
          <property name="test.dir" value="${basedir}/../test"/>
2679
482
        </ant>
2680
483
    </target>
2681
484
2682
485
2683
486
</project>
2684
487
0
2685
=== removed directory '.pc/disable_git_call.diff'
2686
=== removed directory '.pc/disable_git_call.diff/make'
2687
=== removed file '.pc/disable_git_call.diff/make/build-common.xml'
2688
--- .pc/disable_git_call.diff/make/build-common.xml	2011-10-08 11:39:42 +0000
2689
+++ .pc/disable_git_call.diff/make/build-common.xml	1970-01-01 00:00:00 +0000
2690
@@ -1,498 +0,0 @@
2691
1
<?xml version="1.0" encoding="UTF-8"?>
2692
2
2693
3
<project name="JOGLCommonStuff" basedir="." default="common.init">
2694
4
2695
5
    <description>Common JOGL Stuff</description>
2696
6
2697
7
    <fail message="Please build using Ant 1.8.0 or higher.">
2698
8
        <condition>
2699
9
            <not>
2700
10
                <antversion atleast="1.8.0"/>
2701
11
            </not>
2702
12
        </condition>
2703
13
    </fail>
2704
14
2705
15
    <!-- Pull in GlueGen cpptasks build file -->
2706
16
    <property name="gluegen.root" value="/usr/share/gluegen2/" />
2707
17
    <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
2708
18
    <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
2709
19
    <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
2710
20
    <import file="${gluegen.root}/make/jogamp-env.xml" />
2711
21
2712
22
    <property name="ant-contrib.jar"  value="/usr/share/java/ant-contrib.jar" />
2713
23
2714
24
    <condition property="rootrel.build" value="build">
2715
25
      <not>
2716
26
          <isset property="rootrel.build"/>
2717
27
      </not>
2718
28
    </condition>
2719
29
2720
30
    <import file="versions.xml" />
2721
31
2722
32
    <!-- ================================================================== -->
2723
33
    <!-- 
2724
34
       - Base initialization of properties and detection of operating system.
2725
35
      -->
2726
36
    <target name="set.debug">
2727
37
        <property name="c.compiler.debug" value="true" /> 
2728
38
        <property name="javacdebug"       value="true" /> 
2729
39
        <property name="javacdebuglevel"  value="source,lines,vars" /> 
2730
40
    </target>
2731
41
    <target name="common.init.debug" depends="set.debug, common.init"/>
2732
42
2733
43
    <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done">
2734
44
        <property name="common.init.done" value="true" />
2735
45
2736
46
        <!-- Set the project root directory to be up one directory. -->
2737
47
        <property name="project.root"               value=".." />
2738
48
        <property name="build"                      value="${project.root}/${rootrel.build}" />
2739
49
        <property name="tempdir"                    value="${project.root}/build-temp" />
2740
50
        <property name="src"                        value="${project.root}/src" />
2741
51
        <property name="lib"                        value="${build}/lib" />
2742
52
        <property name="jar"                        value="${build}/jar" />
2743
53
2744
54
        <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
2745
55
        <!-- No generated classes for Newt at the present time -->
2746
56
        <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
2747
57
2748
58
        <!-- Set the configuration and build files to this directory. -->
2749
59
        <property name="make"                       value="." />
2750
60
        <property name="config"                     value="${make}/config" />
2751
61
        <property name="stub.includes"              value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
2752
62
2753
63
        <property name="stub.includes.gluegen.gg"  value="${gluegen.root}/make/stub_includes/gluegen" />
2754
64
        <property name="stub.includes.gluegen.cc"  value="${gluegen.root}/make/stub_includes/platform" />
2755
65
2756
66
        <tstamp>
2757
67
             <format property="version.timestamp" pattern="yyyyMMdd"/>
2758
68
        </tstamp>
2759
69
2760
70
        <property name="jogl.build.number" value="manual"/>
2761
71
        <property name="jogl.build.id"     value="${version.timestamp}"/>
2762
72
        <mkdir dir="${tempdir}" />
2763
73
        <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
2764
74
                  output="${tempdir}/localbranch.raw">
2765
75
            <arg line="branch --no-color"/>
2766
76
        </exec>
2767
77
        <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
2768
78
                  outputproperty="jogl.build.branch">
2769
79
            <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${tempdir}/localbranch.raw"/>
2770
80
        </exec>
2771
81
        <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
2772
82
        <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
2773
83
                  outputproperty="jogl.build.commit">
2774
84
            <arg line="rev-parse HEAD"/>
2775
85
        </exec>
2776
86
        <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
2777
87
2778
88
        <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
2779
89
        <property name="jogl.version"         value="${jogl_base_version}-b${jogl.build.number}-${version.timestamp}" />
2780
90
        <property name="newt.version"         value="${newt_base_version}-b${jogl.build.number}-${version.timestamp}" />
2781
91
        <property name="jogl.version.plus"    value="${jogl_base_version}-${jogl.build.branch}-b${jogl.build.number}-${jogl.build.commit}-${version.timestamp}" />
2782
92
2783
93
        <property name="archive.name"         value="jogl-${jogl.version}-${os.and.arch}" />
2784
94
        <property name="archive"              value="${build}/${archive.name}" />
2785
95
2786
96
        <condition property="setup.noNativeAWT">
2787
97
            <or>
2788
98
                <isset property="setup.noAWT"/> 
2789
99
                <isset property="isAndroid"/> 
2790
100
            </or>
2791
101
        </condition>
2792
102
2793
103
        <condition property="setup.noNativeDesktop">
2794
104
            <or>
2795
105
                <isset property="isAndroid"/> 
2796
106
            </or>
2797
107
        </condition>
2798
108
2799
109
        <echo message="setup.noAWT: ${setup.noAWT}" />
2800
110
        <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
2801
111
        <echo message="setup.noNativeDesktop: ${setup.noNativeDesktop}" />
2802
112
2803
113
        <!-- Load the user specified properties file that defines various host
2804
114
           - specific paths.  The user will be notified if this is does not
2805
115
           - exist. -->
2806
116
        <property name="user.properties.file" value="${user.home}/jogl.properties" />
2807
117
        <property file="${user.properties.file}" />
2808
118
        <echo message="Loaded ${user.properties.file}." />
2809
119
        <property file="${user.home}/gluegen.properties" />
2810
120
        <echo message="Loaded ${user.home}/gluegen.properties." />
2811
121
        <echo message="antlr.jar=${antlr.jar}" />
2812
122
        <echo message="junit.jar=${junit.jar}" />
2813
123
        <echo message="android.jar=${android.jar}" />
2814
124
2815
125
        <!-- Set swt.jar to the correct file for this platform. We point to the debug JARs to allow
2816
126
             stepping into SWT calls using the accompanying source code zip archives. -->
2817
127
        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt-debug.jar">
2818
128
          <istrue value="${isWindowsAMD64}" />
2819
129
        </condition>
2820
130
        <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
2821
131
          <istrue value="${isWindowsX86}" />
2822
132
        </condition>
2823
133
        <condition property="swt.jar" value="/usr/share/java/swt.jar">
2824
134
          <istrue value="${isLinux}" />
2825
135
        </condition>
2826
136
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
2827
137
          <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
2828
138
        </condition>
2829
139
        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
2830
140
          <and>
2831
141
            <istrue value="${isOSX}" />
2832
142
            <or>
2833
143
              <os arch="AMD64" />
2834
144
              <os arch="x86_64" />
2835
145
            </or>                
2836
146
          </and>
2837
147
        </condition>
2838
148
        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar">
2839
149
          <and>
2840
150
            <istrue value="${isOSX}" />
2841
151
            <or>
2842
152
              <os arch="i386" />
2843
153
              <os arch="x86" />
2844
154
            </or>
2845
155
          </and>
2846
156
        </condition>
2847
157
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
2848
158
          <istrue value="${isSolarisX86}" />
2849
159
        </condition>
2850
160
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
2851
161
          <istrue value="${isSolarisAMD64}" />
2852
162
        </condition>
2853
163
        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
2854
164
          <istrue value="${isSolarisSparc}" />
2855
165
        </condition>
2856
166
		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
2857
167
          <istrue value="${isSolarisSparcv9}" />
2858
168
        </condition>
2859
169
        <echo message="swt.jar=${swt.jar}" />
2860
170
2861
171
        <property name="target.sourcelevel" value="1.5" />
2862
172
        <property name="host.sourcelevel"   value="1.5" />
2863
173
2864
174
        <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
2865
175
        <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
2866
176
2867
177
        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
2868
178
        <property name="javacdebug"       value="true" /> 
2869
179
        <property name="javacdebuglevel"  value="source,lines" /> 
2870
180
        <!--property name="javacdebuglevel"  value="source,lines,vars" /--> 
2871
181
        <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
2872
182
        <property name="javac.memorymax"  value="512m" /> 
2873
183
2874
184
        <!-- Names of directories relative to the project root.
2875
185
             Some of these are used in FileMappers later for dependence information
2876
186
             and need exact string matching, which is why they use file.separator
2877
187
             instead of "/". -->
2878
188
2879
189
        <!-- NOTE that these require a checked-out GlueGen, etc workspace as a -->
2880
190
        <!-- sibling of the JOGL workspace. -->
2881
191
        <property name="gluegen.make"               value="${gluegen.root}/make" />
2882
192
        <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
2883
193
        <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
2884
194
        <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
2885
195
        <property name="gluegen.jar"                value="/usr/share/java/gluegen2.jar" />
2886
196
        <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
2887
197
        <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
2888
198
2889
199
        <property name="nativewindow.make"          value="." />
2890
200
        <property name="nativewindow.build.xml"     value="${nativewindow.make}/build-nativewindow.xml" />
2891
201
        <property name="build.nativewindow"         value="${build}/nativewindow" />
2892
202
        <property name="obj.nativewindow"           value="${build.nativewindow}/obj"/>
2893
203
2894
204
        <property name="jogl.make"                  value="." />
2895
205
        <property name="jogl.build.xml"             value="${jogl.make}/build-jogl.xml" />
2896
206
        <property name="build.jogl"                 value="${build}/jogl" />
2897
207
        <property name="obj.jogl"                   value="${build.jogl}/obj"/>
2898
208
2899
209
        <property name="newt.make"                  value="." />
2900
210
        <property name="newt.build.xml"             value="${newt.make}/build-newt.xml" />
2901
211
        <property name="build.newt"                 value="${build}/newt" />
2902
212
        <property name="obj.newt"                   value="${build.newt}/obj"/>
2903
213
2904
214
        <property name="results.test"              value="${build}/test/results" />
2905
215
        <property name="build.test"                value="${build}/test/build" />
2906
216
        <property name="obj.test"                  value="${build.test}/obj"/>
2907
217
2908
218
        <condition property="obj.custom" value="${custom.libdir}${path.separator}" else="">
2909
219
          <isset property="custom.libdir"/>
2910
220
        </condition>
2911
221
2912
222
        <property name="obj.all.paths"              value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.test}" />
2913
223
2914
224
        <path id="gluegen.classpath">
2915
225
          <pathelement location="${gluegen.jar}" />
2916
226
          <pathelement location="${antlr.jar}" />
2917
227
        </path>
2918
228
2919
229
        <property name="gluegen-gl.jar"             value="${build.jogl}/gluegen-gl.jar" />
2920
230
2921
231
        <path id="gluegen-gl.classpath">
2922
232
          <pathelement location="${gluegen.jar}" />
2923
233
          <pathelement location="${gluegen-gl.jar}" />
2924
234
        </path>
2925
235
2926
236
        <!-- Atomic JavaSE JARS -->
2927
237
2928
238
        <property name="nativewindow.core.jar"         value="${build.nativewindow}/nativewindow.core.jar" />
2929
239
        <property name="nativewindow.awt.jar"          value="${build.nativewindow}/nativewindow.awt.jar"  />
2930
240
        <property name="nativewindow.os.x11.jar"       value="${build.nativewindow}/nativewindow.os.x11.jar"  />
2931
241
        <property name="nativewindow.os.win.jar"       value="${build.nativewindow}/nativewindow.os.win.jar"  />
2932
242
        <property name="nativewindow.os.macosx.jar"    value="${build.nativewindow}/nativewindow.os.macosx.jar"  />
2933
243
2934
244
        <path id="nativewindow_all_atoms.classpath">
2935
245
            <pathelement location="${nativewindow.core.jar}" />
2936
246
            <pathelement location="${nativewindow.awt.jar}" />
2937
247
            <pathelement location="${nativewindow.os.x11.jar}" />
2938
248
            <pathelement location="${nativewindow.os.win.jar}" />
2939
249
            <pathelement location="${nativewindow.os.macosx.jar}" />
2940
250
        </path>
2941
251
        <path id="nativewindow_all-noawt_atoms.classpath">
2942
252
            <pathelement location="${nativewindow.core.jar}" />
2943
253
            <pathelement location="${nativewindow.os.x11.jar}" />
2944
254
            <pathelement location="${nativewindow.os.win.jar}" />
2945
255
            <pathelement location="${nativewindow.os.macosx.jar}" />
2946
256
        </path>
2947
257
        <path id="nativewindow_core_atoms.classpath">
2948
258
            <pathelement location="${nativewindow.core.jar}" />
2949
259
        </path>
2950
260
        
2951
261
        <property name="jogl.core.jar"                  value="${build.jogl}/jogl.core.jar" />
2952
262
        <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
2953
263
        <property name="jogl.glmobile.jar"              value="${build.jogl}/jogl.glmobile.jar" />
2954
264
        <property name="jogl.glmobile.dbg.jar"          value="${build.jogl}/jogl.glmobile.dbg.jar" />
2955
265
        <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
2956
266
        <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
2957
267
        <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
2958
268
        <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
2959
269
        <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
2960
270
        <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
2961
271
        <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
2962
272
        <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
2963
273
        <property name="jogl.os.osx.jar"                value="${build.jogl}/jogl.os.osx.jar" />
2964
274
        <property name="jogl.gldesktop.jar"             value="${build.jogl}/jogl.gldesktop.jar" />
2965
275
        <property name="jogl.gldesktop.dbg.jar"         value="${build.jogl}/jogl.gldesktop.dbg.jar" />
2966
276
        <property name="jogl.glugldesktop.jar"          value="${build.jogl}/jogl.glu.gldesktop.jar" />
2967
277
        <property name="jogl.util.gldesktop.jar"        value="${build.jogl}/jogl.util.gldesktop.jar" />
2968
278
        <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
2969
279
        <property name="jogl.cg.jar"                    value="${build.jogl}/jogl.cg.jar" />
2970
280
2971
281
        <path id="jogl_all_atoms.classpath">
2972
282
            <pathelement location="${jogl.core.jar}" />
2973
283
            <pathelement location="${jogl.sdk.jar}" />
2974
284
            <pathelement location="${jogl.glmobile.jar}" />
2975
285
            <pathelement location="${jogl.glmobile.dbg.jar}" />
2976
286
            <pathelement location="${jogl.util.jar}" />
2977
287
            <pathelement location="${jogl.glutess.jar}" />
2978
288
            <pathelement location="${jogl.glumipmap.jar}" />
2979
289
            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
2980
290
            <pathelement location="${jogl.awt.jar}" />
2981
291
            <pathelement location="${jogl.util.awt.jar}" />
2982
292
            <pathelement location="${jogl.os.x11.jar}" />
2983
293
            <pathelement location="${jogl.os.win.jar}" />
2984
294
            <pathelement location="${jogl.os.osx.jar}" />
2985
295
            <pathelement location="${jogl.gldesktop.jar}" />
2986
296
            <pathelement location="${jogl.gldesktop.dbg.jar}" />
2987
297
            <pathelement location="${jogl.glugldesktop.jar}" />
2988
298
            <pathelement location="${jogl.util.gldesktop.jar}" />
2989
299
            <pathelement location="${jogl.omx.jar}" />
2990
300
        </path>
2991
301
        <path id="jogl_all-noawt_atoms.classpath">
2992
302
            <pathelement location="${jogl.core.jar}" />
2993
303
            <pathelement location="${jogl.sdk.jar}" />
2994
304
            <pathelement location="${jogl.glmobile.jar}" />
2995
305
            <pathelement location="${jogl.glmobile.dbg.jar}" />
2996
306
            <pathelement location="${jogl.util.jar}" />
2997
307
            <pathelement location="${jogl.glutess.jar}" />
2998
308
            <pathelement location="${jogl.glumipmap.jar}" />
2999
309
            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
3000
310
            <pathelement location="${jogl.os.x11.jar}" />
3001
311
            <pathelement location="${jogl.os.win.jar}" />
3002
312
            <pathelement location="${jogl.os.osx.jar}" />
3003
313
            <pathelement location="${jogl.gldesktop.jar}" />
3004
314
            <pathelement location="${jogl.gldesktop.dbg.jar}" />
3005
315
            <pathelement location="${jogl.glugldesktop.jar}" />
3006
316
            <pathelement location="${jogl.util.gldesktop.jar}" />
3007
317
            <pathelement location="${jogl.omx.jar}" />
3008
318
        </path>
3009
319
        <path id="jogl_all-mobile_atoms.classpath">
3010
320
            <pathelement location="${jogl.core.jar}" />
3011
321
            <pathelement location="${jogl.glmobile.jar}" />
3012
322
            <pathelement location="${jogl.glmobile.dbg.jar}" />
3013
323
            <pathelement location="${jogl.util.jar}" />
3014
324
            <pathelement location="${jogl.glutess.jar}" />
3015
325
            <pathelement location="${jogl.glumipmap.jar}" />
3016
326
            <pathelement location="${jogl.util.fixedfuncemu.jar}" />
3017
327
            <pathelement location="${jogl.omx.jar}" />
3018
328
        </path>
3019
329
        <!-- 
3020
330
            ${jogl.core.jar} ${jogl.glutess.jar} ${jogl.glumipmap.jar} ${jogl.glugldesktop.jar} ${jogl.os.x11.jar} ${jogl.os.win.jar} ${jogl.os.osx.jar} ${jogl.gldesktop.jar} ${jogl.gldesktop.dbg.jar} ${jogl.glmobile.jar} ${jogl.glmobile.dbg.jar} ${jogl.omx.jar} ${jogl.util.jar} ${jogl.util.gldesktop.jar} ${jogl.util.awt.jar} ${jogl.util.fixedfuncemu.jar} ${jogl.sdk.jar} -->
3021
331
3022
332
        <property name="newt.core.jar"                  value="${build.newt}/newt.core.jar" />
3023
333
        <property name="newt.ogl.jar"                   value="${build.newt}/newt.ogl.jar" />
3024
334
        <property name="newt.awt.jar"                   value="${build.newt}/newt.awt.jar" />
3025
335
        <property name="newt.driver.x11.jar"            value="${build.newt}/newt.driver.x11.jar" />
3026
336
        <property name="newt.driver.win.jar"            value="${build.newt}/newt.driver.win.jar" />
3027
337
        <property name="newt.driver.macosx.jar"         value="${build.newt}/newt.driver.macosx.jar" />
3028
338
        <property name="newt.driver.android.jar"        value="${build.newt}/newt.driver.android.jar" />     <!-- excluded from all -->
3029
339
        <property name="newt.driver.kd.jar"             value="${build.newt}/newt.driver.kd.jar" />          <!-- excluded from all -->
3030
340
        <property name="newt.driver.intelgdl.jar"       value="${build.newt}/newt.driver.intelgdl.jar" />    <!-- excluded from all -->
3031
341
        <property name="newt.driver.broadcomegl.jar"    value="${build.newt}/newt.driver.broadcomegl.jar" /> <!-- excluded from all -->
3032
342
        <path id="newt_all_atoms.classpath">
3033
343
            <pathelement location="${newt.core.jar}" />
3034
344
            <pathelement location="${newt.ogl.jar}" />
3035
345
            <pathelement location="${newt.awt.jar}" />
3036
346
            <pathelement location="${newt.driver.x11.jar}" />
3037
347
            <pathelement location="${newt.driver.win.jar}" />
3038
348
            <pathelement location="${newt.driver.macosx.jar}" />
3039
349
        </path>
3040
350
        <path id="newt_all-noawt_atoms.classpath">
3041
351
            <pathelement location="${newt.core.jar}" />
3042
352
            <pathelement location="${newt.ogl.jar}" />
3043
353
            <pathelement location="${newt.driver.x11.jar}" />
3044
354
            <pathelement location="${newt.driver.win.jar}" />
3045
355
            <pathelement location="${newt.driver.macosx.jar}" />
3046
356
        </path>
3047
357
        <path id="newt_all-mobile_atoms.classpath">
3048
358
            <pathelement location="${newt.core.jar}" />
3049
359
            <pathelement location="${newt.ogl.jar}" />
3050
360
            <pathelement location="${newt.driver.x11.jar}" />
3051
361
            <pathelement location="${newt.driver.win.jar}" />
3052
362
        </path>
3053
363
        <path id="newt_all-android_atoms.classpath">
3054
364
            <pathelement location="${newt.core.jar}" />
3055
365
            <pathelement location="${newt.ogl.jar}" />
3056
366
            <pathelement location="${newt.driver.android.jar}" />
3057
367
        </path>
3058
368
3059
369
        <!-- JavaSE combinations -->
3060
370
        <property name="gluegen-rt.jar"                 value="/usr/share/java/gluegen2-rt.jar" />
3061
371
        <property name="jogl.test.jar"                  value="${jar}/jogl.test.jar"/>
3062
372
3063
373
        <!-- JavaSE combinations . AWT -->
3064
374
        <property name="jogl.all.jar"                   value="${jar}/jogl.all.jar" />
3065
375
        <property name="newt.event.jar"                 value="${jar}/newt.event.jar" />
3066
376
3067
377
        <!-- JavaSE combinations . NO.AWT -->
3068
378
        <property name="jogl.all-noawt.jar"             value="${jar}/jogl.all-noawt.jar" />
3069
379
        <property name="jogl.all-mobile.jar"            value="${jar}/jogl.all-mobile.jar" />
3070
380
        <property name="jogl.all-android.jar"           value="${jar}/jogl.all-android.jar" />
3071
381
3072
382
        <path id="swt_gluegen.classpath">
3073
383
            <pathelement location="${gluegen-rt.jar}" />
3074
384
            <pathelement location="${swt.jar}" />
3075
385
        </path>
3076
386
3077
387
        <!-- JOGL Compilation .. -->
3078
388
        <path id="nativewindow_gluegen.classpath">
3079
389
            <pathelement location="${gluegen-rt.jar}" />
3080
390
            <pathelement location="${swt.jar}" />
3081
391
            <path refid="nativewindow_all_atoms.classpath" />
3082
392
        </path>
3083
393
3084
394
        <!-- NEWT Compilation .. -->
3085
395
        <path id="jogl_nativewindow_gluegen.classpath">
3086
396
            <pathelement location="${android.jar}" />
3087
397
            <pathelement location="${gluegen-rt.jar}" />
3088
398
            <pathelement location="${swt.jar}" />
3089
399
            <path refid="nativewindow_all_atoms.classpath" />
3090
400
            <path refid="jogl_all_atoms.classpath" />
3091
401
        </path>
3092
402
3093
403
        <!-- Test Compilation .. -->
3094
404
        <path id="junit_jogl_newt_android.compile.classpath">
3095
405
            <pathelement location="${android.jar}" />
3096
406
            <pathelement location="${junit.jar}" />
3097
407
            <pathelement location="${ant.jar}" />
3098
408
            <pathelement location="${ant-junit.jar}" />
3099
409
            <pathelement location="${gluegen-rt.jar}" />
3100
410
            <pathelement location="${swt.jar}" />
3101
411
            <path refid="nativewindow_all_atoms.classpath" />
3102
412
            <path refid="jogl_all_atoms.classpath" />
3103
413
            <path refid="newt_all_atoms.classpath" />
3104
414
            <pathelement location="${newt.driver.android.jar}" />
3105
415
        </path>
3106
416
3107
417
        <!-- Postbuild: javadoc .. -->
3108
418
        <path id="jogl_all.classpath">
3109
419
            <pathelement location="${android.jar}" />
3110
420
            <pathelement location="${gluegen-rt.jar}" />
3111
421
            <pathelement location="${swt.jar}" />
3112
422
            <pathelement location="${jogl.all.jar}" />
3113
423
        </path>
3114
424
3115
425
        <!-- Test Run w/ AWT .. -->
3116
426
        <path id="junit_jogl_awt.run.classpath">
3117
427
            <pathelement location="${junit.jar}" />
3118
428
            <pathelement location="${ant.jar}" />
3119
429
            <pathelement location="${ant-junit.jar}" />
3120
430
            <pathelement location="${gluegen-rt.jar}" />
3121
431
            <pathelement location="${jogl.all.jar}" />
3122
432
            <pathelement location="${jogl.test.jar}" />
3123
433
        </path>
3124
434
        <property name="junit_jogl_awt.run.jars"
3125
435
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
3126
436
3127
437
        <!-- Test Run w/o AWT .. -->
3128
438
        <path id="junit_jogl_noawt.run.classpath">
3129
439
            <pathelement location="${junit.jar}" />
3130
440
            <pathelement location="${ant.jar}" />
3131
441
            <pathelement location="${ant-junit.jar}" />
3132
442
            <pathelement location="${gluegen-rt.jar}" />
3133
443
            <pathelement location="${jogl.all-noawt.jar}" />
3134
444
            <pathelement location="${jogl.test.jar}" />
3135
445
        </path>
3136
446
        <property name="junit_jogl_noawt.run.jars"
3137
447
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
3138
448
3139
449
        <!-- Test Run w/ SWT .. -->
3140
450
        <path id="junit_jogl_swt.run.classpath">
3141
451
          <pathelement location="${junit.jar}" />
3142
452
          <pathelement location="${ant.jar}" />
3143
453
          <pathelement location="${ant-junit.jar}" />
3144
454
          <pathelement location="${gluegen-rt.jar}" />
3145
455
          <pathelement location="${swt.jar}" />
3146
456
          <pathelement location="${jogl.all.jar}" />
3147
457
          <pathelement location="${jogl.test.jar}" />
3148
458
        </path>
3149
459
        <property name="junit_jogl_swt.run.jars"
3150
460
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/>
3151
461
3152
462
        <!-- Test Run w/ Android [w/o AWT] .. -->
3153
463
        <path id="junit_jogl_android.run.classpath">
3154
464
            <pathelement location="${junit.jar}" />
3155
465
            <pathelement location="${ant.jar}" />
3156
466
            <pathelement location="${ant-junit.jar}" />
3157
467
            <pathelement location="${android.jar}" />
3158
468
            <pathelement location="${gluegen-rt.jar}" />
3159
469
            <pathelement location="${jogl.all-android.jar}" />
3160
470
            <pathelement location="${jogl.test.jar}" />
3161
471
        </path>
3162
472
        <property name="junit_jogl_android.run.jars"
3163
473
                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/>
3164
474
3165
475
3166
476
        <!-- The location and name of the configuration ANT file that will 
3167
477
           - validate to ensure that all user-define variables are set. -->
3168
478
        <property name="validate.user.properties" value="${make}/validate-properties.xml" />
3169
479
    </target>
3170
480
3171
481
    <!-- ================================================================== -->
3172
482
    <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
3173
483
    <!--
3174
484
       - Build GlueGen
3175
485
      -->
3176
486
    <target name="common.gluegen.build" depends="common.init" unless="common.gluegen.build.done">
3177
487
        <property name="common.gluegen.build.done" value="true" />
3178
488
3179
489
        <!-- Run the GlueGen build to ensure that the GlueGen ANT task
3180
490
           - has been built. -->
3181
491
        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
3182
492
          <property name="build" value="${basedir}/../"/>
3183
493
          <property name="test.dir" value="${basedir}/../test"/>
3184
494
        </ant>
3185
495
    </target>
3186
496
3187
497
3188
498
</project>
3189
499
0
3190
=== removed directory '.pc/linker.cfg.id.os.diff'
3191
=== removed directory '.pc/linker.cfg.id.os.diff/make'
3192
=== removed file '.pc/linker.cfg.id.os.diff/make/build-jogl.xml'
3193
--- .pc/linker.cfg.id.os.diff/make/build-jogl.xml	2011-10-10 12:13:14 +0000
3194
+++ .pc/linker.cfg.id.os.diff/make/build-jogl.xml	1970-01-01 00:00:00 +0000
3195
@@ -1,1655 +0,0 @@
3196
1
<?xml version="1.0" encoding="UTF-8"?>
3197
2
<!--
3198
3
   - Ant build for JOGL.  This build has been tested with ANT 1.7.0.  The
3199
4
   - optional.jar that contains the optional ANT tasks must be in the ANT
3200
5
   - classpath (typically the ant/lib directory).
3201
6
   -
3202
7
   - A clean download of JOGL is required for this build.
3203
8
   -
3204
9
   - This build has no dependence on environment variables; the needed
3205
10
   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
3206
11
   - script, by the virtual machine, or elsewhere. However, on all platforms,
3207
12
   - the C compiler and linker should be in the path. All other paths that
3208
13
   - need to be set are in host.properties.
3209
14
   -
3210
15
   - NOTE:  because the GlueGen config files have their own relative paths
3211
16
   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
3212
17
   -        the "make" directory. This also means that this build-jogl.xml MUST
3213
18
   -        be run from the "make" directory.
3214
19
   -
3215
20
   - Public targets:
3216
21
   -   all: (default; autodetects OS and chooses C compiler from gluegen.properties)
3217
22
   -   clean:        clean all built
3218
23
   -   javadoc:      create the standard developer Javadoc (recommended)
3219
24
   -                 (Note: should build all first - may be dependence in the future)
3220
25
   -   javadoc.spec:   create the standard developer Javadoc but exclude com.jogamp.* classes
3221
26
   -   javadoc.dev.all: create the internal developer Javadoc.  This includes the
3222
27
   -                       Java and C file generators. Note that it is only supported
3223
28
   -                       to create the Javadoc for the platform on which you are
3224
29
   -                       currently running.
3225
30
   - 
3226
31
   - Note: on Windows the "win32.c.compiler" property in gluegen.properties
3227
32
   - is required to select the appropriate C compiler. See the example
3228
33
   - gluegen.properties in this directory for valid values. On Mac OS X
3229
34
   - universal binaries may also be built by setting the "macosxfat"
3230
35
   - property in gluegen.properties; again see the example file in this
3231
36
   - directory.
3232
37
   -   
3233
38
   - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
3234
39
   - ANT build, including the GlueGen and StaticGLInfo tasks, the building of
3235
40
   - the Java generated sources, the first and second phase Java compiles, and
3236
41
   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
3237
42
   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
3238
43
   - the original OS detection code.
3239
44
   -
3240
45
   - Some environment defs affecting native compilation (only)
3241
46
       setup.noNativeDesktop     - drop native desktop bindings (glx, wgl, ..)
3242
47
3243
48
       setup.addNativeOpenMAX    - add experimental binding to Khrono's OpenMAX
3244
49
3245
50
       setup.addNativeNVidiaCG   - add experimental binding to NVidia's Cg language 
3246
51
                                   (enabled for windows, osx and X11 per default)
3247
52
3248
53
   - Internal settings, may not be necessary to set them manually,
3249
54
     since all JAR archives are orthogonal.
3250
55
       setup.noAWT
3251
56
3252
57
   - Skip gluegen: java.generate.skip
3253
58
   -->
3254
59
<project name="JOGL" basedir="." default="all">
3255
60
3256
61
    <import file="build-common.xml"/>
3257
62
3258
63
    <!-- needed for outofdate task -->
3259
64
    <taskdef resource="net/sf/antcontrib/antlib.xml">
3260
65
      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
3261
66
    </taskdef>
3262
67
3263
68
    <condition property="setup.addNativeNVidiaCG">
3264
69
        <or>
3265
70
            <isset property="${isWindows}" />
3266
71
            <isset property="${isOSX}" />
3267
72
            <isset property="${isX11}" />
3268
73
        </or>
3269
74
    </condition>
3270
75
3271
76
    <!-- ================================================================== -->
3272
77
    <!-- 
3273
78
       - Base initialization and detection of operating system.
3274
79
      -->
3275
80
    <target name="partitioning.setup" depends="common.init">
3276
81
        <property name="java.part.gluegen-gl" 
3277
82
                  value="com/jogamp/gluegen/opengl/** com/jogamp/gluegen/runtime/opengl/*"/>
3278
83
3279
84
        <property name="java.part.core" 
3280
85
                  value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/gluegen/runtime/opengl/* com/jogamp/opengl/* jogamp/opengl/* jogamp/opengl/glu/* jogamp/opengl/glu/error/*"/>
3281
86
        <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/>
3282
87
3283
88
        <property name="java.part.nv-cg"
3284
89
                  value="com/jogamp/opengl/cg com/jogamp/opengl/cg/* jogamp/opengl/cg/*"/>
3285
90
3286
91
        <property name="java.part.egl"
3287
92
                  value="jogamp/opengl/egl/*"/>
3288
93
3289
94
        <property name="java.part.glutess"
3290
95
                  value="jogamp/opengl/glu/tessellator/**"/>
3291
96
3292
97
        <property name="java.part.glumipmap"
3293
98
                  value="jogamp/opengl/glu/mipmap/**"/>
3294
99
3295
100
        <property name="java.part.glugldesktop"
3296
101
                  value="jogamp/opengl/glu/gl2/** jogamp/opengl/glu/nurbs/** jogamp/opengl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
3297
102
3298
103
        <property name="java.part.openmax"
3299
104
                  value="com/jogamp/openmax/** jogamp/openmax/**"/>
3300
105
3301
106
        <property name="java.part.sdk"
3302
107
                  value="com/jogamp/opengl/util/glsl/sdk/**"/>
3303
108
3304
109
        <property name="java.part.glx"
3305
110
                  value="jogamp/opengl/x11/glx/*"/>
3306
111
3307
112
        <property name="java.part.wgl"
3308
113
                  value="jogamp/opengl/windows/wgl/*"/>
3309
114
3310
115
        <property name="java.part.cgl"
3311
116
                  value="jogamp/opengl/macosx/cgl/*"/>
3312
117
3313
118
        <property name="java.part.gldesktop"
3314
119
                  value="jogamp/opengl/**/gl2/** jogamp/opengl/**/gl3/** jogamp/opengl/**/gl4/**"/>
3315
120
3316
121
        <property name="java.part.gldesktop.dbg"
3317
122
                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
3318
123
3319
124
        <property name="java.part.es1"
3320
125
                  value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/** jogamp/opengl/**/es1/**"/>
3321
126
3322
127
        <property name="java.part.es1.dbg"
3323
128
                  value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.* javax/media/opengl/TraceGL2ES1.* javax/media/opengl/DebugGL2ES1.*"/>
3324
129
3325
130
        <property name="java.part.es2"
3326
131
                  value="javax/media/opengl/**/es2/** com/jogamp/opengl/**/es2/** jogamp/opengl/**/es2/**"/>
3327
132
3328
133
        <property name="java.part.es2.dbg"
3329
134
                  value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.* javax/media/opengl/TraceGL2ES2.* javax/media/opengl/DebugGL2ES2.*"/>
3330
135
3331
136
        <property name="java.part.awt"
3332
137
                  value="javax/media/opengl/awt/** jogamp/opengl/**/awt/**"/>
3333
138
3334
139
        <property name="java.part.util"
3335
140
                  value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/** jogamp/opengl/util/*"/>
3336
141
3337
142
        <property name="java.part.util.awt"
3338
143
                  value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
3339
144
3340
145
        <property name="java.part.util.gldesktop"
3341
146
                  value="com/jogamp/opengl/util/**/gl2/**"/>
3342
147
3343
148
        <property name="java.part.util.glsl"
3344
149
                  value="com/jogamp/opengl/util/glsl/* com/jogamp/opengl/util/glsl/fixedfunc/* jogamp/opengl/util/glsl/*"/>
3345
150
3346
151
        <property name="java.part.util.graph"
3347
152
                  value="com/jogamp/graph/** jogamp/graph/**"/>
3348
153
3349
154
        <property name="java.part.util.graph.fonts"
3350
155
                  value="jogamp/graph/font/fonts/**"/>
3351
156
3352
157
        <property name="java.part.util.graph.shadercode"
3353
158
                  value="jogamp/graph/curve/opengl/shader/* jogamp/graph/curve/opengl/shader/bin/**"/>
3354
159
3355
160
        <property name="java.part.util.fixedfuncemu"
3356
161
                  value="jogamp/opengl/util/glsl/fixedfunc/**"/>
3357
162
3358
163
        <property name="java.part.util.fixedfuncemu.shadercode"
3359
164
                  value="jogamp/opengl/util/glsl/fixedfunc/shaders/* jogamp/opengl/util/glsl/fixedfunc/shaders/bin/**"/>
3360
165
3361
166
        <property name="java.part.nonjava" 
3362
167
                  value="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
3363
168
3364
169
        <property name="java.part.all-desktop" 
3365
170
                  value="${java.part.sdk} ${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.part.gldesktop} ${java.part.glugldesktop} ${java.part.util.gldesktop}"/>
3366
171
3367
172
        <!-- condition excludes -->
3368
173
3369
174
        <condition property="java.excludes.awt"
3370
175
                   value="${java.part.awt} ${java.part.util.awt}">
3371
176
           <isset property="setup.noAWT"/> 
3372
177
        </condition>
3373
178
3374
179
        <property name="java.excludes.javadoc.packagenames"
3375
180
                  value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
3376
181
3377
182
        <property name="java.excludes.fixme" 
3378
183
                  value="jogamp/opengl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
3379
184
3380
185
        <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt}" />
3381
186
        <echo message="java.excludes.all: ${java.excludes.all}" />
3382
187
    </target>
3383
188
3384
189
    <!-- ================================================================== -->
3385
190
    <!-- 
3386
191
       - Declare all paths and user defined variables.
3387
192
      -->
3388
193
    <target name="declare.common" description="Declare properties" depends="partitioning.setup">
3389
194
        <property name="config.jogl"              value="${config}/jogl" />
3390
195
3391
196
        <property name="rootrel.src.java"         value="src/jogl/classes" />
3392
197
        <property name="rootrel.src.c"            value="src/jogl/native" />
3393
198
        <property name="rootrel.src.c.openmax"    value="src/jogl/native/openmax" />
3394
199
3395
200
        <property name="rootrel.src.generated"    value="${rootrel.build}/jogl/gensrc" />
3396
201
        <property name="rootrel.generated.c.jogl" value="${rootrel.src.generated}/native/jogl" />
3397
202
        <property name="rootrel.generated.c.cg"   value="${rootrel.src.generated}/native/jogl_cg" />
3398
203
3399
204
        <!-- The source directories. -->
3400
205
        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
3401
206
        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
3402
207
        
3403
208
        <!-- The generated source directories. -->
3404
209
        <property name="src.generated" value="${build.jogl}/gensrc" />
3405
210
        <property name="src.generated.java" value="${src.generated}/classes" />
3406
211
        <property name="src.generated.java.cg" value="${src.generated.java}/com/jogamp/opengl/cg" />
3407
212
        <property name="src.generated.c" value="${src.generated}/native/jogl" />
3408
213
        <property name="src.generated.c.openmax" value="${src.generated}/native/openmax" />
3409
214
        <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" />
3410
215
        
3411
216
        <!-- The compiler output directories. -->
3412
217
        <property name="classes"                    value="${build.jogl}/classes" />
3413
218
        <property name="obj.joglsub"                value="${obj.jogl}/jogl" />
3414
219
        <property name="obj.cgsub"                  value="${obj.jogl}/cg" />
3415
220
3416
221
        <property name="javah.classpath" value="${gluegen-rt.jar}:${build.nativewindow}/classes:${classes}" />
3417
222
3418
223
        <!-- The GL headers from which Java files are generated -->
3419
224
        <property name="stub.includes.opengl"       value="${stub.includes}/opengl" />
3420
225
3421
226
        <dirset id="stub.includes.fileset.all.gldesktop" dir=".">
3422
227
            <include name="${stub.includes}/opengl/**" />
3423
228
            <include name="${stub.includes}/macosx/**" />
3424
229
            <include name="${stub.includes}/win32/**" />
3425
230
            <include name="${stub.includes}/x11/**" />
3426
231
            <include name="${stub.includes}/khr/**" />
3427
232
            <include name="${stub.includes}/jni/**" />
3428
233
        </dirset>
3429
234
3430
235
        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
3431
236
            <include name="opengl/**" />
3432
237
            <include name="macosx/**" />
3433
238
            <include name="win32/**" />
3434
239
            <include name="x11/**" />
3435
240
            <include name="common/**" />
3436
241
            <include name="jni/**" />
3437
242
        </fileset>
3438
243
        <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
3439
244
        <fileset id="stub.includes.dependencies.fileset.3" dir="${config.jogl}">
3440
245
            <include name="*.cfg" />
3441
246
            <include name="gl*.java" />
3442
247
            <include name="*.c" />
3443
248
            <exclude name="cg-common.cfg" />
3444
249
        </fileset>
3445
250
        <dirset id="stub.includes.cg.fileset.all" dir=".">
3446
251
            <include name="${stub.includes}/opengl/**" />
3447
252
            <include name="${stub.includes}/cg/**" />
3448
253
            <include name="${stub.includes}/macosx/**" />
3449
254
            <include name="${stub.includes}/win32/**" />
3450
255
            <include name="${stub.includes}/x11/**" />
3451
256
            <include name="${stub.includes}/khr/**" />
3452
257
            <include name="${stub.includes}/jni/**" />
3453
258
        </dirset>
3454
259
        <fileset id="stub.includes.cg.dependencies.fileset" dir=".">
3455
260
            <include name="${stub.includes}/cg/**" />
3456
261
            <include name="${config.jogl}/cg-common.cfg" />
3457
262
            <include name="${config.jogl}/cg-common-CustomJavaCode.java" />
3458
263
        </fileset>
3459
264
3460
265
        <!-- Create the classpath that includes GlueGen and
3461
266
           - the current classes for building the composable pipelines.
3462
267
           -->
3463
268
        <path id="pipeline.classpath">
3464
269
          <pathelement location="${gluegen.jar}" />
3465
270
          <pathelement location="${classes}" />
3466
271
        </path>
3467
272
3468
273
        <!-- The javadoc dirs. -->
3469
274
        <property name="javadoc" value="${project.root}/javadoc_jogl_public" />
3470
275
        <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" />
3471
276
        <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" />
3472
277
        <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" />
3473
278
        <property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
3474
279
        <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
3475
280
3476
281
        <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.jogamp.opengl.util.*" />
3477
282
3478
283
        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},jogamp.opengl.*,com.jogamp.gluegen,com.jogamp.gluegen.runtime" />
3479
284
    <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
3480
285
    </target>
3481
286
    
3482
287
    <target name="declare.gl.gles1">
3483
288
        <property name="gles1.headers" value="${stub.includes}/opengl/GLES/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
3484
289
    </target>
3485
290
3486
291
    <target name="declare.gl.gles2">
3487
292
        <property name="gles2.headers" value="${stub.includes}/opengl/GLES2/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
3488
293
    </target>
3489
294
3490
295
    <target name="declare.gl.gles" depends="declare.gl.gles1, declare.gl.gles2">
3491
296
        <!-- Prepare to build the EGL interface -->
3492
297
        <property name="window.es.cfg"                             value="${config.jogl}/egl.cfg" />
3493
298
        <property name="window.es.ext.cfg"                         value="${config.jogl}/eglext.cfg" />
3494
299
        <property name="window.es.system"                          value="egl"/>
3495
300
    </target>
3496
301
3497
302
    <target name="declare.gl.gl2">
3498
303
        <property name="gl2.headers" value="${stub.includes}/opengl/GL/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
3499
304
    </target>
3500
305
3501
306
    <!-- ================================================================== -->
3502
307
    <!-- 
3503
308
       - Initialize all parameters required for the build and create any
3504
309
       - required directories.
3505
310
      -->
3506
311
    <target name="init" depends="declare.common, declare.gl.gles, declare.gl.gl2">
3507
312
        <!-- Create the required output directories. -->
3508
313
        <mkdir dir="${src.generated.java}" />
3509
314
        <mkdir dir="${src.generated.c}" />
3510
315
        <mkdir dir="${src.generated.c}/MacOSX" />
3511
316
        <mkdir dir="${src.generated.c}/Windows" />
3512
317
        <mkdir dir="${src.generated.c}/X11" />
3513
318
        <mkdir dir="${src.generated.c.openmax}" />
3514
319
        <mkdir dir="${classes}" />
3515
320
        <mkdir dir="${obj.jogl}" />
3516
321
        <mkdir dir="${obj.joglsub}" />
3517
322
        <mkdir dir="${obj.cgsub}" />
3518
323
    </target>
3519
324
3520
325
    <!--
3521
326
       - Check to see whether we need to rebuild the generated sources.
3522
327
      -->
3523
328
    <target name="java.generate.check">
3524
329
        <!-- Blow away all target files if any dependencies are violated
3525
330
             (the uptodate task doesn't allow arbitrary source and target filesets but should) -->
3526
331
             <!--
3527
332
        <dependset>
3528
333
            <srcfileset refid="stub.includes.dependencies.fileset.1" />
3529
334
            <srcfileset refid="stub.includes.dependencies.fileset.2" />
3530
335
            <srcfileset refid="stub.includes.dependencies.fileset.3" />
3531
336
            <targetfileset dir="${src.generated}">
3532
337
                <include name="**/*.java" />
3533
338
                <include name="**/*.c" />
3534
339
            </targetfileset>
3535
340
        </dependset>
3536
341
        -->
3537
342
3538
343
        <!-- Now check for the presence of one well-known file -->
3539
344
        <uptodate property="java.generate.skip.es1"
3540
345
                  targetfile="${src.generated.java}/javax/media/opengl/GLES1.java">
3541
346
            <srcfiles refid="stub.includes.dependencies.fileset.1" />
3542
347
            <srcfiles refid="stub.includes.dependencies.fileset.2" />
3543
348
            <srcfiles refid="stub.includes.dependencies.fileset.3" />
3544
349
        </uptodate>
3545
350
        <uptodate property="java.generate.skip.es2"
3546
351
                  targetfile="${src.generated.java}/javax/media/opengl/GLES2.java">
3547
352
            <srcfiles refid="stub.includes.dependencies.fileset.1" />
3548
353
            <srcfiles refid="stub.includes.dependencies.fileset.2" />
3549
354
            <srcfiles refid="stub.includes.dependencies.fileset.3" />
3550
355
        </uptodate>
3551
356
        <uptodate property="java.generate.skip.gl2"
3552
357
                  targetfile="${src.generated.java}/javax/media/opengl/GL2.java">
3553
358
            <srcfiles refid="stub.includes.dependencies.fileset.1" />
3554
359
            <srcfiles refid="stub.includes.dependencies.fileset.2" />
3555
360
            <srcfiles refid="stub.includes.dependencies.fileset.3" />
3556
361
        </uptodate>
3557
362
        <uptodate property="java.generate.skip.glu"
3558
363
                  targetfile="${src.generated.java}/javax/media/opengl/glu/GLU.java">
3559
364
            <srcfiles refid="stub.includes.dependencies.fileset.1" />
3560
365
            <srcfiles refid="stub.includes.dependencies.fileset.2" />
3561
366
            <srcfiles refid="stub.includes.dependencies.fileset.3" />
3562
367
        </uptodate>
3563
368
3564
369
        <condition property="java.generate.skip">
3565
370
          <and>
3566
371
              <isset property="java.generate.skip.es1"/>
3567
372
              <isset property="java.generate.skip.es2"/>
3568
373
              <isset property="java.generate.skip.gl2"/>
3569
374
              <isset property="java.generate.skip.glu"/>
3570
375
          </and>
3571
376
        </condition>
3572
377
3573
378
        <!--property name="java.generate.skip" value="true"/-->
3574
379
    </target>
3575
380
3576
381
    <target name="java.generate.cleantemp">
3577
382
        <delete includeEmptyDirs="true" quiet="true">
3578
383
            <fileset dir="${tempdir}/gensrc" />
3579
384
        </delete>
3580
385
    </target>
3581
386
3582
387
    <target name="java.generate.copy2temp">
3583
388
        <copy todir="${tempdir}">
3584
389
            <fileset dir="${build.jogl}"
3585
390
                     includes="gensrc/classes/**" />
3586
391
        </copy>
3587
392
    </target>
3588
393
3589
394
    <target name="java.generate.gl_if">
3590
395
        <echo message="Generating GL interface" />
3591
396
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3592
397
        <gluegen src="${stub.includes.opengl}/gles2.c"
3593
398
                 outputRootDir="${build.jogl}"
3594
399
                 config="${config.jogl}/gl-if-gl.cfg"
3595
400
                 includeRefid="stub.includes.fileset.all.gldesktop" 
3596
401
                 literalInclude="${stub.includes.gluegen.gg}"
3597
402
                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
3598
403
                 debug="false">
3599
404
            <classpath refid="gluegen-gl.classpath" />
3600
405
        </gluegen>
3601
406
    </target>
3602
407
3603
408
    <target name="java.generate.gl2_es1_if">
3604
409
        <echo message="Generating GL2_ES1 interface" />
3605
410
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3606
411
        <gluegen src="${stub.includes.opengl}/gles1.c"
3607
412
                 outputRootDir="${build.jogl}"
3608
413
                 config="${config.jogl}/gl-if-gl2_es1.cfg" 
3609
414
                 includeRefid="stub.includes.fileset.all.gldesktop"
3610
415
                 literalInclude="${stub.includes.gluegen.gg}"
3611
416
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3612
417
            <classpath refid="gluegen-gl.classpath" />
3613
418
        </gluegen>
3614
419
    </target>
3615
420
3616
421
    <target name="java.generate.gl2_es2_if">
3617
422
        <echo message="Generating GL2_ES2 interface" />
3618
423
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3619
424
        <gluegen src="${stub.includes.opengl}/gles2.c"
3620
425
                 outputRootDir="${build.jogl}"
3621
426
                 config="${config.jogl}/gl-if-gl2_es2.cfg" 
3622
427
                 includeRefid="stub.includes.fileset.all.gldesktop"
3623
428
                 literalInclude="${stub.includes.gluegen.gg}"
3624
429
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3625
430
            <classpath refid="gluegen-gl.classpath" />
3626
431
        </gluegen>
3627
432
    </target>
3628
433
3629
434
    <target name="java.generate.gl2_gl3_if">
3630
435
        <echo message="Generating GL2_GL3 interface" />
3631
436
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3632
437
        <gluegen src="${stub.includes.opengl}/gl3.c" 
3633
438
                 outputRootDir="${build.jogl}"
3634
439
                 config="${config.jogl}/gl-if-gl3-subset.cfg"
3635
440
                 includeRefid="stub.includes.fileset.all.gldesktop"
3636
441
                 literalInclude="${stub.includes.gluegen.gg}"
3637
442
                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
3638
443
                 debug="false">
3639
444
            <classpath refid="gluegen-gl.classpath" />
3640
445
        </gluegen>
3641
446
        <gluegen src="${stub.includes.opengl}/gl2.c" 
3642
447
                 outputRootDir="${build.jogl}"
3643
448
                 config="${config.jogl}/gl-if-gl2_gl3.cfg"
3644
449
                 includeRefid="stub.includes.fileset.all.gldesktop"
3645
450
                 literalInclude="${stub.includes.gluegen.gg}"
3646
451
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3647
452
            <classpath refid="gluegen-gl.classpath" />
3648
453
        </gluegen>
3649
454
    </target>
3650
455
3651
456
    <target name="java.generate.gl2">
3652
457
        <echo message="Generating GL2 interface and implementation" />
3653
458
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3654
459
        <gluegen src="${stub.includes.opengl}/gl2.c" 
3655
460
                 outputRootDir="${build.jogl}"
3656
461
                 config="${config.jogl}/gl-if-gl2.cfg"
3657
462
                 includeRefid="stub.includes.fileset.all.gldesktop"
3658
463
                 literalInclude="${stub.includes.gluegen.gg}"
3659
464
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3660
465
            <classpath refid="gluegen-gl.classpath" />
3661
466
        </gluegen>
3662
467
    </target>
3663
468
3664
469
    <target name="java.generate.gl3">
3665
470
        <echo message="Generating GL3 interface and implementation" />
3666
471
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3667
472
        <gluegen src="${stub.includes.opengl}/gl3.c" 
3668
473
                 outputRootDir="${build.jogl}"
3669
474
                 config="${config.jogl}/gl-if-gl3.cfg"
3670
475
                 includeRefid="stub.includes.fileset.all.gldesktop"
3671
476
                 literalInclude="${stub.includes.gluegen.gg}"
3672
477
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3673
478
            <classpath refid="gluegen-gl.classpath" />
3674
479
        </gluegen>
3675
480
    </target>
3676
481
3677
482
    <target name="java.generate.gl3bc">
3678
483
        <echo message="Generating GL3bc implementation" />
3679
484
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3680
485
        <gluegen src="${stub.includes.opengl}/gl3bc.c" 
3681
486
                 outputRootDir="${build.jogl}"
3682
487
                 config="${config.jogl}/gl-if-gl3bc.cfg"
3683
488
                 includeRefid="stub.includes.fileset.all.gldesktop"
3684
489
                 literalInclude="${stub.includes.gluegen.gg}"
3685
490
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3686
491
            <classpath refid="gluegen-gl.classpath" />
3687
492
        </gluegen>
3688
493
    </target>
3689
494
3690
495
    <target name="java.generate.gl4">
3691
496
        <echo message="Generating GL4 interface and implementation" />
3692
497
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3693
498
        <gluegen src="${stub.includes.opengl}/gl4.c" 
3694
499
                 outputRootDir="${build.jogl}"
3695
500
                 config="${config.jogl}/gl-if-gl4.cfg"
3696
501
                 includeRefid="stub.includes.fileset.all.gldesktop"
3697
502
                 literalInclude="${stub.includes.gluegen.gg}"
3698
503
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3699
504
            <classpath refid="gluegen-gl.classpath" />
3700
505
        </gluegen>
3701
506
    </target>
3702
507
3703
508
    <target name="java.generate.gl4bc">
3704
509
        <echo message="Generating GL4bc implementation" />
3705
510
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3706
511
        <gluegen src="${stub.includes.opengl}/gl4bc.c" 
3707
512
                 outputRootDir="${build.jogl}"
3708
513
                 config="${config.jogl}/gl-gl4bc.cfg"
3709
514
                 includeRefid="stub.includes.fileset.all.gldesktop"
3710
515
                 literalInclude="${stub.includes.gluegen.gg}"
3711
516
                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
3712
517
                 debug="false">
3713
518
            <classpath refid="gluegen-gl.classpath" />
3714
519
        </gluegen>
3715
520
    </target>
3716
521
3717
522
    <target name="java.generate.gles1">
3718
523
        <echo message="Generating GLES1 interface and implementation" />
3719
524
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3720
525
        <gluegen src="${stub.includes.opengl}/gles1.c" 
3721
526
                 outputRootDir="${build.jogl}"
3722
527
                 config="${config.jogl}/gl-es1.cfg"
3723
528
                 includeRefid="stub.includes.fileset.all.gldesktop"
3724
529
                 literalInclude="${stub.includes.gluegen.gg}"
3725
530
                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
3726
531
                 debug="false">
3727
532
            <classpath refid="gluegen-gl.classpath" />
3728
533
        </gluegen>
3729
534
    </target>
3730
535
3731
536
    <target name="java.generate.gles2">
3732
537
        <echo message="Generating GLES2 interface and implementation" />
3733
538
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3734
539
        <gluegen src="${stub.includes.opengl}/gles2.c" 
3735
540
                 outputRootDir="${build.jogl}"
3736
541
                 config="${config.jogl}/gl-es2.cfg"
3737
542
                 includeRefid="stub.includes.fileset.all.gldesktop"
3738
543
                 literalInclude="${stub.includes.gluegen.gg}"
3739
544
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3740
545
            <classpath refid="gluegen-gl.classpath" />
3741
546
        </gluegen>
3742
547
    </target>
3743
548
3744
549
    <target name="java.generate.gl.all" depends="java.generate.gl_if, java.generate.gl2_es1_if, java.generate.gl2_es2_if, java.generate.gl2_gl3_if, java.generate.gl2, java.generate.gl3, java.generate.gl3bc, java.generate.gl4, java.generate.gl4bc, java.generate.gles1, java.generate.gles2"/>
3745
550
3746
551
    <!-- target name="java.generate.gl.nsig" if="gluegen.nsig">
3747
552
        <echo message="Generating GL interface and implementation" />
3748
553
        <gluegen src="${gl.c}" 
3749
554
                 config="${gl.cfg.nsig}"
3750
555
                 includeRefid="stub.includes.fileset.all.gldesktop"
3751
556
                 literalInclude="${stub.includes.gluegen.gg}"
3752
557
                 emitter="com.jogamp.gluegen.nativesig.NativeSignatureEmitter">
3753
558
            <classpath refid="gluegen-gl.classpath" />
3754
559
        </gluegen>
3755
560
    </target> -->
3756
561
3757
562
    <target name="java.generate.glu.base">
3758
563
        <echo message="Generating GLU class" />
3759
564
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3760
565
        <gluegen src="${stub.includes.opengl}/glu.c" 
3761
566
                 outputRootDir="${build.jogl}"
3762
567
                 config="${config.jogl}/glu-base.cfg"
3763
568
                 includeRefid="stub.includes.fileset.all.gldesktop"
3764
569
                 literalInclude="${stub.includes.gluegen.gg}"
3765
570
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3766
571
            <classpath refid="gluegen-gl.classpath" />
3767
572
        </gluegen>
3768
573
    </target>
3769
574
3770
575
    <target name="java.generate.glu.GL2ES1">
3771
576
        <echo message="Generating GLU class" />
3772
577
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3773
578
        <gluegen src="${stub.includes.opengl}/glu.c" 
3774
579
                 outputRootDir="${build.jogl}"
3775
580
                 config="${config.jogl}/glu-gl2es1.cfg"
3776
581
                 includeRefid="stub.includes.fileset.all.gldesktop"
3777
582
                 literalInclude="${stub.includes.gluegen.gg}"
3778
583
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3779
584
            <classpath refid="gluegen-gl.classpath" />
3780
585
        </gluegen>
3781
586
    </target>
3782
587
3783
588
    <target name="java.generate.glu.GL2">
3784
589
        <echo message="Generating GLU class" />
3785
590
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3786
591
        <gluegen src="${stub.includes.opengl}/glu.c" 
3787
592
                 outputRootDir="${build.jogl}"
3788
593
                 config="${config.jogl}/glu-gl2.cfg"
3789
594
                 includeRefid="stub.includes.fileset.all.gldesktop"
3790
595
                 literalInclude="${stub.includes.gluegen.gg}"
3791
596
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3792
597
            <classpath refid="gluegen-gl.classpath" />
3793
598
        </gluegen>
3794
599
    </target>
3795
600
3796
601
    <target name="java.generate.platform.glext">
3797
602
        <echo message="Generating platform-specific OpenGL extension class: ${window.os.system}" />
3798
603
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3799
604
        <gluegen src="${glext.platform.header}" 
3800
605
                 outputRootDir="${build.jogl}"
3801
606
                 config="${glext.platform.cfg}"
3802
607
                 includeRefid="stub.includes.fileset.all.gldesktop"
3803
608
                 literalInclude="${stub.includes.gluegen.gg}"
3804
609
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3805
610
            <classpath refid="gluegen-gl.classpath" />
3806
611
        </gluegen>
3807
612
    </target>
3808
613
3809
614
    <target name="java.generate.window.system.es" if="window.es.cfg">
3810
615
        <echo message="Generating EGL implementation class" />
3811
616
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3812
617
        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" />
3813
618
        <gluegen src="${stub.includes}/${window.es.system}/window-system1.c"
3814
619
                 outputRootDir="${build.jogl}"
3815
620
                 config="${window.es.cfg}"
3816
621
                 includeRefid="stub.includes.fileset.platform"
3817
622
                 literalInclude="${stub.includes.gluegen.gg}"
3818
623
                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
3819
624
                 debug="false">
3820
625
            <classpath refid="gluegen-gl.classpath" />
3821
626
        </gluegen>
3822
627
    </target>
3823
628
3824
629
    <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg">
3825
630
        <echo message="Generating EGLExt implementation class" />
3826
631
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3827
632
        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/**" />
3828
633
        <gluegen src="${stub.includes}/${window.es.system}/window-system-ext.c"
3829
634
                 outputRootDir="${build.jogl}"
3830
635
                 config="${window.es.ext.cfg}"
3831
636
                 includeRefid="stub.includes.fileset.platform"
3832
637
                 literalInclude="${stub.includes.gluegen.gg}"
3833
638
                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
3834
639
                 debug="false">
3835
640
            <classpath refid="gluegen-gl.classpath" />
3836
641
        </gluegen>
3837
642
    </target>
3838
643
3839
644
    <target name="java.generate.window.system.os0" if="window.os0.cfg">
3840
645
        <echo message="Generating window system glue impl: ${window.os.system}" />
3841
646
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3842
647
        <gluegen src="${stub.includes}/${window.os.system}/window-system0.c"
3843
648
                 outputRootDir="${build.jogl}"
3844
649
                 config="${window.os0.cfg}"
3845
650
                 includeRefid="stub.includes.fileset.platform"
3846
651
                 literalInclude="${stub.includes.gluegen.gg}"
3847
652
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3848
653
            <classpath refid="gluegen-gl.classpath" />
3849
654
        </gluegen>
3850
655
    </target>
3851
656
3852
657
    <target name="java.generate.window.system.os1" if="window.os1.cfg">
3853
658
        <echo message="Generating window system glue impl: ${window.os.system}" />
3854
659
        <antcall target="java.generate.copy2temp" inheritRefs="true" />
3855
660
        <gluegen src="${stub.includes}/${window.os.system}/window-system1.c"
3856
661
                 outputRootDir="${build.jogl}"
3857
662
                 config="${window.os1.cfg}"
3858
663
                 includeRefid="stub.includes.fileset.platform"
3859
664
                 literalInclude="${stub.includes.gluegen.gg}"
3860
665
                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
3861
666
            <classpath refid="gluegen-gl.classpath" />
3862
667
        </gluegen>
3863
668
    </target>
3864
669
3865
670
    <target name="java.generate.gl.platforms" >
3866
671
        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/${window.es.system}/** ${stub.includes}/gluegen/** ${stub.includes}/khr/** ${stub.includes}/opengl/**" />
3867
672
3868
673
        <antcall target="java.generate.window.system.os0" inheritRefs="true" />
3869
674
        <antcall target="java.generate.window.system.os1" inheritRefs="true" />
3870
675
        <antcall target="java.generate.platform.glext" inheritRefs="true" />
3871
676
    </target>
3872
677
3873
678
    <!--
3874
679
       - Setup the generating ANT tasks and use it to generate the Java files 
3875
680
       - from the C GL headers.  This involves setting the taskdef and creating
3876
681
       - the classpath reference id then running the task on each header.
3877
682
      -->
3878
683
    <target name="build.gluegen-gl.jar" depends="init, common.gluegen.build, setup-manifestfile">
3879
684
        <javac destdir="${classes}"
3880
685
               includes="${java.part.gluegen-gl}"
3881
686
               fork="yes"
3882
687
               memoryMaximumSize="${javac.memorymax}"
3883
688
               includeAntRuntime="true"
3884
689
               source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
3885
690
            <classpath refid="gluegen-gl.classpath"/>
3886
691
            <src path="${src.java}" />
3887
692
        </javac>
3888
693
3889
694
        <jar manifest="${build.jogl}/manifest.mf" destfile="${gluegen-gl.jar}" filesonly="true">
3890
695
            <fileset dir="${classes}"
3891
696
                     includes="${java.part.gluegen-gl}"/>
3892
697
        </jar>
3893
698
    </target>
3894
699
3895
700
    <target name="java.generate" depends="build.gluegen-gl.jar, java.generate.check" unless="java.generate.skip">
3896
701
3897
702
        <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
3898
703
        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
3899
704
                 classpathref="gluegen.classpath" />
3900
705
        <taskdef name="staticglgen" classname="com.jogamp.gluegen.opengl.ant.StaticGLGenTask"
3901
706
                 classpathref="gluegen-gl.classpath" />
3902
707
                 
3903
708
        <!-- Use the GlueGen and BuildStaticGLInfo tasks to generate the Java files -->
3904
709
3905
710
        <!-- Just to have a fast test of single interfaces .. 
3906
711
            <antcall target="java.generate.gl_if"      inheritRefs="true" />
3907
712
            <antcall target="java.generate.gl2_es1_if" inheritRefs="true" />
3908
713
            <antcall target="java.generate.gl2_es2_if" inheritRefs="true" />
3909
714
            <antcall target="java.generate.gl2_gl3_if" inheritRefs="true" />
3910
715
            <antcall target="java.generate.gles1" inheritRefs="true"/>
3911
716
            <antcall target="java.generate.window.system.es" inheritRefs="true" />
3912
717
            <antcall target="java.generate.window.system.es.ext" inheritRefs="true" />
3913
718
            <antcall target="java.generate.gl4bc" inheritRefs="true"/>
3914
719
            <fail/>  -->
3915
720
3916
721
        <echo message="Generating GL interface and implementation" />
3917
722
        <antcall target="java.generate.gl.all"      inheritRefs="true" />
3918
723
        <!--antcall target="java.generate.gl.nsig" inheritRefs="true" /-->
3919
724
3920
725
        <antcall target="java.generate.window.system.es"     inheritRefs="true" />
3921
726
        <antcall target="java.generate.window.system.es.ext" inheritRefs="true" />
3922
727
3923
728
        <antcall target="java.generate.gl.platforms" inheritRefs="true">
3924
729
            <param name="window.os.system"                       value="x11"/>
3925
730
            <param name="window.os1.cfg"                         value="${config.jogl}/glx-x11.cfg" />
3926
731
            <param name="glext.platform.cfg"                     value="${config.jogl}/glxext.cfg" />
3927
732
            <param name="glext.platform.header"                  value="${stub.includes}/x11/glxext.c" />
3928
733
        </antcall>
3929
734
3930
735
        <antcall target="java.generate.gl.platforms" inheritRefs="true">
3931
736
            <param name="window.os.system"                       value="win32"/>
3932
737
            <param name="window.os1.cfg"                         value="${config.jogl}/wgl-win32.cfg" />
3933
738
            <param name="glext.platform.cfg"                     value="${config.jogl}/wglext.cfg" />
3934
739
            <param name="glext.platform.header"                  value="${stub.includes}/win32/wglext.c" />
3935
740
        </antcall>          
3936
741
3937
742
        <antcall target="java.generate.gl.platforms" inheritRefs="true">
3938
743
          <param name="window.os.system"                     value="macosx"/>
3939
744
          <param name="window.os1.cfg"                       value="${config.jogl}/cgl-macosx.cfg" />
3940
745
          <param name="glext.platform.cfg"                   value="${config.jogl}/cglext.cfg" />
3941
746
          <param name="glext.platform.header"                value="${stub.includes}/macosx/cglext.c" />
3942
747
        </antcall>
3943
748
    
3944
749
        <!-- Generate GLU class -->
3945
750
        <antcall target="java.generate.glu.base"   inheritrefs="true" />
3946
751
        <antcall target="java.generate.glu.GL2ES1" inheritrefs="true" />
3947
752
        <antcall target="java.generate.glu.GL2"    inheritrefs="true" />
3948
753
3949
754
        <!-- Inform the user that the generators have successfully created 
3950
755
           - the necessary Java files -->
3951
756
        <echo message="" />
3952
757
        <echo message="GlueGen and BuildStaticGLInfo have successfully generated files." />
3953
758
    
3954
759
    </target>      
3955
760
3956
761
    <target name="java.generate.cg.check">
3957
762
        <!-- Blow away all target files if any dependencies are violated
3958
763
             (the uptodate task doesn't allow arbitrary source and target filesets but should) -->
3959
764
        <dependset>
3960
765
            <srcfileset refid="stub.includes.cg.dependencies.fileset" />
3961
766
            <targetfileset dir=".">
3962
767
                <include name="${src.generated.java.cg}/**/*.java" />
3963
768
                <include name="${src.generated.c.cg}/**/*.c" />
3964
769
            </targetfileset>
3965
770
        </dependset>
3966
771
3967
772
        <!-- Now check for the presence of one well-known file -->
3968
773
        <uptodate property="java.generate.cg.skip">
3969
774
            <srcfiles refid="stub.includes.cg.dependencies.fileset" />
3970
775
            <mapper type="merge" to="${src.generated.java}/com/jogamp/opengl/cg/CgGL.java" />
3971
776
        </uptodate>
3972
777
    </target>
3973
778
3974
779
    <!--
3975
780
       - Setup the generating ANT tasks and use it to generate the Java files 
3976
781
       - from the C GL headers.  This involves setting the taskdef and creating
3977
782
       - the classpath reference id then running the task on each header.
3978
783
      -->
3979
784
    <target name="java.generate.cg" depends="build.gluegen-gl.jar,java.generate.cg.check" unless="java.generate.cg.skip">
3980
785
        <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
3981
786
        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
3982
787
                 classpathref="gluegen.classpath" />
3983
788
        <taskdef name="staticglgen" classname="com.jogamp.gluegen.opengl.ant.StaticGLGenTask"
3984
789
                 classpathref="gluegen-gl.classpath" />
3985
790
3986
791
        <!-- Generate CgGL interface class -->
3987
792
        <gluegen src="${stub.includes.opengl}/cg.c" 
3988
793
                 outputRootDir="${build.jogl}"
3989
794
                 config="${config.jogl}/cg-common.cfg"
3990
795
                 includeRefid="stub.includes.cg.fileset.all"
3991
796
                 literalInclude="${stub.includes.gluegen.gg}"
3992
797
                 emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
3993
798
            <classpath refid="gluegen-gl.classpath" />
3994
799
        </gluegen>
3995
800
    </target>
3996
801
3997
802
    <!-- ================================================================== -->
3998
803
    <!-- 
3999
804
       - Build and dependency rules for the composable pipeline
4000
805
      -->
4001
806
    <target name="java.generate.composable.pipeline.check.es1">
4002
807
        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
4003
808
             (the uptodate element doesn't support arbitrary source and destination files) -->
4004
809
        <dependset>
4005
810
            <srcfilelist dir="${classes}/javax/media/opengl" files="GLES1.class" />
4006
811
            <targetfileset dir="${src.generated.java}/javax/media/opengl"
4007
812
                           includes="DebugGLES1.java,TraceGLES1.java" />
4008
813
        </dependset>
4009
814
                           
4010
815
        <!-- Now choose one of the two to test to see if we have to regenerate -->
4011
816
        <uptodate property="java.generate.composable.pipeline.skip.es1"
4012
817
                  srcfile="${classes}/javax/media/opengl/GLES1.class"
4013
818
                  targetfile="${src.generated.java}/javax/media/opengl/DebugGLES1.java" />
4014
819
4015
820
    </target>        
4016
821
4017
822
    <target name="java.generate.composable.pipeline.check.es2">
4018
823
        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
4019
824
             (the uptodate element doesn't support arbitrary source and destination files) -->
4020
825
        <dependset>
4021
826
            <srcfilelist dir="${classes}/javax/media/opengl" files="GLES2.class" />
4022
827
            <targetfileset dir="${src.generated.java}/javax/media/opengl"
4023
828
                           includes="DebugGLES2.java,TraceGLES2.java" />
4024
829
        </dependset>
4025
830
                           
4026
831
        <!-- Now choose one of the two to test to see if we have to regenerate -->
4027
832
        <uptodate property="java.generate.composable.pipeline.skip.es2"
4028
833
                  srcfile="${classes}/javax/media/opengl/GLES2.class"
4029
834
                  targetfile="${src.generated.java}/javax/media/opengl/DebugGLES2.java" />
4030
835
4031
836
    </target>        
4032
837
4033
838
    <target name="java.generate.composable.pipeline.check.gl2">
4034
839
        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
4035
840
             (the uptodate element doesn't support arbitrary source and destination files) -->
4036
841
        <dependset>
4037
842
            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2.class" />
4038
843
            <targetfileset dir="${src.generated.java}/javax/media/opengl"
4039
844
                           includes="DebugGL2.java,TraceGL2.java" />
4040
845
        </dependset>
4041
846
4042
847
        <!-- Now choose one of the two to test to see if we have to regenerate -->
4043
848
        <uptodate property="java.generate.composable.pipeline.skip.gl2"
4044
849
                  srcfile="${classes}/javax/media/opengl/GL2.class"
4045
850
                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL2.java" />
4046
851
    </target>        
4047
852
4048
853
    <target name="java.generate.composable.pipeline.check.gl3">
4049
854
        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
4050
855
             (the uptodate element doesn't support arbitrary source and destination files) -->
4051
856
        <dependset>
4052
857
            <srcfilelist dir="${classes}/javax/media/opengl" files="GL3.class" />
4053
858
            <targetfileset dir="${src.generated.java}/javax/media/opengl"
4054
859
                           includes="DebugGL3.java,TraceGL3.java,DebugGL3bc.java,TraceGL3bc.java" />
4055
860
        </dependset>
4056
861
                           
4057
862
        <!-- Now choose one of the two to test to see if we have to regenerate -->
4058
863
        <uptodate property="java.generate.composable.pipeline.skip.gl3"
4059
864
                  srcfile="${classes}/javax/media/opengl/GL3.class"
4060
865
                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL3.java" />
4061
866
    </target>        
4062
867
4063
868
    <target name="java.generate.composable.pipeline.check.gl4">
4064
869
        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
4065
870
             (the uptodate element doesn't support arbitrary source and destination files) -->
4066
871
        <dependset>
4067
872
            <srcfilelist dir="${classes}/javax/media/opengl" files="GL4.class" />
4068
873
            <targetfileset dir="${src.generated.java}/javax/media/opengl"
4069
874
                           includes="DebugGL4.java,TraceGL4.java,DebugGL4bc.java,TraceGL4bc.java" />
4070
875
        </dependset>
4071
876
                           
4072
877
        <!-- Now choose one of the two to test to see if we have to regenerate -->
4073
878
        <uptodate property="java.generate.composable.pipeline.skip.gl4"
4074
879
                  srcfile="${classes}/javax/media/opengl/GL4.class"
4075
880
                  targetfile="${src.generated.java}/javax/media/opengl/DebugGL4.java" />
4076
881
    </target>        
4077
882
4078
883
    <target name="java.generate.composable.pipeline.es1" depends="java.generate.composable.pipeline.check.es1" unless="java.generate.composable.pipeline.skip.es1">
4079
884
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4080
885
            <arg value="javax.media.opengl.GLES1" />
4081
886
            <arg value="${src.generated.java}/javax/media/opengl" />
4082
887
            <classpath refid="pipeline.classpath" />
4083
888
        </java>
4084
889
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4085
890
            <arg value="javax.media.opengl.GL2ES1" />
4086
891
            <arg value="${src.generated.java}/javax/media/opengl" />
4087
892
            <classpath refid="pipeline.classpath" />
4088
893
        </java>
4089
894
    </target>          
4090
895
4091
896
    <target name="java.generate.composable.pipeline.es2" depends="java.generate.composable.pipeline.check.es2" unless="java.generate.composable.pipeline.skip.es2">
4092
897
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4093
898
            <arg value="javax.media.opengl.GLES2" />
4094
899
            <arg value="${src.generated.java}/javax/media/opengl" />
4095
900
            <classpath refid="pipeline.classpath" />
4096
901
        </java>
4097
902
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4098
903
            <arg value="javax.media.opengl.GL2ES2" />
4099
904
            <arg value="${src.generated.java}/javax/media/opengl" />
4100
905
            <classpath refid="pipeline.classpath" />
4101
906
        </java>
4102
907
    </target>          
4103
908
4104
909
    <target name="java.generate.composable.pipeline.gl2" depends="java.generate.composable.pipeline.check.gl2" unless="java.generate.composable.pipeline.skip.gl2">
4105
910
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4106
911
            <arg value="javax.media.opengl.GL2" />
4107
912
            <arg value="${src.generated.java}/javax/media/opengl" />
4108
913
            <classpath refid="pipeline.classpath" />
4109
914
        </java>
4110
915
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4111
916
            <arg value="javax.media.opengl.GL2GL3" />
4112
917
            <arg value="${src.generated.java}/javax/media/opengl" />
4113
918
            <classpath refid="pipeline.classpath" />
4114
919
        </java>
4115
920
    </target>          
4116
921
4117
922
    <target name="java.generate.composable.pipeline.gl3" depends="java.generate.composable.pipeline.check.gl3" unless="java.generate.composable.pipeline.skip.gl3">
4118
923
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4119
924
            <arg value="javax.media.opengl.GL3" />
4120
925
            <arg value="${src.generated.java}/javax/media/opengl" />
4121
926
            <classpath refid="pipeline.classpath" />
4122
927
        </java>
4123
928
4124
929
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4125
930
            <arg value="javax.media.opengl.GL3bc" />
4126
931
            <arg value="${src.generated.java}/javax/media/opengl" />
4127
932
            <classpath refid="pipeline.classpath" />
4128
933
        </java>
4129
934
    </target>          
4130
935
4131
936
    <target name="java.generate.composable.pipeline.gl4" depends="java.generate.composable.pipeline.check.gl4" unless="java.generate.composable.pipeline.skip.gl4">
4132
937
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4133
938
            <arg value="javax.media.opengl.GL4" />
4134
939
            <arg value="${src.generated.java}/javax/media/opengl" />
4135
940
            <classpath refid="pipeline.classpath" />
4136
941
        </java>
4137
942
4138
943
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4139
944
            <arg value="javax.media.opengl.GL4bc" />
4140
945
            <arg value="${src.generated.java}/javax/media/opengl" />
4141
946
            <classpath refid="pipeline.classpath" />
4142
947
        </java>
4143
948
    </target>          
4144
949
4145
950
    <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2, java.generate.composable.pipeline.gl3, java.generate.composable.pipeline.gl4">
4146
951
    </target>
4147
952
4148
953
    <target name="java.generate.composable.pipeline.custom.check.glfixfunc">
4149
954
        <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
4150
955
             (the uptodate element doesn't support arbitrary source and destination files) -->
4151
956
        <dependset>
4152
957
            <srcfilelist dir="${classes}/jogamp/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" />
4153
958
            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES1.class" />
4154
959
            <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES2.class" />
4155
960
            <targetfileset dir="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc"
4156
961
                           includes="FixedFuncImpl.java" />
4157
962
        </dependset>
4158
963
                           
4159
964
        <!-- Now choose one of the two to test to see if we have to regenerate -->
4160
965
        <uptodate property="java.generate.composable.pipeline.custom.skip.glfixfunc"
4161
966
                  srcfile="${classes}/javax/media/opengl/GL2ES1.class"
4162
967
                  targetfile="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc/FixedFuncImpl.java" />
4163
968
    </target>        
4164
969
    <target name="java.generate.composable.pipeline.custom.glfixfunc" depends="java.generate.composable.pipeline.custom.check.glfixfunc" unless="java.generate.composable.pipeline.custom.skip.glfixfunc">
4165
970
        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
4166
971
            <arg value="javax.media.opengl.GL2ES1" />
4167
972
            <arg value="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc" />
4168
973
            <arg value="jogamp.opengl.util.glsl.fixedfunc.FixedFuncImpl" />
4169
974
            <arg value="jogamp.opengl.util.glsl.fixedfunc.FixedFuncHook" />
4170
975
            <arg value="javax.media.opengl.GL2ES2" />
4171
976
            <arg value="prolog_xor_downstream" />
4172
977
            <classpath refid="pipeline.classpath" />
4173
978
        </java>
4174
979
    </target>          
4175
980
    <target name="java.generate.composable.pipeline.custom" depends="init, common.gluegen.build, java.generate.composable.pipeline.custom.glfixfunc">
4176
981
    </target>
4177
982
4178
983
    <!-- ================================================================== -->
4179
984
    <!-- 
4180
985
       - Compile the original and generated source.  The composable pipelines
4181
986
       - will be generated.
4182
987
      -->
4183
988
    <target name="java.compile.firstpass" depends="java.generate,java.generate.cg">
4184
989
        <antcall target="java.generate.cleantemp" inheritRefs="true" />
4185
990
4186
991
        <!-- Perform the first pass Java compile. -->
4187
992
        <javac destdir="${classes}"
4188
993
               includes="javax/media/opengl/fixedfunc/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GLES1.java javax/media/opengl/GLES2.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java javax/media/opengl/GL4.java javax/media/opengl/GL4bc.java"
4189
994
               fork="yes"
4190
995
               memoryMaximumSize="${javac.memorymax}"
4191
996
               includeAntRuntime="false"
4192
997
               source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
4193
998
            <classpath refid="nativewindow_gluegen.classpath"/>
4194
999
            <src path="${src.java}" />
4195
1000
            <src path="${src.generated.java}" />
4196
1001
        </javac>
4197
1002
    </target>
4198
1003
4199
1004
    <target name="java.compile.secondpass.javase">
4200
1005
        <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
4201
1006
        <javac destdir="${classes}"
4202
1007
               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
4203
1008
               source="${target.sourcelevel}"
4204
1009
               fork="yes"
4205
1010
               memoryMaximumSize="${javac.memorymax}"
4206
1011
               includeAntRuntime="false"
4207
1012
               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
4208
1013
            <classpath refid="nativewindow_gluegen.classpath"/>
4209
1014
            <src path="${src.java}" />
4210
1015
            <src path="${src.generated.java}" />
4211
1016
        </javac>
4212
1017
    </target>
4213
1018
4214
1019
    <target name="java.compile.secondpass" depends="java.generate.composable.pipeline, java.compile.secondpass.javase" />
4215
1020
4216
1021
    <target name="java.compile.thirdpass.javase">
4217
1022
        <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
4218
1023
        <javac destdir="${classes}"
4219
1024
               excludes="${java.excludes.all}"
4220
1025
               source="${target.sourcelevel}"
4221
1026
               fork="yes"
4222
1027
               memoryMaximumSize="${javac.memorymax}"
4223
1028
               includeAntRuntime="false"
4224
1029
               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
4225
1030
            <classpath refid="nativewindow_gluegen.classpath"/>
4226
1031
            <src path="${src.java}" />
4227
1032
            <src path="${src.generated.java}" />
4228
1033
        </javac>
4229
1034
    </target>
4230
1035
4231
1036
    <target name="java.compile.thirdpass" depends="java.generate.composable.pipeline.custom, java.compile.thirdpass.javase" />
4232
1037
4233
1038
    <target name="java.compile" depends="java.compile.firstpass,java.compile.secondpass,java.compile.thirdpass">
4234
1039
        <!-- make shadercode and fonts available in classpath -->
4235
1040
        <copy todir="${classes}">
4236
1041
            <fileset dir="${src.java}"
4237
1042
                     includes="${java.part.nonjava}"
4238
1043
                     excludes="**/*.java"/>
4239
1044
        </copy>
4240
1045
    </target>
4241
1046
4242
1047
    <!-- ================================================================== -->
4243
1048
    <!-- 
4244
1049
       - Compile the native C code for JOGL (and optionally the Cg binding).
4245
1050
      -->
4246
1051
4247
1052
    <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
4248
1053
      <!-- compiler configuration -->
4249
1054
      <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
4250
1055
4251
1056
      <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
4252
1057
        <!-- Need to force X11R6 headers on to include path after stub_includes -->
4253
1058
        <includepath path="stub_includes/opengl"/>
4254
1059
        <includepath path="/usr/local/include" />
4255
1060
      </compiler>
4256
1061
4257
1062
      <compiler id="compiler.cfg.linux.armv7.jogl.x11" extends="compiler.cfg.linux.armv7">
4258
1063
        <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
4259
1064
        <compilerarg value="-idirafter" />
4260
1065
        <compilerarg value="/usr/include" />
4261
1066
      </compiler>
4262
1067
4263
1068
      <!-- linker configuration -->
4264
1069
 
4265
1070
      <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
4266
1071
        <syslibset dir="/usr/local/lib" libs="X11"/>
4267
1072
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
4268
1073
      </linker>
4269
1074
4270
1075
      <linker id="linker.cfg.freebsd.amd64.jogl.x11" extends="linker.cfg.freebsd.amd64">
4271
1076
        <syslibset dir="/usr/local/lib" libs="X11"/>
4272
1077
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
4273
1078
      </linker>
4274
1079
4275
1080
      <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
4276
1081
        <syslibset libs="X11"/>
4277
1082
        <syslibset libs="Xxf86vm" />
4278
1083
      </linker>
4279
1084
4280
1085
      <linker id="linker.cfg.linux.x86.jogl.x11" extends="linker.cfg.linux.x86">
4281
1086
        <syslibset libs="X11"/>
4282
1087
        <syslibset libs="Xxf86vm" />
4283
1088
      </linker>
4284
1089
4285
1090
      <linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64">
4286
1091
        <syslibset libs="X11"/>
4287
1092
        <syslibset libs="Xxf86vm" />
4288
1093
      </linker>
4289
1094
4290
1095
      <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7">
4291
1096
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/>
4292
1097
        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
4293
1098
      </linker>
4294
1099
4295
1100
      <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
4296
1101
      </linker>
4297
1102
4298
1103
      <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris">
4299
1104
        <syslibset libs="X11"/>
4300
1105
      </linker>
4301
1106
4302
1107
      <linker id="linker.cfg.solaris.sparcv9.jogl.x11" extends="linker.cfg.solaris.sparcv9">
4303
1108
        <linkerarg value="-xarch=v9a" />
4304
1109
        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
4305
1110
      </linker>
4306
1111
4307
1112
      <linker id="linker.cfg.solaris.amd64.jogl.x11" extends="linker.cfg.solaris.amd64">
4308
1113
        <linkerarg value="-xarch=amd64" />
4309
1114
        <syslibset dir="/usr/lib/amd64" libs="X11"/>
4310
1115
      </linker>
4311
1116
4312
1117
      <linker id="linker.cfg.win32.mingw.jogl" extends="linker.cfg.win32.mingw">
4313
1118
        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
4314
1119
        <syslibset libs="gdi32, kernel32"/>
4315
1120
      </linker>
4316
1121
4317
1122
      <linker id="linker.cfg.win64.mingw.jogl" extends="linker.cfg.win64.mingw">
4318
1123
        <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
4319
1124
        <syslibset libs="gdi32, kernel32"/>
4320
1125
      </linker>
4321
1126
4322
1127
      <linker id="linker.cfg.win32.msvc.jogl" extends="linker.cfg.win32.msvc">
4323
1128
        <syslibset libs="user32, kernel32" />
4324
1129
    <!-- This is temporary -->
4325
1130
        <syslibset libs="winmm" />
4326
1131
      </linker>
4327
1132
4328
1133
      <linker id="linker.cfg.macosx.jogl" extends="linker.cfg.macosx">
4329
1134
        <linkerarg value="-framework" />
4330
1135
        <linkerarg value="Cocoa" />
4331
1136
        <linkerarg value="-framework" />
4332
1137
        <linkerarg value="OpenGL" />
4333
1138
      </linker>
4334
1139
4335
1140
      <!--linker id="linker.cfg.macosx.jogl.cg" extends="linker.cfg.macosx.jogl">
4336
1141
        <linkerarg value="-framework"/>
4337
1142
        <linkerarg value="Cg"/>
4338
1143
      </linker-->
4339
1144
4340
1145
      <linker id="linker.cfg.hpux.jogl" extends="linker.cfg.hpux">
4341
1146
        <syslibset dir="/opt/graphics/OpenGL/lib" libs="GL, GLU"/>
4342
1147
        <syslibset dir="/usr/lib" libs="X11"/>
4343
1148
      </linker>
4344
1149
    </target>
4345
1150
4346
1151
    <target name="c.configure.win32.vc" if="isVCFamily">
4347
1152
      <echo message="Win32.VC" />
4348
1153
      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.msvc" />
4349
1154
      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.msvc.jogl" />
4350
1155
    </target>
4351
1156
    
4352
1157
    <target name="c.configure.win32.mingw" if="isMingW32">
4353
1158
      <echo message="Win32.MingW" />
4354
1159
      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.mingw" />
4355
1160
      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.mingw.jogl" />
4356
1161
    </target>
4357
1162
4358
1163
    <target name="c.configure.win64.mingw" if="isMingW64">
4359
1164
      <echo message="Win64.MingW" />
4360
1165
      <property name="compiler.cfg.id"                     value="compiler.cfg.win64.mingw" />
4361
1166
      <property name="linker.cfg.id.os"                    value="linker.cfg.win64.mingw.jogl" />
4362
1167
    </target>
4363
1168
4364
1169
    <target name="c.configure.linux.x86" if="isLinuxX86">
4365
1170
      <echo message="Linux.x86" />
4366
1171
      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.x86" />
4367
1172
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.x86.jogl.x11" />
4368
1173
    </target>
4369
1174
    
4370
1175
    <target name="c.configure.linux.amd64" if="isLinuxAMD64">
4371
1176
      <echo message="Linux.AMD64" />
4372
1177
      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.amd64" />
4373
1178
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
4374
1179
    </target>
4375
1180
    
4376
1181
    <target name="c.configure.linux.armv7" if="isLinuxARMv7">
4377
1182
      <echo message="Linux.armv7" />
4378
1183
      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.armv7.jogl.x11" />
4379
1184
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.armv7.jogl.x11" />
4380
1185
    </target>
4381
1186
    
4382
1187
    <target name="c.configure.linux.ia64" if="isLinuxIA64">
4383
1188
      <echo message="Linux.IA64" />
4384
1189
      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
4385
1190
      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
4386
1191
    </target>
4387
1192
4388
1193
    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
4389
1194
4390
1195
    <target name="c.configure.android" if="isAndroid">
4391
1196
      <echo message="Android" />
4392
1197
      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
4393
1198
      <property name="linker.cfg.id.os"                     value="linker.cfg.android.jogl" />
4394
1199
    </target>
4395
1200
    
4396
1201
    <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
4397
1202
      <echo message="Solaris" />
4398
1203
      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris" />
4399
1204
      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.jogl.x11" />
4400
1205
    </target>
4401
1206
  
4402
1207
 
4403
1208
    <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
4404
1209
      <echo message="SolarisSparcv9" />
4405
1210
      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris.sparcv9" />
4406
1211
      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.sparcv9.jogl.x11" />
4407
1212
    </target>
4408
1213
   
4409
1214
4410
1215
    <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
4411
1216
      <echo message="SolarisAMD64" />
4412
1217
      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris.amd64" />
4413
1218
      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.amd64.jogl.x11" />
4414
1219
    </target>
4415
1220
   
4416
1221
    <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
4417
1222
      <echo message="FreeBSD" />
4418
1223
      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
4419
1224
      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.jogl.x11" />
4420
1225
    </target>
4421
1226
4422
1227
    <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
4423
1228
      <echo message="FreeBSD" />
4424
1229
      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
4425
1230
      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.amd64.jogl.x11" />
4426
1231
    </target>
4427
1232
4428
1233
    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
4429
1234
4430
1235
    <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
4431
1236
      <echo message="HP-UX" />
4432
1237
      <property name="compiler.cfg.id"                     value="compiler.cfg.hpux" />
4433
1238
      <property name="linker.cfg.id.os"                    value="linker.cfg.hpux.jogl.x11" />
4434
1239
    </target>
4435
1240
4436
1241
    <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
4437
1242
4438
1243
    <target name="c.configure.x11" if="isX11" />
4439
1244
4440
1245
    <target name="c.configure.macosx" if="isOSX">
4441
1246
      <property name="compiler.cfg.id"                     value="compiler.cfg.macosx" />
4442
1247
      <property name="linker.cfg.id.os"                    value="linker.cfg.macosx.jogl" />
4443
1248
    </target>
4444
1249
    
4445
1250
    <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.android,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
4446
1251
4447
1252
    <target name="c.configure" depends="c.configure.1,c.configure.2" />
4448
1253
4449
1254
    <target name="rename.mingw.dll" if="isMingW">
4450
1255
        <move file="${src}" tofile="${dest}" />
4451
1256
    </target>
4452
1257
4453
1258
    <target name="rename.dylib" if="isOSX">
4454
1259
        <move file="${src}" tofile="${dest}" />
4455
1260
    </target>
4456
1261
4457
1262
    <macrodef name="c.build">
4458
1263
      <attribute name="c.compiler.src.files" />
4459
1264
      <attribute name="compiler.cfg.id" />
4460
1265
      <attribute name="linker.cfg.id" />
4461
1266
      <attribute name="output.lib.name" />
4462
1267
      <attribute name="c.compiler.use-jawt" default="false"/>
4463
1268
      <sequential>
4464
1269
        <echo message="Output lib name = @{output.lib.name}" />
4465
1270
4466
1271
        <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
4467
1272
        <property name="c.compiler.debug"     value="false" /> 
4468
1273
        <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } --> 
4469
1274
        <property name="c.compiler.optimise"  value="none" /> 
4470
1275
4471
1276
        <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
4472
1277
4473
1278
        <patternset id="c.src.files.jogl.desktop">
4474
1279
          <include name="${rootrel.src.c}/JoglCommon.c"/>
4475
1280
          <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/>
4476
1281
          <include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/>
4477
1282
          <include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/>
4478
1283
          <include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/>
4479
1284
          <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
4480
1285
          <!-- FIXME: the Mixer should be moved to another library -->
4481
1286
          <!--include name="${rootrel.src.c}/Mixer.cpp" if="isWindows"/-->
4482
1287
          <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="setup.addNativeOpenMAX"/>
4483
1288
          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="setup.addNativeOpenMAX"/>
4484
1289
4485
1290
          <include name="${rootrel.generated.c.jogl}/gl4/GL4bcImpl_JNI.c"/>
4486
1291
          <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
4487
1292
          <include name="${rootrel.generated.c.jogl}/gl2/GLUgl2_JNI.c"/>
4488
1293
          <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/>
4489
1294
          <include name="${rootrel.generated.c.jogl}/MacOSX/CGL*.c" if="isOSX"/>
4490
1295
          <include name="${rootrel.generated.c.jogl}/Windows/GDI*.c" if="isWindows"/>
4491
1296
          <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/>
4492
1297
        </patternset>
4493
1298
4494
1299
        <patternset id="c.src.files.jogl.mobile">
4495
1300
          <include name="${rootrel.src.c}/JoglCommon.c"/>
4496
1301
          <include name="${rootrel.src.c}/GLDebugMessageHandler.c"/>
4497
1302
          <include name="${rootrel.src.c}/GLXGetProcAddressARB.c" if="isX11"/>
4498
1303
          <include name="${rootrel.src.c.openmax}/omx_tool.c"  if="setup.addNativeOpenMAX"/>
4499
1304
          <include name="${rootrel.src.c.openmax}/com_jogamp_openmax_OMXInstance.c"  if="setup.addNativeOpenMAX"/>
4500
1305
4501
1306
          <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/>
4502
1307
          <include name="${rootrel.generated.c.jogl}/egl/EGLExtImpl_JNI.c"/>
4503
1308
          <include name="${rootrel.generated.c.jogl}/es2/GLES2Impl_JNI.c"/>
4504
1309
          <include name="${rootrel.generated.c.jogl}/es1/GLES1Impl_JNI.c"/>
4505
1310
          <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
4506
1311
          <!--include name="${rootrel.generated.c.jogl}/es1/GLUes1_JNI.c" EMPTY /-->
4507
1312
        </patternset>
4508
1313
4509
1314
        <patternset id="c.src.files.cg">
4510
1315
          <include name="${rootrel.generated.c.cg}/*.c"/>
4511
1316
        </patternset>
4512
1317
4513
1318
        <echo message="Compiling @{output.lib.name}" />
4514
1319
4515
1320
      	<!-- have to wrap cc task with outofdate, because otherwise cc links a new library
4516
1321
      	     even when no files have been compiled -->
4517
1322
        <outofdate>
4518
1323
          <sourcefiles>
4519
1324
            <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
4520
1325
          </sourcefiles>
4521
1326
          <targetfiles>
4522
1327
            <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/>
4523
1328
            <fileset dir="${obj.jogl}" includes="@{output.lib.name}.dll"/>
4524
1329
            <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.jnilib"/>
4525
1330
          </targetfiles>
4526
1331
          <sequential>
4527
1332
            <cc outtype="shared" 
4528
1333
                objdir="${obj.joglsub}" 
4529
1334
                outfile="${obj.jogl}/@{output.lib.name}"
4530
1335
                optimize="${c.compiler.optimise}" 
4531
1336
                debug="${c.compiler.debug}"
4532
1337
                multithreaded="true" 
4533
1338
                exceptions="false" 
4534
1339
                rtti="false">   
4535
1340
      
4536
1341
              <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
4537
1342
      
4538
1343
              <compiler extends="@{compiler.cfg.id}" >
4539
1344
                <sysincludepath path="${java.includes.dir}"/>
4540
1345
                <sysincludepath path="${java.includes.dir.platform}"/>
4541
1346
                <sysincludepath path="${stub.includes.gluegen.cc}"/>
4542
1347
                <includepath path="stub_includes/khr"/>
4543
1348
                <includepath path="stub_includes/egl"/>
4544
1349
                <includepath path="stub_includes/opengl"/>
4545
1350
                <includepath path="stub_includes/openmax" if="setup.addNativeOpenMAX"/>
4546
1351
                <includepath path="stub_includes/cg" if="setup.addNativeNVidiaCG"/>        
4547
1352
      
4548
1353
                <!-- This is for the generated headers for handwritten C code -->
4549
1354
                <includepath path="${src.generated.c}" />
4550
1355
                <includepath path="${src.generated.c}/X11" if="isX11"/>
4551
1356
                <includepath path="${src.generated.c}/MacOSX" if="isOSX"/>
4552
1357
                <includepath path="${src.generated.c}/Windows" if="isWindows"/>
4553
1358
                <includepath path="${src.generated.c.openmax}" if="setup.addNativeOpenMAX"/>
4554
1359
      
4555
1360
                <!-- This must come last to not override real include paths -->
4556
1361
                <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
4557
1362
              </compiler>
4558
1363
    
4559
1364
              <linker extends="@{linker.cfg.id}">
4560
1365
                <syslibset dir="${java.lib.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
4561
1366
                <syslibset dir="${java.lib.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
4562
1367
              </linker>
4563
1368
            </cc>
4564
1369
    
4565
1370
            <!-- FIXME: this is a hack; the cpptask should have an option to change the
4566
1371
                 suffix or at least understand the override from dylib to jnilib -->
4567
1372
            <antcall target="rename.dylib" inheritRefs="true">
4568
1373
                <param name="src"  value="${obj.jogl}/lib@{output.lib.name}.dylib" />
4569
1374
                <param name="dest" value="${obj.jogl}/lib@{output.lib.name}.jnilib" />
4570
1375
            </antcall>
4571
1376
    
4572
1377
            <!-- FIXME: this is a hack; the cpptask should have an option to change the
4573
1378
                 suffix or at least understand the override from dylib to jnilib -->
4574
1379
            <antcall target="rename.mingw.dll" inheritRefs="true">
4575
1380
                <param name="src"  value="${obj.jogl}/lib@{output.lib.name}.so" />
4576
1381
                <param name="dest" value="${obj.jogl}/@{output.lib.name}.dll" />
4577
1382
            </antcall>
4578
1383
4579
1384
            <!-- this stripping may be called more than once on the same library dir,
4580
1385
                 but that should cause no harm, and doing it here inside outofdate
4581
1386
                 prevents the JARs from always being rebuilt even if no source code changes -->
4582
1387
            <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
4583
1388
                <param name="libdir" value="${obj.jogl}"/>
4584
1389
            </antcall>
4585
1390
4586
1391
          </sequential>
4587
1392
        </outofdate>
4588
1393
      </sequential>
4589
1394
    </macrodef>  
4590
1395
4591
1396
    <target name="c.build.jogl.prepare.openMAX" if="setup.addNativeOpenMAX">
4592
1397
      <javah destdir="${src.generated.c.openmax}" classpath="${javah.classpath}" class="com.jogamp.openmax.OMXInstance" />
4593
1398
    </target>
4594
1399
4595
1400
    <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
4596
1401
      <javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="jogamp.opengl.GLDebugMessageHandler" />
4597
1402
      <!-- Generate the waveout Mixer header -->
4598
1403
      <!-- FIXME: this is temporary until we move this to another workspace -->
4599
1404
      <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
4600
1405
    </target>
4601
1406
4602
1407
    <target name="c.build.jogl.desktop" unless="setup.noNativeDesktop">
4603
1408
      <c.build c.compiler.src.files="c.src.files.jogl.desktop"
4604
1409
               output.lib.name="jogl_desktop"
4605
1410
               compiler.cfg.id="${compiler.cfg.id}"
4606
1411
               linker.cfg.id="${linker.cfg.id.os}"/>
4607
1412
    </target>
4608
1413
4609
1414
    <target name="c.build.jogl.mobile">
4610
1415
      <c.build c.compiler.src.files="c.src.files.jogl.mobile"
4611
1416
               output.lib.name="jogl_mobile"
4612
1417
               compiler.cfg.id="${compiler.cfg.id}"
4613
1418
               linker.cfg.id="${linker.cfg.id.os}"/>
4614
1419
    </target>
4615
1420
4616
1421
    <target name="c.build.jogl.cg" if="setup.addNativeNVidiaCG">
4617
1422
      <c.build c.compiler.src.files="c.src.files.cg"
4618
1423
               output.lib.name="jogl_cg"
4619
1424
               compiler.cfg.id="${compiler.cfg.id}"
4620
1425
               linker.cfg.id="${linker.cfg.id.os}"/>
4621
1426
    </target>
4622
1427
    
4623
1428
    <target name="c.manifest.cg" if="setup.addNativeNVidiaCG">
4624
1429
      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_cg" />
4625
1430
    </target>
4626
1431
4627
1432
    <target name="c.manifest" if="isVC8Family">
4628
1433
      <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
4629
1434
      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es1" />
4630
1435
      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" />
4631
1436
      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_desktop" />
4632
1437
      <antcall target="c.manifest.cg" inheritRefs="true" />
4633
1438
    </target>
4634
1439
4635
1440
    <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.desktop,c.build.jogl.mobile,c.build.jogl.cg">
4636
1441
      <antcall target="c.manifest" inheritRefs="true" />
4637
1442
    </target>
4638
1443
4639
1444
    <!-- ================================================================== -->
4640
1445
    <!--
4641
1446
       - Build the jogl.jar files.
4642
1447
      -->
4643
1448
    <target name="build-jars-dependset" depends="init,gluegen.cpptasks.detect.os" >
4644
1449
        <dependset>
4645
1450
            <srcfileset dir="${src.java}"
4646
1451
                     includes="${java.part.nonjava}"/>
4647
1452
            <targetfileset dir="."
4648
1453
                     includes="${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" />
4649
1454
        </dependset>
4650
1455
    </target>
4651
1456
    <target name="build-jars" depends="build-jars-dependset,build-jars-javase" />
4652
1457
4653
1458
    <target name="setup-manifestfile" depends="common.init">
4654
1459
        <property name="manifestfile" value="joglversion"/>
4655
1460
        <copy file="${manifestfile}"
4656
1461
            tofile="${build.jogl}/manifest.mf"
4657
1462
            overwrite="true">
4658
1463
            <filterset>
4659
1464
                <filter token="VERSION" value="${jogl.version}"/>
4660
1465
                <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
4661
1466
                <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
4662
1467
                <filter token="BASEVERSION" value="${jogl_base_version}"/>
4663
1468
            </filterset>
4664
1469
        </copy>
4665
1470
    </target>
4666
1471
4667
1472
    <target name="build-jars-os-desktop-javase" depends="setup-manifestfile">
4668
1473
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.x11.jar}" filesonly="true">
4669
1474
            <fileset dir="${classes}" includes="${java.part.glx}"/>
4670
1475
        </jar>
4671
1476
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.win.jar}" filesonly="true">
4672
1477
            <fileset dir="${classes}" includes="${java.part.wgl}" />
4673
1478
        </jar>
4674
1479
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.os.osx.jar}" filesonly="true">
4675
1480
            <fileset dir="${classes}" includes="${java.part.cgl}"/>
4676
1481
        </jar>
4677
1482
    </target>
4678
1483
4679
1484
    <target name="build-jars-mobile-javase" depends="setup-manifestfile">
4680
1485
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.jar}" filesonly="true">
4681
1486
            <fileset dir="${classes}"
4682
1487
                     includes="${java.part.egl} ${java.part.es1} ${java.part.es2}"
4683
1488
                     excludes="${java.part.awt} ${java.part.es1.dbg} ${java.part.es2.dbg}"/>
4684
1489
        </jar>
4685
1490
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glmobile.dbg.jar}" filesonly="true">
4686
1491
            <fileset dir="${classes}"
4687
1492
                     includes="${java.part.es1.dbg} ${java.part.es2.dbg}"/>
4688
1493
        </jar>
4689
1494
    </target>
4690
1495
4691
1496
    <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
4692
1497
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.awt.jar}" filesonly="true">
4693
1498
            <fileset dir="${classes}"
4694
1499
                     includes="${java.part.awt}" />
4695
1500
        </jar>
4696
1501
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.awt.jar}" filesonly="true">
4697
1502
            <fileset dir="${classes}"
4698
1503
                     includes="${java.part.util.awt}"/>
4699
1504
        </jar>
4700
1505
    </target>
4701
1506
4702
1507
    <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase">
4703
1508
        <!--os specific gldesktop-->
4704
1509
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.jar}" filesonly="true">
4705
1510
            <fileset dir="${classes}"
4706
1511
                     includes="${java.part.gldesktop}"
4707
1512
                     excludes="${java.part.gldesktop.dbg} ${java.part.glugldesktop}"/>
4708
1513
        </jar>
4709
1514
4710
1515
        <!-- misc -->
4711
1516
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.gldesktop.dbg.jar}" filesonly="true">
4712
1517
            <fileset dir="${classes}"
4713
1518
                     includes="${java.part.gldesktop.dbg}"/>
4714
1519
        </jar>
4715
1520
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glugldesktop.jar}" filesonly="true">
4716
1521
            <fileset dir="${classes}"
4717
1522
                     includes="${java.part.glugldesktop}"/>
4718
1523
        </jar>
4719
1524
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.gldesktop.jar}" filesonly="true">
4720
1525
            <fileset dir="${classes}"
4721
1526
                     includes="${java.part.util.gldesktop}"
4722
1527
                     excludes="${java.part.awt} ${java.part.util.awt}"/>
4723
1528
        </jar>
4724
1529
    </target>
4725
1530
4726
1531
    <target name="build-jars-javase" depends="setup-manifestfile, build-jars-mobile-javase, build-jars-desktop-javase, build-jars-awt-javase">
4727
1532
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.core.jar}" filesonly="true">
4728
1533
            <fileset dir="${classes}"
4729
1534
                     includes="${java.part.core}"
4730
1535
                     excludes="${java.part.core.exclude}"/>
4731
1536
        </jar>
4732
1537
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.sdk.jar}" filesonly="true">
4733
1538
            <fileset dir="${classes}"
4734
1539
                     includes="${java.part.sdk}"/>
4735
1540
        </jar>
4736
1541
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glutess.jar}" filesonly="true">
4737
1542
            <fileset dir="${classes}"
4738
1543
                     includes="${java.part.glutess}"/>
4739
1544
        </jar>
4740
1545
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.glumipmap.jar}" filesonly="true">
4741
1546
            <fileset dir="${classes}"
4742
1547
                     includes="${java.part.glumipmap}"/>
4743
1548
        </jar>
4744
1549
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.jar}" filesonly="true">
4745
1550
            <fileset dir="${classes}"
4746
1551
                     includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph}"
4747
1552
                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
4748
1553
        </jar>
4749
1554
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true">
4750
1555
            <fileset dir="${classes}"
4751
1556
                     includes="${java.part.util.fixedfuncemu}"/>
4752
1557
        </jar>
4753
1558
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.omx.jar}" filesonly="true">
4754
1559
            <fileset dir="${classes}"
4755
1560
                     includes="${java.part.openmax}"/>
4756
1561
        </jar>
4757
1562
        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.cg.jar}" filesonly="true">
4758
1563
            <fileset dir="${classes}"
4759
1564
                     includes="${java.part.nv-cg}"/>
4760
1565
        </jar>
4761
1566
        <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
4762
1567
            <fileset dir="${obj.jogl}">
4763
1568
              <include name="*.${native.library.suffix}" />
4764
1569
              <exclude name="*jogl_cg.${native.library.suffix}" />
4765
1570
            </fileset>
4766
1571
        </jar>
4767
1572
    </target>
4768
1573
4769
1574
    <!-- ================================================================== -->
4770
1575
    <!--
4771
1576
       - Build the Javadocs for the sources.
4772
1577
       - NOTE:  these are not entirely correct as the javadocs targets depend 
4773
1578
       -        on the platform specific build targets.  To circumvent any 
4774
1579
       -        errors, ensure that the source is built first.
4775
1580
      -->
4776
1581
    <!-- Same as above but with Cg directories added -->
4777
1582
    <target name="javadoc" depends="init">
4778
1583
        <!-- Build the general public Javadoc with CG -->
4779
1584
        <javadoc packagenames="${javadoc.packagenames},com.jogamp.opengl.cg"
4780
1585
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
4781
1586
                 sourcepath="${src.java};${src.generated.java}"        
4782
1587
                 destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
4783
1588
                 overview="${javadoc.overview}" 
4784
1589
                 source="${target.sourcelevel}"
4785
1590
                 maxmemory="512m"
4786
1591
                 linkoffline="${javadoc.link} 142-packages"
4787
1592
         bottom="${javadoc.bottom}" >
4788
1593
          <classpath refid="nativewindow_gluegen.classpath"/>
4789
1594
          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
4790
1595
        </javadoc>
4791
1596
    </target>
4792
1597
4793
1598
    <target name="javadoc.spec" depends="init">
4794
1599
        <javadoc packagenames="${javadoc.spec.packagenames}"
4795
1600
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
4796
1601
                 sourcepath="${src.java};${src.generated.java}"
4797
1602
                 destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
4798
1603
                 overview="${javadoc.overview}"
4799
1604
                 source="${target.sourcelevel}"
4800
1605
                 maxmemory="512m"
4801
1606
                 linkoffline="${javadoc.link} 142-packages"
4802
1607
                 bottom="${javadoc.bottom}" >
4803
1608
          <classpath refid="nativewindow_gluegen.classpath"/>
4804
1609
          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
4805
1610
        </javadoc>
4806
1611
    </target>
4807
1612
4808
1613
    <target name="javadoc.dev.all" depends="init">
4809
1614
        <javadoc packagenames="${javadoc.dev.packagenames},com.jogamp.opengl.cg"
4810
1615
                 excludepackagenames="${java.excludes.javadoc.packagenames}"
4811
1616
                 sourcepath="${src.java};${src.generated.java}"        
4812
1617
                 destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
4813
1618
                 overview="${javadoc.overview}" 
4814
1619
                 source="${target.sourcelevel}"
4815
1620
                 maxmemory="512m"
4816
1621
                 linkoffline="${javadoc.link} 142-packages"
4817
1622
         bottom="${javadoc.bottom}" >
4818
1623
          <classpath refid="nativewindow_gluegen.classpath"/>
4819
1624
          <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
4820
1625
        </javadoc>
4821
1626
    </target>
4822
1627
4823
1628
    <target name="all.doc" description="Build JOGL docs" depends="init,javadoc,javadoc.spec,javadoc.dev.all" />
4824
1629
4825
1630
    <!-- ================================================================== -->
4826
1631
    <!--
4827
1632
       - Clean up all that is built.
4828
1633
      -->
4829
1634
    <target name="clean" description="Remove all build products" depends="declare.common">
4830
1635
        <delete includeEmptyDirs="true" quiet="true">
4831
1636
            <fileset dir="${tempdir}" />
4832
1637
            <fileset dir="${build.jogl}" />
4833
1638
            <fileset dir="${javadoc}" />
4834
1639
            <fileset dir="${javadoc.spec}" />
4835
1640
            <fileset dir="${javadoc.dev}" />
4836
1641
        </delete>
4837
1642
    </target>
4838
1643
4839
1644
    <!-- ================================================================== -->
4840
1645
    <!--
4841
1646
       - Build everything.
4842
1647
      -->
4843
1648
    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,java.compile,c.build.jogl,build-jars,generate.version.txt" />
4844
1649
4845
1650
    <target name="generate.version.txt" depends="init">
4846
1651
        <!-- Create a version.txt file indicating which version we just built -->
4847
1652
        <echo message="${jogl.version}" file="${build.jogl}/version.txt" />
4848
1653
    </target>
4849
1654
4850
1655
</project>
4851
1656
0
4852
=== removed directory '.pc/otherArchsoswin.diff'
4853
=== removed directory '.pc/otherArchsoswin.diff/make'
4854
=== removed file '.pc/otherArchsoswin.diff/make/build-nativewindow.xml'
4855
--- .pc/otherArchsoswin.diff/make/build-nativewindow.xml	2011-10-06 15:53:38 +0000
4856
+++ .pc/otherArchsoswin.diff/make/build-nativewindow.xml	1970-01-01 00:00:00 +0000
4857
@@ -1,865 +0,0 @@
4858
1
<?xml version="1.0" encoding="UTF-8"?>
4859
2
<!--
4860
3
   - Ant build for the NativeWindow package.  This build has been tested with ANT 1.7.0.  The
4861
4
   - optional.jar that contains the optional ANT tasks must be in the ANT
4862
5
   - classpath (typically the ant/lib directory).
4863
6
   -
4864
7
   - A clean download of the NativeWindow sources is required for this build.
4865
8
   -
4866
9
   - This build has no dependence on environment variables; the needed
4867
10
   - ones (e.g. java.home, ANT_HOME) are all set by the Ant wrapper shell
4868
11
   - script, by the virtual machine, or elsewhere. However, on all platforms,
4869
12
   - the C compiler and linker should be in the path. All other paths that
4870
13
   - need to be set are in host.properties.
4871
14
   -
4872
15
   - NOTE:  because the GlueGen config files have their own relative paths
4873
16
   -        which cannot be overridden by GlueGen, GlueGen MUST be run from
4874
17
   -        the "make" directory. This also means that this build.xml MUST
4875
18
   -        be run from the "make" directory.
4876
19
   -
4877
20
   - Public targets:
4878
21
   -   all: (default; autodetects OS and chooses C compiler from gluegen.properties)
4879
22
   -   clean:        clean all built
4880
23
   -   javadoc:      create the standard developer Javadoc (recommended)
4881
24
   -                 (Note: should build all first - may be dependence in the future)
4882
25
   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
4883
26
   -   javadoc.dev:  create the internal developer Javadoc.  This includes the
4884
27
   -                       Java and C file generators. Note that it is only supported
4885
28
   -                       to create the Javadoc for the platform on which you are
4886
29
   -                       currently running.
4887
30
   - 
4888
31
   - Note: on Windows the "win32.c.compiler" property in gluegen.properties
4889
32
   - is required to select the appropriate C compiler. See the example
4890
33
   - gluegen.properties in the gluegen workspace for valid values. On Mac OS X
4891
34
   - universal binaries may also be built by setting the "macosxfat"
4892
35
   - property in gluegen.properties; again see the example file in this
4893
36
   - directory.
4894
37
   -   
4895
38
   - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
4896
39
   - ANT build, including the GlueGen tasks, the building of
4897
40
   - the Java generated sources, the first and second phase Java compiles, and
4898
41
   - the building of the jar file. Thanks to Alex Radeski for the bulk of the
4899
42
   - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
4900
43
   - the original OS detection code.
4901
44
   -
4902
45
   - Some environment defs affecting native compilation
4903
46
       setup.noNativeAWT
4904
47
4905
48
   - Internal settings, may not be necessary to set them manually,
4906
49
     since all JAR archives are orthogonal.
4907
50
       setup.noAWT
4908
51
   -->
4909
52
<project name="NativeWindow" basedir="." default="all">
4910
53
4911
54
    <import file="build-common.xml"/>
4912
55
4913
56
	<!-- needed for outofdate task -->
4914
57
    <taskdef resource="net/sf/antcontrib/antlib.xml">
4915
58
      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
4916
59
    </taskdef>
4917
60
4918
61
	<!-- ================================================================== -->
4919
62
    <!-- 
4920
63
       - Base initialization and detection of operating system.
4921
64
      -->
4922
65
    <target name="base.init" depends="common.init">
4923
66
4924
67
        <!-- partitioning -->
4925
68
4926
69
        <property name="java.part.swt"
4927
70
                  value="jogamp/nativewindow/swt/**"/>
4928
71
4929
72
        <property name="java.part.core"
4930
73
                  value="javax/media/nativewindow/* javax/media/nativewindow/util/* javax/media/nativewindow/egl/* com/jogamp/nativewindow/* jogamp/nativewindow/* jogamp/nativewindow/jvm/* ${java.part.swt}"/>
4931
74
4932
75
        <property name="java.part.awt"
4933
76
                  value="javax/media/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/>
4934
77
4935
78
        <property name="java.part.x11"
4936
79
                  value="jogamp/nativewindow/x11/** javax/media/nativewindow/x11/*" />
4937
80
4938
81
        <property name="java.part.windows"
4939
82
                  value="jogamp/nativewindow/windows/** javax/media/nativewindow/windows/*" />
4940
83
4941
84
        <property name="java.part.macosx"
4942
85
                  value="jogamp/nativewindow/macosx/** javax/media/nativewindow/macosx/*" />
4943
86
4944
87
        <!-- condition excludes -->
4945
88
4946
89
        <condition property="java.excludes.awt"
4947
90
                   value="${java.part.awt}">
4948
91
           <isset property="setup.noAWT"/> 
4949
92
        </condition>
4950
93
4951
94
        <property name="java.excludes.all" value="${java.excludes.awt}" />
4952
95
        <echo message="java.excludes.all: ${java.excludes.all}" />
4953
96
    </target>
4954
97
4955
98
4956
99
    <!-- ================================================================== -->
4957
100
    <!-- 
4958
101
       - Declare all paths and user defined variables.
4959
102
      -->
4960
103
    <target name="declare.common" description="Declare properties" depends="base.init">
4961
104
4962
105
        <property name="config.nativewindow" value="${config}/nativewindow" />
4963
106
4964
107
        <property name="rootrel.src" value="src/nativewindow" />
4965
108
        <property name="rootrel.src.java" value="${rootrel.src}/classes" />
4966
109
        <property name="rootrel.src.c" value="${rootrel.src}/native" />
4967
110
4968
111
        <property name="rootrel.src.generated" value="${rootrel.build}/nativewindow/gensrc" />
4969
112
        <property name="rootrel.generated.c" value="${rootrel.src.generated}/native" />
4970
113
4971
114
        <!-- The source directories. -->
4972
115
        <property name="src.java" value="${project.root}/${rootrel.src.java}" />
4973
116
        <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
4974
117
        
4975
118
        <!-- The generated source directories. -->
4976
119
        <property name="src.generated" value="${build.nativewindow}/gensrc" />
4977
120
        <property name="src.generated.java" value="${src.generated}/classes" />
4978
121
        <property name="src.generated.c" value="${src.generated}/native" />
4979
122
        
4980
123
        <!-- The compiler output directories. -->
4981
124
        <property name="classes" value="${build.nativewindow}/classes" />
4982
125
4983
126
        <property name="javah.classpath" value="${gluegen-rt.jar}:${classes}" />
4984
127
4985
128
        <!-- The headers from which Java files are generated -->
4986
129
        <dirset id="stub.includes.fileset.all" dir=".">
4987
130
            <include name="${stub.includes}/macosx/**" />
4988
131
            <include name="${stub.includes}/win32/**" />
4989
132
            <include name="${stub.includes}/x11/**" />
4990
133
            <include name="${stub.includes}/gluegen/**" />
4991
134
            <include name="${stub.includes}/khr/**" />
4992
135
            <include name="${stub.includes}/jni/**" />
4993
136
        </dirset>
4994
137
        <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes}">
4995
138
            <include name="macosx/**" />
4996
139
            <include name="win32/**" />
4997
140
            <include name="x11/**" />
4998
141
            <include name="common/**" />
4999
142
            <include name="jni/**" />
5000
143
        </fileset>
Reviewer	Review Type	Date Requested	Status
Sylvestre Ledru		2011-12-26	Pending
Review via email: mp+86907@code.launchpad.net