Revision 24

View differences:

trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.gpx/pom.xml
11 11
		<version>1.0.0-SNAPSHOT</version>
12 12
	</parent>
13 13
	<dependencies>
14

  
14 15
	    <dependency>
15
            <groupId>org.gdal</groupId>
16
			<artifactId>gdal</artifactId>
17
        </dependency>
18
	    <dependency>
19 16
            <groupId>org.gvsig</groupId>
20 17
            <artifactId>org.gvsig.gdal.gpx</artifactId>
21 18
        </dependency>
......
24 21
            <artifactId>org.gvsig.gdal.app.mainplugin.common</artifactId>
25 22
            <type>zip</type>
26 23
        </dependency>
24
        <dependency>
25
			<groupId>org.gdal</groupId>
26
			<artifactId>gdal</artifactId>
27
		</dependency> 
27 28
	    <dependency>
28 29
	        <groupId>org.gvsig</groupId>
29 30
	        <artifactId>org.gvsig.tools.lib</artifactId>
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.all.all/src/main/assembly/gvsig-plugin-package.xml
28 28
  <formats>
29 29
    <format>zip</format>
30 30
  </formats>
31
  <baseDirectory>${project.artifactId}</baseDirectory>
31
  <baseDirectory>${gvsig.package.info.code}</baseDirectory>
32 32
  <includeBaseDirectory>true</includeBaseDirectory>
33 33
  <files>
34 34
    <file>
35
      <source>target/${project.artifactId}-${project.version}.jar</source>
36
      <outputDirectory>lib</outputDirectory>
37
    </file>
38
    <file>
39 35
      <source>target/package.info</source>
40 36
    </file>
41 37
  </files>
42 38

  
43 39
  <fileSets>
44 40
    <fileSet>
41
      <directory>target/org.gvsig.gdal.app.mainplugin.commons</directory>
42
      <outputDirectory>.</outputDirectory>
43
      <excludes>
44
      	<exclude>package.info</exclude>
45
      </excludes>
46
    </fileSet>
47
    <fileSet>
48
      <directory>target/native</directory>
49
      <outputDirectory>native</outputDirectory>
50
    </fileSet>
51
    <fileSet>
45 52
      <directory>src/main/resources-plugin</directory>
46 53
      <outputDirectory>.</outputDirectory>
47 54
    </fileSet>
......
53 60
      <useProjectArtifact>false</useProjectArtifact>
54 61
      <useTransitiveDependencies>false</useTransitiveDependencies>
55 62
      <outputDirectory>lib</outputDirectory>
56
		  <includes>
57
        	
58
		  </includes>
63
		<includes>
64
            <include>org.gvsig:org.gvsig.gdal.app.mainplugin.commons:jar</include>
65
		</includes>
59 66
    </dependencySet>
60 67
  </dependencySets>
61 68

  
62 69
</assembly>
63 70

  
71

  
72

  
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.all.all/src/main/resources-plugin/autorun.sh
1
#!/bin/sh
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

  
26

  
27
#
28
# Plugin autorun
29
# 
30

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

  
33
# Proj4 data files
34
#export PROJ_LIB="${GVSIG_HOME_FOLDER}/plugins/$PLUGIN_NAME/projlib"
35

  
36
# Temporary fix for number locale related formatting error with proj4.
37
#export LC_NUMERIC=C
38

  
39
add_library_path "/usr/lib/jni"
40
add_library_path "/usr/share/java"
41

  
42
export GDAL_DATA="/usr/share/java"
43
GVSIG_NATIVE_LIBS="$GVSIG_NATIVE_LIBS:/usr/lib/jni"
44

  
45

  
46

  
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.all.all/pom.xml
1
<?xml version="1.0" encoding="ISO-8859-1"?>
2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3

  
4
	<modelVersion>4.0.0</modelVersion>
5
	<artifactId>org.gvsig.gdal.app.mainplugin.all.all</artifactId>
6
	<packaging>jar</packaging>
7
	<name>org.gvsig.gdal.app.mainplugin.all.all</name>
8
	<description>Gdal data provider for gvSIG: jpeg, tiff, png, gif.</description>
9
	<parent>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  <modelVersion>4.0.0</modelVersion>
4
  <artifactId>org.gvsig.gdal.app.mainplugin.all.all</artifactId>
5
  <packaging>jar</packaging>
6
   
7
 	<parent>
10 8
		<groupId>org.gvsig</groupId>
11 9
		<artifactId>org.gvsig.gdal.app.mainplugin</artifactId>
12 10
		<version>1.0.0-SNAPSHOT</version>
13 11
	</parent>
14
	<dependencies>
15
	    <dependency>
16
			<groupId>org.gdal</groupId>
17
			<artifactId>gdal</artifactId>
