Revision 386

View differences:

2.1/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.lin.x86/pom.xml
32 32
			<type>zip</type>
33 33
		</dependency>
34 34

  
35
		<!-- Nativas libjni-osgvp -->
36

  
35 37
		<dependency>
36 38
			<groupId>org.gvsig.osgvp.libjni-osgvp</groupId>
39
			<artifactId>libNative</artifactId>
40
		</dependency>
41
		<dependency>
42
			<groupId>org.gvsig.osgvp.libjni-osgvp</groupId>
37 43
			<artifactId>libjni-osgvpcore</artifactId>
38 44
		</dependency>
39 45
		<dependency>
......
132 138
			<classifier>${native_classifier}</classifier>
133 139
			<type>tar.gz</type>
134 140
		</dependency>
141

  
142
		<!-- Nativas JOGL -->
143
	
144
		<dependency>
145
			<groupId>jogl</groupId>
146
			<artifactId>jogl</artifactId>
147
		</dependency>
148
		<dependency>
149
			<groupId>jogl</groupId>
150
			<artifactId>jogl</artifactId>
151
			<version>1.1.1</version>
152
			<classifier>${native_classifier}</classifier>
153
			<type>tar.gz</type>
154
		</dependency>
155

  
156
		<!-- Nativas OSGVP -->
157

  
158
		<dependency>
159
			<groupId>org.gvsig</groupId>
160
			<artifactId>osgvp</artifactId>
161
			<version>2.9.0-SNAPSHOT</version>
162
			<classifier>${native_classifier}</classifier>
163
			<type>tar.gz</type>
164
		</dependency>
165

  
166
		<!-- Nativas Openscenegraph -->
167

  
168
		<dependency>
169
			<groupId>org.openscenegraph</groupId>
170
			<artifactId>openscenegraph</artifactId>
171
			<version>3.1.2</version>
172
			<classifier>${native_classifier}</classifier>
173
			<type>tar.gz</type>
174
		</dependency>
175

  
176
		<!-- Nativas liblas -->
177

  
178
		<dependency>
179
			<groupId>org.liblas</groupId>
180
			<artifactId>liblas</artifactId>
181
			<version>1.7.0</version>
182
			<classifier>${native_classifier}</classifier>
183
			<type>tar.gz</type>
184
		</dependency>
185
		
186
		<!--  Nativas gluegen -->
187
		
188
		<dependency>
189
			<groupId>jogl</groupId>
190
			<artifactId>gluegen-rt</artifactId>
191
		</dependency>
192

  
135 193
	</dependencies>
136 194

  
137 195
	<build>
......
157 215
									<outputDirectory>target</outputDirectory>
158 216
								</artifactItem>
159 217

  
218
								<!-- Nativas libjni-osgvp -->
160 219

  
161 220
								<artifactItem>
162 221
									<groupId>org.gvsig.osgvp.libjni-osgvp</groupId>
......
255 314

  
256 315
								</artifactItem>
257 316

  
317
								<!-- Nativas jogl -->
258 318

  
319
								<artifactItem>
320
									<groupId>jogl</groupId>
321
									<artifactId>jogl</artifactId>
322
									<version>1.1.1</version>
323
									<classifier>${native_classifier}</classifier>
324
									<type>tar.gz</type>
325
									<overWrite>true</overWrite>
326
									<outputDirectory>target/native/</outputDirectory>
327
								</artifactItem>
328

  
329
								<!-- Nativas osgvp -->
330

  
331
								<artifactItem>
332
									<groupId>org.gvsig</groupId>
333
									<artifactId>osgvp</artifactId>
334
									<version>2.9.0-SNAPSHOT</version>
335
									<classifier>${native_classifier}</classifier>
336
									<type>tar.gz</type>
337
									<overWrite>true</overWrite>
338
									<outputDirectory>target/native</outputDirectory>
339
								</artifactItem>
340

  
341

  
342
								<!-- Nativas Openscenegraph -->
343

  
344
								<artifactItem>
345
									<groupId>org.openscenegraph</groupId>
346
									<artifactId>openscenegraph</artifactId>
347
									<version>3.1.2</version>
348
									<classifier>${native_classifier}</classifier>
349
									<type>tar.gz</type>
350
									<overWrite>true</overWrite>
