Revision 3008

View differences:

org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.lin.x86/pom.xml
9 9
		<artifactId>org.gvsig.raster.gdal.app</artifactId>
10 10
    <version>2.2.5-SNAPSHOT</version>
11 11
	</parent>
12

  
12
    
13
    <repositories>
14
        <repository>
15
            <id>osgeo</id>
16
            <name>Open Source Geospatial Foundation Repository</name>
17
            <url>http://download.osgeo.org/webdav/geotools/</url>
18
        </repository>
19
    </repositories>
20
    
13 21
  <properties>
14 22
    <gvsig.package.info.operatingSystem>lin</gvsig.package.info.operatingSystem>
15 23
    <gvsig.package.info.architecture>x86</gvsig.package.info.architecture>
......
39 47
          <scope>runtime</scope>
40 48
          <type>tar.gz</type>
41 49
        </dependency>
50
        
51
        <dependency>
52
          <groupId>org.gdal</groupId>
53
          <artifactId>gdal</artifactId>
54
          <version>${gdal.version}</version>
55
        </dependency>
56
                
42 57
    </dependencies>
43 58
  </dependencyManagement>
44 59

  
......
82 97
      <type>tar.gz</type>
83 98
    </dependency>
84 99

  
100
    <dependency>
101
      <groupId>org.gdal</groupId>
102
      <artifactId>gdal</artifactId>
103
    </dependency>
104

  
85 105
  </dependencies>
86 106

  
87 107
  <build>
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.lin.x86/src/main/assembly/gvsig-plugin-package.xml
66 66
      <outputDirectory>lib</outputDirectory>
67 67
		<includes>
68 68
            <include>org.gvsig:org.gvsig.jgdal:jar</include>
69
            <!--
70 69
            <include>org.gdal:gdal:jar</include>
71
            -->
72 70
		</includes>
73 71
    </dependencySet>
74 72
  </dependencySets>
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.win.x86/src/main/assembly/gvsig-plugin-package.xml
47 47
    <fileSet>
48 48
      <directory>target/native/gdal/bin</directory>
49 49
      <outputDirectory>./install/files</outputDirectory>
50
      <excludes>
51
        <exclude>*.exe</exclude>
52
      </excludes>    
50 53
    </fileSet>
51 54
    <fileSet>
52 55
      <directory>target/native/gdal/data</directory>
......
55 58
    <fileSet>
56 59
      <directory>target/native/jgdal/bin</directory>
57 60
      <outputDirectory>./install/files</outputDirectory>
58
    </fileSet>    <fileSet>
61
    </fileSet>    
62
    <fileSet>
63
      <directory>target/native/visualcppredist8/bin</directory>
64
      <outputDirectory>./install/files</outputDirectory>
65
      <excludes>
66
        <exclude>README-visualcppredist-2008.txt</exclude>
67
      </excludes>    
68
    </fileSet>    
69
    <fileSet>
70
      <directory>target/native/visualcppredist9/bin</directory>
71
      <outputDirectory>./install/files</outputDirectory>
72
    </fileSet>    
73
    <fileSet>
59 74
      <directory>src/main/resources-plugin</directory>
60 75
      <outputDirectory>.</outputDirectory>
61 76
    </fileSet>
......
69 84
      <outputDirectory>lib</outputDirectory>
70 85
		<includes>
71 86
  		 <include>org.gvsig:org.gvsig.jgdal:jar</include> 
72
  		 <!--
73 87
  		 <include>org.gdal:gdal:jar</include>
74
  		 --> 
75 88
		</includes>
76 89
    </dependencySet>
77 90
  </dependencySets>
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.win.x86/pom.xml
4 4
  <artifactId>org.gvsig.raster.gdal.app.win.x86</artifactId>
5 5
  <packaging>jar</packaging>
6 6
   
7
 	<parent>
8
		<groupId>org.gvsig</groupId>
9
		<artifactId>org.gvsig.raster.gdal.app</artifactId>
7
  <parent>
8
    <groupId>org.gvsig</groupId>
9
    <artifactId>org.gvsig.raster.gdal.app</artifactId>
10 10
    <version>2.2.5-SNAPSHOT</version>
11
	</parent>
11
  </parent>
12 12

  
13

  
14
    <repositories>
15
        <repository>
16
            <id>osgeo</id>
17
            <name>Open Source Geospatial Foundation Repository</name>
18
            <url>http://download.osgeo.org/webdav/geotools/</url>
19
        </repository>
20
    </repositories>
21

  
13 22
  <properties>
14 23
    <gvsig.package.info.operatingSystem>win</gvsig.package.info.operatingSystem>
15 24
    <gvsig.package.info.architecture>x86</gvsig.package.info.architecture>
......
18 27
    <jgdal.version>2.0.4</jgdal.version>
19 28
        
20 29
    <gdal.classifier>win-nt-vs8-i386-dynamic</gdal.classifier>