18
		</dependency>
19
		<dependency>
20
			<groupId>org.gvsig</groupId>
21
			<artifactId>org.gvsig.andami</artifactId>
22
			<scope>compile</scope>
23
		</dependency>
24
		<dependency>
25
			<groupId>org.gvsig</groupId>
26
			<artifactId>org.gvsig.jgdal</artifactId>
27
			<classifier>linux-all-gcc4-x86_64-dynamic</classifier>
28
			<type>tar.gz</type>
29
			<scope>runtime</scope>
30
		</dependency>
31
	</dependencies>
32
	
33
  <properties>
34
      <!-- Control the deploy of the plugin in gvsig.product.folder.path/gvSIG/extensiones -->
35
      <gvsig.install.plugin>false</gvsig.install.plugin>
36
      <!--  Control the deploy of the plugin package in gvsig.product.folder.path/install -->
37
      <gvsig.install.plugin.package>false</gvsig.install.plugin.package>
38
  </properties>	
12

  
13
  <dependencies>
14
    <dependency>
15
        <groupId>org.gvsig</groupId>
16
        <artifactId>org.gvsig.gdal.app.mainplugin.common</artifactId>
17
        <type>zip</type>
18
    </dependency>      
19
  </dependencies>
20
  
21
    <properties>
22
        <!-- Package info property values -->
23
        <!-- Default values in org.gvsig.desktop -->
24
        <gvsig.package.info.state>testing</gvsig.package.info.state>
25
        <gvsig.package.info.official>true</gvsig.package.info.official>
26
        <gvsig.package.info.dependencies>required: org.gvsig.app.mainplugin -ge 2.1.0-A</gvsig.package.info.dependencies>
27
        <gvsig.package.info.categories>Libraries,GDAL</gvsig.package.info.categories>
28
        <gvsig.package.info.poolURL>https://devel.gvsig.org/download/projects/gvsig-gdal/pool</gvsig.package.info.poolURL>
29
   		<gvsig.package.info.operatingSystem>lin</gvsig.package.info.operatingSystem>
30
    	<gvsig.package.info.architecture>x86_64</gvsig.package.info.architecture>
31
    	<gvsig.install.plugin>false</gvsig.install.plugin>
32
    	<gvsig.install.plugin.package>false</gvsig.install.plugin.package>    
33
 	</properties>
34
     	 
35
  <build>
36
    <plugins>
37
  
38
      <plugin>
39
        <groupId>org.apache.maven.plugins</groupId>
40
         <artifactId>maven-install-plugin</artifactId>
41
<!--         <artifactId>maven-dependency-plugin</artifactId> -->
42
<!--         <artifactId>maven-compiler-plugin</artifactId> -->
43
        <executions>
44
<!--             <execution> -->
45
<!--             <id>default-testCompile</id> -->
46
<!--             <phase>process-test-sources</phase> -->
47
<!--             <goals> -->
48
<!--               <goal>testCompile</goal> -->
49
<!--             </goals> -->
50
<!--             <configuration> -->
51
<!--               <skip>true</skip> -->
52
<!--             </configuration> -->
53
<!--           </execution> -->
54
          
55
           <execution>
56
              <id>install1</id>
57
              <phase>package</phase>
58
              <goals>
59
                <goal>install-file</goal>
60
              </goals>
61
              <configuration>
62
                <file>/usr/share/java/gdal.jar</file>
63
                <groupId>org.gvsig</groupId>
64
                <artifactId>gdal</artifactId>
65
                <version>1.11.2</version>
66
                <packaging>jar</packaging>
67
              </configuration>
68
            </execution>  
69
          <!-- 
70
          <execution>
71
          	<id>unpack</id>
72
	        <phase>process-sources</phase>
73
	        <goals>
74
	          <goal>unpack</goal>
75
	        </goals>
76
	        <configuration>
77
	          <artifactItems>
78
	            <artifactItem>
79
		            <groupId>org.gvsig</groupId>
80
		            <artifactId>org.gvsig.gdal</artifactId>
81
                	<classifier>linux-all-gcc4-i686-dynamic</classifier>
82
		            <type>tar.gz</type>
83
					<overWrite>true</overWrite>
84
					<outputDirectory>target/native</outputDirectory>
85
	            </artifactItem>
86
	          </artifactItems>
87
	        </configuration>
88
          </execution>
89
          -->
90
        </executions>
91
	  </plugin>
92
  
93
  
94
    </plugins>
95
  </build>
96

  
97
	<profiles>
98
		<profile>
99
			<id>gvsig-plugin-install-gdal-linux-x86_64</id>
100
			<activation>
101
				<os>
102
					<family>unix</family>
103
					<name>linux</name>
104
					<arch>x86_64</arch>
105
				</os>
