Revision 34422

View differences:

branches/v2_0_0_prep/build/projects/gvsig-standard/gvsig-standard-installer/src/main/installjammer/gvsig-standard-installer.mpi
84 84
{}
85 85

  
86 86
InstallVersion
87
{2.0.0.2023}
87
{2.0.0.2024}
88 88

  
89 89
Language,ca
90 90
{Yes}
......
8948 8948
{0755}
8949 8949

  
8950 8950
Linux-x86,Executable
8951
{<%ShortAppName%>-<%Version%>-2023-devel-lin-x86-j1_5.bin}
8951
{<%ShortAppName%>-<%Version%>-<%BuildVersion%>-devel-lin-x86-j1_5.bin}
8952 8952

  
8953 8953
Linux-x86,FallBackToConsole
8954 8954
{Yes}
......
9182 9182
{Typical}
9183 9183

  
9184 9184
TarArchive,OutputFileName
9185
{<%AppName%>-<%Version%>-devel-lin-x86-j1_5.tar.gz}
9185
{<%ShortAppName%>-<%Version%>-<%BuildVersion%>-devel-all-x86-j1_5.tar.gz}
9186 9186

  
9187 9187
TarArchive,ProgramExecutable
9188 9188
{}
......
9221 9221
{No}
9222 9222

  
9223 9223
Windows,Executable
9224
{<%ShortAppName%>-<%Version%>-2023-devel-win-x86-j1_5.exe}
9224
{<%ShortAppName%>-<%Version%>-<%BuildVersion%>-devel-win-x86-j1_5.exe}
9225 9225

  
9226 9226
Windows,FileDescription
9227 9227
{<%AppName%> <%Version%> Setup}
......
9299 9299
{Typical}
9300 9300

  
9301 9301
ZipArchive,OutputFileName
9302
{<%AppName%>-<%Version%>-devel-win-x86-j1_5.zip}
9302
{<%ShortAppName%>-<%Version%>-<%BuildVersion%>-devel-all-x86-j1_5.zip}
9303 9303

  
9304 9304
ZipArchive,ProgramExecutable
9305 9305
{}
branches/v2_0_0_prep/build/projects/gvsig-standard/gvsig-standard-installer/pom.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2

  
3 3
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
4
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5 5
                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
6 6

  
7
	<modelVersion>4.0.0</modelVersion>
8
	<parent>
9
		<artifactId>gvsig-standard</artifactId>
10
		<groupId>org.gvsig</groupId>
11
		<version>2.0-SNAPSHOT</version>
12
	</parent>
13
	<groupId>org.gvsig</groupId>
14
	<artifactId>gvsig-standard-installer</artifactId>
15
	<version>2.0-SNAPSHOT</version>
16
	<name>gvsig-standard-installer</name>
17
	<packaging>pom</packaging>
18
	<profiles>
19
		<profile>
20
			<id>create-installer</id>
21
			<properties>
22
				<install.build.dir>${project.build.directory}/installjammer</install.build.dir>
23
				<!-- 
24
					You can set those properties in a profile in your 
25
					settings.xml file to change the default location 
26
				-->
27
				<gvsig.install.dir>${basedir}../../../../product</gvsig.install.dir>
28
				<gvsig.native.libs.dir>${user.home}/.depman/lib</gvsig.native.libs.dir>
7
    <modelVersion>4.0.0</modelVersion>
8
    <parent>
9
        <artifactId>gvsig-standard</artifactId>
10
        <groupId>org.gvsig</groupId>
11
        <version>2.0-SNAPSHOT</version>
12
    </parent>
13
    <groupId>org.gvsig</groupId>
14
    <artifactId>gvsig-standard-installer</artifactId>
15
    <version>2.0-SNAPSHOT</version>
16
    <name>gvsig-standard-installer</name>
17
    <packaging>pom</packaging>
18
    <profiles>
19
        <profile>
20
            <id>create-installer</id>
21
            <properties>
22
                <install.build.dir>${project.build.directory}/installjammer</install.build.dir>
23
                <!-- You can set those properties in a profile in your settings.xml 
24
                    file to change the default location -->
25
                <gvsig.install.dir>${basedir}../../../../product</gvsig.install.dir>
26
                <gvsig.native.libs.dir>${user.home}/.depman/lib</gvsig.native.libs.dir>
29 27
                <gvsig.native.win.libs.dir>${user.home}/.depman/bin</gvsig.native.win.libs.dir>
30
			</properties>
31
			<build>
32
				<plugins>
33
					<plugin>
