Revision 40581 trunk/org.gvsig.desktop/org.gvsig.desktop.installer/pom.xml

View differences:

pom.xml
41 41
                      <configuration>
42 42
                          <files>
43 43
		                        <!-- Define gvsig.product.folder.path in this property -->
44
		                        <file>${user.home}/.gvsig-devel.properties</file>
44
		                        <file>${env.HOME}/.gvsig-devel.properties</file>
45 45
		                        <file>${project.basedir}/gvsig-devel.properties</file>
46 46
                          </files>
47 47
                          <quiet>true</quiet>
......
63 63
                  </goals>
64 64
                  <configuration>
65 65
                    <source><![CDATA[
66
  // println project.metaClass.methods*.name.sort().unique()  
67
  
66 68
  ant = new AntBuilder()
67 69
  log.info("For create windows launchers launch4j is requiered in the PATH. In linux link launch4j to launch4jc.")
68 70
  log.info("For create installer InstallJammer is required in the PATH.")
......
153 155
  jre_pkg_name = "gvSIG-desktop-2.0.0-jre_6_windows_i586-1.6.26-0-devel-win-x86-j1_6.gvspkg"
154 156
  url = "http://downloads.gvsig.org/download/gvsig-desktop/pool/jre_6_windows_i586/" + jre_pkg_name
155 157
  target = project.basedir.getAbsolutePath() + "/target/" + jre_pkg_name
156
  if(! new File(target).exists() ) { 			                   
157
    log.info("Downloading windows jre plugin")
158
    ant.get(src: url, dest: target)
158
  if(! new File(target).exists() ) {
159
  	if( project.properties["jre.path"]!=null ) {
160
  		if( project.properties["jre.path"].endsWith(".gvspkg") ) {
161
  			source = project.properties["jre.path"]
162
  		} else {
163
	  		source = project.properties["jre.path"] + "/" + jre_pkg_name
164
  		}
165
		if (source.startsWith("~" + File.separator)) {
166
		    source = System.getenv().get("HOME") + source.substring(1);
167
		}
168
  		if( ! new File(source).exists() ) {
169
			log.info("jre specified in jre.path variable not found - "+source)
170
		    log.info("Downloading windows jre plugin")
171
		    ant.get(src: url, dest: target)
172
		} else {
173
		    log.info("Copy windows jre plugin")
174
		    ant.copy(file:source, todir:project.basedir.getAbsolutePath() + "/target/")
175
		}  		
176
  	} else {
177
	    log.info("Downloading windows jre plugin")
178
	    ant.get(src: url, dest: target)
179
  	}		                   
159 180
  } else {
160 181
    log.info("Skip download of jre, it exist in local filesystem.")
161 182
  }

Also available in: Unified diff