Revision 43790

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.annotation/org.gvsig.annotation.swing/org.gvsig.annotation.swing.impl/.project
1
<?xml version="1.0" encoding="UTF-8"?>
2
<projectDescription>
3
	<name>org.gvsig.annotation.swing.impl</name>
4
	<comment></comment>
5
	<projects>
6
	</projects>
7
	<buildSpec>
8
		<buildCommand>
9
			<name>org.eclipse.jdt.core.javabuilder</name>
10
			<arguments>
11
			</arguments>
12
		</buildCommand>
13
		<buildCommand>
14
			<name>org.eclipse.m2e.core.maven2Builder</name>
15
			<arguments>
16
			</arguments>
17
		</buildCommand>
18
	</buildSpec>
19
	<natures>
20
		<nature>org.eclipse.jdt.core.javanature</nature>
21
		<nature>org.eclipse.m2e.core.maven2Nature</nature>
22
	</natures>
23
</projectDescription>
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/packaging/gvspkg
629 629
        shorthelp(args)
630 630
        sys.exit(2)
631 631

  
632
    for platform in platforms:
633
      excludes_pkg_by_os[platform.getOS()] = list()
634
      
632 635
    default_selection = None
633 636
    index_only = False
634 637
    clear_list=False
......
646 649
        elif opt in ( "--excludepki"):
647 650
            excludes_pki.append(arg)
648 651
        elif opt in ( "--excludepkg"):
649
            excludes_pkg.append(arg)
652
            if ":" in arg:
653
              osid, arg = arg.split(":")
654
              excludes_pkg_by_os[osid] = arg
655
            else:
656
              excludes_pkg.append(arg)
650 657
        elif opt in ( "--include", "-I"):
651 658
            if not os.path.isabs(arg) :
652 659
              arg = os.path.join(getPool(), arg)
......
715 722
        message( "Writing 'packages-"+platform.getOS()+"-"+platform.getArch()+".gvspks' to '%s'" % packages_gvspks )
716 723
        set = zipfile.ZipFile(packages_gvspks,"w",zipfile.ZIP_STORED)
717 724
        for info in indexes:
718
            if not info.match(excludes_pkg):
725
            if not info.match(excludes_pkg) and not info.match(excludes_pkg_by_os[platform.getOS()]):
719 726
                try:
720 727
                    if info.hasPkg():
721 728
                      if info.getOS() in ("all", platform.getOS()) :
......
2017 2024
main()
2018 2025

  
2019 2026

  
2027

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.shp.app/org.gvsig.shp.app.mainplugin/buildNumber.properties
1 1
#Tue Feb 20 10:20:55 CET 2018
2
buildNumber=2766
2
buildNumber=2767
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.selectiontools.app/.project
1
<?xml version="1.0" encoding="UTF-8"?>
2
<projectDescription>
3
	<name>org.gvsig.selectiontools.app</name>
4
	<comment></comment>
5
	<projects>
6
	</projects>
7
	<buildSpec>
8
		<buildCommand>
9
			<name>org.eclipse.m2e.core.maven2Builder</name>
10
			<arguments>
11
			</arguments>
12
		</buildCommand>
13
	</buildSpec>
14
	<natures>
15
		<nature>org.eclipse.m2e.core.maven2Nature</nature>
16
	</natures>
17
</projectDescription>

Also available in: Unified diff