34
						<groupId>org.codehaus.mojo</groupId>
35
						<artifactId>exec-maven-plugin</artifactId>
36
						<executions>
37
							<execution>
38
								<phase>install</phase>
39
								<goals>
40
									<goal>exec</goal>
41
								</goals>
42
								<configuration>
28
                <appgvsig.install.dir>${gvsig.install.dir}/gvSIG/extensiones/org.gvsig.app</appgvsig.install.dir>
29
            </properties>
30
            <build>
31
                <plugins>
32
                    <plugin>
33
                        <groupId>org.codehaus.mojo</groupId>
34
                        <artifactId>properties-maven-plugin</artifactId>
35
                        <executions>
36
                            <execution>
37
                                <phase>install</phase>
38
                                <goals>
39
                                    <goal>read-project-properties</goal>
40
                                </goals>
41
                                <configuration>
42
                                    <files>
43
                                        <file>${appgvsig.install.dir}/package.info</file>
44
                                        <file>${appgvsig.install.dir}/buildNumber.properties</file>
45
                                    </files>
46
                                </configuration>
47
                            </execution>
48
                        </executions>
49
                    </plugin>
50
                    <plugin>
51
                        <groupId>org.codehaus.mojo</groupId>
52
                        <artifactId>exec-maven-plugin</artifactId>
53
                        <executions>
54
                            <execution>
55
                                <phase>install</phase>
56
                                <goals>
57
                                    <goal>exec</goal>
58
                                </goals>
59
                                <configuration>
43 60
                                    <!-- Tested with InstallJammer 1.2.15b1 -->
44
									<executable>installjammer</executable>
45
									<arguments>
46
										<argument>--output-dir ${install.build.dir}/output</argument>
47
										<!--argument>-DBaseDir ${basedir}/../../product</argument-->
48
										<argument>-DBaseDir ${gvsig.install.dir}</argument>
49
										<argument>-DNativeLibsDir ${gvsig.native.libs.dir}</argument>
50
                                        <argument>-DWinNativeLibsDir ${gvsig.native.win.libs.dir}</argument>
51
										<argument>--build-for-release</argument>
52
										<argument>--build-dir ${install.build.dir}</argument>
53
										<argument>--build-log-file ${project.build.directory}/build.log</argument>
54
										<argument>--verbose</argument>
55
										<argument>--build</argument>
56
										<argument>${basedir}/src/main/installjammer/${project.artifactId}.mpi</argument>
57
									</arguments>
58
								</configuration>
59
							</execution>
60
						</executions>						
61
					</plugin>
62
				</plugins>
63
			</build>
64
		</profile>
65
	</profiles>
61
                                    <executable>installjammer</executable>
62
                                    <arguments>
63
                                        <argument>--output-dir
64
                                            ${install.build.dir}/output</argument>
65
                                        <!--argument>-DBaseDir ${basedir}/../../product</argument -->
66
                                        <argument>-DBaseDir ${gvsig.install.dir}</argument>
67
                                        <argument>-DNativeLibsDir
68
                                            ${gvsig.native.libs.dir}</argument>
69
                                        <argument>-DWinNativeLibsDir
70
                                            ${gvsig.native.win.libs.dir}</argument>
71
                                        <argument>-DInstallVersion ${gvSIG-version}.${buildNumber}</argument>
72
                                        <argument>-DVersion ${gvSIG-version}</argument>
73
                                        <argument>--build-for-release</argument>
74
                                        <argument>--build-dir
75
                                            ${install.build.dir}</argument>
76
                                        <argument>--build-log-file
77
                                            ${project.build.directory}/build.log</argument>
78
                                        <argument>--verbose</argument>
79
                                        <argument>--build</argument>
80
                                        <argument>${basedir}/src/main/installjammer/${project.artifactId}.mpi</argument>
81
                                    </arguments>
82
                                </configuration>
83
                            </execution>
84
                        </executions>
85
                    </plugin>
86
                </plugins>
87
            </build>
88
        </profile>
89
    </profiles>
66 90
</project>
branches/v2_0_0_prep/applications/appgvSIG/distribution/distribution.xml
27 27
            <outputDirectory>${extension.install.dir.name}
28 28
            </outputDirectory>
29 29
        </file>
30
        <file>
31
            <source>buildNumber.properties</source>
32
            <outputDirectory>${extension.install.dir.name}
33
            </outputDirectory>
34
        </file>
30 35
    </files>
31 36
	<!--
32 37
		***********************************************************************

Also available in: Unified diff