Revision 38072

View differences:

trunk/install/installjammer/gvsig-standard-installer.mpi
6988 6988
3FCCA384-2783-D981-2506-3A9F5DBE3E9B,FileUpdateMethod
6989 6989
{Always overwrite files}
6990 6990

  
6991
3FCCA384-2783-D981-2506-3A9F5DBE3E9B,FollowFileLinks
6992
{Yes}
6993

  
6994 6991
3FCCA384-2783-D981-2506-3A9F5DBE3E9B,Name
6995 6992
{Linux i386}
6996 6993

  
trunk/install/launch4j/gvsig_package_installer.xml
32 32
  <versionInfo>
33 33
    <fileVersion>1.12.0.1406</fileVersion>
34 34
    <txtFileVersion>1.12.0 build 1406</txtFileVersion>
35
    <fileDescription>gvSIG package installer 1.12.0</fileDescription>
35
    <fileDescription>gvSIG package installer</fileDescription>
36 36
    <copyright>gvSIG Association</copyright>
37 37
    <productVersion>1.12.0.1406</productVersion>
38 38
    <txtProductVersion>1.12.0 build 1406</txtProductVersion>
trunk/install/launch4j/gvsig.xml
32 32
  <versionInfo>
33 33
    <fileVersion>1.12.0.1406</fileVersion>
34 34
    <txtFileVersion>1.12.0 build 1406</txtFileVersion>
35
    <fileDescription>gvSIG desktop 1.12.0</fileDescription>
35
    <fileDescription>gvSIG desktop</fileDescription>
36 36
    <copyright>(c) 2009-2012 gvSIG Association</copyright>
37 37
    <productVersion>1.12.0.1406</productVersion>
38 38
    <txtProductVersion>1.12.0 build 1406</txtProductVersion>
trunk/install/deploy.xml
1
<project name="Deploy gvSIG" default="deployTrunk" basedir="../appgvSIG">
1
<project name="Deploy gvSIG" default="createInstallersFromSource" basedir="../appgvSIG">
2 2
    <description>
3 3
    	Ant file to deploy gvSIG
4 4
    </description>
......
7 7
	<import file="../install/gvsig_default_installation_projects.xml"/>
8 8
	<!-- be aware to not overwrite the appgvSIG targets -->
9 9
	<import file="../appgvSIG/build.xml"/>
10

  
11 10
	
12

  
13
	<!-- <loadproperties srcFile="${basedir}/../../appgvSIG/package.info"/> --> 
11
	
12
	
13
	<!-- IMPORTANT. Change the location to match your settings -->
14
	<property name="launch4j.dir" location="/usr/local/development/launch4j" />
15
	
16
	<taskdef name="launch4j" 
17
		classname="net.sf.launch4j.ant.Launch4jTask" 
18
		classpath="${launch4j.dir}/launch4j.jar:${launch4j.dir}/lib/xstream.jar" />
19
	
20
	<target name="createWindowsExecutables">
14 21
		
15

  
16

  
17
	<target name="deployTrunk">
22
		<loadproperties srcFile="${basedir}/package.info"/>
23
		<launch4j configFile="../install/launch4j/gvsig.xml"
24
			fileVersion="${gvSIG-version}.${buildNumber}"
25
			txtFileVersion="${gvSIG-version} build ${buildNumber}"
26
			productVersion="${gvSIG-version}.${buildNumber}"
27
			txtProductVersion="${gvSIG-version} build ${buildNumber}"
28
		/>
29
				
30
		<launch4j configFile="../install/launch4j/gvsig_package_installer.xml"
31
			fileVersion="${gvSIG-version}.${buildNumber}"
32
			txtFileVersion="${gvSIG-version} build ${buildNumber}"
33
			productVersion="${gvSIG-version}.${buildNumber}"
34
			txtProductVersion="${gvSIG-version} build ${buildNumber}"
35
		/>
36
	</target>
37
	
38
	<target name="buildFromSource">
18 39
				<!--
19 40
					TODO: ¿Delete ${dist}?. {Delete _fwAndami/lib and the remaining stuff in root _fwAndami?
20 41
				-->
......
40 61
				<!-- fpuga. Workaround to get the binaries "compiled" at the same time for both platforms -->
41 62
				<ant antfile="../binaries/w32/build.xml" inheritall="false" />
42 63
				<ant antfile="../binaries/linux/build.xml" inheritall="false" />
43
		
44
		<!-- 
45
		We should recreate .exe and .sh files with the correct version and build number
46
		launch4j /home/fpuga/development/workspace/install/launch4j/gvsig_package_installer.xml
47
		launch4j /home/fpuga/development/workspace/install/launch4j/gvsig.xml 
48
		-->
49
		</target>
64
	</target>
50 65
	
66
	<target name="createInstallers">
67
			<ant antfile="../install/installjammer/build.xml" inheritall="false" />
68
	</target>
69
	
70
	<target name="createInstallersFromSource" depends="buildFromSource,createWindowsExecutables,createInstallers">
71
	</target>
51 72

  
52 73
</project>

Also available in: Unified diff