21
 		<gdal.version>1.8.1</gdal.version>    
22
 		
23
    <visualcppredist.classifier>win-nt-vs8-i386-dynamic</visualcppredist.classifier>
24
 		<visualcppredist.version>2008</visualcppredist.version>    
25
 		
30
    <gdal.version>1.8.1</gdal.version>    
31
     
32
    <visualcppredist8.classifier>win-nt-vs8-i386-dynamic</visualcppredist8.classifier>
33
    <visualcppredist8.version>2008</visualcppredist8.version>    
34
     
35
    <visualcppredist9.classifier>win-nt-vs9-i386-dynamic</visualcppredist9.classifier>
36
    <visualcppredist9.version>9.0.21022.8</visualcppredist9.version>    
37
     
26 38
  </properties>
27 39

  
28 40
  <dependencyManagement>
......
43 55
          <scope>runtime</scope>
44 56
          <type>tar.gz</type>
45 57
        </dependency>
46
        <!--
58
        
47 59
        <dependency>
48 60
          <groupId>org.gdal</groupId>
49 61
          <artifactId>gdal</artifactId>
50 62
          <version>${gdal.version}</version>
51 63
        </dependency>
52
        -->
53
				<dependency>
54
					<groupId>com.microsoft</groupId>
55
					<artifactId>visualcppredist</artifactId>
56
					<version>${visualcppredist.version}</version>
57
					<classifier>${visualcppredist.classifier}</classifier>
58
					<type>tar.gz</type>
59
				</dependency>
60 64
        
65
        <dependency>
66
          <groupId>com.microsoft</groupId>
67
          <artifactId>visualcppredist</artifactId>
68
          <version>${visualcppredist8.version}</version>
69
          <classifier>${visualcppredist8.classifier}</classifier>
70
          <type>tar.gz</type>
71
        </dependency>
72
        
73
        <dependency>
74
          <groupId>com.microsoft</groupId>
75
          <artifactId>visualcppredist</artifactId>
76
          <version>${visualcppredist9.version}</version>
77
          <classifier>${visualcppredist9.classifier}</classifier>
78
          <type>tar.gz</type>
79
        </dependency>
80
        
61 81
    </dependencies>
62 82
  </dependencyManagement>
63 83

  
......
69 89
      <type>zip</type>
70 90
    </dependency>
71 91
    <dependency>
72
			<groupId>org.gvsig</groupId>
73
			<artifactId>org.gvsig.andami</artifactId>
74
			<scope>compile</scope>
75
		</dependency>
76
		<dependency>
77
			<groupId>org.gvsig</groupId>
78
			<artifactId>org.gvsig.raster.gdal.io</artifactId>
79
			<scope>runtime</scope>
80
		</dependency>
81
		<dependency>
82
			<groupId>org.gvsig</groupId>
83
			<artifactId>org.gvsig.jgdal</artifactId>
92
      <groupId>org.gvsig</groupId>
93
      <artifactId>org.gvsig.andami</artifactId>
94
      <scope>compile</scope>
95
    </dependency>
96
    <dependency>
97
      <groupId>org.gvsig</groupId>
98
      <artifactId>org.gvsig.raster.gdal.io</artifactId>
84 99
      <scope>runtime</scope>
85
		</dependency>
100
    </dependency>
86 101
    <dependency>
102
      <groupId>org.gvsig</groupId>
103
      <artifactId>org.gvsig.jgdal</artifactId>
104
      <scope>runtime</scope>
105
    </dependency>
106
    <dependency>
87 107
        <groupId>org.gvsig</groupId>
88 108
        <artifactId>org.gvsig.jgdal</artifactId>
89 109
        <version>${jgdal.version}</version>
......
99 119
      <scope>runtime</scope>
100 120
      <type>tar.gz</type>
101 121
    </dependency>
102
    <!--
122
    
103 123
    <dependency>
104 124
      <groupId>org.gdal</groupId>
105 125
      <artifactId>gdal</artifactId>
106 126
      <version>${gdal.version}</version>
107 127
      <scope>runtime</scope>
108 128
    </dependency>
109
    -->
110
		<dependency>
111
			<groupId>com.microsoft</groupId>
112
			<artifactId>visualcppredist</artifactId>
113
			<version>${visualcppredist.version}</version>
114
			<classifier>${visualcppredist.classifier}</classifier>
115
			<type>tar.gz</type>
116
		</dependency>
117
		
129
    
130
    <dependency>
131
      <groupId>com.microsoft</groupId>
132
      <artifactId>visualcppredist</artifactId>
133
      <version>${visualcppredist8.version}</version>
134
      <classifier>${visualcppredist8.classifier}</classifier>
135
      <type>tar.gz</type>
136
    </dependency>
137
    <dependency>
138
      <groupId>com.microsoft</groupId>
139
      <artifactId>visualcppredist</artifactId>