351
									<outputDirectory>target/native</outputDirectory>
352
								</artifactItem>
353

  
354
								<!-- Nativas libLas -->
355

  
356
								<artifactItem>
357
									<groupId>org.liblas</groupId>
358
									<artifactId>liblas</artifactId>
359
									<version>1.7.0</version>
360
									<classifier>${native_classifier}</classifier>
361
									<type>tar.gz</type>
362
									<overWrite>true</overWrite>
363
									<outputDirectory>target/native</outputDirectory>
364
								</artifactItem>
365

  
259 366
							</artifactItems>
260 367
						</configuration>
261 368
					</execution>
2.1/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.lin.x86/src/main/assembly/gvsig-plugin-package.xml
1
<!--
2

  
3
    gvSIG. Desktop Geographic Information System.
4

  
5
    Copyright (C) 2007-2013 gvSIG Association.
6

  
7
    This program is free software; you can redistribute it and/or
8
    modify it under the terms of the GNU General Public License
9
    as published by the Free Software Foundation; either version 3
10
    of the License, or (at your option) any later version.
11

  
12
    This program is distributed in the hope that it will be useful,
13
    but WITHOUT ANY WARRANTY; without even the implied warranty of
14
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
    GNU General Public License for more details.
16

  
17
    You should have received a copy of the GNU General Public License
18
    along with this program; if not, write to the Free Software
19
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
20
    MA  02110-1301, USA.
21

  
22
    For any additional information, do not hesitate to contact us
23
    at info AT gvsig.com, or visit our website www.gvsig.com.
24

  
25
-->
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
26 13
<assembly>
27
  <id>gvsig-plugin-package</id>
28
  <formats>
29
    <format>zip</format>
30
  </formats>
31
  <baseDirectory>${gvsig.package.info.code}</baseDirectory>
32
  <includeBaseDirectory>true</includeBaseDirectory>
33
  <files>
34
    <file>
35
      <source>target/package.info</source>
36
    </file>
37
  </files>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${gvsig.package.info.code}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/package.info</source>
23
		</file>
24
	</files>
38 25

  
39
  <fileSets>
40
    <fileSet>
41
      <directory>target/org.gvsig.gvsig3d.app.commons</directory>
42
      <outputDirectory>.</outputDirectory>
43
      <excludes>
44
      	<exclude>package.info</exclude>
45
      </excludes>
46
    </fileSet>
47
    <fileSet>
48
      <directory>target/native/lib</directory>
49
      <outputDirectory>native</outputDirectory>
50
    </fileSet>
51
    <fileSet>
52
      <directory>src/main/resources-plugin</directory>
53
      <outputDirectory>.</outputDirectory>
54
    </fileSet>
55
  </fileSets>
26
	<fileSets>
27
		<fileSet>
28
			<directory>target/org.gvsig.gvsig3d.app.commons</directory>
29
			<outputDirectory>.</outputDirectory>
30
			<excludes>
31
				<exclude>package.info</exclude>
32
			</excludes>
33
		</fileSet>
34
		<fileSet>
35
			<directory>target/native/lib</directory>
36
			<outputDirectory>native</outputDirectory>
37
			<includes>
38
				<include>libjogl_cg.so</include>
39
				<include>libjogl.so</include>
40
				<include>libgluegen-rt.so</include>
41
				<include>libjogl_awt.so</include>
42
			</includes>
43
		</fileSet>
44
		<fileSet>
45
			<directory>target/native/lib</directory>
46
			<outputDirectory>linux32/lib</outputDirectory>
47
			<excludes>
48
				<exclude>libjogl_cg.so</exclude>
49
				<exclude>libjogl.so</exclude>
50
				<exclude>libgluegen-rt.so</exclude>
51
				<exclude>libjogl_awt.so</exclude>
52
			</excludes>
53
		</fileSet>
54
		<fileSet>
55
			<directory>src/main/resources-plugin</directory>
56
			<outputDirectory>.</outputDirectory>
57
		</fileSet>
58
	</fileSets>
56 59

  
57 60

  
58
  <dependencySets>
59
    <dependencySet>
60
      <useProjectArtifact>false</useProjectArtifact>
61
      <useTransitiveDependencies>false</useTransitiveDependencies>
62
      <outputDirectory>lib</outputDirectory>
63
		<includes>
