Revision 26

View differences:

trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.lin.x86_64/src/main/assembly/gvsig-plugin-package.xml
50 50
      <outputDirectory>./gdal</outputDirectory>
51 51
    </fileSet>
52 52
    <fileSet>
53
      <directory>target/native/jgdal</directory>
54
      <outputDirectory>./jgdal</outputDirectory>
55
    </fileSet>
56
    <fileSet>
57 53
      <directory>src/main/resources-plugin</directory>
58 54
      <outputDirectory>.</outputDirectory>
59 55
    </fileSet>
......
66 62
      <useTransitiveDependencies>false</useTransitiveDependencies>
67 63
      <outputDirectory>lib</outputDirectory>
68 64
		<includes>
69
		     <include>org.gvsig:org.gvsig.jgdal:jar</include>
70 65
            <include>org.gdal:gdal:jar</include>
71 66
		</includes>
72 67
    </dependencySet>
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.lin.x86_64/src/main/resources-plugin/autorun.sh
30 30

  
31 31
PLUGIN_NAME="$(basename $PLUGIN_FOLDER)"
32 32

  
33
add_library_path "$PLUGIN_FOLDER/jgdal/lib"
34 33
add_library_path "$PLUGIN_FOLDER/gdal"
35

  
36 34
export GDAL_DATA="${PLUGIN_FOLDER}/gdal/data/gdal"
37 35

  
38
list_shared_library_dependencies "$PLUGIN_FOLDER/jgdal/lib/"libjgdal*
39 36

  
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.lin.x86_64/pom.xml
16 16
		<gvsig.package.info.operatingSystem>lin</gvsig.package.info.operatingSystem>
17 17
		<gvsig.package.info.architecture>x86_64</gvsig.package.info.architecture>
18 18

  
19
		<jgdal.classifier>linux-all-gcc4-x86_64-dynamic</jgdal.classifier>
20
		<jgdal.version>2.0.4</jgdal.version>
21

  
22 19
		<gdal.classifier>linux-all-gcc4-x86_64-dynamic</gdal.classifier>
23 20
		<gdal.version>1.11.2</gdal.version>
24 21
	</properties>
......
26 23
	<dependencyManagement>
27 24
		<dependencies>
28 25
			<dependency>
29
				<groupId>org.gvsig</groupId>
30
				<artifactId>org.gvsig.jgdal</artifactId>
31
				<version>${jgdal.version}</version>
32
				<classifier>${jgdal.classifier}</classifier>
33
				<type>tar.gz</type>
34
				<scope>runtime</scope>
35
			</dependency>
36
			<dependency>
37 26
				<groupId>org.gdal</groupId>
38 27
				<artifactId>gdal</artifactId>
39 28
				<version>${gdal.version}</version>
......
63 52
			<scope>runtime</scope>
64 53
			<type>tar.gz</type>
65 54
		</dependency>
66
		<dependency>
67
			<groupId>org.gvsig</groupId>
68
			<artifactId>org.gvsig.jgdal</artifactId>
69
			<version>${jgdal.version}</version>
70
			<scope>runtime</scope>
71
		</dependency>
72
		<dependency>
73
			<groupId>org.gvsig</groupId>
74
			<artifactId>org.gvsig.jgdal</artifactId>
75
			<version>${jgdal.version}</version>
76
			<classifier>${jgdal.classifier}</classifier>
77
			<type>tar.gz</type>
78
			<scope>runtime</scope>
79
		</dependency>
80 55
	</dependencies>
81 56

  
82 57

  
......
104 79
									<outputDirectory>target</outputDirectory>
105 80
								</artifactItem>
106 81
								<artifactItem>
107
									<groupId>org.gvsig</groupId>
108
									<artifactId>org.gvsig.jgdal</artifactId>
109
									<version>${jgdal.version}</version>
110
									<classifier>${jgdal.classifier}</classifier>
111
									<type>tar.gz</type>
112
									<overWrite>true</overWrite>
113
									<outputDirectory>target/native/jgdal</outputDirectory>
114
								</artifactItem>
115
								<artifactItem>
116 82
									<groupId>org.gdal</groupId>
117 83
									<artifactId>gdal</artifactId>
118 84
									<version>${gdal.version}</version>

Also available in: Unified diff