140
      <version>${visualcppredist9.version}</version>
141
      <classifier>${visualcppredist9.classifier}</classifier>
142
      <type>tar.gz</type>
143
    </dependency>
144
    
118 145
  </dependencies>
119 146

  
120 147
  <build>
......
125 152
        <artifactId>maven-dependency-plugin</artifactId>
126 153
        <executions>
127 154
          <execution>
128
          	<id>unpack</id>
129
	        <phase>process-sources</phase>
130
	        <goals>
131
	          <goal>unpack</goal>
132
	        </goals>
133
	        <configuration>
134
	          <artifactItems>
135
	          
136
	            <artifactItem>
137
		            <groupId>org.gvsig</groupId>
138
		            <artifactId>org.gvsig.raster.gdal.app.common</artifactId>
139
		            <type>zip</type>
140
					      <overWrite>true</overWrite>
141
					      <outputDirectory>target</outputDirectory>
142
	            </artifactItem>
143
	            
144
	            <artifactItem>
155
            <id>unpack</id>
156
          <phase>process-sources</phase>
157
          <goals>
158
            <goal>unpack</goal>
159
          </goals>
160
          <configuration>
161
            <artifactItems>
162
            
163
              <artifactItem>
145 164
                <groupId>org.gvsig</groupId>
165
                <artifactId>org.gvsig.raster.gdal.app.common</artifactId>
166
                <type>zip</type>
167
                <overWrite>true</overWrite>
168
                <outputDirectory>target</outputDirectory>
169
              </artifactItem>
170
              
171
              <artifactItem>
172
                <groupId>org.gvsig</groupId>
146 173
                <artifactId>org.gvsig.jgdal</artifactId>
147 174
                <version>${jgdal.version}</version>
148 175
                <classifier>${jgdal.classifier}</classifier>
149
		            <type>tar.gz</type>
150
					      <overWrite>true</overWrite>
151
					      <outputDirectory>target/native/jgdal</outputDirectory>
152
	            </artifactItem>
153
	            
154
	            <artifactItem>
176
                <type>tar.gz</type>
177
                <overWrite>true</overWrite>
178
                <outputDirectory>target/native/jgdal</outputDirectory>
179
              </artifactItem>
180
              
181
              <artifactItem>
155 182
                <groupId>org.gdal</groupId>
156 183
                <artifactId>gdal</artifactId>
157 184
                <version>${gdal.version}</version>
158 185
                <classifier>${gdal.classifier}</classifier>
159
		            <type>tar.gz</type>
160
					      <overWrite>true</overWrite>
161
					      <outputDirectory>target/native/gdal</outputDirectory>
162
	            </artifactItem>
163
	            
164
	            <artifactItem>
165
			          <groupId>com.microsoft</groupId>
166
			          <artifactId>visualcppredist</artifactId>
167
			          <version>${visualcppredist.version}</version>
168
			          <classifier>${visualcppredist.classifier}</classifier>
169
		            <type>tar.gz</type>
170
					      <overWrite>true</overWrite>
171
					      <outputDirectory>target/native/visualcppredist</outputDirectory>
172
	            </artifactItem>
173
	            
174
	          </artifactItems>
175
	        </configuration>
186
                <type>tar.gz</type>
187
                <overWrite>true</overWrite>
188
                <outputDirectory>target/native/gdal</outputDirectory>
189
              </artifactItem>
190
              
191
              <artifactItem>
192
                <groupId>com.microsoft</groupId>
193
                <artifactId>visualcppredist</artifactId>
194
                <version>${visualcppredist8.version}</version>
195
                <classifier>${visualcppredist8.classifier}</classifier>
196
                <type>tar.gz</type>
197
                <overWrite>true</overWrite>
198
                <outputDirectory>target/native/visualcppredist8</outputDirectory>
199
              </artifactItem>
200
              
201
              <artifactItem>
202
                <groupId>com.microsoft</groupId>
203
                <artifactId>visualcppredist</artifactId>
204
                <version>${visualcppredist9.version}</version>
205
                <classifier>${visualcppredist9.classifier}</classifier>
206
                <type>tar.gz</type>
207
                <overWrite>true</overWrite>
208
                <outputDirectory>target/native/visualcppredist9</outputDirectory>
209
              </artifactItem>
210
              
211
            </artifactItems>
212
          </configuration>
176 213
          </execution>
177 214
        </executions>
178
	  </plugin>
215
    </plugin>
179 216
  
180 217
  
181 218
    </plugins>
......
198 235
             -->
199 236
         </os>
200 237
      </activation>
201
	  <properties>
202
	    <gvsig.install.plugin>true</gvsig.install.plugin>
203
	  </properties>
238
    <properties>
239
      <gvsig.install.plugin>true</gvsig.install.plugin>
240
    </properties>
204 241
    </profile>
205 242
    
206 243
  </profiles>

Also available in: Unified diff