/ - Diff - Application: gvSIG desktop - gvSIG

Revision 42726

             x = x.replace("\\:", ":")
             return x
           return default
         def getDescription(self):
           return self.getIniOption("description")
-...
             for line in lines:
               if line[-1] == "\n":
                 line = line[:-1]
               info = PackageInfo(line)
               self.append(info)
-...
     def installer_add(cmd,arg1,arg2):
         installer_add_use_zip(cmd,arg1,arg2)
     def installer_add_use_zip(cmd,arg1,arg2):
         if cmd == "addjrelin":
           return
         if cmd == "addjrewin":
           return
         if cmd == "addpks":
            zip = zipfile.ZipFile(arg1,"a",zipfile.ZIP_STORED)
            zip.write(arg2,"package.gvspks")
            zip.close()
     def installer_add_use_installkit(cmd,arg1,arg2):
         folder = "%s/gvspkg.bin" % GVSPKG_ROOT
-...
                 distribution_name = arg
             else:
                 assert False, "unhandled option"
         if len(args) != 2 :
             shorthelp(args)
             sys.exit(4)
-...
         mychmod(custom_name,RWALL)
         message("Adding %s..." % gvspks_name)
         installer_add("addpks", custom_name, gvspks_name)
         """
         if addjrelin:
             withjre_name = bin_name.replace("online", distribution_name+"-withjre")
-...
             msgwarn("No se ha encontrado el fichero %r. la opcion -s/--include-default-selection sera ignorada." % default_selection)
             default_selection = None
         indexes = IndexList()
         packages_txt = getDist() +"/packages.txt"
         packages_gvspki = getDist() +"/packages.gvspki"
         packages_gvspki = getDist() +"/packages.gvspki"
         message( "Creating 'packages.gvspki' for version '%s'" % getVersion() + "...")
         if not os.path.exists(getDist()):
             msgerror("Can't locate version folder '%s'." % getDist())
             sys.exit(3)
         if os.path.exists(packages_txt) and not clear_list:
             indexes.load(packages_txt)
         else:
-...
         if os.path.lexists(dst+".md5"):
           os.remove(dst+".md5")
         os.symlink(src+".md5",dst+".md5")
     def domkmirror(root_src, version, build):
       join = os.path.join
-...
       build_target = join(root_target,"dists",version,"builds",build)
       pool_src = join(root_src,"pool")
       pool_target = join(root_target,"pool")
       makedirs(root_target)
       makedirs(build_target)
       makedirs(pool_target)
-...
         indexes = IndexList()
         packages_txt = getDist() +"/packages.txt"
         if os.path.exists(packages_txt) and not clear_list:
             indexes.load(packages_txt)
         else:
-...
       <meta http-equiv="Content-Type" content= "text/html; charset=us-ascii" />
           <title>"%s" package list</title>'''% getVersion() # Title
         html += '''
         html += '''
     <!-- estilos para las tablas -->
       <style type="text/css" title="currentStyle">
         @import "css/demo_table.css";
-...
           raise ex
         message("html pages createds.\n")
     def mkpkihtml(basepath, info):
       html='''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     <html xmlns="http://www.w3.org/1999/xhtml">
-...
           print "Requiered option --state not found."
           shorthelp(args)
           sys.exit(2)
         join = os.path.join
         build_folder = join(getPackagesRoot(),"dists",getVersion(),"builds",build)
         if not os.path.isdir(build_folder):
-...
         makedirs(join(portable_folder,"standard"))
         makedirs(join(portable_folder,"patchs"))
         f=open(join(portable_folder,"packages","excludes"),"w")
         f.write("""EPSG_v6
     EPSG_v8_4
         f.write("""EPSG_v6
     EPSG_v8_4
     org.gvsig.app.document.layout1.app.mainplugin
     org.gvsig.dyschromatopsia.app.extension
     org.gvsig.educa.portableview.app.editor
-...
         #   join(portable_folder,"make-portable")
         # )
         mychmod(join(portable_folder,"make-portable"),RWXALL)
     def zipfolder(source,target):
       def zipdir(path, zip):
           for root, dirs, files in os.walk(path):
-...
     def removefile(filename):
       if os.path.exists(filename):
         os.remove(filename)
     def mkportable(args):
         cmd = Command(args)
         try:
-...
           print "Requiered option --state not found."
           shorthelp(args)
           sys.exit(2)
         join = os.path.join
         build_folder = join(getPackagesRoot(),"dists",getVersion(),"builds",build)
         if not os.path.isdir(build_folder):
           print "Can't access the build folder "+build_folder+"."
           sys.exit(2)
         portable_folder = join(build_folder,"misc","portable")
         if not os.path.isdir(portable_folder) :
           do_prepare_portable(build,state)
-...
         removefile(join(build_folder,"gvsig-desktop-%s-%s-%s-lin-x86.zip" %  (getVersion(),build,state)))
         removefile(join(build_folder,"gvsig-desktop-%s-%s-%s-lin-x86_x86.zip" % (getVersion(),build,state)))
         removefile(join(build_folder,"gvsig-desktop-%s-%s-%s-win-x86.zip" % (getVersion(),build,state)))
         target_folder = join(getPackagesRoot(),"dists",getVersion(),"builds",build,"misc","portable","target")
         os.chdir(target_folder)
         message("Creating zip gvsig-desktop-%s-%s-%s-lin-x86.zip" % (getVersion(),build,state))
         zipfolder(
           "gvsig-desktop-%s-%s-%s-lin-x86" % (getVersion(),build,state),
-...
           "gvsig-desktop-%s-%s-%s-win-x86" % (getVersion(),build,state),
           join(build_folder,"gvsig-desktop-%s-%s-%s-win-x86.zip" % (getVersion(),build,state))
+        )
         #message("Remove temporary folders")
         #shutil.rmtree(target_folder)
-...
         distribution_name = "standard"
         platforms = ("x86", "x86_64")
         oss = ("lin", "win")
         for opt, arg in opts:
             if opt in ("-b", "--build"):
                 build=arg
-...
         if not os.path.isdir("builds/"+build):
           print "Can't access the build folder builds/"+build+"."
           sys.exit(2)
         message( "Generating distribution for build "+ build + "...")
         message("Recreating index of packages...")
         executeCommand("mks", "-s", "-c")
         executeCommand("mkhtml" )
         gvspki_filename = "builds/"+build+"/packages.gvspki"
         message( "Coping packages.gvspki to "+ gvspki_filename + "\n")
         shutil.copyfile("packages.gvspki", gvspki_filename)
         shutil.copyfile("packages.gvspki.md5", gvspki_filename +".md5")
         #exec_extensions = {
         #  "lin" : LINUX_EXEC_EXTENSION,
         #  "win" : ".exe"
         #}
         for cur_os in oss:
           exec_extension = ".jar" #exec_extensions[cur_os]
           for cur_platform in platforms:
-...
             if not os.path.isfile(online_filename):
               msgwarn("Can't access the online installable for "+cur_os+"/"+cur_platform + " ("+online_filename+").")
               continue
             message( "Coping packages-"+cur_os+"-"+cur_platform+"..gvspks to "+ gvspks_filename)
             shutil.copyfile("packages-"+cur_os+"-"+cur_platform+".gvspks", gvspks_filename)
             shutil.copyfile("packages-"+cur_os+"-"+cur_platform+".gvspks.md5", gvspks_filename +".md5")
-...
             md5sum(online_filename,online_filename+".md5")
             mychmod(online_filename+".md5",RWALL)
             executeCommand("mkinstall" , "--addjre"+cur_os, online_filename, gvspks_filename)
             message( "Renaming files from custom to standard...")
-...
             mychmod(target_filename+".md5",RWALL)
             """
             message( "Createds installers for platform "+cur_os+"/"+cur_platform+"\n")
         message( "Coping html index to browse paqueges of the distro.")
         shutil.rmtree("builds/"+build+"/web", ignore_errors=True)
         shutil.copytree("web", "builds/"+build+"/web")
-...
         f.close()
         message( "\nCreation of distribution completed.\n")
     def show(args):
         cmd = Command(args)
         try:
-...
     def editall(args):
         cmd = Command(args)
         try:
         try:
             opts, args = getopt.getopt(cmd.getArgs("editall"), "Scx:I:r:", ["clear-list", "exclude=", "excludepki=", "excludepkg=", "include=", "replace=", "sign"])
         except getopt.GetoptError, err:
             # print help information and exit:
-...
         url_pki = args[0]
         if url_pki.startswith("https:") and nohttps :
            url_pki = "http:" + url_pki[6:]
         message( "Download package index '%s'" % url_pki)
         temppath_pki= os.path.join("/tmp",os.path.basename(url_pki))
         if not downloadFile(url_pki,temppath_pki):
-...
         if url_pkg[-7:] == ".gvspki" :
           msgwarn("Suspicious download-url value. Ends with gvspki, expected gvspkg.")
           msgwarn("download-url ='%s'." % url_pkg)
         if url_pkg.startswith("https:") and nohttps :
            url_pkg = "http:" + url_pkg[6:]
         message( "Download package '%s'" % url_pkg)
         temppath_pkg= os.path.join("/tmp",os.path.basename(url_pkg))
         if not downloadFile(url_pkg,temppath_pkg):
-...
         pathname_pkg = os.path.join(folder,os.path.basename(url_pkg))
         if  not force and os.path.isfile(pathname_pki) :
             msgwarn("The package downloaded from download-url alredy exists in the pool. Use -f to force install.")
             print # force a newline
             print # force a newline
             return 1
         message( "installing package '%s'" % os.path.basename(pathname_pki))
         shutil.copyfile(temppath_pki, pathname_pki)
-...
     -d,--debug      Activa el modo debug.
     --version ver   Fija la version con la que van a trabajar.
     -r,--package-root root    Fija la carpeta del raiz del sistema de paquetes
     COMMANDS:
     mkinstall [OPTIONS] install-file packages-file
-...
          -b BUILD, --build=BUILD
          -p, --platform=all|x86|x86_64|amd64
          -N, --distribution-name=name
     mkmirror [OPTIONS]
          -b, --build buildnumber
-...
     -r|--package-root package-root
         Fija la carpeta en la que va a buscar el raiz del sistema de paquetes
         con el que trabajar
     COMMANDS:
     mkinstall [OPTIONS] install-file packages-file
-...
         -l | --addjrelin
         -w | --addjrewin
         -N | --distribution-name=name
           Nombre usado como sufijo del nuevo binario a generar. Por defecto si no se
           indica valdra "custom".
-...
             Si no se indica plataforma se generara para "all".
             El indice,"gvspki", siempre llevara los de todas las plataformas, esta opcion
             solo afecta a la genracion del "gvspks".
          -i | --index-only
             No crea el fichero gvspks, solo crea el gvspki
-...
             - x86_64
             - amd64 (sinonimo aceptado para x86_64)
             Si no se indica plataforma se generara para x86.
          -N | --distribution-name=name
             Nombre usado como sufijo del nuevo binario a generar. Por defecto si no se
             indica valdra "standard".
     mkmirror [OPTIONS]
       Prepara una carpeta para hacer un mirror de un build en concreto.

Also available in: Unified diff