Revision 42745

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.lin.x86_64/src/main/scripts/deploy_lin.groovy
5 5

  
6 6
def deployInstallers(helper) {
7 7

  
8
        WebDAVClient session = helper.getWebDAVClient(log);
9
        targetfolder = helper.getAddOnRepoURL()
10
        sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
8
  WebDAVClient session = helper.getWebDAVClient(log);
9
  targetfolder = helper.getAddOnRepoURL()
10
  sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
11 11

  
12
        session.makedirs(targetfolder);
12
  session.makedirs(targetfolder);
13 13

  
14
        fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
        session.put(
16
	  sourcefolder + "/" + fname,
17
	  targetfolder+"/" + fname
18
	)
14
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
  session.put(
16
    sourcefolder + "/" + fname,
17
    targetfolder+"/" + fname
18
  )
19
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.zip")
20
  session.put(
21
    sourcefolder + "/" + fname,
22
    targetfolder+"/" + fname
23
  )
19 24
}
20 25

  
21 26

  
22 27
def main() {
23
    if( project.properties["deploy-installers"] != null ) {
24
	def helper = new Helper(log,project)
28
  if( project.properties["deploy-installers"] != null ) {
29
    def helper = new Helper(log,project)
25 30

  
26
        deployInstallers(helper)
27
    }
31
    deployInstallers(helper)
32
  }
28 33

  
29 34
}
30 35

  
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.lin.x86_64/src/main/scripts/prepare_lin.groovy
15 15

  
16 16
    log.info("Copy org.gvsig.desktop.installer.izpack.extractpackages.jar")
17 17
    helper.copy_extractpackages_jar(target)
18

  
19
    helper.prepare_portable()
20
    helper.pack_portable()
18 21
}
19 22

  
23

  
20 24
main()
21 25

  
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/src/main/scripts/Helper.groovy
264 264

  
265 265
  }
266 266

  
267
  def expand(s) {
268

  
269
    def t = "target/portable/gvSIG-desktop-"+this.getVersionWithoutBuildNumber()
270
    def install_path = new File(project.basedir, t).getAbsolutePath()
271
    s = s.replace("\${product.folder}",this.getInstallationFolder().getAbsolutePath())
272
    s = s.replace("\${INSTALL_PATH}",install_path)
273
    s = s.replace("\$INSTALL_PATH",install_path)
274
    return s
275
  }
276

  
277
  def prepare_portable() {
278

  
279
    def t = "target/portable/gvSIG-desktop-"+this.getVersionWithoutBuildNumber()
280
    def install_path = new File(project.basedir, t).getAbsoluteFile()
281
    install_path.mkdirs()
282

  
283
    def target = new File(project.basedir, "target")
284
    def installfile = new File(target,"install.xml")
285
    def install = new XmlSlurper().parse(installfile)
286
    install.packs.each {
287
      it.pack.each {
288
	it.file.each {
289
	  def src = new File(expand(it.@src.text()))
290
	  if( !src.isAbsolute() ) {
291
	    src = new File(target,src.getPath())
292
	  }
293
	  def targetdir = expand(it.@targetdir.text())
294
	  this.copyFileToDir(src,targetdir)
295
	}
296
	it.fileset.each {
297
	  def src = new File(expand(it.@dir.text()))
298
	  if( !src.isAbsolute() ) {
299
	    src = new File(target,src.getPath())
300
	  }
301
	  def targetdir = expand(it.@targetdir.text())
302
	  this.copyDirToDir(src,targetdir)
303
	}
304
	it.executable.each {
305
	  def targetfile = new File(expand(it.@targetfile.text()))
306
	  targetfile.setExecutable(true)
307
	}
308
      }
309
    }
310

  
311
    this.copyDirToDir(
312
      this.getInstallationFolder("gvSIG/extensiones/org.gvsig.coreplugin.app.mainplugin"),
313
      new File(install_path,"gvSIG/extensiones/org.gvsig.coreplugin.app.mainplugin")
314
    )
315
    this.copyDirToDir(
316
      this.getInstallationFolder("gvSIG/extensiones/org.gvsig.installer.app.mainplugin"),
317
      new File(install_path,"gvSIG/extensiones/org.gvsig.installer.app.mainplugin")
318
    )
319
  }
320

  
321
  def pack_portable() {
322

  
323
    def t = "target/portable/gvSIG-desktop-"+this.getVersionWithoutBuildNumber()
324
    def install_path = new File(project.basedir, t).getAbsoluteFile()
325
    def target = new File(project.basedir, "target")
326

  
327
    def portablezip = new File(target,this.getInstallerName(
328
      "-" +
329
      project.properties["installer_os"] +
330
      "-" +
331
      project.properties["installer_architecture"] +
332
      "-online.zip"
333
    ))
334

  
335
    this.ant.zip(
336
      destfile: portablezip,
337
      basedir: install_path
338
    )
339
  }
