Changeset 464

Timestamp:

06/12/08 21:07:10 (3 months ago)

Author:

fidojones

Message:

modificaciones en la generacion de diff

Files:

• trunk/scripts/baifox_codeupdate_v2.php (modified) (4 diffs)

trunk/scripts/baifox_codeupdate_v2.php

@@ -16 +16 @@
 
         $update_files=array("main_config.php");
-        $ignore_files=array("bind_ignore.txt","clientes.xml","database.xml","dominios.xml","ftp.xml",".htpasswd","usuarios.xml","update_ignore.txt","crontab");
+        $ignore_files=array("bind_ignore.txt","clientes.xml","database.xml","dominios.xml","ftp.xml",".htpasswd","usuarios.xml","update_ignore.txt","crontab","Makefile");
 
         if($argv[1]=="update"){
                 $nueva_version=file_version();
-                //Genera un zip con el panel completo
-                baifox_full_zip($nueva_version);
-                baifox_diff_zip($nueva_version);
-                write_file(CFG_DIRECTORY.CFG_VERSION,$nueva_version);
+                $lineas=file(CFG_DIRECTORY.CFG_LASTUPDATE);
+                $version_actual=$lineas[0];
+                $version_ultima=exec("svn info svn://".SVN_USER."@".SVN_URL."| grep '^Revisión:' | sed -e 's/Revisión: *//'");
+                if($version_actual!=$version_ultima){
+                        //Genera un zip con las ultimas diferencias
+                        baifox_diff_zip($nueva_version,$version_actual,$version_ultima);
+                        //Genera un zip con el panel completo
+                        baifox_full_zip($nueva_version);
+                        //Pone la version del panel
+                        write_file(CFG_DIRECTORY.CFG_VERSION,$nueva_version);
+                        //Pone la version del SVN
+                        write_file(CFG_DIRECTORY.CFG_LASTUPDATE,$version_ultima);
+                }
         }
 
-        function baifox_diff_zip($nueva_version){
+        function baifox_diff_zip($nueva_version,$version_actual,$version_ultima){
+                //Elimina si existe las carpetas temporales
                 if(file_exists(CFG_DIRECTORY.CFG_TEMP))
                         exec("rm -R -f ".CFG_DIRECTORY.CFG_TEMP);
                 exec("mkdir ".CFG_DIRECTORY.CFG_TEMP);
                 exec("svn checkout svn://".SVN_USER."@".SVN_URL." ".CFG_DIRECTORY.CFG_TEMP.SVN_PROJECT_TEMP);
-                $lineas=file(CFG_DIRECTORY.CFG_LASTUPDATE);
-                $version_actual=$lineas[0];
-                $version_ultima=exec("svn info ".CFG_DIRECTORY.CFG_TEMP.SVN_PROJECT_TEMP."| grep '^Revisión:' | sed -e 's/Revisión: *//'");
                 exec("svn diff -r $version_actual:$version_ultima --summarize ".CFG_DIRECTORY.CFG_TEMP.SVN_PROJECT_TEMP."| sort | uniq > ".CFG_DIRECTORY.CFG_TEMP."difffiles.tmp");
                 $lineas=file(CFG_DIRECTORY.CFG_TEMP."difffiles.tmp");
@@ -60 +67 @@
                 //Crea el fichero zip
                 exec("cd ".CFG_DIRECTORY.CFG_TEMP.";zip -9 -r ".CFG_DIRECTORY."baifox-$nueva_version-diff.bxz ".CFG_UPDATE." ".CFG_OLDFILES." ".CFG_VERSION." ".SVN_PROJECT." -x \"*.svn/*\"");
+                //Añade el diff a la lista de diff
+                write_file(CFG_DIRECTORY.CFG_UPDATEDIFF,"$nueva_version|baifox-$nueva_version-diff.bxz\n","a");
                 //Borra el directorio temporal
                 if(file_exists(CFG_DIRECTORY.CFG_TEMP))
                         exec("rm -R -f ".CFG_DIRECTORY.CFG_TEMP);
-
-                //Añade el diff a la lista de diff
-                write_file(CFG_DIRECTORY.CFG_UPDATEDIFF,"$nueva_version|baifox-$nueva_version-diff.bxz\n","a");
-                //Pone la version del SVN
-                write_file(CFG_DIRECTORY.CFG_LASTUPDATE,$version_ultima);
         }
 
@@ -84 +88 @@
 
                 //Crea el fichero zip
-                exec("cd ".CFG_DIRECTORY.CFG_TEMP.";zip -9 -r ".CFG_DIRECTORY."baifox-$nueva_version.bxz ".CFG_UPDATE." ".CFG_OLDFILES." ".CFG_VERSION." ".SVN_PROJECT." -x \"*.svn/*\"");
+                exec("cd ".CFG_DIRECTORY.CFG_TEMP.";zip -9 -r ".CFG_DIRECTORY."baifox-$nueva_version.bxz ".CFG_UPDATE." ".CFG_OLDFILES." ".CFG_VERSION." ".SVN_PROJECT." -x \"*.svn/*\" \"*debian/*\" \"*src/*\" \"*Makefile\"");
+                //Borra el directorio temporal
                 if(file_exists(CFG_DIRECTORY.CFG_TEMP))
                         exec("rm -R -f ".CFG_DIRECTORY.CFG_TEMP);
@@ -146 +151 @@
                 $ignoredDirectory[] = "..";
                 $ignoredDirectory[] = ".svn";
+                $ignoredDirectory[] = "debian";
+                $ignoredDirectory[] = "src";
 
                 global $directorylist;    //initialize global array