Revision 42730

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/packaging/gvspkg
1199 1199
      shorthelp(args)
1200 1200
      sys.exit(2)
1201 1201

  
1202
    #
1203
    # Independientemente de la plataforma, los binarios de la version online a utilizar
1204
    # que usamos son siempre los de x86, con lo que el instalador siempre sera para x86.
1205
    # Si hemos especificado que queremos una instalacion para x86, este llevara solo paquetes
1206
    # multiplataforma, "all", y "x86".
1207
    # Si hemos especificado que queremos una instalacion para x86_64, este llevara solo paquetes
1208
    # multiplataforma, "all", y "x86_64".
1209
    #
1210

  
1211 1202
    if not os.path.isdir("builds/"+build):
1212 1203
      print "Can't access the build folder builds/"+build+"."
1213 1204
      sys.exit(2)
......
1233 1224
      for cur_platform in platforms:
1234 1225
        message( "Creating installers for platform "+cur_os+"/"+cur_platform+"...")
1235 1226
        gvspks_filename = "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-"+cur_platform+".gvspks"
1236
        online_filename = "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-x86-online" + exec_extension
1227
        online_filename = "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-"+cur_platform + "-online" + exec_extension
1237 1228

  
1238 1229
        if not os.path.isfile(online_filename):
1239 1230
          msgwarn("Can't access the online installable for "+cur_os+"/"+cur_platform + " ("+online_filename+").")
1240 1231
          continue
1241 1232

  
1242
        message( "Coping packages-"+cur_os+"-"+cur_platform+"..gvspks to "+ gvspks_filename)
1233
        message( "Coping packages-"+cur_os+"-"+cur_platform+".gvspks to "+ gvspks_filename)
1243 1234
        shutil.copyfile("packages-"+cur_os+"-"+cur_platform+".gvspks", gvspks_filename)
1244 1235
        shutil.copyfile("packages-"+cur_os+"-"+cur_platform+".gvspks.md5", gvspks_filename +".md5")
1245 1236

  
......
1255 1246
        message( "Renaming files from custom to standard...")
1256 1247
        target_filename = "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-"+cur_platform+"-"+distribution_name + exec_extension
1257 1248
        shutil.move(
1258
            "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-x86-custom" + exec_extension,
1249
            "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-"+cur_platform + "-custom" + exec_extension,
1259 1250
            target_filename
1260 1251
        )
1261 1252
        mychmod(target_filename,RWXALL)
......
1263 1254
        md5sum(target_filename,target_filename+".md5")
1264 1255
        mychmod(target_filename+".md5",RWALL)
1265 1256

  
1266
        """
1267
        target_filename = "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-"+cur_platform+"-"+distribution_name+"-withjre" + exec_extension
1268
        shutil.move(
1269
            "builds/"+build+"/gvSIG-desktop-" + VERSION + "-" + build+ "-" + state + "-"+cur_os+"-x86-custom-withjre" + exec_extension,
1270
            target_filename
1271
        )
1272
        mychmod(target_filename,RWXALL)
1273

  
1274
        md5sum(target_filename,target_filename+".md5")
1275
        mychmod(target_filename+".md5",RWALL)
1276
        """
1277 1257
        message( "Createds installers for platform "+cur_os+"/"+cur_platform+"\n")
1278 1258

  
1279 1259
    message( "Coping html index to browse paqueges of the distro.")

Also available in: Unified diff