340

  
267 341
}
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.win.x86/src/main/scripts/deploy_win.groovy
5 5

  
6 6
def deployInstallers(helper) {
7 7

  
8
        WebDAVClient session = helper.getWebDAVClient(log);
9
        targetfolder = helper.getAddOnRepoURL()
10
        sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
8
  WebDAVClient session = helper.getWebDAVClient(log);
9
  targetfolder = helper.getAddOnRepoURL()
10
  sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
11 11

  
12
        session.makedirs(targetfolder);
12
  session.makedirs(targetfolder);
13 13

  
14
	fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
	session.put(
16
	  sourcefolder + "/" + fname,
17
	  targetfolder+"/" + fname
18
	)
14
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
  session.put(
16
    sourcefolder + "/" + fname,
17
    targetfolder+"/" + fname
18
  )
19
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.zip")
20
  session.put(
21
    sourcefolder + "/" + fname,
22
    targetfolder+"/" + fname
23
  )
19 24
}
20 25

  
21 26

  
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.win.x86/src/main/scripts/prepare_win.groovy
27 27
      src: "http://downloads.gvsig.org/download/gvsig-desktop/runtimes/winutils/x86/cygcheck.exe",
28 28
      dest: new File(target,"cygcheck.exe").getAbsolutePath()
29 29
    )
30
    helper.prepare_portable()
31
    helper.pack_portable()
32

  
30 33
}
31 34

  
32 35
main()
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.lin.x86/src/main/scripts/deploy_lin.groovy
5 5

  
6 6
def deployInstallers(helper) {
7 7

  
8
        WebDAVClient session = helper.getWebDAVClient(log);
9
        targetfolder = helper.getAddOnRepoURL()
10
        sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
8
  WebDAVClient session = helper.getWebDAVClient(log);
9
  targetfolder = helper.getAddOnRepoURL()
10
  sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
11 11

  
12
        session.makedirs(targetfolder);
12
  session.makedirs(targetfolder);
13 13

  
14
        fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
        session.put(
16
	  sourcefolder + "/" + fname,
17
	  targetfolder+"/" + fname
18
	)
14
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
  session.put(
16
    sourcefolder + "/" + fname,
17
    targetfolder+"/" + fname
18
  )
19
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.zip")
20
  session.put(
21
    sourcefolder + "/" + fname,
22
    targetfolder+"/" + fname
23
  )
19 24
}
20 25

  
21 26

  
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.lin.x86/src/main/scripts/prepare_lin.groovy
15 15

  
16 16
    log.info("Copy org.gvsig.desktop.installer.izpack.extractpackages.jar")
17 17
    helper.copy_extractpackages_jar(target)
18

  
19
    helper.prepare_portable()
20
    helper.pack_portable()
18 21
}
19 22

  
20 23
main()
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.win.x86_64/src/main/scripts/prepare_win.groovy
27 27
      src: "http://downloads.gvsig.org/download/gvsig-desktop/runtimes/winutils/x64/cygcheck.exe",
28 28
      dest: new File(target,"cygcheck.exe").getAbsolutePath()
29 29
    )
30
    helper.prepare_portable()
31
    helper.pack_portable()
30 32
}
31 33

  
32 34
main()
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.win.x86_64/src/main/scripts/deploy_win.groovy
5 5

  
6 6
def deployInstallers(helper) {
7 7

  
8
        WebDAVClient session = helper.getWebDAVClient(log);
9
        targetfolder = helper.getAddOnRepoURL()
10
        sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
8
  WebDAVClient session = helper.getWebDAVClient(log);
9
  targetfolder = helper.getAddOnRepoURL()
10
  sourcefolder  = new File(project.basedir, "target").getAbsolutePath()
11 11

  
12
        session.makedirs(targetfolder);
12
  session.makedirs(targetfolder);
13 13

  
14
	fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
	session.put(
16
	  sourcefolder + "/" + fname,
17
	  targetfolder+"/" + fname
18
	)
14
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.jar")
15
  session.put(
16
    sourcefolder + "/" + fname,
17
    targetfolder+"/" + fname
18
  )
19
  fname = helper.getInstallerName("-"+project.properties["installer_os"]+"-"+project.properties["installer_architecture"]+"-online.zip")
20
  session.put(
21
    sourcefolder + "/" + fname,
22
    targetfolder+"/" + fname
23
  )
19 24
}
20 25

  
21 26

  

Also available in: Unified diff