106
			</activation>
107
			<properties>
108
				<gvsig.install.plugin>true</gvsig.install.plugin>
109
			</properties>
110
		</profile>
111

  
112
		<profile>
113
			<id>gvsig-plugin-install-gdal-linux-amd64</id>
114
			<activation>
115
				<os>
116
					<family>unix</family>
117
					<name>linux</name>
118
					<arch>amd64</arch>
119
				</os>
120
			</activation>
121
			<properties>
122
				<gvsig.install.plugin>true</gvsig.install.plugin>
123
			</properties>
124
		</profile>
125

  
126
	</profiles>
127
  
39 128
</project>
129

  
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.all.all/buildNumber.properties
1
#Thu Nov 21 11:05:56 CET 2013
2
buildNumber=1
0 3

  
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/install/install.xml
1
<project name="org.gvsig.raster.gdal.app" default="main" basedir=".">
1
<project name="org.gvsig.gdal.app.mainplugin" default="main" basedir=".">
2 2
	<target name="main">
3 3
	  <exec dir="${extensions_dir}/org.gvsig.gdal.app.mainplugin/gdal/lib64" executable="ln" >
4 4
	    <arg value="-sf"/>
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/pom.xml
15 15
	  <properties>
16 16
	    <svn.tags.folder>https://devel.gvsig.org/svn/gvsig-gdal/org.gvsig.gdal/tags/</svn.tags.folder>
17 17
	    <gvsig.install.plugin>false</gvsig.install.plugin>  
18
	    <gvsig.install.plugin.package>false</gvsig.install.plugin.package>
18 19
	    <gvsig.package.info.state>testing</gvsig.package.info.state>
19 20
	    <gvsig.package.info.official>false</gvsig.package.info.official>
20 21
	    <gvsig.package.info.operatingSystem>all</gvsig.package.info.operatingSystem>
......
26 27
	    <gvsig.package.info.codealias />
27 28
	    <gvsig.package.info.name>${project.parent.name}</gvsig.package.info.name>
28 29
	    <gvsig.package.info.description>${project.parent.description}</gvsig.package.info.description>
29
	    <gvsig.install.plugin>false</gvsig.install.plugin>    
30 30
		<gvsig.package.info.dependencies>required: org.gvsig.app.mainplugin -ge 2</gvsig.package.info.dependencies>
31 31

  
32 32
  </properties>
33 33
  
34
	<modules>
35
	    <module>org.gvsig.gdal.app.mainplugin.common</module>
36
<!-- 		<module>org.gvsig.gdal.app.mainplugin.lin.x86</module> -->
34
	<modules>	    	
35
	  <module>org.gvsig.gdal.app.mainplugin.common</module>
36
<!-- 	  <module>org.gvsig.gdal.app.mainplugin.all.all</module>  -->
37
<!-- 	<module>org.gvsig.gdal.app.mainplugin.lin.x86</module>     -->
37 38
		<module>org.gvsig.gdal.app.mainplugin.lin.x86_64</module>
38 39
<!-- 		<module>org.gvsig.gdal.app.mainplugin.win.x86</module> -->
39 40
	</modules>
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.lin.x86/src/main/resources-plugin/autorun.sh
36 36
# Temporary fix for number locale related formatting error with proj4.
37 37
#export LC_NUMERIC=C
38 38

  
39
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PLUGIN_FOLDER/native"
40
GVSIG_NATIVE_LIBS="$GVSIG_NATIVE_LIBS:$PLUGIN_FOLDER/native"
39
add_library_path "/usr/lib/jni"
40
add_library_path "/usr/share/java"
41 41

  
42
export GDAL_DATA="/usr/share/java"
43
GVSIG_NATIVE_LIBS="$GVSIG_NATIVE_LIBS:/usr/lib/jni"
42 44

  
43 45

  
46

  
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.mainplugin/org.gvsig.gdal.app.mainplugin.lin.x86/pom.xml
13 13
  <dependencies>
14 14
    <dependency>
15 15
        <groupId>org.gvsig</groupId>
16
        <artifactId>org.gvsig.gdal.app.mainplugin.all.all</artifactId>
16
        <artifactId>org.gvsig.gdal.app.mainplugin.common</artifactId>
17 17
        <type>zip</type>
18
    </dependency>                          
18
    </dependency>      
19 19
  </dependencies>
20 20
  
21 21
    <properties>
......
27 27
        <gvsig.package.info.categories>Libraries,GDAL</gvsig.package.info.categories>
28 28
        <gvsig.package.info.poolURL>https://devel.gvsig.org/download/projects/gvsig-gdal/pool</gvsig.package.info.poolURL>
29 29
   		<gvsig.package.info.operatingSystem>lin</gvsig.package.info.operatingSystem>