64
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpmanipulator:jar</include>
61
	<dependencySets>
62
		<dependencySet>
63
			<useProjectArtifact>false</useProjectArtifact>
64
			<useTransitiveDependencies>false</useTransitiveDependencies>
65
			<outputDirectory>lib</outputDirectory>
66
			<includes>
67
				<include>org.gvsig.osgvp.libjni-osgvp:libNative:jar</include>
68
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpmanipulator:jar
69
				</include>
65 70
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpcore:jar</include>
66
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpviewer:jar</include>
67
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpterrain:jar</include>
68
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpsymbology:jar</include>
69
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpgeometry:jar</include>
70
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpfeatures:jar</include>
71
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpmultiresolution:jar</include>
72
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpstereoconfig:jar</include>
71
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpviewer:jar
72
				</include>
73
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpterrain:jar
74
				</include>
75
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpsymbology:jar
76
				</include>
77
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpgeometry:jar
78
				</include>
79
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpfeatures:jar
80
				</include>
81
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpmultiresolution:jar
82
				</include>
83
				<include>org.gvsig.osgvp.libjni-osgvp:libjni-osgvpstereoconfig:jar
84
				</include>
85
				<include>jogl:jogl:jar</include>
86
				<include>jogl:gluegen-rt:jar</include>
73 87

  
74 88

  
75
		</includes>
76
    </dependencySet>
77
  </dependencySets>
89
			</includes>
90
		</dependencySet>
91
	</dependencySets>
78 92

  
79 93
</assembly>
80 94

  
2.1/trunk/org.gvsig.gvsig3d/pom.xml
134 134
		<dependencies>
135 135
			<dependency>
136 136
				<groupId>org.gvsig.osgvp.libjni-osgvp</groupId>
137
				<artifactId>libNative</artifactId>
138
				<version>2.9.0-SNAPSHOT</version>
139
			</dependency>
140
			<dependency>
141
				<groupId>org.gvsig.osgvp.libjni-osgvp</groupId>
137 142
				<artifactId>libjni-osgvpcore</artifactId>
138 143
				<version>2.9.0-SNAPSHOT</version>
139 144
			</dependency>
......
181 186
				<groupId>org.gvsig</groupId>
182 187
				<artifactId>org.gvsig.gvsig3d.lib.api</artifactId>
183 188
				<version>1.0.0-SNAPSHOT</version>
184
			</dependency>			
189
			</dependency>
185 190
			<dependency>
186 191
				<groupId>org.gvsig</groupId>
187 192
				<artifactId>org.gvsig.gvsig3d.lib.api</artifactId>
......
266 271
			  </artifactId>
267 272
				<version>2.0.31</version>
268 273
			</dependency>
274
			<dependency>
275
				<groupId>jogl</groupId>
276
				<artifactId>jogl</artifactId>
277
				<version>1.1.1</version>
278
			</dependency>
279
			<dependency>
280
				<groupId>jogl</groupId>
281
				<artifactId>gluegen-rt</artifactId>
282
				<version>1.1.1</version>
283
			</dependency>
269 284
		</dependencies>
270 285
	</dependencyManagement>
271
	
286

  
272 287
</project>
2.1/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.lib/org.gvsig.gvsig3d.lib.api/pom.xml
39 39
		</dependency>
40 40
		<dependency>
41 41
			<groupId>org.gvsig.osgvp.libjni-osgvp</groupId>
42
			<artifactId>libNative</artifactId>
43
		</dependency>
44
		<dependency>
45
			<groupId>org.gvsig.osgvp.libjni-osgvp</groupId>
42 46
			<artifactId>libjni-osgvpcore</artifactId>
43 47
		</dependency>
44 48
<!-- 		<dependency> -->
......
137 141
<!-- 			<classifier>${native-classifier}</classifier> -->
138 142
<!-- 			<type>tar.gz</type> -->
139 143
<!-- 		</dependency> -->
140
		<dependency>
141
			<groupId>jogl</groupId>
142
			<artifactId>jogl</artifactId>
143
			<version>1.1.1</version>
144
		</dependency>
145 144
<!-- 		<dependency> -->
146 145
<!-- 			<groupId>jogl</groupId> -->
147 146
<!-- 			<artifactId>jogl</artifactId> -->

Also available in: Unified diff