Revision 42768

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/packaging/gvspkg
973 973

  
974 974
def extract_make_portable(zfile, targetfolder):
975 975
  zf = zipfile.ZipFile(zfile)
976
  data = zf.read("gvsig-desktop/tools/make-portable")
976
  data = zf.read("tools/make-portable")
977 977
  f = open(os.path.join(targetfolder,"make-portable"),"wb")
978 978
  f.write(data)
979 979
  f.close()
......
1028 1028
    f=open(join(portable_folder,"packages","excludes"),"w")
1029 1029
    f.write("""EPSG_v6
1030 1030
EPSG_v8_4
1031
EPSG_v8_5
1032
EPSG_v8_6
1031 1033
org.gvsig.app.document.layout1.app.mainplugin
1032 1034
org.gvsig.dyschromatopsia.app.extension
1033 1035
org.gvsig.educa.portableview.app.editor
......
1039 1041
""")
1040 1042
    f.close()
1041 1043
    fname_base = "gvSIG-desktop-%s-%s-%s" % (getVersion(),build,state)
1042
    linkfile(
1043
      join(build_folder,fname_base + "-all-x86-online.zip"),
1044
      join(portable_folder,"standard",fname_base + "-all-x86-online.zip")
1045
    )
1046
    linkfile(
1047
      join(build_folder,fname_base + "-lin-x86.gvspks"),
1048
      join(portable_folder,"standard",fname_base + "-lin-x86.gvspks")
1049
    )
1050
    linkfile(
1051
      join(build_folder,fname_base + "-lin-x86_64.gvspks"),
1052
      join(portable_folder,"standard",fname_base + "-lin-x86_64.gvspks")
1053
    )
1054
    linkfile(
1055
      join(build_folder,fname_base + "-lin-x86-online.jar"),
1056
      join(portable_folder,"standard",fname_base + "-lin-x86-online.jar")
1057
    )
1058
    linkfile(
1059
      join(build_folder,fname_base + "-win-x86.gvspks"),
1060
      join(portable_folder,"standard",fname_base + "-win-x86.gvspks")
1061
    )
1062
    linkfile(
1063
      join(build_folder,fname_base + "-win-x86-online.jar"),
1064
      join(portable_folder,"standard",fname_base + "-win-x86-online.jar")
1065
    )
1044
    for cur_os in ("lin","win") :
1045
      for arch in ("x86", "x86_64"):
1046
        linkfile(
1047
          join(build_folder,fname_base + "-" + cur_os + "-" + arch + "-online.zip"),
1048
          join(portable_folder,"standard",fname_base + "-" + cur_os + "-" + arch + "-online.zip")
1049
        )
1050
        linkfile(
1051
          join(build_folder,fname_base + "-" + cur_os + "-" + arch + ".gvspks"),
1052
          join(portable_folder,"standard",fname_base + "-" + cur_os + "-" + arch + ".gvspks")
1053
        )
1066 1054
    extract_make_portable(
1067
      join(build_folder,fname_base + "-all-x86-online.zip"),
1055
      join(build_folder,fname_base + "-lin-x86_64-online.zip"),
1068 1056
      join(portable_folder)
1069 1057
    )
1070
    # shutil.copyfile(
1071
    #   join(getPackagesRoot(),"gvspkg.bin","make-portable"),
1072
    #   join(portable_folder,"make-portable")
1073
    # )
1074 1058
    mychmod(join(portable_folder,"make-portable"),RWXALL)
1075 1059

  
1076 1060
def zipfolder(source,target):
......
1126 1110
    if not os.path.isdir(portable_folder) :
1127 1111
      do_prepare_portable(build,state)
1128 1112
    os.system('cd %s ; ./make-portable' % (portable_folder))
1129

  
1113
    """
1130 1114
    message("Removing previos portable zip files")
1131
    removefile(join(build_folder,"gvsig-desktop-%s-%s-%s-lin-x86.zip" %  (getVersion(),build,state)))
1132
    removefile(join(build_folder,"gvsig-desktop-%s-%s-%s-lin-x86_x86.zip" % (getVersion(),build,state)))
1133
    removefile(join(build_folder,"gvsig-desktop-%s-%s-%s-win-x86.zip" % (getVersion(),build,state)))
1115
    for cur_os in ("lin","win") :
1116
      for arch in ("x86", "x86_64"):
1117
        removefile(join(build_folder,"gvsig-desktop-%s-%s-%s-%s-%s.zip" %  (getVersion(),build,state,cur_os,arch)))
1134 1118

  
1135 1119
    target_folder = join(getPackagesRoot(),"dists",getVersion(),"builds",build,"misc","portable","target")
1136 1120
    os.chdir(target_folder)
1137 1121

  
1138
    message("Creating zip gvsig-desktop-%s-%s-%s-lin-x86.zip" % (getVersion(),build,state))
1139
    zipfolder(
1140
      "gvsig-desktop-%s-%s-%s-lin-x86" % (getVersion(),build,state),
1141
      join(build_folder,"gvsig-desktop-%s-%s-%s-lin-x86.zip" % (getVersion(),build,state))
1142
    )
1143
    message("Creating zip gvsig-desktop-%s-%s-%s-lin-x86_64.zip" % (getVersion(),build,state))
1144
    zipfolder(
1145
      "gvsig-desktop-%s-%s-%s-lin-x86_64" % (getVersion(),build,state),
1146
      join(build_folder,"gvsig-desktop-%s-%s-%s-lin-x86_64.zip" % (getVersion(),build,state))
1147
    )
1148
    message("Creating zip gvsig-desktop-%s-%s-%s-win-x86.zip" % (getVersion(),build,state))
1149
    zipfolder(
1150
      "gvsig-desktop-%s-%s-%s-win-x86" % (getVersion(),build,state),
1151
      join(build_folder,"gvsig-desktop-%s-%s-%s-win-x86.zip" % (getVersion(),build,state))
1152
    )
1153

  
1122
    for cur_os in ("lin","win") :
1123
      for arch in ("x86", "x86_64"):
1124
        message("Creating zip gvsig-desktop-%s-%s-%s-%s-%s.zip" % (getVersion(),build,state,cur_os,arch))
1125
        zipfolder(
1126
          "gvsig-desktop-%s-%s-%s-%s-%s" % (getVersion(),build,state,cur_os,arch),
1127
          join(build_folder,"gvsig-desktop-%s-%s-%s-%s-%s.zip" % (getVersion(),build,state,cur_os,arch))
1128
        )
1129
    """
1154 1130
    #message("Remove temporary folders")
1155 1131
    #shutil.rmtree(target_folder)
1156 1132

  

Also available in: Unified diff