30
    	<gvsig.package.info.architecture>x86</gvsig.package.info.architecture>
31
    	<gvsig.install.plugin>true</gvsig.install.plugin>
32
    	<gvsig.install.plugin.package>true</gvsig.install.plugin.package>    
30
    	<gvsig.package.info.architecture>x86_64</gvsig.package.info.architecture>
31
    	<gvsig.install.plugin>false</gvsig.install.plugin>
32
    	<gvsig.install.plugin.package>false</gvsig.install.plugin.package>    
33 33
 	</properties>
34 34
     	 
35 35
  <build>
......
37 37
  
38 38
      <plugin>
39 39
        <groupId>org.apache.maven.plugins</groupId>
40
        <!-- <artifactId>maven-dependency-plugin</artifactId> -->
41
        <artifactId>maven-compiler-plugin</artifactId>
40
         <artifactId>maven-install-plugin</artifactId>
41
<!--         <artifactId>maven-dependency-plugin</artifactId> -->
42
<!--         <artifactId>maven-compiler-plugin</artifactId> -->
42 43
        <executions>
43
            <execution>
44
            <id>default-testCompile</id>
45
            <phase>process-test-sources</phase>
46
            <goals>
47
              <goal>testCompile</goal>
48
            </goals>
49
            <configuration>
50
              <skip>true</skip>
51
            </configuration>
52
          </execution>
44
<!--             <execution> -->
45
<!--             <id>default-testCompile</id> -->
46
<!--             <phase>process-test-sources</phase> -->
47
<!--             <goals> -->
48
<!--               <goal>testCompile</goal> -->
49
<!--             </goals> -->
50
<!--             <configuration> -->
51
<!--               <skip>true</skip> -->
52
<!--             </configuration> -->
53
<!--           </execution> -->
54
          
55
           <execution>
56
              <id>install1</id>
57
              <phase>package</phase>
58
              <goals>
59
                <goal>install-file</goal>
60
              </goals>
61
              <configuration>
62
                <file>/usr/share/java/gdal.jar</file>
63
                <groupId>org.gdal</groupId>
64
                <artifactId>gdal</artifactId>
65
                <version>1.12</version>
66
                <packaging>jar</packaging>
67
              </configuration>
68
            </execution>  
53 69
          <!-- 
54 70
          <execution>
55 71
          	<id>unpack</id>
......
78 94
    </plugins>
79 95
  </build>
80 96

  
81
  <profiles>
97
	<profiles>
98
		<profile>
99
			<id>gvsig-plugin-install-gdal-linux-x86_64</id>
100
			<activation>
101
				<os>
102
					<family>unix</family>
103
					<name>linux</name>
104
					<arch>x86_64</arch>
105
				</os>
106
			</activation>
107
			<properties>
108
				<gvsig.install.plugin>true</gvsig.install.plugin>
109
			</properties>
110
		</profile>
111

  
112
		<profile>
113
			<id>gvsig-plugin-install-gdal-linux-amd64</id>
114
			<activation>
115
				<os>
116
					<family>unix</family>
117
					<name>linux</name>
118
					<arch>amd64</arch>
119
				</os>
120
			</activation>
121
			<properties>
122
				<gvsig.install.plugin>true</gvsig.install.plugin>
123
			</properties>
124
		</profile>
125

  
126
	</profiles>
82 127
  
83
    <profile>
84
      <id>gvsig-plugin-install-driver-linux-x86</id>
85
      <activation>
86
         <os>
87
             <family>unix</family>
88
             <name>linux</name>
89
             <arch>x86</arch>
90
         </os>
91
      </activation>
92
	  <properties>
93
	    <gvsig.install.plugin>true</gvsig.install.plugin>
94
	  </properties>
95
    </profile>
96
  </profiles>
97
  
98 128
</project>
99 129

  
trunk/org.gvsig.gdal/pom.xml
92 92
			</dependency>
93 93
			<dependency>
94 94
				<groupId>org.gvsig</groupId>
95
				<artifactId>org.gvsig.gdal.app.mainplugin.all.all</artifactId>
96
				<version>1.0.0-SNAPSHOT</version>
97
			</dependency>
98
			<dependency>
99
				<groupId>org.gvsig</groupId>
95 100
				<artifactId>org.gvsig.gdal.app.mainplugin.lin.x86</artifactId>
96 101
				<version>1.0.0-SNAPSHOT</version>
97 102
			</dependency>
......
108 113
			<dependency>
109 114
				<groupId>org.gdal</groupId>
110 115
				<artifactId>gdal</artifactId>
111
				<version>1.10.1</version>
116
				<version>1.11.2</version>
112 117
			</dependency>
113 118
			<dependency>
114 119
				<groupId>org.gvsig</groupId>

Also available in: Unified diff