Revision 43458 trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/packaging/gvspkg

View differences:

gvspkg
71 71
    return self.portableSufix
72 72

  
73 73
platforms = (
74
  Platform("lin","x86_64",".run"),
75
  Platform("win","x86_64",".exe"),
74 76
  Platform("darwin_macos_10.11","x86_64",".run",onlinefamily="lin", portableSufix=".app"),
75
  Platform("lin_ubuntu_14.04","x86_64",".run"),
76
  Platform("lin_ubuntu_14.04","x86",".run"),
77 77
  Platform("lin","x86",".run"),
78
  Platform("lin","x86_64",".run"),
79 78
  Platform("win","x86",".exe"),
80
  Platform("win","x86_64",".exe")
79
  Platform("lin_ubuntu_14.04","x86_64",".run"),
80
  Platform("lin_ubuntu_14.04","x86",".run")
81 81
)
82 82

  
83 83

  
......
1088 1088
    makedirs(join(portable_folder,"packages","custom"))
1089 1089
    makedirs(join(portable_folder,"standard"))
1090 1090
    makedirs(join(portable_folder,"patchs"))
1091
    f=open(join(portable_folder,"packages","excludes"),"w")
1092
    f.write("""EPSG_v6
1093
EPSG_v8_4
1094
EPSG_v8_5
1095
EPSG_v8_6
1096
org.gvsig.app.document.layout1.app.mainplugin
1097
org.gvsig.dyschromatopsia.app.extension
1098
org.gvsig.educa.portableview.app.editor
1099
org.gvsig.educa.portableview.app.viewer
1100
org.gvsig.projection.app.cresques
1101
org.gvsig.projection.app.proj4j
1102
org.gvsig.editing.app.mainplugin
1103
org.gvsig.downloader.app.mainplugin
1104
org.gvsig.publish.app.mainplugin
1105
org.gvsig.mapsheets.app.mainplugin
1106
org.gvsig.customize.app.mainplugin
1107
org.gvsig.timesupport.app.viewfilter
1108
org.gvsig.timesupport.app.animation
1109
""")
1110
    f.close()
1111
    fname_base = "gvSIG-desktop-%s-%s-%s" % (getVersion(),build,state)
1091
    shutil.copy(
1092
        join(getPackagesRoot(),"dists",getVersion(),"excludes.portable"),
1093
        join(portable_folder,"packages","excludes") 
1094
    )
1112 1095
    for platform in platforms :
1096
      fname_base = "gvSIG-desktop-%s-%s-%s-%s-%s" % (
1097
        getVersion(),build,state,platform.getOS(),platform.getArch()
1098
      )
1113 1099
      linkfile(
1114
        join(build_folder,fname_base + "-" + platform.getOS() + "-" + platform.getArch() + "-online.zip"),
1115
        join(portable_folder,"standard",fname_base + "-" + platform.getOS() + "-" + platform.getArch() + "-online.zip")
1100
        join(build_folder,fname_base + "-online.zip"),
1101
        join(portable_folder,"standard",fname_base + "-online.zip")
1116 1102
      )
1117 1103
      linkfile(
1118
        join(build_folder,fname_base + "-" + platform.getOS() + "-" + platform.getArch() + ".gvspks"),
1119
        join(portable_folder,"standard",fname_base + "-" + platform.getOS() + "-" + platform.getArch() + ".gvspks")
1104
        join(build_folder,fname_base + ".gvspks"),
1105
        join(portable_folder,"standard",fname_base + ".gvspks")
1120 1106
      )
1121 1107
    extract_make_portable(
1122
      join(build_folder,fname_base + "-lin-x86_64-online.zip"),
1108
      join(build_folder,fname_base + "-online.zip"),
1123 1109
      join(portable_folder)
1124 1110
    )
1125 1111
    mychmod(join(portable_folder,"make-portable"),RWXALL)
......
1169 1155

  
1170 1156
    join = os.path.join
1171 1157
    build_folder = join(getPackagesRoot(),"dists",getVersion(),"builds",build)
1158
    portable_folder = join(build_folder,"misc","portable")
1159
    target_folder = join(portable_folder,"target")
1160

  
1172 1161
    if not os.path.isdir(build_folder):
1173 1162
      print "Can't access the build folder "+build_folder+"."
1174 1163
      sys.exit(2)
1175 1164

  
1176
    portable_folder = join(build_folder,"misc","portable")
1177 1165
    if not os.path.isdir(portable_folder) :
1178 1166
      do_prepare_portable(build,state)
1179 1167
    os.system('cd %s ; ./make-portable' % (portable_folder))
1180 1168

  
1181
    message("Removing previos portable zip files")
1169
    message("Moving portable zip files to build folder")
1182 1170
    for platform in platforms :
1183
      removefile(join(build_folder,"gvSIG-desktop-%s-%s-%s-%s-%s%s.zip" %  (
1171
      fname = "gvSIG-desktop-%s-%s-%s-%s-%s%s.zip" %  (
1184 1172
        getVersion(),build,state,platform.getOS(),platform.getArch(), platform.getPortableSufix()
1185
      )))
1186

  
1187
    target_folder = join(getPackagesRoot(),"dists",getVersion(),"builds",build,"misc","portable","target")
1188
    for platform in platforms :
1189
      message("Moving zip gvSIG-desktop-%s-%s-%s-%s-%s%s.zip" % (
1190
        getVersion(),build,state,platform.getOS(),platform.getArch(), platform.getPortableSufix()
1191
      ))
1192
      shutil.move(
1193
        join(portable_folder,"target","gvSIG-desktop-%s-%s-%s-%s-%s%s.zip" % (
1194
        getVersion(), build, state, platform.getOS(), platform.getArch(), platform.getPortableSufix()
1195
    )
1196
  ),
1197
        build_folder
1198 1173
      )
1174
      if os.path.exists(join(target_folder,fname)) :
1175
        message("    Removing previos %s" % fname)
1176
        removefile(join(build_folder,fname))
1177
        message("    Moving zip %s" % fname)
1178
        shutil.move(join(target_folder,fname), build_folder)
1179
      else:
1180
        message("    Skip zip %s" % fname)
1181

  
1199 1182
    message("Remove temporary folders")
1200 1183
    shutil.rmtree(target_folder)
1201 1184

  
......
1566 1549
            assert False, "unhandled option %r" % opt
1567 1550

  
1568 1551
    url_pki = args[0]
1569
    if url_pki.startswith("https:") and nohttps :
1552
    if url_pki.endswith(".gvspki") and url_pki.startswith("https:") and nohttps :
1570 1553
       url_pki = "http:" + url_pki[6:]
1571 1554

  
1572 1555
    message( "Download package index '%s'" % url_pki)

Also available in: Unified diff